diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj
index 23b97ea1b3b4..89ad26d3c1e0 100644
--- a/src/SourceBuild/content/repo-projects/aspnetcore.proj
+++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj
@@ -23,6 +23,7 @@
$(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture)
$(BuildArgs) /p:TargetRuntimeIdentifier=$(TargetRid)
$(BuildArgs) /p:PublicBaseURL=file:%2F%2F$(ArtifactsAssetsDir)
+ $(BuildArgs) /p:CrossArchitectureInstallerBasePath=$(ArtifactsAssetsDir)
$(BuildArgs) /p:PgoInstrument=true
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index 6a14f437be1a..7f34a2f370f9 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -70,6 +70,11 @@
+
+
+
+
+
++ true
+ $(ArtifactsShippingPackagesDir)
+
+
+diff --git a/eng/Build.props b/eng/Build.props
+index 697c3d9ba0..87e19ef337 100644
+--- a/eng/Build.props
++++ b/eng/Build.props
+@@ -59,7 +59,7 @@
+
+
+
+-
++
+
+
+@@ -70,6 +70,14 @@
+
+
+
++
++
++
++ Platform=x86
++ $(DotNetBuildPass)
++
++
++
+
+
+
+@@ -255,10 +263,6 @@
+
+
+
+-
+-
+-
+-
+
+
+
+diff --git a/eng/Publishing.props b/eng/Publishing.props
+index 201e167159..a6a89bd0e9 100644
+--- a/eng/Publishing.props
++++ b/eng/Publishing.props
+@@ -96,12 +96,13 @@
+
+
+
+-
+
+-
++
+
+
+diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
+index 3389f389a7..5ef4167757 100644
+--- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
++++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
+@@ -99,18 +99,27 @@
+ $(BundleNameFull)
+
+
++
++
++ $([MSBuild]::NormalizeDirectory('$(CrossArchitectureInstallerBasePath)', 'aspnetcore', 'Runtime', '$(SharedFxMsiVersion)'))
++
++
++
++ $(CrossArchitectureInstallerBasePath)
++
++
+
+-
++
+ x64
+ SharedFxRedistInstallerx64
+ $(SharedFxPackageVersion)
+
+-
++
+ x86
+ SharedFxRedistInstallerx86
+ $(SharedFxPackageVersion)
+
+-
++
+ arm64
+ SharedFxRedistInstallerarm64
+ $(SharedFxPackageVersion)
+@@ -127,7 +136,7 @@
+ $(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer)
+ $(DefineConstants);BundleRegFamily=$(BundleRegFamily)
+ $(DefineConstants);BundleRegName=$(BundleRegName)
+- $(DefineConstants);CrossArchitectureInstallerBasePath=$(CrossArchitectureInstallerBasePath)
++ $(DefineConstants);CrossArchitectureInstallerBasePath=$(CrossArchitectureInstallerBasePathNormalized)
+
+
+
+