Skip to content

Commit 46fcb7f

Browse files
wtgodbewtgodbe
committed
Initial commit for wix5 update
1 parent 53323f9 commit 46fcb7f

39 files changed

+1638
-2130
lines changed

‎eng/targets/Wix.Common.props‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<SchemaVersion>2.0</SchemaVersion>
66
<ProductVersion>3.14</ProductVersion>
77
<WixVersion>$(MicrosoftSignedWixVersion)</WixVersion>
8+
<Wix5Version>$(MicrosoftWixToolsetVersion)</Wix5Version>
9+
<UseWix5>true</UseWix5>
810
</PropertyGroup>
911

1012
<PropertyGroup>
@@ -19,10 +21,21 @@
1921

2022
<Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.props" Condition="'$(_ProjectExtensionsWereImported)' != 'true'" />
2123

22-
<ItemGroup>
24+
<ItemGroup Condition="'$(UseWix5)' != 'true'">
2325
<PackageReference Include="Microsoft.Signed.Wix" Version="$(WixVersion)" />
2426
</ItemGroup>
2527

28+
<ItemGroup Condition="'$(UseWix5)' == 'true'">
29+
<!-- Microsoft.Wix is a dotnet tool package, so exlude its assets. -->
30+
<PackageReference Include="Microsoft.Wix" Version="$(MicrosoftWixToolsetVersion)" ExcludeAssets="all" />
31+
<!-- Installers needs the $(PkgMicrosoftWixToolsetUIwixext) property to locate the extension. -->
32+
<PackageReference Include="Microsoft.WixToolset.UI.wixext" Version="$(MicrosoftWixToolsetVersion)" GeneratePathProperty="true" />
33+
<PackageReference Include="Microsoft.WixToolset.Dependency.wixext" Version="$(MicrosoftWixToolsetVersion)" GeneratePathProperty="true" />
34+
<PackageReference Include="Microsoft.WixToolset.Util.wixext" Version="$(MicrosoftWixToolsetVersion)" GeneratePathProperty="true" />
35+
<PackageReference Include="Microsoft.WixToolset.Bal.wixext" Version="$(MicrosoftWixToolsetVersion)" GeneratePathProperty="true" />
36+
<PackageReference Include="Microsoft.WixToolset.Heat" Version="$(MicrosoftWixToolsetVersion)" />
37+
</ItemGroup>
38+
2639
<PropertyGroup>
2740
<SignOutput>false</SignOutput>
2841
<DarkToolPath>$(WixExtDir)dark.exe</DarkToolPath>

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
5?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
44

@@ -34,7 +34,7 @@
3434

3535
<ItemGroup>
3636
<Compile Include="ancm_iis_expressv2.wxs" />
37-
<Compile Include="$(IIS-Setup)iisca\wix3\iisca.wxs">
37+
<Compile Include="$(IIS-Setup)iisca\wix5\iisca.wxs">
3838
<Link>iisca.wxs</Link>
3939
</Compile>
4040
<EmbeddedResource Include="..\setupstrings.wxl">

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs‎

Lines changed: 296 additions & 464 deletions
Large diffs are not rendered by default.

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<ItemGroup>
3333
<Compile Include="aspnetcoremodulev2.wxs" />
34-
<Compile Include="$(IIS-Setup)iisca\wix3\iisca.wxs">
34+
<Compile Include="$(IIS-Setup)iisca\wix5\iisca.wxs">
3535
<Link>iisca.wxs</Link>
3636
</Compile>
3737
<EmbeddedResource Include="..\setupstrings.wxl">

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

Lines changed: 152 additions & 225 deletions
Large diffs are not rendered by default.

‎src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<!--
1+
<!--
42
Copyright (c) Microsoft Corporation. All rights reserved.
53
Licensed under the MIT license.
64
-->
@@ -11,7 +9,7 @@
119
1210
-->
1311

14-
<Include>
12+
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
1513
<!--
1614
all these properties are marked secure because that is the mechanism by
1715
which they can be passed from the client side of msiexec to the server
@@ -23,36 +21,36 @@
2321

2422
<!-- iis installation lookup -->
2523
<Property Id="IISINSTALLPATH" Admin="no" Secure="yes">
26-
<RegistrySearch Id="RegistrySearch_IISINSTALLPATH" Type="raw" Root="HKLM" Key="Software\Microsoft\InetStp" Name="InstallPath" Win64="$(var.IsWin64)" />
24+
<RegistrySearch Id="RegistrySearch_IISINSTALLPATH" Type="raw" Root="HKLM" Key="Software\Microsoft\InetStp" Name="InstallPath" Bitness="$(var.Bitness)" />
2725
</Property>
2826

2927
<!-- iis features lookup -->
3028
<Property Id="IISCOREWEBENGINEINSTALLED" Secure="yes">
31-
<RegistrySearch Id="RegistrySearch_IISCOREWEBENGINEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="CoreWebEngine" Win64="$(var.IsWin64)" />
29+
<RegistrySearch Id="RegistrySearch_IISCOREWEBENGINEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="CoreWebEngine" Bitness="$(var.Bitness)" />
3230
</Property>
3331
<Property Id="IISW3SVCINSTALLED" Secure="yes">
34-
<RegistrySearch Id="RegistrySearch_IISW3SVCINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="W3SVC" Win64="$(var.IsWin64)"/>
32+
<RegistrySearch Id="RegistrySearch_IISW3SVCINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="W3SVC" Bitness="$(var.Bitness)" />
3533
</Property>
3634
<Property Id="IISADMINSERVICEINSTALLED" Secure="yes">
37-
<RegistrySearch Id="RegistrySearch_IISADMINSERVICEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="AdminService" Win64="$(var.IsWin64)"/>
35+
<RegistrySearch Id="RegistrySearch_IISADMINSERVICEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="AdminService" Bitness="$(var.Bitness)" />
3836
</Property>
3937
<Property Id="IISMANAGEMENTCONSOLEINSTALLED" Secure="yes">
40-
<RegistrySearch Id="RegistrySearch_IISMANAGEMENTCONSOLEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ManagementConsole" Win64="$(var.IsWin64)" />
38+
<RegistrySearch Id="RegistrySearch_IISMANAGEMENTCONSOLEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ManagementConsole" Bitness="$(var.Bitness)" />
4139
</Property>
4240
<Property Id="IISNETFXEXTENSIBILITYINSTALLED" Secure="yes">
43-
<RegistrySearch Id="RegistrySearch_IISNETFXEXTENSIBILITYINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="NetFxExtensibility" Win64="$(var.IsWin64)" />
41+
<RegistrySearch Id="RegistrySearch_IISNETFXEXTENSIBILITYINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="NetFxExtensibility" Bitness="$(var.Bitness)" />
4442
</Property>
4543
<Property Id="IISASPNET" Secure="yes">
46-
<RegistrySearch Id="RegistrySearch_IISASPNETINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ASPNET" Win64="$(var.IsWin64)" />
44+
<RegistrySearch Id="RegistrySearch_IISASPNETINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ASPNET" Bitness="$(var.Bitness)" />
4745
</Property>
4846

4947
<Property Id="IISMETABASEIMAGEPATH" Secure="yes">
50-
<RegistrySearch Id="RegistrySearch_IISMETABASEIMAGEPATH" Type="raw" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\IISADMIN" Name="ImagePath" Win64="$(var.IsWin64)" />
48+
<RegistrySearch Id="RegistrySearch_IISMETABASEIMAGEPATH" Type="raw" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\IISADMIN" Name="ImagePath" Bitness="$(var.Bitness)" />
5149
</Property>
5250

5351
<!-- UI features lookup -->
5452
<Property Id="IISREMOTECHANNELINSTALLED" Secure="yes">
55-
<RegistrySearch Id ="RegistrySearch_IISREMOTECHANNELINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\Inetmgr\7.0" Name="RemoteChannel" Win64="$(var.IsWin64)"/>
53+
<RegistrySearch Id="RegistrySearch_IISREMOTECHANNELINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\Inetmgr\7.0" Name="RemoteChannel" Bitness="$(var.Bitness)" />
5654
</Property>
5755

5856
<!--
@@ -63,36 +61,36 @@
6361
(NOT NETFRAMEWORK20) Or (NETFRAMEWORK20_SP_LEVEL ~>= "#1") Or Installed
6462
-->
6563
<Property Id="NETFRAMEWORK20" Secure="yes">
66-
<RegistrySearch Id="RegistrySearch_NETFRAMEWORK20" Type="raw" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="Install" Win64="$(var.IsWin64)"/>
64+
<RegistrySearch Id="RegistrySearch_NETFRAMEWORK20" Type="raw" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="Install" Bitness="$(var.Bitness)" />
6765
</Property>
6866
<Property Id="NETFRAMEWORK20_SP_LEVEL" Secure="yes">
69-
<RegistrySearch Id="RegistrySearch_NETFRAMEWORK20_SP_LEVEL" Type="raw" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="SP" Win64="$(var.IsWin64)"/>
67+
<RegistrySearch Id="RegistrySearch_NETFRAMEWORK20_SP_LEVEL" Type="raw" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="SP" Bitness="$(var.Bitness)" />
7068
</Property>
7169
<Property Id="NETFRAMEWORK35_SP_LEVEL" Secure="yes">
72-
<RegistrySearch Id="RegistrySearch_NETFRAMEWORK35_SP_LEVEL" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5" Name="SP" Win64="$(var.IsWin64)"/>
70+
<RegistrySearch Id="RegistrySearch_NETFRAMEWORK35_SP_LEVEL" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5" Name="SP" Bitness="$(var.Bitness)" />
7371
</Property>
7472

7573
<!-- search for powershell v1 -->
7674
<Property Id="POWERSHELLINSTALLED" Secure="yes">
77-
<RegistrySearch Id="RegistrySearch_POWERSHELLINSTALLED" Type="raw" Root="HKLM" Key="Software\Microsoft\PowerShell\1" Name="Install" Win64="$(var.IsWin64)"/>
75+
<RegistrySearch Id="RegistrySearch_POWERSHELLINSTALLED" Type="raw" Root="HKLM" Key="Software\Microsoft\PowerShell\1" Name="Install" Bitness="$(var.Bitness)" />
7876
</Property>
7977

8078
<!-- Read the start type for the Windows Update service -->
8179
<Property Id="WINDOWSUPDATE_START_TYPE" Secure="yes">
82-
<RegistrySearch Id="RegistrySearch_WINDOWSUPDATE_START_TYPE" Type="raw" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\wuauserv" Name="Start" Win64="$(var.IsWin64)"/>
80+
<RegistrySearch Id="RegistrySearch_WINDOWSUPDATE_START_TYPE" Type="raw" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\wuauserv" Name="Start" Bitness="$(var.Bitness)" />
8381
</Property>
8482

8583
<!-- Figure out the windows sku -->
8684
<Property Id="WINDOWSEDITION" Secure="yes">
87-
<RegistrySearch Id="RegistrySearch_WINDOWSEDITION" Type="raw" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion" Name="EditionID" Win64="$(var.IsWin64)"/>
85+
<RegistrySearch Id="RegistrySearch_WINDOWSEDITION" Type="raw" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion" Name="EditionID" Bitness="$(var.Bitness)" />
8886
</Property>
8987

9088
<!-- search for web pi -->
9189
<Property Id="WEBPI3INSTALLED" Secure="yes">
92-
<RegistrySearch Id="RegistrySearch_WEBPI3INSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\WebPlatformInstaller\3" Name="Install" Win64="$(var.IsWin64)"/>
90+
<RegistrySearch Id="RegistrySearch_WEBPI3INSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\WebPlatformInstaller\3" Name="Install" Bitness="$(var.Bitness)" />
9391
</Property>
9492

9593
<Property Id="WEBPI4INSTALLED" Secure="yes">
96-
<RegistrySearch Id="RegistrySearch_WEBPI4INSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\WebPlatformInstaller\4" Name="Install" Win64="$(var.IsWin64)"/>
94+
<RegistrySearch Id="RegistrySearch_WEBPI4INSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\WebPlatformInstaller\4" Name="Install" Bitness="$(var.Bitness)" />
9795
</Property>
9896
</Include>

0 commit comments

Comments
 (0)