Migrate setup to Wix5

.pipelines/iis.compression.build.1es.yml

@@ -5,9 +5,6 @@ parameters:
 - name: restoreSolution
   type: string
   default: 'Compression.sln;IIS-Setup/IIS-Setup.sln'
-- name: signType
-  type: string
-  default: 'Real'
 - name: productMajor
   type: number
   default: 1
@@ -43,7 +40,11 @@ parameters:
   default: true
 name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.rr)
 pr: none
-trigger: none
+trigger:
+  branches:
+    include:
+    - refs/heads/main
+  batch: True
 resources:
   repositories:
     - repository: self
@@ -59,7 +60,6 @@ variables:
   ProductMinor: ${{ parameters.productMinor }}
   BuildMajor: ${{ parameters.buildMajor }}
   BuildMinor: ${{ parameters.buildMinor }}
-  SignType: ${{ parameters.signType }}
   SigningIdentity: 'Microsoft400'
   CodeQL.Enabled: ${{ parameters.codeQLEnabled }}
   msbuildArgs: '/p:RunWixToolsOutOfProc=true'
@@ -91,7 +91,11 @@ extends:
           mb:
             signing:
               enabled: true
-              signType: $(SignType)
+              ${{ if or(eq(variables['Build.Reason'], 'IndividualCI'), eq(variables['Build.Reason'], 'BatchedCI'), eq(variables['Build.Reason'], 'BuildCompletion')) }}:
+                signType: real
+                signWithProd: true
+              ${{ else }}:
+                signType: test
           outputs:
           - output: pipelineArtifact
             displayName: 'Publish Artifact: Binaries'
@@ -129,6 +133,13 @@ extends:
           displayName: 'Install NuGet Tool'
           inputs:
             versionSpec: '>=4.7.1'
+        - task: NuGetCommand@2            
+          displayName: 'Restore packages.config'
+          inputs:
+            restoreSolution: '$(Build.SourcesDirectory)\iisbrotli\packages.config'
+            feedsToUse: config
+            nugetConfigPath: $(Build.SourcesDirectory)\Nuget.config
+            restoreDirectory: $(Build.SourcesDirectory)\packages            
         - task: NuGetCommand@2
           displayName: 'NuGet restore'
           inputs:
@@ -269,4 +280,14 @@ extends:
             inputs:
               symbolsFolder: '$(Build.ArtifactStagingDirectory)\Symbols'
               searchPattern: '**\*.pdb'
-              symbolServerType: TeamServices
+              symbolServerType: TeamServices
+        - task: MicroBuildArchiveSymbols@6
+          displayName: 'Upload Symbols to Symweb/MSDL'
+          condition: eq(variables['SignType'], 'real')
+          inputs:
+            azureSubscription: 'VSEng-SymbolsUpload'     # SERVICE CONNECTION
+            SymbolsFeatureName: 'IIS-Compression'
+            SymbolsProject: 'DDE'
+            SymbolsAgentPath: '$(Build.ArtifactStagingDirectory)\symbols'
+          env:
+            SYSTEM_ACCESSTOKEN: $(System.AccessToken)

CustomAction/iiscompressionCA.vcxproj

@@ -4,7 +4,6 @@
   <Import Project="$(IIS-Common)build\versions.props" Condition="Exists('$(IIS-Common)build\versions.props')" />
   <Import Project="$(IIS-Common)build\settings.props" Condition="Exists('$(IIS-Common)build\settings.props')" />
   <Import Project="$(IIS-Common)build\sign.props" Condition="Exists('$(IIS-Common)build\sign.props')" />
-  <Import Project="..\packages\WiX.3.14.1\build\wix.props" Condition="Exists('..\packages\WiX.3.14.1\build\wix.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
@@ -81,9 +80,6 @@
     <RootNamespace>iiscompressionCA</RootNamespace>
     <ProjectName>iiscompressionCA</ProjectName>
   </PropertyGroup>
-  <PropertyGroup>
-    <WixNativeCATargetsPath Condition=" Exists('$(WixSdkPath)') ">$(WixSdkPath)\wix.nativeca.targets</WixNativeCATargetsPath>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -101,13 +97,17 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IIS-Setup)iisca\lib;$(WixIncPath);$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IIS-Setup)iisca\lib;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <WarningLevel>Level3</WarningLevel>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <AdditionalOptions>/guard:cast /d2CastGuardFailureMode:fastfail /GL %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>httpapi.lib;shlwapi.lib;ahadmin.lib;xmllite.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>httpapi.lib;shlwapi.lib;ahadmin.lib;xmllite.lib;msi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>$(TargetName).def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
+      <LinkIncremental>false</LinkIncremental>
+      <AdditionalOptions>/LTCG /NODEFAULTLIB:LIBCMT.lib %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
@@ -117,7 +117,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     <Link>
-      <AdditionalLibraryDirectories>$(VC_ReferencesPath_x86);$(WindowsSDK_LibraryPath)\$(PlatformTarget);$(WixLibPath)x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(VC_ReferencesPath_x86);$(WindowsSDK_LibraryPath)\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <TargetMachine>MachineX86</TargetMachine>
       <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">DebugFull</GenerateDebugInformation>
     </Link>
@@ -131,7 +131,7 @@
       <SupportJustMyCode Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</SupportJustMyCode>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(VC_ReferencesPath_x64);$(WindowsSDK_LibraryPath)\$(PlatformTarget);$(WixLibPath)x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(VC_ReferencesPath_x64);$(WindowsSDK_LibraryPath)\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <TargetMachine>Machinex64</TargetMachine>
       <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">DebugFull</GenerateDebugInformation>
     </Link>
@@ -142,7 +142,7 @@
       <SupportJustMyCode Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">false</SupportJustMyCode>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(VC_ReferencesPath_ARM64EC);$(WindowsSDK_LibraryPath)\$(PlatformTarget);$(WixLibPath)x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(VC_ReferencesPath_ARM64EC);$(WindowsSDK_LibraryPath)\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">DebugFull</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
@@ -152,22 +152,11 @@
       <SupportJustMyCode Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</SupportJustMyCode>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(VC_ReferencesPath_ARM64);$(WindowsSDK_LibraryPath)\$(PlatformTarget);$(WixLibPath)x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(VC_ReferencesPath_ARM64);$(WindowsSDK_LibraryPath)\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">DebugFull</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(WixNativeCATargetsPath)" Condition=" '$(WixNativeCATargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.NativeCA.targets" Condition=" '$(WixNativeCATargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.NativeCA.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" BeforeTargets="_PrepareForBuild" Condition=" '$(WixNativeCATargetsImported)' != 'true' ">
-    <Error Text="The WiX package must be installed to build this project." />
-  </Target>
-  <PropertyGroup>
-    <WixLibPath Condition=" Exists('$(WixSdkPath)') ">$(WixSdkPath)\$(WixPlatformToolset)\lib\</WixLibPath>
-    <WixLibPath Condition=" '$(WixLibPath)' == '' ">$(WIX)sdk\$(WixPlatformToolset)\lib\</WixLibPath>
-    <WixIncPath Condition=" Exists('$(WixSdkPath)') ">$(WixSdkPath)\inc\</WixIncPath>
-    <WixIncPath Condition=" '$(WixIncPath)' == '' ">$(WIX)sdk\$(WixPlatformToolset)\inc\</WixIncPath>
-  </PropertyGroup>
   <Target Name="EnsureImportsExist" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project is trying to import a missing file: {0}.</ErrorText>

CustomAction/packages.config

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="VisualCppTools.Community.VS2017Layout" version="14.11.25547" developmentDependency="true" />
-  <package id="WiX" version="3.14.1" />
 </packages>

Installer/Setup.wixproj

@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.WixToolset.Sdk/6.0.3-dotnet.3">
   <Import Project="$(ProjectDir)..\build\submodule.props" Condition="Exists('$(ProjectDir)..\build\submodule.props')" />
   <Import Project="$(IIS-Common)build\settings.props" Condition="Exists('$(IIS-Common)build\settings.props')" />
   <Import Project="$(IIS-Common)build\versions.props" Condition="Exists('$(IIS-Common)build\versions.props')" />
   <Import Project="$(IIS-Setup)build\wix-versions.props" Condition="Exists('$(IIS-Setup)build\wix-versions.props')" />
   <Import Project="$(IIS-Common)build\sign.props" Condition="Exists('$(IIS-Common)build\sign.props')" />
-  <Import Project="..\packages\WiX.3.14.1\build\wix.props" Condition="Exists('..\packages\WiX.3.14.1\build\wix.props')" />
   <PropertyGroup>
-    <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>1ABF68C6-4E3D-4C36-AB9E-3AD64F9FD744</ProjectGuid>
-    <SchemaVersion>2.0</SchemaVersion>
     <OutputType>Package</OutputType>
+    <SuppressValidation>true</SuppressValidation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'x86' Or '$(Platform)' == '' ">
     <OutputName>iiscompression_x86</OutputName>
@@ -29,40 +26,25 @@
     <SignOutput>True</SignOutput>
   </PropertyGroup>
   <PropertyGroup>
-    <WixVariables>Platform=($Platform);$(WixVariables);</WixVariables>
     <OutputPath>$(SolutionDir)bin\$(Configuration)\$(Platform)\</OutputPath>
     <OutDir>$(OutputPath)</OutDir>
     <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
-    <IncludeSearchPaths>$(IncludeSearchPaths);$(IntermediateOutputPath);$(IIS-Setup)</IncludeSearchPaths>
+    <AdditionalIncludePaths>$(IntermediateOutputPath);$(IIS-Setup)</AdditionalIncludePaths>
     <NeutralBinRoot Condition="'$(NeutralBinRoot)' == ''">$(RepositoryRoot)bin\$(Configuration)\$(Platform)</NeutralBinRoot>
     <NeutralWOW64BinRoot Condition="'$(NeutralWOW64BinRoot)' == ''">$(RepositoryRoot)bin\$(Configuration)\x86\</NeutralWOW64BinRoot>
     <DefineConstants>$(DefineConstants);NeutralWOW64BinRoot=$(NeutralWOW64BinRoot);NeutralBinRoot=$(NeutralBinRoot)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DefineConstants>Debug;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="iiscompression.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="bitmaps" />
-    <Folder Include="license" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="bitmaps\bannrbmp.bmp" />
     <Content Include="bitmaps\iiscompression.ico" />
     <Content Include="bitmaps\dlgbmp.bmp" />
     <Content Include="iiscompression_readme.htm" />
     <Content Include="license\License.rtf" />
-    <Content Include="packages.config" />
     <Content Include="ThirdPartyNotices.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="$(IIS-Setup)iisca\wix\setupstrings.wxl">
       <Link>setupstrings.wxl</Link>
@@ -78,11 +60,9 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" BeforeTargets="_PrepareForBuild" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="The WiX package must be installed to build this project." />
-  </Target>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WixToolset.UI.wixext"  Version="6.0.3-dotnet.3" />
+  </ItemGroup>
   <Target Name="BeforeBuild">
     <CreateProperty Condition="$(IIS-Setup) != ''" Value="IIS-Setup=$(IIS-Setup);$(DefineConstants)">
       <Output TaskParameter="Value" PropertyName="DefineConstants" />