diff --git a/.pipelines/iis.compression.build.1es.yml b/.pipelines/iis.compression.build.1es.yml
index 2cbc745..45a164b 100644
--- a/.pipelines/iis.compression.build.1es.yml
+++ b/.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
\ No newline at end of file
+              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)
\ No newline at end of file
diff --git a/CustomAction/iiscompressionCA.vcxproj b/CustomAction/iiscompressionCA.vcxproj
index 329dcc3..5362a26 100644
--- a/CustomAction/iiscompressionCA.vcxproj
+++ b/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>
diff --git a/CustomAction/packages.config b/CustomAction/packages.config
index b7a62d8..ff6bafd 100644
--- a/CustomAction/packages.config
+++ b/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>
diff --git a/IIS-Setup b/IIS-Setup
index 90de1cc..3b959d5 160000
--- a/IIS-Setup
+++ b/IIS-Setup
@@ -1 +1 @@
-Subproject commit 90de1cc8e278f453b82ab03bd41e51dbfe4a90fe
+Subproject commit 3b959d5d8a29300e12410915be09e43f15d880c8
diff --git a/Installer/Setup.wixproj b/Installer/Setup.wixproj
index 71a0c85..d8ba35e 100644
--- a/Installer/Setup.wixproj
+++ b/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,11 +26,10 @@
     <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>
@@ -41,28 +37,14 @@
   <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" />
diff --git a/Installer/iiscompression.wxs b/Installer/iiscompression.wxs
index 1fda257..ecf75b2 100644
--- a/Installer/iiscompression.wxs
+++ b/Installer/iiscompression.wxs
@@ -18,202 +18,167 @@
 
 <?include $(var.IisCompressionRoot)IIS-Setup\include.wxi ?>
 
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="$(var.ProductCode)"
-             Name="!(loc.IisCompressionProductName)"
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+  <Package Name="!(loc.IisCompressionProductName)"
              Manufacturer="!(loc.Manufacturer)"
              Version="$(var.MsiVersion)"
              Language="!(loc.Language)"
              Codepage="$(var.Codepage)"
-             UpgradeCode="$(var.UpgradeCode)" >
+             UpgradeCode="$(var.UpgradeCode)"
+             Compressed="yes"
+             InstallerVersion="500"
+             Scope="perMachine">
 
-      <Package Id="*"
-               Description="!(loc.IisCompressionProductName)"
-               Manufacturer="!(loc.Manufacturer)"
-               Compressed="yes"
-               InstallPrivileges="elevated"
-               InstallerVersion="400" />   
-
-    <Media Id="1" Cabinet="iiscompression.cab" EmbedCab="yes" CompressionLevel="high"/>
+    <SummaryInformation Description="!(loc.IisCompressionProductName)" Manufacturer="!(loc.Manufacturer)" />
+    <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
 
     <WixVariable Id="WixUILicenseRtf" Value=".\license\license.rtf" />
-    
+
     <!-- include the standard app searches -->
-    <?include $(var.IisCompressionRoot)IIS-Setup\appsearch\appsearch.wxi ?>
+    <?include $(var.IisCompressionRoot)IIS-Setup\appsearch5\appsearch.wxi ?>
 
     <!-- make patching UI go from welcome to ready to repair -->
-    <?include $(var.IisCompressionRoot)IIS-Setup\iisca\wix3\FixPatchingBehavior.wxi ?>
+    <?include $(var.IisCompressionRoot)IIS-Setup\iisca\wix5\FixPatchingBehavior.wxi ?>
 
     <!-- Properties that show up under Control Panel\Programs and Features\More Columns -->
-    <Property Id="ARPCONTACT">Microsoft Corporation</Property>
+    <Property Id="ARPCONTACT" Value="Microsoft Corporation" />
     <Property Id="ARPPRODUCTICON" Value="iiscompression.ico" />
     <Icon Id="iiscompression.ico" SourceFile="Bitmaps\iiscompression.ico" />
 
-    <Upgrade Id="$(var.UpgradeCode)">
-      <UpgradeVersion OnlyDetect="no" Property="OLDERVERSIONFOUND" Maximum="$(var.MsiVersion)" IncludeMaximum="no" MigrateFeatures="yes" />
-      <UpgradeVersion OnlyDetect="yes" Property="DUPLICATEVERSIONFOUND" Minimum="$(var.MsiVersion)" Maximum="$(var.MsiVersion)" IncludeMinimum="yes" IncludeMaximum="yes" />
-      <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONFOUND" Minimum="$(var.MsiVersion)" IncludeMinimum="no" />
-    </Upgrade>
-
-    <Condition Message="!(loc.DuplicateVersionFound)">
-      (NOT DUPLICATEVERSIONFOUND) OR Installed
-    </Condition>
+    <MajorUpgrade DowngradeErrorMessage="!(loc.NewerVersionFound)"
+                  AllowSameVersionUpgrades="no"
+                  Schedule="afterInstallFinalize" />
 
-    <Condition Message="!(loc.NewerVersionFound)">
-      (NOT NEWERVERSIONFOUND) OR Installed
-    </Condition>
-
-    <!-- Require the user be an admin to install -->
-    <Condition Message="!(loc.AdminRequired)">Privileged</Condition>
+    <!-- Launch conditions -->
+    <Launch Condition="Privileged" Message="!(loc.AdminRequired)" />
 
     <!-- Prevent install of 32 bit product on 64 bit machine -->
     <?if $(var.Platform) = "x86" ?>
-    <Condition Message="!(loc.LaunchCondition_64BIT)">
-      <![CDATA[Installed Or NOT VersionNT64]]>
-    </Condition>
+    <Launch Condition="Installed Or NOT VersionNT64" Message="!(loc.LaunchCondition_64BIT)" />
     <?endif ?>
 
     <!-- prevent install of 64-bit product on ARM64 machine -->
     <?if $(var.Platform) = "x64" ?>
-    <Condition Message="!(loc.LaunchCondition_ARM64)">
-      <![CDATA[(Installed And NOT PATCH) Or (PROCESSORARCHITECTURE ~<> "ARM64")]]>
-    </Condition>
+    <Launch Condition="(Installed And NOT PATCH) Or (PROCESSORARCHITECTURE ~&lt;&gt; &quot;ARM64&quot;)" Message="!(loc.LaunchCondition_ARM64)" />
     <?endif ?>
 
-    <!-- Per machine only if administrator, per user if no administrator -->
-    <Property Id="ALLUSERS">2</Property>
-
     <!-- Detect IIS version and require 7.5 -->
-    <Condition Message="!(loc.IIS75OrGreater)">
-      <![CDATA[Installed OR (VersionNT >= 601)]]>
-    </Condition>
+    <Launch Condition="Installed OR (VersionNT >= 601)" Message="!(loc.IIS75OrGreater)" />
 
     <!-- Require core web server and w3svc -->
-    <Condition Message="!(loc.CoreWebW3SVC)">
-      ((IISCOREWEBENGINEINSTALLED = "#1") AND (IISW3SVCINSTALLED = "#1")) OR Installed
-    </Condition>
+    <Launch Condition="((IISCOREWEBENGINEINSTALLED = &quot;#1&quot;) AND (IISW3SVCINSTALLED = &quot;#1&quot;)) OR Installed" Message="!(loc.CoreWebW3SVC)" />
 
     <!-- Directory Structure and Component Definitions -->
-
-    <Directory Id="TARGETDIR" Name="SourceDir">
-
-      <!-- Platform specific core module -->
-
-      <Directory Id="$(var.ProgramFilesFolder)">
-        <Directory Id="IISModuleDirectory" Name="IIS">
-          <Directory Id="INSTALLLOCATION" ShortName="IISComp" Name="IIS Compression">
-            <Component Id="IisZlib" Guid="B60CA37C-79E9-4ECF-BDF2-1EA3504D3A83" Win64="$(var.IsWin64)">
-              <File Id="IisZlibDll"
-                    Name="iiszlib.dll"
-                    Source="$(var.NeutralBinRoot)\iiszlib.dll"
-                    DiskId="1"
-                    Vital="yes"
-                    KeyPath="yes" />
-              <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.IISZlibCompressionScheme)">
-                <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#IisZlibDll]"/>
-                <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
-              </RegistryKey>
-            </Component>
-            <Component Id="IisBrotli" Guid="3C2A0748-058E-46DB-B8C8-F1FF3BFB4C42" Win64="$(var.IsWin64)">
-              <File Id="IisBrotliDll"
-                    Name="iisbrotli.dll"
-                    Source="$(var.NeutralBinRoot)\iisbrotli.dll"
-                    DiskId="1"
-                    Vital="yes" />
-              <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.IISBrotliCompressionScheme)">
-                <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#IisBrotliDll]"/>
-                <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
-              </RegistryKey>
-            </Component>
-            <Component Id="License" Guid="399719BA-8F33-4B40-8B24-290946BA18D7" Win64="$(var.IsWin64)">
-              <File Id="LicenseFile"
-                    ShortName="license.rtf"
-                    Name="iiscompression_license.rtf"
-                    Source=".\license\license.rtf"
-                    DiskId="1"
-                    Vital="yes"/>
-            </Component>
-            <Component Id="ThirdPartyNotices" Guid="D1CCF0C2-F183-4B17-A3BB-B0C3BF8B09F5" Win64="$(var.IsWin64)">
-              <File Id="ThirdPartyNoticesFile"
-                    ShortName="TPN.txt"
-                    Name="iiscompression_ThirdPartyNotices.txt"
-                    Source=".\ThirdPartyNotices.txt"
-                    DiskId="1"
-                    Vital="yes"/>
-            </Component>
-            <Component Id="Readme" Guid="4024AAD1-6345-4F0D-B434-953B779825C0" Win64="$(var.IsWin64)">
-              <File Id="ReadmeFile"
-                    ShortName="readme.htm"
-                    Name="iiscompression_readme.htm"
-                    Source=".\iiscompression_readme.htm"
-                    DiskId="1"
-                    Vital="yes"/>
-            </Component>
-          </Directory>
+    <StandardDirectory Id="$(var.ProgramFilesFolder)">
+      <Directory Id="IISModuleDirectory" Name="IIS">
+        <Directory Id="INSTALLLOCATION" ShortName="IISComp" Name="IIS Compression">
+          <Component Id="IisZlib" Guid="B60CA37C-79E9-4ECF-BDF2-1EA3504D3A83" Bitness="$(var.Bitness)">
+            <File Id="IisZlibDll"
+                  Name="iiszlib.dll"
+                  Source="$(var.NeutralBinRoot)\iiszlib.dll"
+                  DiskId="1"
+                  Vital="yes"
+                  KeyPath="yes" />
+            <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.IISZlibCompressionScheme)">
+              <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#IisZlibDll]"/>
+              <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
+            </RegistryKey>
+          </Component>
+          <Component Id="IisBrotli" Guid="3C2A0748-058E-46DB-B8C8-F1FF3BFB4C42" Bitness="$(var.Bitness)">
+            <File Id="IisBrotliDll"
+                  Name="iisbrotli.dll"
+                  Source="$(var.NeutralBinRoot)\iisbrotli.dll"
+                  DiskId="1"
+                  Vital="yes" />
+            <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.IISBrotliCompressionScheme)">
+              <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#IisBrotliDll]"/>
+              <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
+            </RegistryKey>
+          </Component>
+          <Component Id="License" Guid="399719BA-8F33-4B40-8B24-290946BA18D7" Bitness="$(var.Bitness)">
+            <File Id="LicenseFile"
+                  ShortName="license.rtf"
+                  Name="iiscompression_license.rtf"
+                  Source=".\license\license.rtf"
+                  DiskId="1"
+                  Vital="yes"/>
+          </Component>
+          <Component Id="ThirdPartyNotices" Guid="D1CCF0C2-F183-4B17-A3BB-B0C3BF8B09F5" Bitness="$(var.Bitness)">
+            <File Id="ThirdPartyNoticesFile"
+                  ShortName="TPN.txt"
+                  Name="iiscompression_ThirdPartyNotices.txt"
+                  Source=".\ThirdPartyNotices.txt"
+                  DiskId="1"
+                  Vital="yes"/>
+          </Component>
+          <Component Id="Readme" Guid="4024AAD1-6345-4F0D-B434-953B779825C0" Bitness="$(var.Bitness)">
+            <File Id="ReadmeFile"
+                  ShortName="readme.htm"
+                  Name="iiscompression_readme.htm"
+                  Source=".\iiscompression_readme.htm"
+                  DiskId="1"
+                  Vital="yes"/>
+          </Component>
         </Directory>
       </Directory>
-
-      <!-- Discoverability-->
-
-      <Component Id="DiscoverabilityKey" Guid="18765706-E98E-43EF-8F02-0F877679CF75" Win64="$(var.IsWin64)">
-        <RegistryKey Root="HKLM" Key="$(var.DiscoverabilityKeyRoot)\$(var.ProductShortName)">
-          <RegistryKey Key="$(var.IISZlibCompressionScheme)">
-            <RegistryValue Type="integer" Name="Install" Value="1" />
-            <RegistryValue Type="string" Name="Version" Value="$(var.MsiVersion)" />
-          </RegistryKey>
-          <RegistryKey Key="$(var.IISBrotliCompressionScheme)">
-            <RegistryValue Type="integer" Name="Install" Value="1" />
-            <RegistryValue Type="string" Name="Version" Value="$(var.MsiVersion)" />
-          </RegistryKey>
+    </StandardDirectory>
+
+    <!-- Discoverability-->
+    <Component Id="DiscoverabilityKey" Guid="18765706-E98E-43EF-8F02-0F877679CF75" Bitness="$(var.Bitness)" Directory="TARGETDIR">
+      <RegistryKey Root="HKLM" Key="$(var.DiscoverabilityKeyRoot)\$(var.ProductShortName)">
+        <RegistryKey Key="$(var.IISZlibCompressionScheme)">
+          <RegistryValue Type="integer" Name="Install" Value="1" />
+          <RegistryValue Type="string" Name="Version" Value="$(var.MsiVersion)" />
         </RegistryKey>
-      </Component>
-
-      <!-- WOW64 Support -->
-
-      <?if $(var.IsWin64)=yes ?>
-
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="IISModuleDirectory32" Name="IIS">
-          <Directory Id="INSTALLLOCATION32" ShortName="IISComp" Name="IIS Compression" SourceName="WowOnly">
-            <Component Id="IisZlib32" Guid="FBDB630C-D614-4523-910E-257E41E5F83D" Win64="no">
-              <File Id="IisZlibDll32"
-                    Name="iiszlib.dll"
-                    Source="$(var.NeutralWOW64BinRoot)\iiszlib.dll"
-                    DiskId="1"
-                    Vital="yes" />
-            </Component>
-            <Component Id="IisBrotli32" Guid="72A086DB-7D00-466D-81A1-84D07388E023" Win64="no">
-              <File Id="IisBrotliDll32"
-                    Name="iisbrotli.dll"
-                    Source="$(var.NeutralWOW64BinRoot)\iisbrotli.dll"
-                    DiskId="1"
-                    Vital="yes" />
-            </Component>
-          </Directory>
+        <RegistryKey Key="$(var.IISBrotliCompressionScheme)">
+          <RegistryValue Type="integer" Name="Install" Value="1" />
+          <RegistryValue Type="string" Name="Version" Value="$(var.MsiVersion)" />
+        </RegistryKey>
+      </RegistryKey>
+    </Component>
+
+    <!-- WOW64 Support -->
+    <?if $(var.IsWin64)=yes ?>
+
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="IISModuleDirectory32" Name="IIS">
+        <Directory Id="INSTALLLOCATION32" ShortName="IISComp" Name="IIS Compression">
+          <Component Id="IisZlib32" Guid="FBDB630C-D614-4523-910E-257E41E5F83D" Bitness="always32">
+            <File Id="IisZlibDll32"
+                  Name="iiszlib.dll"
+                  Source="$(var.NeutralWOW64BinRoot)\iiszlib.dll"
+                  DiskId="1"
+                  Vital="yes" />
+          </Component>
+          <Component Id="IisBrotli32" Guid="72A086DB-7D00-466D-81A1-84D07388E023" Bitness="always32">
+            <File Id="IisBrotliDll32"
+                  Name="iisbrotli.dll"
+                  Source="$(var.NeutralWOW64BinRoot)\iisbrotli.dll"
+                  DiskId="1"
+                  Vital="yes" />
+          </Component>
         </Directory>
       </Directory>
-
-      <!-- Discoverability WOW64 -->
-
-      <Component Id="DiscoverabilityKeyWow" Guid="1E9CDB5F-1E85-4F6D-8243-BFA63A5F71B9" Win64="no">
-        <RegistryKey Root="HKLM" Key="$(var.DiscoverabilityKeyRoot)\$(var.ProductShortName)">
-          <RegistryKey Key="$(var.IISZlibCompressionScheme)">
-            <RegistryValue Type="integer" Name="Install" Value="1" />
-            <RegistryValue Type="string" Name="Version" Value="$(var.MsiVersion)" />
-          </RegistryKey>
-          <RegistryKey Key="$(var.IISBrotliCompressionScheme)">
-            <RegistryValue Type="integer" Name="Install" Value="1" />
-            <RegistryValue Type="string" Name="Version" Value="$(var.MsiVersion)" />
-          </RegistryKey>
+    </StandardDirectory>
+
+    <!-- Discoverability WOW64 -->
+    <Component Id="DiscoverabilityKeyWow" Guid="1E9CDB5F-1E85-4F6D-8243-BFA63A5F71B9" Bitness="always32" Directory="TARGETDIR">
+      <RegistryKey Root="HKLM" Key="$(var.DiscoverabilityKeyRoot)\$(var.ProductShortName)">
+        <RegistryKey Key="$(var.IISZlibCompressionScheme)">
+          <RegistryValue Type="integer" Name="Install" Value="1" />
+          <RegistryValue Type="string" Name="Version" Value="$(var.MsiVersion)" />
         </RegistryKey>
-      </Component>
-
-      <?endif ?>
+        <RegistryKey Key="$(var.IISBrotliCompressionScheme)">
+          <RegistryValue Type="integer" Name="Install" Value="1" />
+          <RegistryValue Type="string" Name="Version" Value="$(var.MsiVersion)" />
+        </RegistryKey>
+      </RegistryKey>
+    </Component>
 
-    </Directory>
+    <?endif ?>
 
     <!-- Feature Definition -->
-
     <Feature Id="IisCompressionFeature" Title="!(loc.IisCompressionTitle)" Description="!(loc.IisCompressionDescription)" Level="1">
       <ComponentRef Id="IisZlib"/>
       <ComponentRef Id="IisBrotli"/>
@@ -229,45 +194,39 @@
     </Feature>
 
     <!-- User Interface -->
-
-    <UIRef Id="WixUI_Minimal"/>
+    <ui:WixUI Id="WixUI_Minimal" />
     <UIRef Id="WixUI_ErrorProgressText"/>
 
     <UI>
       <DialogRef Id="WelcomeEulaDlg"/>
 
       <!--Custom errors specific to shared configuration detection -->
-      <Error Id="30001">!(loc.Error30001)</Error>
-      <Error Id="30002">!(loc.Error30002)</Error>
+      <Error Id="30001" Message="!(loc.Error30001)" />
+      <Error Id="30002" Message="!(loc.Error30002)" />
       <!-- Require WAS and WMSVC be stopped to avoid restarts -->
-      <Error Id="30003">!(loc.WebServicesRunning)</Error>
+      <Error Id="30003" Message="!(loc.WebServicesRunning)" />
     </UI>
 
     <!-- Specific custom actions for this project. -->
-
-    <CustomAction BinaryKey="IISCustomActionDll"
-                  Id="RegisterCompressionSchemes"
+    <CustomAction Id="RegisterCompressionSchemes"
+                  BinaryRef="IISCustomActionDll"
                   DllEntry="RegisterCompressionSchemesCA"
                   Execute="deferred"
                   Return="check"
                   Impersonate="no"/>
 
-    <CustomAction BinaryKey="IISCustomActionDll"
-                  Id="CleanupCompressionSchemes"
+    <CustomAction Id="CleanupCompressionSchemes"
+                  BinaryRef="IISCustomActionDll"
                   DllEntry="CleanupCompressionSchemesCA"
                   Execute="deferred"
                   Return="check"
                   Impersonate="no"/>
 
     <InstallExecuteSequence>
-      <AppSearch Before="LaunchConditions" />
-      <Custom Action="RegisterCompressionSchemes" After="InstallFiles">NOT Installed</Custom>
-      <Custom Action="CleanupCompressionSchemes" Before="RemoveFiles">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
-      <LaunchConditions After="FindRelatedProducts" />
-      <MigrateFeatureStates />
-      <RemoveExistingProducts After="InstallFinalize"/>
+      <Custom Action="RegisterCompressionSchemes" After="InstallFiles" Condition="NOT Installed" />
+      <Custom Action="CleanupCompressionSchemes" Before="RemoveFiles" Condition="(NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
     </InstallExecuteSequence>
-  </Product>
+  </Package>
 
   <Fragment>
     <!-- Reference Output by project name -->
diff --git a/Installer/packages.config b/Installer/packages.config
deleted file mode 100644
index bb015b2..0000000
--- a/Installer/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.VisualStudioEng.MicroBuild.Core" version="0.4.1" developmentDependency="true" />
-  <package id="WiX" version="3.14.1" />
-</packages>
\ No newline at end of file
diff --git a/iisbrotli/iisbrotli.vcxproj b/iisbrotli/iisbrotli.vcxproj
index f1ce6f0..c7472c3 100644
--- a/iisbrotli/iisbrotli.vcxproj
+++ b/iisbrotli/iisbrotli.vcxproj
@@ -82,8 +82,6 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DisableSpecificWarnings>4091</DisableSpecificWarnings>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\IIS-Common\Include;$(SubmoduleBrotli)\c\include;$(SubmoduleBrotli)\c\include\brotli;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\IIS-Common\Include;$(SubmoduleBrotli)\c\include;$(SubmoduleBrotli)\c\include\brotli;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\IIS-Common\Include;$(SubmoduleBrotli)\c\include;$(SubmoduleBrotli)\c\include\brotli;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -96,10 +94,15 @@
       <SupportJustMyCode Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</SupportJustMyCode>
       <SupportJustMyCode Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</SupportJustMyCode>
       <SupportJustMyCode Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">false</SupportJustMyCode>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalOptions>/guard:cast /d2CastGuardFailureMode:fastfail /GL %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>iisbrotli.def</ModuleDefinitionFile>
+      <LinkIncremental>false</LinkIncremental>
+      <AdditionalOptions>/LTCG /NODEFAULTLIB:LIBCMT.lib %(AdditionalOptions)</AdditionalOptions>
       <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">DebugFull</GenerateDebugInformation>
       <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">DebugFull</GenerateDebugInformation>
       <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">DebugFull</GenerateDebugInformation>