huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.2' into jkotalik/masterMerge

This commit is contained in:
Justin Kotalik 2019-01-17 08:31:41 -08:00
parent 9b8146ffa9 4c1a375a2c
commit 42d3289662
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs
View File

@ -51,6 +51,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"/> -->
@ -242,7 +243,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>

3
src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
View File

@ -51,6 +51,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"/> -->
@ -274,7 +275,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>

18
src/Installers/Windows/WindowsHostingBundle/ANCM.wxs
View File

@ -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" />
@ -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.AspNetCoreModule_x64.TargetPath)"
Name="$(var.AspNetCoreModule_x64.TargetFileName)"
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.AspNetCoreModuleV2_x86.TargetPath)"
Name="$(var.AspNetCoreModuleV2_x86.TargetFileName)"
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.AspNetCoreModuleV2_x64.TargetPath)"
Name="$(var.AspNetCoreModuleV2_x64.TargetFileName)"
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"

3
src/Installers/Windows/WindowsHostingBundle/Bundle.wxs
View File

@ -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"/>