Skip to content

Allow disabling shared configuration check from hosting bundle. #6498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 16, 2019
Merged

Allow disabling shared configuration check from hosting bundle. #6498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e027cb3
Allow disabling shared configuration check from hosting bundle.
jkotalik Jan 5, 2019
b03195b
move variable
jkotalik Jan 8, 2019
371cab8
inverting default
jkotalik Jan 9, 2019
431f311
feedback
jkotalik Jan 10, 2019
3b658e8
cleanup
jkotalik Jan 11, 2019
3430762
Feedback
jkotalik Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@

<Property Id="ARPCONTACT">Microsoft Corporation</Property>
<Property Id="ARPPRODUCTICON" Value="AspNetCoreModule.ico" />
<Property Id="OPT_NO_SHARED_CONFIG_CHECK" Value="0"/>
<Icon Id="AspNetCoreModule.ico" SourceFile="..\Bitmaps\AspNetCoreModule.ico" />
<!-- <Property Id="REINSTALLMODE" Value="emus"/> -->

Expand Down Expand Up @@ -251,7 +252,7 @@
<AppSearch Before="LaunchConditions" />
<LaunchConditions After="FindRelatedProducts" />
<MigrateFeatureStates />
<Custom Action="CheckForSharedConfiguration" After="InstallInitialize"></Custom>
<Custom Action="CheckForSharedConfiguration" After="InstallInitialize">OPT_NO_SHARED_CONFIG_CHECK=0 AND NOT Installed AND NOT REMOVE="ALL"</Custom>
<Custom Action="CA_UNLOCk_HANDLER_PROPERTY" After="InstallFiles"><![CDATA[(NOT PATCH)]]></Custom>
<Custom Action="CA_UNLOCk_HANDLER" After="CA_UNLOCk_HANDLER_PROPERTY"><![CDATA[(NOT PATCH)]]></Custom>
<Custom Action="UpdateDynamicCompression" After="InstallFiles"><![CDATA[(NOT PATCH)]]></Custom>
Expand Down
3 changes: 2 additions & 1 deletion src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@

<Property Id="ARPCONTACT">Microsoft Corporation</Property>
<Property Id="ARPPRODUCTICON" Value="AspNetCoreModule.ico" />
<Property Id="OPT_NO_SHARED_CONFIG_CHECK" Value="0"/>
<Icon Id="AspNetCoreModule.ico" SourceFile="..\Bitmaps\AspNetCoreModule.ico" />
<!-- <Property Id="REINSTALLMODE" Value="emus"/> -->

Expand Down Expand Up @@ -285,7 +286,7 @@
<AppSearch Before="LaunchConditions" />
<LaunchConditions After="FindRelatedProducts" />
<MigrateFeatureStates />
<Custom Action="CheckForSharedConfiguration" After="InstallInitialize"></Custom>
<Custom Action="CheckForSharedConfiguration" After="InstallInitialize">OPT_NO_SHARED_CONFIG_CHECK=0 AND NOT Installed AND NOT REMOVE="ALL"</Custom>
<Custom Action="CA_UNLOCk_HANDLER_PROPERTY" After="InstallFiles"><![CDATA[(NOT PATCH)]]></Custom>
<Custom Action="CA_UNLOCk_HANDLER" After="CA_UNLOCk_HANDLER_PROPERTY"><![CDATA[(NOT PATCH)]]></Custom>
<Custom Action="UpdateDynamicCompression" After="InstallFiles"><![CDATA[(NOT PATCH)]]></Custom>
Expand Down
18 changes: 13 additions & 5 deletions src/Installers/Windows/WindowsHostingBundle/ANCM.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
<Fragment>
<PackageGroup Id="PG_ANCM">
<RollbackBoundary Id="RB_ANCM" />
Expand All @@ -9,28 +9,36 @@
Compressed="yes"
Vital="yes"
Visible="no"
InstallCondition="NOT VersionNT64 AND (VersionNT &gt;= v6.1) AND (IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1) AND (NOT OPT_NO_ANCM)" />
InstallCondition="NOT VersionNT64 AND (VersionNT &gt;= v6.1) AND (IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1) AND (NOT OPT_NO_ANCM)">
<MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
</MsiPackage>

<MsiPackage Id="AspNetCoreModule_x64" SourceFile="$(var.BinPath)aspnetcoremodule_x64_en.msi"
Name="aspnetcoremodule_x64_en.msi"
Compressed="yes"
Vital="yes"
Visible="no"
InstallCondition="VersionNT64 AND (VersionNT64 &gt;= v6.1) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM)" />
InstallCondition="VersionNT64 AND (VersionNT64 &gt;= v6.1) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM)">
<MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
</MsiPackage>

<MsiPackage Id="AspNetCoreModuleV2_x86" SourceFile="$(var.BinPath)aspnetcoremodule_x86_en_v2.msi"
Name="aspnetcoremodule_x86_en_v2.msi"
Compressed="yes"
Vital="yes"
Visible="no"
InstallCondition="NOT VersionNT64 AND (VersionNT &gt;= v6.1) AND (IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1) AND (NOT OPT_NO_ANCM)" />
InstallCondition="NOT VersionNT64 AND (VersionNT &gt;= v6.1) AND (IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1) AND (NOT OPT_NO_ANCM)">
<MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
</MsiPackage>

<MsiPackage Id="AspNetCoreModuleV2_x64" SourceFile="$(var.BinPath)aspnetcoremodule_x64_en_v2.msi"
Name="aspnetcoremodule_x64_en_v2.msi"
Compressed="yes"
Vital="yes"
Visible="no"
InstallCondition="VersionNT64 AND (VersionNT64 &gt;= v6.1) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM)" />
InstallCondition="VersionNT64 AND (VersionNT64 &gt;= v6.1) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM)">
<MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
</MsiPackage>
</PackageGroup>

<util:RegistrySearch Id="IISCoreWebEngineInstalledSearch_x86"
Expand Down
3 changes: 2 additions & 1 deletion src/Installers/Windows/WindowsHostingBundle/Bundle.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@
<Variable Name="OPT_NO_SHAREDFX" Value="0" bal:Overridable="yes"/>
<Variable Name="OPT_NO_RUNTIME" Value="0" bal:Overridable="yes"/>
<Variable Name="OPT_NO_X86" Value="0" bal:Overridable="yes"/>
<Variable Name="OPT_NO_SHARED_CONFIG_CHECK" Value="0" bal:Overridable="yes" />

<!-- These variables control the state of conditional UI text elements.
<!-- These variables control the state of conditional UI text elements.
They are disabled by default and enabled based on whether or not we detect that IIS is installed -->
<Variable Name="InstallResetIISState" Value="disable"/>
<Variable Name="InstallNoIISState" Value="disable"/>
Expand Down