diff --git a/nuget.config b/nuget.config
index b7e5add1c..cea62835b 100644
--- a/nuget.config
+++ b/nuget.config
@@ -12,6 +12,7 @@
   <packageSourceMapping>
     <packageSource key="nuget">
       <package pattern="*" />
+      <package pattern="WixToolset.*" allowedVersions="[,{GitBaseVersionMajor})" />
     </packageSource>
     <packageSource key="build">
       <package pattern="WixToolset.*" />
diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj
index cf98234ef..87a81d5bc 100644
--- a/src/internal/SetBuildNumber/SetBuildNumber.proj
+++ b/src/internal/SetBuildNumber/SetBuildNumber.proj
@@ -23,6 +23,7 @@
       SetGlobalJson;
       SetDirectoryPackagesProps;
       SetOverallWixVersions;
+      TransformWixAppConfig;
       InstallSigningClient
     </SetBuildNumbersDependsOn>
 
@@ -30,8 +31,26 @@
     <CentralPackageVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\Directory.Packages.props))</CentralPackageVersionsPath>
     <OverallWixVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\wixver.props))</OverallWixVersionsPath>
     <GitInfoThisAssemblyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\ThisAssembly.WixVer.cs))</GitInfoThisAssemblyFile>
+    <WixAppConfigTransform>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\wix\wix\app.config))</WixAppConfigTransform>
   </PropertyGroup>
 
+  <Target Name="TransformWixAppConfig"
+          Inputs="transform.wix.app.config"
+          Outputs="$(WixAppConfigTransform)">
+    <PropertyGroup>
+	  <OverallWixAppConfigHeader></OverallWixAppConfigHeader>
+      <OverallWixAppConfigText>$([System.IO.File]::ReadAllText(transform.wix.app.config))</OverallWixAppConfigText>
+      <OverallWixAppConfigText>$(OverallWixAppConfigText.Replace('{GitBaseVersionMajor}', $(GitBaseVersionMajor)))</OverallWixAppConfigText>
+    </PropertyGroup>
+
+    <WriteLinesToFile File="$(WixAppConfigTransform)"
+                      Lines="$(OverallWixAppConfigHeader);$(OverallWixAppConfigText)"
+					  WriteOnlyWhenDifferent="true"
+                      Overwrite="true" />
+
+    <Message Importance="high" Text="$(MSBuildProjectName) -&gt; $(WixAppConfigTransform)" />
+  </Target>
+
   <Target Name="SetGlobalJson"
           Inputs="global.json.pp"
           Outputs="$(GlobalJsonPath)">
diff --git a/src/internal/SetBuildNumber/transform.wix.app.config b/src/internal/SetBuildNumber/transform.wix.app.config
new file mode 100644
index 000000000..188427ea4
--- /dev/null
+++ b/src/internal/SetBuildNumber/transform.wix.app.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<configuration>
+  <runtime>
+    <loadFromRemoteSources enabled="true"/>
+    <AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="WixToolset.Extensibility" publicKeyToken="a7d136314861246c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-{GitBaseVersionMajor}.0.0.0" newVersion="{GitBaseVersionMajor}.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="WixToolset.Data" publicKeyToken="a7d136314861246c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-{GitBaseVersionMajor}.0.0.0" newVersion="{GitBaseVersionMajor}.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/src/wix/wix/app.config b/src/wix/wix/app.config
index 081fea2c4..75b447520 100644
--- a/src/wix/wix/app.config
+++ b/src/wix/wix/app.config
@@ -4,5 +4,15 @@
   <runtime>
     <loadFromRemoteSources enabled="true"/>
     <AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="WixToolset.Extensibility" publicKeyToken="a7d136314861246c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="WixToolset.Data" publicKeyToken="a7d136314861246c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
 </configuration>