dotnet · NikolaMilosavljevic · Dec 18, 2025 · Dec 16, 2025 · Dec 17, 2025 · Dec 17, 2025
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -7,5 +7,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>65e09c040143048211dcf6b2bd69336cbf27eec6</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="11.0.0-beta.25578.1">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -15,5 +15,7 @@
     <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
     <MicrosoftVisualStudioSetupConfigurationPackageVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationPackageVersion>
     <WindowsAzureStoragePackageVersion>9.3.3</WindowsAzureStoragePackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>11.0.0-beta.25578.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftWixToolsetSdkVersion>5.0.2-dotnet.2811440</MicrosoftWixToolsetSdkVersion>
   </PropertyGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -8,6 +8,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25605.2"
+    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25605.2",
+    "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"
   }
 }
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
@@ -9,7 +9,13 @@
 
   <ItemGroup>
     <ProjectReference Include="..\dotnet-core-uninstall\dotnet-core-uninstall.csproj" />
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25124.4" Condition="'$(RID)' == 'win-x86'"/>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersPackageVersion)" Condition="'$(RID)' == 'win-x86'"/>
+  </ItemGroup>
+
+  <!-- These P2Ps ensure that package references for WiX extensions are correctly restored. The MSBuildRestoreSessionId condition makes sure that these
+       projects are only restored. They get built later when computed properties are available. These properties do not exist when projects are evaluated. -->
+  <ItemGroup Condition="'$(OS)' == 'Windows_NT' and '$(MSBuildRestoreSessionId)' != ''">
+    <ProjectReference Include="targets\packaging\windows\dotnetCoreUninstall\uninstall-tool.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
 
   <Import Condition="'$(RID)' == 'win-x86'" Project="targets\Versions.targets" />

diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
@@ -9,15 +9,6 @@
   </Target>
 
   <Target Name="SetupWixProperties" DependsOnTargets="SetupFileExtensions;GetCurrentRuntimeInformation">
-    <!-- AcquireWix Properties -->
-    <PropertyGroup>
-      <WixVersion>3.14.1.8722</WixVersion>
-      <WixDownloadUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip</WixDownloadUrl>
-      <WixRoot>$(ArtifactsDir)Tools/WixTools/$(WixVersion)</WixRoot>
-      <WixDestinationPath>$(WixRoot)/WixTools.$(WixVersion).zip</WixDestinationPath>
-      <WixDownloadSentinel>$(WixRoot)/WixDownload.$(WixVersion).sentinel</WixDownloadSentinel>
-    </PropertyGroup>
-
     <!-- Generate MSI/Bundle Properties -->
     <PropertyGroup>
       <DotnetCoreUninstallGenerateMsiPowershellScript>$(MSBuildThisFileDirectory)packaging/windows/dotnetCoreUninstall/generatemsi.ps1</DotnetCoreUninstallGenerateMsiPowershellScript>
@@ -45,64 +36,20 @@
 
   </Target>
 
-  <Target Name="AcquireWix"
-          DependsOnTargets="SetupWixProperties;MsiTargetsSetupInputOutputs"
-          Inputs="$(WixDownloadSentinel)"
-          Outputs="$(WixDestinationPath)">
-
-    <!-- Setup sentinel to take advantage of incrementality -->
-    <MakeDir Directories="$(WixRoot)" />
-    <WriteLinesToFile
-        File="$(WixDownloadSentinel)"
-        Lines="$(WixVersion)"
-        Overwrite="true"
-        Encoding="Unicode"/>
-
-    <DownloadFile
-        Uri="$(WixDownloadUrl)"
-        DestinationPath="$(WixDestinationPath)"
-        Overwrite="false" />
-
-    <ExtractArchiveToDirectory
-        SourceArchive="$(WixDestinationPath)"
-        DestinationDirectory="$(WixRoot)" />
-
-  </Target>
-
   <Target Name="GenerateDotnetCoreUninstallMsi"
-          DependsOnTargets="GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs;SetDotnetCoreUninstallBrandingInfo"
+          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;SetDotnetCoreUninstallBrandingInfo"
           Condition=" '$(OS)' == 'Windows_NT' "
           Inputs="$(DotnetCoreUninstallOutputDirectory)**/*;
                     $(DotnetCoreUninstallGenerateMsiPowershellScript)"
           Outputs="$(DotnetCoreUninstallMSIInstallerFile)">
-    <Exec Command="powershell -NoProfile -NoLogo $(DotnetCoreUninstallGenerateMsiPowershellScript) ^
-                      '$(DotnetCoreUninstallOutputDirectory.TrimEnd('\'))' ^
-                      '$(DotnetCoreUninstallMSIInstallerFile)' ^
-                      '$(WixRoot)' ^
-                      '$(DotnetCoreUninstallBrandName)' ^
-                      '$(MsiVersion)' ^
-                      '$(DotnetCoreUninstallInstallerUpgradeCode)' ^
-                      '$(Architecture)' ^
-                      -InformationAction Continue" />
-    <PropertyGroup>
-      <!-- Temp directory for light command layouts -->
-      <LightCommandObjDir>$(ArtifactsObjDir)/LightCommandPackages</LightCommandObjDir>
-      <!-- Directory for the zipped up light command package -->
-      <LightCommandPackagesDir>$(ArtifactsShippingPackagesDir)</LightCommandPackagesDir>
-    </PropertyGroup>
-    <ItemGroup>
-        <UninstallerMsiWixSrcFiles Include="$(WixRoot)\*.wixobj" />
-    </ItemGroup>
-    <CreateLightCommandPackageDrop
-      LightCommandWorkingDir="$(LightCommandObjDir)"
-      OutputFolder="$(LightCommandPackagesDir)"
-      AdditionalBasePaths="$(MSBuildThisFileDirectory)/packaging/windows/dotnetCoreUninstall"
-      Cultures="en-us" 
-      InstallerFile="$(DotnetCoreUninstallMSIInstallerFile)"
-      WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension"
-      WixSrcFiles="@(UninstallerMsiWixSrcFiles)">
-      <Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
-    </CreateLightCommandPackageDrop>
+    <MSBuild Projects="$(RepoRoot)src\redist\targets\packaging\windows\dotnetCoreUninstall\uninstall-tool.wixproj"
+             Properties="InstallerPath=$(DotnetCoreUninstallMSIInstallerFile);
+                         DotnetMsiVersion=$(MsiVersion);
+                         ProductMoniker=$(DotnetCoreUninstallBrandName);
+                         UpgradeCode=$(DotnetCoreUninstallInstallerUpgradeCode);
+                         OutputPath=$([System.IO.Path]::GetDirectoryName($(DotnetCoreUninstallMSIInstallerFile)));
+                         OutputName=$([System.IO.Path]::GetFileNameWithoutExtension($(DotnetCoreUninstallMSIInstallerFile)));
+                         DotnetSrc=$(DotnetCoreUninstallOutputDirectory.TrimEnd('\'))" />
   </Target>
 
 </Project>
diff --git a/src/redist/targets/packaging/windows/dotnetCoreUninstall/dotnet.wxs b/src/redist/targets/packaging/windows/dotnetCoreUninstall/dotnet.wxs
@@ -1,43 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <?include "Variables.wxi" ?>
-  <Product Id="*" Name="$(var.ProductName)" Language="$(var.ProductLanguage)" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
-    <Package Compressed="yes" InstallScope="perMachine" InstallerVersion="200" />
-
-    <MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize"/>
+  <Package Name="$(var.ProductName)" Language="$(var.ProductLanguage)" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)" InstallerVersion="200">
+
+    <MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize" />
     <WixVariable Id="WixUIBannerBmp" Value="images/dotnetbanner.png" />
     <WixVariable Id="WixUIDialogBmp" Value="images/dotnetbackground.png" />
 
-    <?if $(var.Platform)=x86?>
+    <?if $(var.InstallerPlatform)=x86?>
     <MediaTemplate EmbedCab="yes" />
-    <?elseif $(var.Platform)=x64?>
+    <?elseif $(var.InstallerPlatform)=x64?>
     <MediaTemplate EmbedCab="yes" />
     <?endif?>
 
     <Feature Id="MainFeature" Title="Main Feature" Level="1">
       <ComponentGroupRef Id="InstallFiles" />
       <ComponentGroupRef Id="InstallSharedHostandDetectionKeys" />
     </Feature>
-    <Feature Id="Provider" Absent="disallow" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" Level="1" InstallDefault="local" Title="RefCounting" TypicalDefault="install">
+
+    <Feature Id="Provider" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" Level="1" InstallDefault="local" Title="RefCounting" TypicalDefault="install" AllowAbsent="no">
       <ComponentRef Id="$(var.DependencyKeyId)" />
     </Feature>
+
     <Property Id="ProductFamily" Value="$(var.ProductFamily)" />
     <Property Id="ProductEdition" Value="$(var.ProductEdition)" />
-    <Property Id="ProductCPU" Value="$(var.Platform)" />
+    <Property Id="ProductCPU" Value="$(var.InstallerPlatform)" />
     <Property Id="RTM_ProductVersion" Value="$(var.Dotnet_ProductVersion)" />
     <Property Id="MSIFASTINSTALL" Value="7" />
 
-  </Product>
-  <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="$(var.Program_Files)">
-        <Directory Id="DOTNETDOTNETCOREUNINSTALLHOME" Name="dotnet-core-uninstall"/>
-      </Directory>
-    </Directory>
+  </Package>
 
+  <Fragment>
     <ComponentGroup Id="InstallSharedHostandDetectionKeys">
       <Component Id="cmpCoreHost" Directory="DOTNETDOTNETCOREUNINSTALLHOME" Guid="{97A5B877-FA59-4031-9E61-0ED30BBC00B1}">
-        <CreateFolder/>
+        <CreateFolder />
         <Environment Id="E_PATH" Name="PATH" Value="[DOTNETDOTNETCOREUNINSTALLHOME]" Part="last" Action="set" System="yes" />
       </Component>
     </ComponentGroup>
@@ -62,35 +57,40 @@
       <DialogRef Id="ResumeDlg" />
       <DialogRef Id="UserExit" />
 
-      <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
-      <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+      <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(sys.BUILDARCHSHORT)" Order="3" />
+      <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;&quot;1&quot;" />
 
-      <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+      <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" />
 
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">NOT Installed</Publish>
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Condition="NOT Installed" />
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" />
 
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
-      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" />
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1" />
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(sys.BUILDARCHSHORT)" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" />
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;&quot;1&quot;" />
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4" Condition="WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID=&quot;1&quot;" />
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1" />
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2" />
 
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish>
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1" Condition="NOT Installed" />
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2" Condition="Installed AND NOT PATCH" />
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" Condition="Installed AND PATCH" />
 
-      <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+      <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
 
-      <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-      <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
+      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
+      <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
 
       <Property Id="ARPNOMODIFY" Value="1" />
     </UI>
 
     <UIRef Id="WixUI_Common" />
+
+    <StandardDirectory Id="ProgramFiles6432Folder">
+      <Directory Id="DOTNETDOTNETCOREUNINSTALLHOME" Name="dotnet-core-uninstall" />
+    </StandardDirectory>
   </Fragment>
+
 </Wix>
diff --git a/src/redist/targets/packaging/windows/dotnetCoreUninstall/generatemsi.ps1 b/src/redist/targets/packaging/windows/dotnetCoreUninstall/generatemsi.ps1