Skip to content

Commit 42d3289

Browse files
jkotalikjkotalik
committed
Merge branch 'release/2.2' into jkotalik/masterMerge
2 parents 9b8146f + 4c1a375 commit 42d3289

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151

5252
<Property Id="ARPCONTACT">Microsoft Corporation</Property>
5353
<Property Id="ARPPRODUCTICON" Value="AspNetCoreModule.ico" />
54+
<Property Id="OPT_NO_SHARED_CONFIG_CHECK" Value="0"/>
5455
<Icon Id="AspNetCoreModule.ico" SourceFile="..\Bitmaps\AspNetCoreModule.ico" />
5556
<!-- <Property Id="REINSTALLMODE" Value="emus"/> -->
5657

@@ -242,7 +243,7 @@
242243
<AppSearch Before="LaunchConditions" />
243244
<LaunchConditions After="FindRelatedProducts" />
244245
<MigrateFeatureStates />
245-
<Custom Action="CheckForSharedConfiguration" After="InstallInitialize"></Custom>
246+
<Custom Action="CheckForSharedConfiguration" After="InstallInitialize">OPT_NO_SHARED_CONFIG_CHECK=0 AND NOT Installed AND NOT REMOVE="ALL"</Custom>
246247
<Custom Action="CA_UNLOCk_HANDLER_PROPERTY" After="InstallFiles"><![CDATA[(NOT PATCH)]]></Custom>
247248
<Custom Action="CA_UNLOCk_HANDLER" After="CA_UNLOCk_HANDLER_PROPERTY"><![CDATA[(NOT PATCH)]]></Custom>
248249
<Custom Action="UpdateDynamicCompression" After="InstallFiles"><![CDATA[(NOT PATCH)]]></Custom>

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151

5252
<Property Id="ARPCONTACT">Microsoft Corporation</Property>
5353
<Property Id="ARPPRODUCTICON" Value="AspNetCoreModule.ico" />
54+
<Property Id="OPT_NO_SHARED_CONFIG_CHECK" Value="0"/>
5455
<Icon Id="AspNetCoreModule.ico" SourceFile="..\Bitmaps\AspNetCoreModule.ico" />
5556
<!-- <Property Id="REINSTALLMODE" Value="emus"/> -->
5657

@@ -274,7 +275,7 @@
274275
<AppSearch Before="LaunchConditions" />
275276
<LaunchConditions After="FindRelatedProducts" />
276277
<MigrateFeatureStates />
277-
<Custom Action="CheckForSharedConfiguration" After="InstallInitialize"></Custom>
278+
<Custom Action="CheckForSharedConfiguration" After="InstallInitialize">OPT_NO_SHARED_CONFIG_CHECK=0 AND NOT Installed AND NOT REMOVE="ALL"</Custom>
278279
<Custom Action="CA_UNLOCk_HANDLER_PROPERTY" After="InstallFiles"><![CDATA[(NOT PATCH)]]></Custom>
279280
<Custom Action="CA_UNLOCk_HANDLER" After="CA_UNLOCk_HANDLER_PROPERTY"><![CDATA[(NOT PATCH)]]></Custom>
280281
<Custom Action="UpdateDynamicCompression" After="InstallFiles"><![CDATA[(NOT PATCH)]]></Custom>

‎src/Installers/Windows/WindowsHostingBundle/ANCM.wxs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
2+
<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">
33
<Fragment>
44
<PackageGroup Id="PG_ANCM">
55
<RollbackBoundary Id="RB_ANCM" />
@@ -9,28 +9,36 @@
99
Compressed="yes"
1010
Vital="yes"
1111
Visible="no"
12-
InstallCondition="NOT VersionNT64 AND (VersionNT &gt;= v6.1) AND (IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1) AND (NOT OPT_NO_ANCM)" />
12+
InstallCondition="NOT VersionNT64 AND (VersionNT &gt;= v6.1) AND (IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1) AND (NOT OPT_NO_ANCM)">
13+
<MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
14+
</MsiPackage>
1315

1416
<MsiPackage Id="AspNetCoreModule_x64" SourceFile="$(var.AspNetCoreModule_x64.TargetPath)"
1517
Name="$(var.AspNetCoreModule_x64.TargetFileName)"
1618
Compressed="yes"
1719
Vital="yes"
1820
Visible="no"
19-
InstallCondition="VersionNT64 AND (VersionNT64 &gt;= v6.1) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM)" />
21+
InstallCondition="VersionNT64 AND (VersionNT64 &gt;= v6.1) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM)">
22+
<MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
23+
</MsiPackage>
2024

2125
<MsiPackage Id="AspNetCoreModuleV2_x86" SourceFile="$(var.AspNetCoreModuleV2_x86.TargetPath)"
2226
Name="$(var.AspNetCoreModuleV2_x86.TargetFileName)"
2327
Compressed="yes"
2428
Vital="yes"
2529
Visible="no"
26-
InstallCondition="NOT VersionNT64 AND (VersionNT &gt;= v6.1) AND (IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1) AND (NOT OPT_NO_ANCM)" />
30+
InstallCondition="NOT VersionNT64 AND (VersionNT &gt;= v6.1) AND (IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1) AND (NOT OPT_NO_ANCM)">
31+
<MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
32+
</MsiPackage>
2733

2834
<MsiPackage Id="AspNetCoreModuleV2_x64" SourceFile="$(var.AspNetCoreModuleV2_x64.TargetPath)"
2935
Name="$(var.AspNetCoreModuleV2_x64.TargetFileName)"
3036
Compressed="yes"
3137
Vital="yes"
3238
Visible="no"
33-
InstallCondition="VersionNT64 AND (VersionNT64 &gt;= v6.1) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM)" />
39+
InstallCondition="VersionNT64 AND (VersionNT64 &gt;= v6.1) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM)">
40+
<MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
41+
</MsiPackage>
3442
</PackageGroup>
3543

3644
<util:RegistrySearch Id="IISCoreWebEngineInstalledSearch_x86"

‎src/Installers/Windows/WindowsHostingBundle/Bundle.wxs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@
2424
<Variable Name="OPT_NO_SHAREDFX" Value="0" bal:Overridable="yes"/>
2525
<Variable Name="OPT_NO_RUNTIME" Value="0" bal:Overridable="yes"/>
2626
<Variable Name="OPT_NO_X86" Value="0" bal:Overridable="yes"/>
27+
<Variable Name="OPT_NO_SHARED_CONFIG_CHECK" Value="0" bal:Overridable="yes" />
2728

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

0 commit comments

Comments
 (0)