[release/10.0] Update to Wix v5

.azure/pipelines/ci.yml

@@ -202,11 +202,9 @@ extends:
                     -prepareMachine
                     -noBuildRepoTasks
                     -arch arm64
-                    -sign
                     -pack
                     -noBuildJava
                     -noBuildNative
-                    /p:DotNetSignType=$(_SignType)
                     /p:OnlyPackPlatformSpecificPackages=true
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
@@ -228,23 +226,6 @@ extends:
               MSBUILDUSESERVER: "1"
             displayName: Build SiteExtension
 
-          # This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If
-          # https://github.com/dotnet/arcade/issues/1957 is resolved, consider running code-signing inline with the other
-          # previous steps. Sign check is disabled because it is run in a separate step below, after installers are built.
-          - script: ./eng/build.cmd
-                    -ci
-                    -prepareMachine
-                    -noBuildRepoTasks
-                    -noBuildNative
-                    -noBuild
-                    -sign
-                    /p:DotNetSignType=$(_SignType)
-                    $(_BuildArgs)
-                    $(WindowsSignLogArgs)
-            env:
-              MSBUILDUSESERVER: "1"
-            displayName: Code sign packages
-
           # Windows installers bundle x86/x64/arm64 assets
           - script: ./eng/build.cmd
                     -ci

eng/Version.Details.props

@@ -235,4 +235,4 @@ This file should be imported by eng/Versions.props
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
     <MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildUtilitiesCorePackageVersion)</MicrosoftBuildUtilitiesCoreVersion>
   </PropertyGroup>
-</Project>
+</Project>

eng/Version.Details.xml

@@ -454,4 +454,4 @@
     </Dependency>
     <!-- End of manually updated dependencies -->
   </ToolsetDependencies>
-</Dependencies>
+</Dependencies>

eng/targets/BeforeWix.Common.targets

@@ -0,0 +1,26 @@
+<!-- Targets for making .wixproj better. -->
+<Project>
+  <PropertyGroup Condition="'$(OutputType)' == 'package'">
+    <EmbedCab Condition="'$(EmbedCab)' == ''">yes</EmbedCab>
+    <InstallDir>$(ProductName)</InstallDir>
+
+    <DefineConstants Condition="'$(Configuration)' == 'Debug'">$(DefineConstants);Debug</DefineConstants>
+    <DefineConstants>$(DefineConstants);EmbedCab=$(EmbedCab)</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(OutputType)' == 'package' AND '$(Cabinet)' == '' ">
+    <Cabinet>$(OutputName.Replace('-', '_')).cab</Cabinet>
+    <Cabinet Condition=" '$(EmbedCab)' != 'yes' ">$(OutputName.Replace('_win', '')).cab</Cabinet>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Culture Condition=" '$(Culture)' == '' ">en-US</Culture>
+    <Cultures Condition=" '$(Cultures)' == '' ">$(Culture)</Cultures>
+    <InstallerPlatform>$(Platform)</InstallerPlatform>
+    <OutDir Condition=" '$(OutDir)' == '' ">$(OutputPath)</OutDir>
+
+    <DefineConstants>$(DefineConstants);Cabinet=$(Cabinet)</DefineConstants>
+    <DefineConstants>$(DefineConstants);BinPath=$(OutputPath)$(Culture)\</DefineConstants>
+    <DefineConstants>$(WixVariables);$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+</Project>

eng/targets/Wix.Common.props

@@ -3,11 +3,10 @@
 
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProductVersion>3.14</ProductVersion>
-    <WixVersion>$(MicrosoftSignedWixVersion)</WixVersion>
   </PropertyGroup>
 
   <PropertyGroup>
+    <CustomBeforeWixTargets>$(MSBuildThisFileDirectory)BeforeWix.Common.targets</CustomBeforeWixTargets>
     <TargetFrameworkMoniker>Native,Version=v0.0</TargetFrameworkMoniker>
 
     <MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
@@ -17,10 +16,15 @@
     <NuGetRestoreTargets Condition="'$(NuGetRestoreTargets)'==''">$(MSBuildToolsPath)\NuGet.targets</NuGetRestoreTargets>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.props" Condition="'$(_ProjectExtensionsWereImported)' != 'true'" />
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.Signed.Wix" Version="$(WixVersion)" />
+    <!-- Microsoft.Wix is a dotnet tool package, so exlude its assets. -->
+    <PackageReference Include="Microsoft.Wix" Version="$(MicrosoftWixToolsetSdkVersion)" ExcludeAssets="all" />
+    <!-- Installers needs the $(PkgMicrosoftWixToolsetUIwixext) property to locate the extension. -->
+    <PackageReference Include="Microsoft.WixToolset.UI.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Dependency.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Util.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Bal.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Heat" Version="$(MicrosoftWixToolsetSdkVersion)" />
   </ItemGroup>
 
   <PropertyGroup>

eng/targets/Wix.Common.targets

@@ -1,57 +1,4 @@
-<!-- Targets for making .wixproj better. -->
 <Project>
-
-  <ItemDefinitionGroup>
-    <!-- Override the MicroBuild default certs which still uses MicrosoftSHA1 and Microsoft401 -->
-    <SignCabs>
-      <Authenticode>Microsoft400</Authenticode>
-    </SignCabs>
-    <SignMsi>
-      <Authenticode>Microsoft400</Authenticode>
-    </SignMsi>
-    <SignBundle>
-      <Authenticode>Microsoft400</Authenticode>
-    </SignBundle>
-    <SignBundleEngine>
-      <Authenticode>Microsoft400</Authenticode>
-    </SignBundleEngine>
-  </ItemDefinitionGroup>
-
-  <PropertyGroup Condition="'$(OutputType)' == 'package'">
-    <!-- Set package version for SharedFx & TargetingPack wixproj's -->
-    <!-- Everything built in those projects _except_ the final package & MSI are shipping assets. -->
-    <_GeneratedPackageVersion>$(PackageVersion)</_GeneratedPackageVersion>
-    <_GeneratedPackageVersion
-        Condition="! $(PackageVersion.Contains('$(_BuildNumberLabels)'))">$(VersionPrefix)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
-    <!-- Insert PackageVersion into OutputName for SharedFx & TargetingPack -->
-    <OutputName Condition="'$(OutputNamePrefix)' != '' AND '$(OutputNameSuffix)' != ''">$(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix)</OutputName>
-
-    <EmbedCab Condition="'$(EmbedCab)' == ''">yes</EmbedCab>
-    <InstallDir>$(ProductName)</InstallDir>
-
-    <DefineConstants Condition="'$(Configuration)' == 'Debug'">$(DefineConstants);Debug</DefineConstants>
-    <DefineConstants>$(DefineConstants);EmbedCab=$(EmbedCab)</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(OutputType)' == 'package' AND '$(Cabinet)' == '' ">
-    <Cabinet>$(OutputName.Replace('-', '_')).cab</Cabinet>
-    <Cabinet Condition=" '$(EmbedCab)' != 'yes' ">$(OutputName.Replace('_win', '')).cab</Cabinet>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <Culture Condition=" '$(Culture)' == '' ">en-US</Culture>
-    <Cultures Condition=" '$(Cultures)' == '' ">$(Culture)</Cultures>
-    <InstallerPlatform>$(Platform)</InstallerPlatform>
-    <OutDir Condition=" '$(OutDir)' == '' ">$(OutputPath)</OutDir>
-
-    <DefineConstants>$(DefineConstants);Cabinet=$(Cabinet)</DefineConstants>
-    <DefineConstants>$(DefineConstants);BinPath=$(OutputPath)$(Culture)\</DefineConstants>
-    <DefineConstants>$(WixVariables);$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
-
-  <Import Project="$(NuGetRestoreTargets)" />
-  <Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.targets" />
-  <Import Project="$(WixTargetsPath)" Condition="'$(WixTargetsPath)' != '' " />
   <!-- Don't import the Microbuild signing targets when post build sign is enabled. They override the
        standard Wix targets for signing, and call ESRP directly (rather than through SignTool). So without this,
        ASPNetCore will sign even when PostbuildSign == true -->

eng/tools/GenerateFiles/Directory.Build.props.in

@@ -4,5 +4,6 @@
     <ArtifactsShippingPackagesDir>${ArtifactsShippingPackagesDir}</ArtifactsShippingPackagesDir>
     <TreatWarningsAsErrors Condition="'$(BuildingInsideVisualStudio)' != 'true'">true</TreatWarningsAsErrors>
     <LibNetHostAppPackVersion Condition=" '$(LibNetHostAppPackVersion)' == '' ">${LibNetHostAppPackVersion}</LibNetHostAppPackVersion>
+    <_ProductVersionForInstallers>${MicrosoftAspNetCoreAppRuntimeVersion}</_ProductVersionForInstallers>
   </PropertyGroup>
 </Project>

global.json

@@ -31,6 +31,7 @@
     "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25466.101",
     "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25466.101",
     "Microsoft.Build.NoTargets": "3.7.0",
-    "Microsoft.Build.Traversal": "3.4.0"
+    "Microsoft.Build.Traversal": "3.4.0",
+    "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"
   }
 }

src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj

@@ -6,6 +6,8 @@
     <!-- We aren't producing a NuGet package here, so disable package validation -->
     <EnablePackageValidation>false</EnablePackageValidation>
     <IsPackable>false</IsPackable>
+    <!-- Bundles should always be built for x86 -->
+    <InstallerPlatform>x86</InstallerPlatform>
     <BundleInstallerUpgradeCodeSeed>ASP.NET Core Shared Framework Bundle Installer</BundleInstallerUpgradeCodeSeed>
     <BundleThemeDirectory>$(MSBuildProjectDirectory)</BundleThemeDirectory>
     <InstallerName>aspnetcore-runtime</InstallerName>
@@ -19,30 +21,24 @@
     <PatchVersion>$(AspNetCorePatchVersion)</PatchVersion>
 
     <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
-    <WixBootstrapperFlavor>HyperlinkLicense</WixBootstrapperFlavor>
+    <UseWix5>true</UseWix5>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
+    <!-- Microsoft.Wix is a dotnet tool package, so exlude its assets. -->
+    <PackageReference Include="Microsoft.Wix" Version="$(MicrosoftWixToolsetSdkVersion)" ExcludeAssets="all" />
+    <!-- Installers needs the $(PkgMicrosoftWixToolsetUIwixext) property to locate the extension. -->
+    <PackageReference Include="Microsoft.WixToolset.UI.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Dependency.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Util.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Bal.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Heat" Version="$(MicrosoftWixToolsetSdkVersion)" />
   </ItemGroup>
 
   <ItemGroup>
     <BundleComponentReference Include="$(RepoRoot)/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj" />
   </ItemGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.Build.NoTargets" />
-
-  <PropertyGroup>
-    <BundleNameShort>Microsoft ASP.NET Core $(PackageBrandingVersion)</BundleNameShort>
-    <BundleNameSub>Shared Framework</BundleNameSub>
-    <BundleName>$(BundleNameShort) - $(BundleNameSub) ($(TargetArchitecture))</BundleName>
-    <BundleNameFull>$(BundleName)</BundleNameFull>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <WixThemeVariable Include="BundleNameShort" Value="$(BundleNameShort)" />
-    <WixThemeVariable Include="BundleNameSub" Value="$(BundleNameSub)" />
-    <WixThemeVariable Include="BundleName" Value="$(BundleName)" />
-    <WixThemeVariable Include="BundleNameFull" Value="$(BundleNameFull)" />
-  </ItemGroup>
 </Project>