diff --git a/eng/Build.props b/eng/Build.props
index 91b5e653b579..da8835044a54 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -1,12 +1,6 @@
 <Project>
 
-  <!-- VMR bootstrap -->
-  <ItemGroup Condition="'$(InitializeVMR)' == 'true'">
-    <ProjectToBuild Include="$(RepoRoot)src/VirtualMonoRepo/Tasks/VirtualMonoRepo.Tasks.csproj" BuildInParallel="false" />
-    <ProjectToBuild Include="$(RepoRoot)src/VirtualMonoRepo/InitializeVMR.proj" BuildInParallel="false" />
-  </ItemGroup>
-
-  <!-- For product build, build MSBuildExtensions and VSTemplateLocator only in the second build pass on win-x64 as
+  <!-- For product build, build MSBuildExtensions and VSTemplateLocator in the second build pass on win-x64 as
        they depend on assets from other verticals that are built in the first build pass. -->
   <ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
                         '$(OS)' == 'Windows_NT' and
@@ -15,4 +9,11 @@
     <ProjectToBuild Include="$(RepoRoot)src\VSTemplateLocator\VSTemplateLocator.proj" DotNetBuildPass="2" />
   </ItemGroup>
 
+  <!-- For product build, build the sdk bundle in the second build pass on windows as
+       it depends on assets from other verticals that are built in the first build pass. -->
+  <ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
+                        '$(OS)' == 'Windows_NT'">
+    <ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\redist-installer.proj" DotNetBuildPass="2" />
+  </ItemGroup>
+
 </Project>
diff --git a/eng/Signing.props b/eng/Signing.props
index dc59b4935f5a..da27b6e54029 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -1,8 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <!-- The FullNugetVersion.version file only gets produced in the initial build pass. -->
-    <RelativeBlobPathParent Condition="'$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'">Sdk/$([System.IO.File]::ReadAllText('$(ArtifactsTmpDir)FullNugetVersion.version').Trim())</RelativeBlobPathParent>
+    <RelativeBlobPathParent>Sdk/$([System.IO.File]::ReadAllText('$(ArtifactsTmpDir)FullNugetVersion.version').Trim())</RelativeBlobPathParent>
     <PublishBinariesAndBadge Condition="'$(PublishBinariesAndBadge)' == ''">true</PublishBinariesAndBadge>
   </PropertyGroup>
 
@@ -89,7 +88,13 @@
               PublishFlatContainer="false" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'">
+  <!-- Only publish this file from win-x64 so that we don't end up with duplicates. -->
+  <ItemGroup Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productVersion.txt" IsShipping="true" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt" IsShipping="true" />
+  </ItemGroup>
+
+  <ItemGroup>
     <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.zip" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
     <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.tar.gz" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
     <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.pkg" IsShipping="true" />
@@ -99,9 +104,6 @@
     <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.msi" IsShipping="true" />
     <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.cab" IsShipping="true" />
     <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.svg" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
-    <!-- Only publish this file from windows x64 so that we don't end up with duplicates -->
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productVersion.txt" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" />
     <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.json" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
     <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.txt" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
 
@@ -110,7 +112,9 @@
     <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.tar.gz" IsShipping="false" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
     <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.zip" IsShipping="false" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
     <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.pkg" IsShipping="false" />
+  </ItemGroup>
 
+  <ItemGroup>
     <Artifact Include="@(SdkArtifact)"
               RelativeBlobPath="$(RelativeBlobPathParent)/%(Filename)%(Extension)">
       <ChecksumPath Condition="$([System.String]::Copy('%(Filename)%(Extension)').EndsWith('.wixpack.zip')) != 'true'">%(FullPath).sha512</ChecksumPath>
diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml
index a057480d6a15..acea818b3c0f 100644
--- a/eng/pipelines/templates/stages/vmr-build.yml
+++ b/eng/pipelines/templates/stages/vmr-build.yml
@@ -892,12 +892,30 @@ stages:
             targetArchitecture: x86
             buildPass: 2
             reuseBuildArtifactsFrom:
+            - Windows_x64
+            - Windows_x86
+            - Windows_arm64
             - AzureLinux_x64_Cross_x64
             - AzureLinux_x64_Cross_Alpine_x64
             - AzureLinux_x64_Cross_arm64
             - AzureLinux_x64_Cross_Alpine_arm64
             - AzureLinux_x64_Cross_arm
             - AzureLinux_x64_Cross_Alpine_arm
+          
+        - template: ../jobs/vmr-build.yml
+          parameters:
+            buildName: Windows
+            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+            vmrBranch: ${{ variables.VmrBranch }}
+            sign: ${{ variables.signEnabled }}
+            pool: ${{ parameters.pool_Windows }}
+            targetOS: windows
+            targetArchitecture: arm64
+            buildPass: 2
+            reuseBuildArtifactsFrom:
+            - Windows_x64
+            - Windows_x86
+            - Windows_arm64
 
 ### FINAL JOIN ###
 - ${{ if and(parameters.isBuiltFromVmr, not(parameters.isSourceOnlyBuild), eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
diff --git a/src/Installer/redist-installer/Directory.Build.targets b/src/Installer/redist-installer/Directory.Build.targets
index 22438f7bda98..959843d4a414 100644
--- a/src/Installer/redist-installer/Directory.Build.targets
+++ b/src/Installer/redist-installer/Directory.Build.targets
@@ -29,18 +29,28 @@
     <ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>dotnet-sdk$(PgoTerm)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
   </PropertyGroup>
 
+  <!-- This is a hack to make the full nuget version available during the publishing step -->
+  <Target Name="GenerateFullNugetVersionFile"
+          BeforeTargets="Build">
+    <WriteLinesToFile File="$(ArtifactsTmpDir)FullNugetVersion.version"
+                      Lines="$(FullNugetVersion)"
+                      Overwrite="true" />
+  </Target>
+
   <Import Project="$(RepoRoot)src\Tasks\sdk-tasks\sdk-tasks.InTree.targets" />
 
-  <!-- Layout -->
-  <Import Project="targets\BundledTemplates.targets" />
+  <Import Project="targets\RestoreLayout.targets" />
   <Import Project="targets\BundledManifests.targets" />
-  <Import Project="targets\BundledDotnetTools.targets" />
-  <Import Project="targets\GenerateBundledVersions.targets" />
-  <Import Project="targets\Crossgen.targets" />
-  <Import Project="targets\GenerateLayout.targets" />
-  <Import Project="targets\GenerateRuntimeAnalyzers.targets" />
-  <Import Project="targets\Badge.targets" Condition="'$(PgoInstrument)' != 'true'" />
-  <Import Project="targets\GenerateArchives.targets" />
+
+  <ImportGroup Condition="'$(GenerateSdkBundleOnly)' != 'true'">
+    <Import Project="targets\BundledTemplates.targets" />
+    <Import Project="targets\BundledDotnetTools.targets" />
+    <Import Project="targets\GenerateBundledVersions.targets" />
+    <Import Project="targets\Crossgen.targets" />
+    <Import Project="targets\GenerateLayout.targets" />
+    <Import Project="targets\Badge.targets" Condition="'$(PgoInstrument)' != 'true'" />
+    <Import Project="targets\GenerateArchives.targets" />
+  </ImportGroup>
 
   <!-- Installers -->
   <Import Project="targets\GenerateMSIs.targets" Condition="'$(OS)' == 'Windows_NT' and '$(SkipBuildingInstallers)' != 'true'" />
diff --git a/src/Installer/redist-installer/redist-installer.proj b/src/Installer/redist-installer/redist-installer.proj
index 93541aac3979..0f6fb1bdcffb 100644
--- a/src/Installer/redist-installer/redist-installer.proj
+++ b/src/Installer/redist-installer/redist-installer.proj
@@ -4,13 +4,18 @@
     <TargetFramework>$(SdkTargetFramework)</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <IsShippingPackage>true</IsShippingPackage>
+    <GenerateSdkBundleOnly Condition="'$(DotNetBuildPass)' == '2' and '$(OS)' == 'Windows_NT'">true</GenerateSdkBundleOnly>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\Layout\redist\redist.csproj" />
+  <ItemGroup Condition="'$(GenerateSdkBundleOnly)' != 'true'">
+    <ProjectReference Include="$(RepoRoot)src\Layout\redist\redist.csproj" />
     <ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+    <ProjectReference Include="$(RepoRoot)src\Installer\finalizer\finalizer-build.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" />
   </ItemGroup>
diff --git a/src/Installer/redist-installer/targets/BundledManifests.targets b/src/Installer/redist-installer/targets/BundledManifests.targets
index b7b0582b5189..c5e328dddd84 100644
--- a/src/Installer/redist-installer/targets/BundledManifests.targets
+++ b/src/Installer/redist-installer/targets/BundledManifests.targets
@@ -52,7 +52,8 @@
   </ItemGroup>
 
   <Target Name="ValidateBundledManifestSigning"
-          Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' ">
+          Condition="'$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm'"
+          BeforeTargets="GenerateWorkloadManifestsWxs">
     <PropertyGroup>
       <SignCheckExe>$(PkgMicrosoft_DotNet_SignCheck)\tools\Microsoft.DotNet.SignCheck.exe</SignCheckExe>
       <SignCheckLog Condition="'$(SignCheckLog)' == ''">$(ArtifactsLogDir)\workloadmanifestsigncheck.log</SignCheckLog>
diff --git a/src/Installer/redist-installer/targets/GenerateLayout.targets b/src/Installer/redist-installer/targets/GenerateLayout.targets
index ab57548db0ef..d72b51411f5a 100644
--- a/src/Installer/redist-installer/targets/GenerateLayout.targets
+++ b/src/Installer/redist-installer/targets/GenerateLayout.targets
@@ -1,324 +1,10 @@
-<Project TreatAsLocalProperty="PublicBaseURL">
+<Project>
 
-  <PropertyGroup>
-    <!-- Only the runtime OSX .pkgs have a `-internal` suffix -->
-    <InstallerStartSuffix Condition="$([MSBuild]::IsOSPlatform('OSX'))">-internal</InstallerStartSuffix>
-    <!-- Use the "x64" Rid when downloading Linux shared framework 'DEB' installer files. -->
-    <InstallerTargetArchitecture>$(Architecture)</InstallerTargetArchitecture>
-    <InstallerTargetArchitecture Condition="'$(IsRPMBasedDistro)' == 'true' and '$(Architecture)' == 'Arm64'">aarch64</InstallerTargetArchitecture>
-
-    <SharedFrameworkInstallerFileRid>$(NetRuntimeRid)</SharedFrameworkInstallerFileRid>
-    <SharedFrameworkInstallerFileRid Condition="'$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true'">$(InstallerTargetArchitecture)</SharedFrameworkInstallerFileRid>
-
-    <!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize -->
-    <!-- In unified build, the layout does match, so use the runtime package versions rather than the VS redist versions -->
-    <AspNetCoreBlobVersion>$(MicrosoftAspNetCoreAppRefInternalPackageVersion)</AspNetCoreBlobVersion>
-    <NetRuntimeBlobVersion>$(MicrosoftNETCorePlatformsPackageVersion)</NetRuntimeBlobVersion>
-    <WindowsDesktopBlobVersion>$(VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion)</WindowsDesktopBlobVersion>
-    <WindowsDesktopBlobVersion Condition="'$(DotNetBuildOrchestrator)' == 'true'">$(MicrosoftWindowsDesktopAppRuntimePackageVersion)</WindowsDesktopBlobVersion>
-    <NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
-
-    <AlternateArchitecture Condition="'$(Architecture)' == 'x86'">x64</AlternateArchitecture>
-    <AlternateArchitecture Condition="'$(Architecture)' == 'x64'">x86</AlternateArchitecture>
-    <DownloadedSharedHostInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
-    <DownloadedHostFxrInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
-    <DownloadedSharedFrameworkInstallerFileName Condition="'$(InstallerExtension)' != '' and '$(PgoInstrument)' != 'true'">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
-    <DownloadedSharedFrameworkInstallerFileName Condition="'$(InstallerExtension)' != '' and '$(PgoInstrument)' == 'true'">dotnet-runtime$(InstallerStartSuffix)$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
-    <DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != ''">windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName>
-    <DownloadedNetCoreAppTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppTargetingPackInstallerFileName>
-    <DownloadedNetCoreAppHostPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppHostPackInstallerFileName>
-    <DownloadedAlternateNetCoreAppHostPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_$(AlternateArchitecture)$(InstallerExtension)</DownloadedAlternateNetCoreAppHostPackInstallerFileName>
-    <DownloadedArm64NetCoreAppHostPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_arm64$(InstallerExtension)</DownloadedArm64NetCoreAppHostPackInstallerFileName>
-    <DownloadedWindowsDesktopTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWindowsDesktopTargetingPackInstallerFileName>
-    <DownloadedNetStandardTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetStandardTargetingPackInstallerFileName>
-    <!-- osx-arm64 netstandard targeting pack pkg is unavailable. Use osx-x64.
-          This should be OK, because the package is just a compressed file containing reference assemblies and
-          runtime independent manifest text files. -->
-    <DownloadedNetStandardTargetingPackInstallerFileName Condition="'$(SharedFrameworkInstallerFileRid)' == 'osx-arm64'">netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-osx-x64$(InstallerExtension)</DownloadedNetStandardTargetingPackInstallerFileName>
-
-    <CombinedFrameworkHostArchiveFileName Condition="'$(PgoInstrument)' != 'true'">dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
-    <CombinedFrameworkHostArchiveFileName Condition="'$(PgoInstrument)' == 'true'">dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
-    <WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
-
-    <AspNetCoreInstallerRid Condition="'$(AspNetCoreInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreInstallerRid>
-    <AspNetCoreArchiveRid>$(AspNetCoreInstallerRid)</AspNetCoreArchiveRid>
-    <AspNetCoreInstallerRid Condition="('$(InstallerExtension)' == '.deb' OR '$(InstallerExtension)' == '.rpm') AND '$(Architecture)' != 'arm64'">x64</AspNetCoreInstallerRid>
-    <AspNetCoreInstallerRid Condition="'$(InstallerExtension)' == '.rpm' AND '$(Architecture)' == 'arm64'">aarch64</AspNetCoreInstallerRid>
-
-    <DownloadedAspNetCoreSharedFxInstallerFileName Condition="'$(InstallerExtension)' != '' AND !$([MSBuild]::IsOSPlatform('OSX'))">aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
-    <DownloadedAspNetCoreSharedFxInstallerFileName Condition="'$(InstallerExtension)' == '.msi'">aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
-    <DownloadedAspNetTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
-    <DownloadedAspNetTargetingPackInstallerFileName Condition="'$(InstallerExtension)' == '.msi'">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
-    <AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
-    <AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
-
-    <!-- URLs -->
-    <InternalBuild Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">true</InternalBuild>
-    <InternalBaseURL Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">https://dotnetbuilds.blob.core.windows.net/internal/</InternalBaseURL>
-    <!-- Base url for official releases. Used to obtain some assets from older releases when necessary. -->
-    <OfficialBaseURL>https://dotnetcli.blob.core.windows.net/dotnet/</OfficialBaseURL>
-    <PublicBaseURL Condition="'$(PublicBaseURL)' == ''">$(OfficialBaseURL)</PublicBaseURL>
-    <!-- MSBuild removes the '//' slashes when passing PublicBaseURL from the outer to the inner build. -->
-    <PublicBaseURL Condition="$(PublicBaseURL.StartsWith('file:')) and '$(OS)' != 'Windows_NT'">$([System.Text.RegularExpressions.Regex]::Replace('$(PublicBaseURL)', '%28file:\/{1,}%29%28.+%29', 'file:///%242'))</PublicBaseURL>
-
-    <!-- Generate the version specific URLs to the targeting packs, runtime packs, etc. -->
-    <NetRuntimeRootUrl>$(PublicBaseURL)Runtime/$(NetRuntimeBlobVersion)</NetRuntimeRootUrl>
-    <NetStandardTargetingPackRootUrl>$(OfficialBaseURL)Runtime/$(NETStandardTargetingPackBlobVersion)</NetStandardTargetingPackRootUrl>
-    <AspNetCoreSharedFxRootUrl>$(PublicBaseURL)aspnetcore/Runtime/$(AspNetCoreBlobVersion)</AspNetCoreSharedFxRootUrl>
-    <WinFormsAndWpfSharedFxRootUrl>$(PublicBaseURL)WindowsDesktop/$(WindowsDesktopBlobVersion)</WinFormsAndWpfSharedFxRootUrl>
-
-    <IncludeWpfAndWinForms Condition="'$(IncludeWpfAndWinForms)' == '' AND '$(Architecture)' == 'arm'">false</IncludeWpfAndWinForms>
-    <IncludeWpfAndWinForms Condition="'$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT'">true</IncludeWpfAndWinForms>
-    <IncludeWpfAndWinForms Condition="'$(IncludeWpfAndWinForms)' == ''">false</IncludeWpfAndWinForms>
-  </PropertyGroup>
-
-  <!-- BEGIN: Bundled layout packages -->
-  <ItemGroup>
-    <BundledLayoutPackage Include="Microsoft.NETCore.App.Ref"
-      PackageName="Microsoft.NETCore.App.Ref"
-      PackageVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
-      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
-
-    <BundledLayoutPackage Include="NETStandard.Library.Ref"
-      PackageName="NETStandard.Library.Ref"
-      PackageVersion="$(NETStandardLibraryRefPackageVersion)"
-      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
-
-    <BundledLayoutPackage Include="Microsoft.AspNetCore.App.Ref"
-      PackageName="Microsoft.AspNetCore.App.Ref"
-      PackageVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
-      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
-
-    <BundledLayoutPackage Include="Microsoft.NETCore.App.Host.$(SharedFrameworkRid)"
-      PackageName="Microsoft.NETCore.App.Host.$(SharedFrameworkRid)"
-      PackageVersion="$(MicrosoftNETCoreAppHostPackageVersion)"
-      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
-
-    <BundledLayoutPackage Include="Microsoft.NETCore.App.Runtime.$(SharedFrameworkRid)"
-      PackageName="Microsoft.NETCore.App.Runtime.$(SharedFrameworkRid)"
-      Condition="'$(BundleRuntimePacks)' == 'true'"
-      PackageVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
-      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
-
-    <BundledLayoutPackage Include="Microsoft.AspNetCore.App.Runtime.$(SharedFrameworkRid)"
-      PackageName="Microsoft.AspNetCore.App.Runtime.$(SharedFrameworkRid)"
-      Condition="'$(BundleRuntimePacks)' == 'true'"
-      PackageVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)"
-      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
-
-    <BundledLayoutPackage Include="Microsoft.WindowsDesktop.App.Ref"
-      PackageName="Microsoft.WindowsDesktop.App.Ref"
-      Condition="'$(IncludeWpfAndWinForms)' != 'false'"
-      PackageVersion="$(MicrosoftWindowsDesktopAppRefPackageVersion)"
-      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
-
-    <BundledLayoutPackage Include="runtime.$(SharedFrameworkRid).Microsoft.DotNet.ILCompiler"
-      Condition="'$(BundleNativeAotCompiler)' == 'true'"
-      PackageName="runtime.$(SharedFrameworkRid).Microsoft.DotNet.ILCompiler"
-      PackageVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
-      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
-
-    <BundledLayoutPackage Include="Microsoft.DotNet.ILCompiler"
-      Condition="'$(BundleNativeAotCompiler)' == 'true'"
-      PackageName="Microsoft.DotNet.ILCompiler"
-      PackageVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
-      RelativeLayoutPath="library-packs"
-      SkipExtractPackage="true" />
-
-    <BundledLayoutPackage Include="Microsoft.NET.ILLink.Tasks"
-      Condition="'$(BundleNativeAotCompiler)' == 'true'"
-      PackageName="Microsoft.NET.ILLink.Tasks"
-      PackageVersion="$(MicrosoftNETILLinkTasksPackageVersion)"
-      RelativeLayoutPath="library-packs"
-      SkipExtractPackage="true" />
-  </ItemGroup>
-  <!-- END: Bundled layout packages -->
-
-  <!-- Restore bundled packages -->
-  <ItemGroup>
-    <PackageDownload Include="@(BundledLayoutPackage->Metadata('PackageName'))" Version="[%(PackageVersion)]" />
-  </ItemGroup>
-
-  <!-- BEGIN: Bundled layout components -->
-  <ItemGroup>
-    <BundledLayoutComponent Include="CombinedSharedHostAndFrameworkArchive">
-      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
-      <DownloadFileName>$(CombinedFrameworkHostArchiveFileName)</DownloadFileName>
-      <RelativeLayoutPath></RelativeLayoutPath>
-    </BundledLayoutComponent>
-
-    <BundledLayoutComponent Include="DownloadedAspNetCoreSharedFxArchiveFile"
-                            Condition="'$(IncludeAspNetCoreRuntime)' != 'false'">
-      <BaseUrl>$(AspNetCoreSharedFxRootUrl)</BaseUrl>
-      <DownloadFileName>$(AspNetCoreSharedFxArchiveFileName)</DownloadFileName>
-      <RelativeLayoutPath></RelativeLayoutPath>
-      <DirectoriesToCopy>shared/Microsoft.AspNetCore.App</DirectoriesToCopy>
-    </BundledLayoutComponent>
-    <!-- The AspNet does not provide native MacOS PKG installers at this time; we use AspNet archives.
-          https://github.com/aspnet/AspNetCore/issues/8806 -->
-    <BundledLayoutComponent Include="DownloadedAspNetTargetingPackArchiveFile"
-                            Condition="'$(IncludeAspNetCoreRuntime)' != 'false' and '$(InstallerExtension)' == '.pkg' And '$(SkipBuildingInstallers)' != 'true' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'osx-arm64')">
-      <BaseUrl>$(AspNetCoreSharedFxRootUrl)</BaseUrl>
-      <DownloadFileName>$(AspNetTargetingPackArchiveFileName)</DownloadFileName>
-      <RelativeLayoutPath></RelativeLayoutPath>
-    </BundledLayoutComponent>
-
-    <BundledLayoutComponent Include="WinFormsAndWpfSharedFxArchiveFile"
-                            Condition="'$(IncludeWpfAndWinForms)' != 'false'">
-      <BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)</BaseUrl>
-      <DownloadFileName>$(WinFormsAndWpfSharedFxArchiveFileName)</DownloadFileName>
-      <DirectoriesToCopy>shared/Microsoft.WindowsDesktop.App</DirectoriesToCopy>
-    </BundledLayoutComponent>
-  </ItemGroup>
-  <!-- END: Bundled layout components -->
-
-  <!-- BEGIN: Bundled installer components -->
-  <ItemGroup Condition="'$(SkipBuildingInstallers)' != 'true'">
-    <BundledInstallerComponent Include="DownloadedSharedFrameworkInstallerFile"
-                                Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64' or '$(Rid)' == 'osx-arm64')">
-      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
-      <DownloadFileName>$(DownloadedSharedFrameworkInstallerFileName)</DownloadFileName>
-    </BundledInstallerComponent>
-
-    <BundledInstallerComponent Include="DownloadedSharedHostInstallerFile"
-                                Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64' or '$(Rid)' == 'osx-arm64')">
-      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
-      <DownloadFileName>$(DownloadedSharedHostInstallerFileName)</DownloadFileName>
-    </BundledInstallerComponent>
-
-    <BundledInstallerComponent Include="DownloadedHostFxrInstallerFile"
-                                Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64' or '$(Rid)' == 'osx-arm64')">
-      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
-      <DownloadFileName>$(DownloadedHostFxrInstallerFileName)</DownloadFileName>
-    </BundledInstallerComponent>
-
-    <BundledInstallerComponent Include="DownloadedNetCoreAppTargetingPackInstallerFile"
-                                Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64' or '$(Rid)' == 'osx-arm64')">
-      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
-      <DownloadFileName>$(DownloadedNetCoreAppTargetingPackInstallerFileName)</DownloadFileName>
-    </BundledInstallerComponent>
-
-    <!-- TODO: Should we somehow obtain a .NET Standard ARM64 package? -->
-    <BundledInstallerComponent Include="DownloadedNetStandardTargetingPackInstallerFile"
-                          Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'osx-arm64')">
-      <BaseUrl>$(NetStandardTargetingPackRootUrl)</BaseUrl>
-      <DownloadFileName>$(DownloadedNetStandardTargetingPackInstallerFileName)</DownloadFileName>
-    </BundledInstallerComponent>
-
-    <BundledInstallerComponent Include="DownloadedNetCoreAppHostPackInstallerFile"
-                    Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64' or '$(Rid)' == 'osx-arm64')">
-      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
-      <DownloadFileName>$(DownloadedNetCoreAppHostPackInstallerFileName)</DownloadFileName>
-    </BundledInstallerComponent>
-
-    <!-- These are apphosts from a different vertical which require a join. They are part of
-         the windows bundle which makes it also require a join. Disable for now in the VMR.
-         https://github.com/dotnet/source-build/issues/4777. -->
-    <BundledInstallerComponent Include="DownloadedAlternateNetCoreAppHostPackInstallerFile"
-                                Condition="'$(InstallerExtension)' == '.msi' and !$(Architecture.StartsWith('arm')) and '$(DotNetBuild)' != 'true'">
-      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
-      <DownloadFileName>$(DownloadedAlternateNetCoreAppHostPackInstallerFileName)</DownloadFileName>
-    </BundledInstallerComponent>
-
-    <!-- These are apphosts from a different vertical which require a join. They are part of
-         the windows bundle which makes it also require a join. Disable for now in the VMR.
-         https://github.com/dotnet/source-build/issues/4777. -->
-    <BundledInstallerComponent Include="DownloadedArm64NetCoreAppHostPackInstallerFile"
-                                Condition="'$(InstallerExtension)' == '.msi' And !$(Architecture.StartsWith('arm'))  and '$(DotNetBuild)' != 'true'">
-      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
-      <DownloadFileName>$(DownloadedArm64NetCoreAppHostPackInstallerFileName)</DownloadFileName>
-    </BundledInstallerComponent>
-
-    <BundledInstallerComponent Include="DownloadedWindowsDesktopTargetingPackInstallerFile"
-                                Condition="'$(InstallerExtension)' == '.msi'">
-      <BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)</BaseUrl>
-      <DownloadFileName>$(DownloadedWindowsDesktopTargetingPackInstallerFileName)</DownloadFileName>
-    </BundledInstallerComponent>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(SkipBuildingInstallers)' != 'true' and '$(IncludeAspNetCoreRuntime)' != 'false'">
-    <BundledInstallerComponent Include="DownloadedAspNetTargetingPackInstallerFile"
-                                Condition="'$(InstallerExtension)' != '.pkg' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
-      <BaseUrl>$(AspNetCoreSharedFxRootUrl)</BaseUrl>
-      <DownloadFileName>$(DownloadedAspNetTargetingPackInstallerFileName)</DownloadFileName>
-    </BundledInstallerComponent>
-
-    <BundledInstallerComponent Include="DownloadedAspNetCoreSharedFxInstallerFile"
-                                Condition="'$(InstallerExtension)' != '.pkg' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
-      <BaseUrl>$(AspNetCoreSharedFxRootUrl)</BaseUrl>
-      <DownloadFileName>$(DownloadedAspNetCoreSharedFxInstallerFileName)</DownloadFileName>
-    </BundledInstallerComponent>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(SkipBuildingInstallers)' != 'true' and '$(IncludeWpfAndWinForms)' != 'false'">
-    <BundledInstallerComponent Include="DownloadedWinFormsAndWpfSharedFrameworkInstallerFile"
-                                Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64' or '$(Rid)' == 'osx-arm64')">
-      <BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)</BaseUrl>
-      <DownloadFileName>$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)</DownloadFileName>
-    </BundledInstallerComponent>
-  </ItemGroup>
-  <!-- END: Bundled installer components -->
-
-  <Target Name="DownloadBundledComponents">
-    <ItemGroup>
-      <BundledLayoutComponent>
-        <DownloadDestination>$(DownloadsFolder)%(DownloadFileName)</DownloadDestination>
-      </BundledLayoutComponent>
-      <BundledInstallerComponent>
-        <DownloadDestination>$(DownloadsFolder)%(DownloadFileName)</DownloadDestination>
-      </BundledInstallerComponent>
-      <ComponentToDownload Include="@(BundledLayoutComponent);@(BundledInstallerComponent)">
-        <ShouldDownload Condition="!Exists('%(DownloadDestination)')">true</ShouldDownload>
-
-        <!--
-          Replaces the public base url with the private one.
-        -->
-        <PrivateBaseUrl>%(BaseUrl)</PrivateBaseUrl>
-        <PrivateBaseUrl Condition="'$(InternalBuild)' == 'true'">$([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(PublicBaseURL)', '$(InternalBaseURL)'))</PrivateBaseUrl>
-      </ComponentToDownload>
-
-      <!-- Now transform the group of components into a list of Uris,
-           with shared metadata DownloadDestination and potentially the encoded key token for the private url.
-           Then use task batching to send batched itemgroups to the DownloadFile task that have the same
-           DownloadDestination. -->
-
-      <UrisToDownload Include="%(ComponentToDownload.BaseUrl)/%(ComponentToDownload.DownloadFileName)" Condition="'%(ComponentToDownload.ShouldDownload)' == 'true'">
-        <ShouldDownload>%(ComponentToDownload.ShouldDownload)</ShouldDownload>
-        <DownloadDestination>%(ComponentToDownload.DownloadDestination)</DownloadDestination>
-      </UrisToDownload>
-    </ItemGroup>
-
-    <!-- If building in product source build mode, there is no need to attempt the external URIs. These are not desired,
-            and won't work anyway because the source build file URI doesn't use the same structure as the storage accounts.
-            For example, the dotnetbuilds uri for 'file:///vmr/dotnet2/artifacts/obj/x64/Release/blob-feed/assets//aspnetcore_base_runtime.version'
-            would end up 'https://dotnetbuilds.blob.core.windows.net/public//dotnet-runtime-8.0.0-rc.1.23381.3-centos.8-x64.tar.gz'. This is
-            missing the runtime version number directory. -->
-    <ItemGroup Condition="'$(DotNetBuildOrchestrator)' != 'true'">
-      <UrisToDownload Include="$([System.String]::Copy('%(ComponentToDownload.BaseUrl)').Replace($(PublicBaseURL), 'https://dotnetbuilds.blob.core.windows.net/public/'))/%(ComponentToDownload.DownloadFileName)"
-                      Condition="'%(ComponentToDownload.ShouldDownload)' == 'true'">
-        <ShouldDownload>%(ComponentToDownload.ShouldDownload)</ShouldDownload>
-        <DownloadDestination>%(ComponentToDownload.DownloadDestination)</DownloadDestination>
-      </UrisToDownload>
-      <UrisToDownload Include="%(ComponentToDownload.PrivateBaseUrl)/%(ComponentToDownload.DownloadFileName)"
-                      Condition="'%(ComponentToDownload.ShouldDownload)' == 'true' and '$(DotNetRuntimeSourceFeedKey)' != ''">
-        <ShouldDownload>%(ComponentToDownload.ShouldDownload)</ShouldDownload>
-        <DownloadDestination>%(ComponentToDownload.DownloadDestination)</DownloadDestination>
-        <token>$(DotNetRuntimeSourceFeedKey)</token>
-      </UrisToDownload>
-    </ItemGroup>
-
-    <DownloadFile Condition="'@(UrisToDownload)' != '' and %(ShouldDownload)"
-                  Uris="@(UrisToDownload)"
-                  DestinationPath="%(DownloadDestination)" />
-  </Target>
-
-  <Target Name="CleanLayoutPath">
+  <Target Name="LayoutBundledComponents">
     <!-- Remove everything from the publish directory so we don't have left over items from previous builds -->
     <RemoveDir Directories="$(RedistLayoutPath)" />
     <MakeDir Directories="$(RedistLayoutPath)" />
-  </Target>
 
-  <Target Name="LayoutBundledComponents">
     <ExtractArchiveToDirectory SourceArchive="%(BundledLayoutComponent.DownloadDestination)"
                                DestinationDirectory="$(RedistLayoutPath)/%(BundledLayoutComponent.RelativeLayoutPath)"
                                DirectoriesToCopy="%(BundledLayoutComponent.DirectoriesToCopy)" />
@@ -389,11 +75,6 @@
     <WriteLinesToFile File="$(SdkOutputDirectory).version"
                       Lines="$(SourceRevisionId);$(Version);$(Rid);$(FullNugetVersion);$(SdkFeatureBand)"
                       Overwrite="true" />
-
-    <!-- This is a hack to make the full nuget version available during the publishing step -->
-    <WriteLinesToFile File="$(ArtifactsTmpDir)FullNugetVersion.version"
-                      Lines="$(FullNugetVersion)"
-                      Overwrite="true" />
   </Target>
 
   <Target Name="CopyKnownWorkloadManifestFile">
@@ -459,7 +140,6 @@
 
   <Target Name="GenerateLayout"
           DependsOnTargets="DownloadBundledComponents;
-                            CleanLayoutPath;
                             LayoutBundledComponents;
                             GenerateVersionFile;
                             CopyKnownWorkloadManifestFile;
diff --git a/src/Installer/redist-installer/targets/GenerateMSIs.targets b/src/Installer/redist-installer/targets/GenerateMSIs.targets
index 89c2b5b2f834..ba43625cb684 100644
--- a/src/Installer/redist-installer/targets/GenerateMSIs.targets
+++ b/src/Installer/redist-installer/targets/GenerateMSIs.targets
@@ -1,54 +1,84 @@
 <Project>
 
-  <Target Name="SetupWixProperties" DependsOnTargets="GetAssemblyVersion">
-    <!-- AcquireWix Properties -->
-    <PropertyGroup>
-      <WixDownloadUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(MicrosoftSignedWixVersion).zip</WixDownloadUrl>
-      <WixRoot>$(ArtifactsDir)Tools/WixTools/$(MicrosoftSignedWixVersion)</WixRoot>
-      <WixDestinationPath>$(WixRoot)/WixTools.$(MicrosoftSignedWixVersion).zip</WixDestinationPath>
-      <WixDownloadSentinel>$(WixRoot)/WixDownload.$(MicrosoftSignedWixVersion).sentinel</WixDownloadSentinel>
-    </PropertyGroup>
+  <PropertyGroup>
+    <GenerateMsisDependsOn>
+      DownloadBundledComponents;
+      MsiTargetsSetupInputOutputs;
+      AcquireWix;
+      GenerateSdkMsi;
+      GenerateSdkBundle;
+      GenerateSdkPlaceholderMsi;
+      GenerateToolsetNupkg;
+      GenerateTemplatesNupkgs;
+      GenerateSdkPlaceholderNupkg;
+      GenerateRuntimeAnalyzersNupkg
+    </GenerateMsisDependsOn>
+    <GenerateMsisDependsOn Condition="'$(GenerateSdkBundleOnly)' == 'true'">GenerateSdkBundle</GenerateMsisDependsOn>
+
+    <GenerateSdkBundleDependsOn>
+      DownloadBundledComponents;
+      AcquireWix;
+      MsiTargetsSetupInputOutputs;
+      GenerateWorkloadManifestsWxs
+    </GenerateSdkBundleDependsOn>
+    <!-- When building the sdk bundle only, the sdk and template msis are acquired via DownloadBundledComponents. -->
+    <GenerateSdkBundleDependsOn Condition="'$(GenerateSdkBundleOnly)' != 'true'">$(GenerateSdkBundleDependsOn);GenerateSdkMsi;GenerateTemplatesMsis</GenerateSdkBundleDependsOn>
+  </PropertyGroup>
+
+  <!-- AcquireWix Properties -->
+  <PropertyGroup>
+    <WixDownloadUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(MicrosoftSignedWixVersion).zip</WixDownloadUrl>
+    <WixRoot>$(ArtifactsDir)Tools/WixTools/$(MicrosoftSignedWixVersion)</WixRoot>
+    <WixDestinationPath>$(WixRoot)/WixTools.$(MicrosoftSignedWixVersion).zip</WixDestinationPath>
+    <WixDownloadSentinel>$(WixRoot)/WixDownload.$(MicrosoftSignedWixVersion).sentinel</WixDownloadSentinel>
+  </PropertyGroup>
 
     <!-- Generate MSI/Bundle Properties -->
+  <PropertyGroup>
+    <CombinedFrameworkSdkHostBundleEngineName>$(ArtifactsTmpDir)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)-engine.exe</CombinedFrameworkSdkHostBundleEngineName>
+
+    <SdkPkgSourcesRootDirectory>$(MSBuildThisFileDirectory)../packaging/windows</SdkPkgSourcesRootDirectory>
+    <SdkGenerateMsiPowershellScript>$(SdkPkgSourcesRootDirectory)/generatemsi.ps1</SdkGenerateMsiPowershellScript>
+    <SdkPlaceholderGenerateMsiPowershellScript>$(SdkPkgSourcesRootDirectory)/generatesdkplaceholdermsi.ps1</SdkPlaceholderGenerateMsiPowershellScript>
+    <SdkStableFileIdForApphostTransform>$(SdkPkgSourcesRootDirectory)/stablefileidforapphosttransform.xslt</SdkStableFileIdForApphostTransform>
+    <SdkGenerateBundlePowershellScript>$(SdkPkgSourcesRootDirectory)/generatebundle.ps1</SdkGenerateBundlePowershellScript>
+    <GenerateNupkgPowershellScript>$(SdkPkgSourcesRootDirectory)/generatenupkg.ps1</GenerateNupkgPowershellScript>
+
+    <FinalizerExe>$(ArtifactsBinDir)finalizer/$(Architecture)/$(Configuration)/bin/finalizer.exe</FinalizerExe>
+
+    <ToolsetInstallerNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Redist.Common.NetCore.Toolset.nuspec</ToolsetInstallerNuspecFile>
+    <ToolsetInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Toolset.$(Architecture).$(FullNugetVersion).nupkg</ToolsetInstallerNupkgFile>
+    <SdkPlaceholderInstallerNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Redist.Common.NetCore.SdkPlaceholder.nuspec</SdkPlaceholderInstallerNuspecFile>
+    <SdkPlaceholderInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.SdkPlaceholder.$(Architecture).$(FullNugetVersion).nupkg</SdkPlaceholderInstallerNupkgFile>
+
+    <RuntimeAnalyzersLayoutDirectory>$(ArtifactsBinDir)$(Configuration)\RuntimeAnalyzers</RuntimeAnalyzersLayoutDirectory>
+    <SdkRuntimeAnalyzersNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.nuspec</SdkRuntimeAnalyzersNuspecFile>
+    <SdkRuntimeAnalyzersNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.$(FullNugetVersion).nupkg</SdkRuntimeAnalyzersNupkgFile>
+    <SdkRuntimeAnalyzersSwrFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.swr</SdkRuntimeAnalyzersSwrFile>
+
+    <!-- Temp directory for light command layouts -->
+    <LightCommandObjDir>$(ArtifactsObjDir)LightCommandPackages</LightCommandObjDir>
+    <!-- Directory for the zipped up light command package -->
+    <LightCommandPackagesDir>$(ArtifactsNonShippingPackagesDir)</LightCommandPackagesDir>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SdkMSIInstallerFile>$(ArtifactsNonShippingPackagesDir)$(SdkMSIInstallerFileName)</SdkMSIInstallerFile>
+    <!-- When building the sdk bundle only, the sdk msi is acquired via DownloadBundledComponents. -->
+    <SdkMSIInstallerFile Condition="'$(GenerateSdkBundleOnly)' == 'true'">$(DownloadsFolder)$(SdkMSIInstallerFileName)</SdkMSIInstallerFile>
+
+    <SdkDependencyKeyName>Dotnet_CLI</SdkDependencyKeyName>
+    <SdkPlaceholderMSIInstallerFile>$(ArtifactsNonShippingPackagesDir)dotnet-sdkplaceholder-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</SdkPlaceholderMSIInstallerFile>
+    <SdkPlaceholderDependencyKeyName>NetCore_SdkPlaceholder</SdkPlaceholderDependencyKeyName>
+    <CombinedFrameworkSdkHostMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostMSIInstallerFile>
+
+    <!-- Warning: Changing the value "SdkBundleInstallerOutputGuidString" can only occur on a product-band boundary [CliProductBandVersion],
+                  Changing "SdkBundleInstallerOutputGuidString" mid-product-band will break the upgradability of the SDK bundle installer. -->
+    <SdkBundleInstallerOutputGuidString>Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid)</SdkBundleInstallerOutputGuidString>
+  </PropertyGroup>
+
+  <Target Name="MsiTargetsSetupInputOutputs" DependsOnTargets="GetAssemblyVersion">
     <PropertyGroup>
-      <CombinedFrameworkSdkHostBundleEngineName>$(ArtifactsTmpDir)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)-engine.exe</CombinedFrameworkSdkHostBundleEngineName>
-
-      <SdkPkgSourcesRootDirectory>$(MSBuildThisFileDirectory)../packaging/windows</SdkPkgSourcesRootDirectory>
-      <SdkGenerateMsiPowershellScript>$(SdkPkgSourcesRootDirectory)/generatemsi.ps1</SdkGenerateMsiPowershellScript>
-      <SdkPlaceholderGenerateMsiPowershellScript>$(SdkPkgSourcesRootDirectory)/generatesdkplaceholdermsi.ps1</SdkPlaceholderGenerateMsiPowershellScript>
-      <SdkStableFileIdForApphostTransform>$(SdkPkgSourcesRootDirectory)/stablefileidforapphosttransform.xslt</SdkStableFileIdForApphostTransform>
-      <SdkGenerateBundlePowershellScript>$(SdkPkgSourcesRootDirectory)/generatebundle.ps1</SdkGenerateBundlePowershellScript>
-      <GenerateNupkgPowershellScript>$(SdkPkgSourcesRootDirectory)/generatenupkg.ps1</GenerateNupkgPowershellScript>
-
-      <FinalizerExe>$(ArtifactsBinDir)finalizer/$(Architecture)/$(Configuration)/bin/finalizer.exe</FinalizerExe>
-
-      <ToolsetInstallerNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Redist.Common.NetCore.Toolset.nuspec</ToolsetInstallerNuspecFile>
-      <ToolsetInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Toolset.$(Architecture).$(FullNugetVersion).nupkg</ToolsetInstallerNupkgFile>
-      <SdkPlaceholderInstallerNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Redist.Common.NetCore.SdkPlaceholder.nuspec</SdkPlaceholderInstallerNuspecFile>
-      <SdkPlaceholderInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.SdkPlaceholder.$(Architecture).$(FullNugetVersion).nupkg</SdkPlaceholderInstallerNupkgFile>
-
-      <SdkRuntimeAnalyzersNuspecFile>$(SdkPkgSourcesRootDirectory)/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.nuspec</SdkRuntimeAnalyzersNuspecFile>
-      <SdkRuntimeAnalyzersNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.$(FullNugetVersion).nupkg</SdkRuntimeAnalyzersNupkgFile>
-      <SdkRuntimeAnalyzersSwrFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.swr</SdkRuntimeAnalyzersSwrFile>
-
-      <!-- Temp directory for light command layouts -->
-      <LightCommandObjDir>$(ArtifactsObjDir)/LightCommandPackages</LightCommandObjDir>
-      <!-- Directory for the zipped up light command package -->
-      <LightCommandPackagesDir>$(ArtifactsNonShippingPackagesDir)</LightCommandPackagesDir>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <SdkMSIInstallerFile>$(ArtifactsNonShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFile>
-      <SdkDependencyKeyName>Dotnet_CLI</SdkDependencyKeyName>
-      <SdkPlaceholderMSIInstallerFile>$(ArtifactsNonShippingPackagesDir)dotnet-sdkplaceholder-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</SdkPlaceholderMSIInstallerFile>
-      <SdkPlaceholderDependencyKeyName>NetCore_SdkPlaceholder</SdkPlaceholderDependencyKeyName>
-      <CombinedFrameworkSdkHostMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostMSIInstallerFile>
-
-      <!-- Warning: Changing the value "ProductBandCombinedHostHostFxrFrameworkSdkName" can only occur on a product-band boundary [CliProductBandVersion],
-                    Changing "ProductBandCombinedHostHostFxrFrameworkSdkName" mid-product-band will break the upgradability of the SDK bundle installer. -->
-      <ProductBandCombinedHostHostFxrFrameworkSdkName>Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid)</ProductBandCombinedHostHostFxrFrameworkSdkName>
-      <SdkBundleInstallerOutputGuidString>$(ProductBandCombinedHostHostFxrFrameworkSdkName)</SdkBundleInstallerOutputGuidString>
-
       <!-- This number comes from arcade and combines the date based build number id and the revision (incremental number per day)
            Fallback to 0 when patch number is not set. This happens only during CI. -->
       <CombinedBuildNumberAndRevision>$([MSBuild]::ValueOrDefault('$(_PatchNumber)', '000000'))</CombinedBuildNumberAndRevision>
@@ -56,16 +86,6 @@
       <!-- This number comes from arcade and combines the date based build number id and the revision (incremental number per day) -->
       <SDKBundleVersion>$(FileVersion)</SDKBundleVersion>
     </PropertyGroup>
-  </Target>
-
-  <Target Name="MsiTargetsSetupInputOutputs"
-          DependsOnTargets="GenerateLayout;SetupWixProperties;SetupTemplatesMsis">
-    <!-- Consumed By Publish -->
-    <ItemGroup>
-      <GeneratedInstallers Include="$(SdkMSIInstallerFile);$(CombinedFrameworkSdkHostMSIInstallerFile);$(SdkPlaceholderMSIInstallerFile)" />
-      <GeneratedInstallers Include="@(TemplatesMsiComponent->'%(MSIInstallerFile)')" />
-      <GeneratedInstallers Include="@(BundledManifests->'%(MSIInstallerFile)')" />
-    </ItemGroup>
 
     <GenerateMsiVersion BuildNumber="$(CombinedBuildNumberAndRevision)"
                         Major="$(VersionMajor)"
@@ -73,25 +93,10 @@
                         Patch="$(VersionFeature)">
       <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
     </GenerateMsiVersion>
-
-    <GenerateGuidFromName Name="$(SdkMSIInstallerFile)">
-      <Output TaskParameter="GeneratedGuid"
-          PropertyName="SdkInstallerUpgradeCode" />
-    </GenerateGuidFromName>
-
-    <GenerateGuidFromName Name="$(SdkPlaceholderMSIInstallerFile)">
-      <Output TaskParameter="GeneratedGuid"
-          PropertyName="SdkPlaceholderInstallerUpgradeCode" />
-    </GenerateGuidFromName>
-
-    <GenerateGuidFromName Name="$(SdkBundleInstallerOutputGuidString)">
-      <Output TaskParameter="GeneratedGuid"
-          PropertyName="CombinedFrameworkSDKHostInstallerUpgradeCode" />
-    </GenerateGuidFromName>
   </Target>
 
   <Target Name="AcquireWix"
-          DependsOnTargets="SetupWixProperties;MsiTargetsSetupInputOutputs"
+          DependsOnTargets="MsiTargetsSetupInputOutputs"
           Inputs="$(WixDownloadSentinel)"
           Outputs="$(WixDestinationPath)">
     <!-- Setup sentinel to take advantage of incrementality -->
@@ -115,8 +120,12 @@
   <Target Name="GenerateSdkMsi"
           DependsOnTargets="GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs"
           Inputs="$(SdkInternalLayoutPath)**/*;
-                    $(SdkGenerateMsiPowershellScript)"
+                  $(SdkGenerateMsiPowershellScript)"
           Outputs="$(SdkMSIInstallerFile)">
+    <GenerateGuidFromName Name="$(SdkMSIInstallerFile)">
+      <Output TaskParameter="GeneratedGuid" PropertyName="SdkInstallerUpgradeCode" />
+    </GenerateGuidFromName>
+
     <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateMsiPowershellScript) ^
                       '$(SdkInternalLayoutPath.TrimEnd('\'))' ^
                       '$(SdkMSIInstallerFile)' ^
@@ -133,6 +142,7 @@
                       '$(Architecture)' ^
                       '$(SdkStableFileIdForApphostTransform)' ^
                       -InformationAction Continue" />
+
     <ItemGroup>
         <SdkMsiWixSrcFiles Include="$(WixRoot)\dotnet.wixobj" />
         <SdkMsiWixSrcFiles Include="$(WixRoot)\provider.wixobj" />
@@ -140,6 +150,7 @@
         <SdkMsiWixSrcFiles Include="$(WixRoot)\dotnethome_x64.wixobj" />
         <SdkMsiWixSrcFiles Include="$(WixRoot)\install-files.wixobj" />
     </ItemGroup>
+
     <CreateLightCommandPackageDrop
       LightCommandWorkingDir="$(LightCommandObjDir)"
       OutputFolder="$(LightCommandPackagesDir)"
@@ -157,6 +168,10 @@
           DependsOnTargets="AcquireWix;MsiTargetsSetupInputOutputs"
           Inputs="$(SdkPlaceholderGenerateMsiPowershellScript)"
           Outputs="$(SdkPlaceholderMSIInstallerFile)">
+    <GenerateGuidFromName Name="$(SdkPlaceholderMSIInstallerFile)">
+      <Output TaskParameter="GeneratedGuid" PropertyName="SdkPlaceholderInstallerUpgradeCode" />
+    </GenerateGuidFromName>
+
     <Exec Command="powershell -NoProfile -NoLogo $(SdkPlaceholderGenerateMsiPowershellScript) ^
                       '$(SdkPlaceholderMSIInstallerFile)' ^
                       '$(WixRoot)' ^
@@ -170,10 +185,12 @@
                       '$(SdkPlaceholderDependencyKeyName)' ^
                       '$(Architecture)' ^
                       -InformationAction Continue" />
+
     <ItemGroup>
-        <SdkPlaceholdMsiWixSrcFiles Include="$(WixRoot)\provider.wixobj" />
-        <SdkPlaceholdMsiWixSrcFiles Include="$(WixRoot)\sdkplaceholder.wixobj" />
+      <SdkPlaceholdMsiWixSrcFiles Include="$(WixRoot)\provider.wixobj" />
+      <SdkPlaceholdMsiWixSrcFiles Include="$(WixRoot)\sdkplaceholder.wixobj" />
     </ItemGroup>
+
     <CreateLightCommandPackageDrop
       LightCommandWorkingDir="$(LightCommandObjDir)"
       OutputFolder="$(LightCommandPackagesDir)"
@@ -205,12 +222,14 @@
                       '%(TemplatesMsiComponent.DependencyKeyName)' ^
                       '$(Architecture)' ^
                       -InformationAction Continue" />
+
     <ItemGroup>
         <TemplatesMsiWixSrcFiles Include="$(WixRoot)\provider.wixobj" />
         <TemplatesMsiWixSrcFiles Include="$(WixRoot)\templates.wixobj" />
         <TemplatesMsiWixSrcFiles Include="$(WixRoot)\dotnethome_x64.wixobj" />
         <TemplatesMsiWixSrcFiles Include="$(WixRoot)\template-install-files.wixobj" />
     </ItemGroup>
+
     <CreateLightCommandPackageDrop
       LightCommandWorkingDir="$(LightCommandObjDir)"
       OutputFolder="$(LightCommandPackagesDir)"
@@ -239,8 +258,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="GenerateWorkloadManifestsWxs"
-          DependsOnTargets="ValidateBundledManifestSigning">
+  <Target Name="GenerateWorkloadManifestsWxs">
     <ItemGroup>
       <_Manifests Include="@(BundledManifests)">
         <RestoredMsiPathInNupkg>$([MSBuild]::NormalizePath($([System.IO.Directory]::GetFiles('%(RestoredMsiNupkgContentPath)/data/', '*$(MsiArchitectureForWorkloadManifests).msi'))))</RestoredMsiPathInNupkg>
@@ -272,27 +290,32 @@
                       Overwrite="true" />
   </Target>
 
-  <!-- The sdk bundle requires a join. Disable for now in the VMR: https://github.com/dotnet/source-build/issues/4777 -->
   <Target Name="GenerateSdkBundle"
-          DependsOnTargets="GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs;GenerateSdkMsi;GenerateTemplatesMsis;GenerateWorkloadManifestsWxs"
-          Condition="'$(DotNetBuild)' != 'true'"
+          DependsOnTargets="$(GenerateSdkBundleDependsOn)"
+          Condition="'$(DotNetBuild)' != 'true' or '$(GenerateSdkBundleOnly)' == 'true'"
           Inputs="$(SdkMSIInstallerFile);
-                    $(DownloadedSharedFrameworkInstallerFile);
-                    $(DownloadedHostFxrInstallerFile);
-                    $(DownloadedSharedHostInstallerFile);
-                    $(SdkGenerateBundlePowershellScript)"
+                  $(DownloadedSharedFrameworkInstallerFile);
+                  $(DownloadedHostFxrInstallerFile);
+                  $(DownloadedSharedHostInstallerFile);
+                  $(SdkGenerateBundlePowershellScript)"
           Outputs="$(CombinedFrameworkSdkHostMSIInstallerFile)">
     <!-- Choose "latest" template MSI to go in bundle. -->
     <ItemGroup>
-      <LatestTemplateInstallerComponent Include="@(TemplatesMsiComponent)"
-                                        Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/>
+      <LatestTemplateInstallerComponent Include="@(TemplatesMsiComponent)" Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/>
     </ItemGroup>
 
     <PropertyGroup>
       <LatestTemplateMsiInstallerFile>@(LatestTemplateInstallerComponent->'%(MSIInstallerFile)')</LatestTemplateMsiInstallerFile>
+      <!-- When building the sdk bundle only, the template msi is acquired via DownloadBundledComponents. -->
+      <LatestTemplateMsiInstallerFile Condition="'$(GenerateSdkBundleOnly)' == 'true'">$(DownloadsFolder)$(SdkTemplatesMSIInstallerFileName)</LatestTemplateMsiInstallerFile>
+
       <UpgradePoliciesSrcPath>$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle\upgradePolicies.wxs</UpgradePoliciesSrcPath>
     </PropertyGroup>
 
+    <GenerateGuidFromName Name="$(SdkBundleInstallerOutputGuidString)">
+      <Output TaskParameter="GeneratedGuid" PropertyName="CombinedFrameworkSDKHostInstallerUpgradeCode" />
+    </GenerateGuidFromName>
+
     <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateBundlePowershellScript) ^
                       -UpgradePoliciesWxsFile '$(UpgradePoliciesSrcPath)' ^
                       -WorkloadManifestWxsFile '$(WorkloadManifestsWxsPath)' ^
@@ -330,9 +353,9 @@
                       -InformationAction Continue " />
 
     <ItemGroup>
-        <BundleMsiWixSrcFiles Include="$(WixRoot)\bundle.wixobj" />
-        <BundleMsiWixSrcFiles Include="$(WixRoot)\WorkloadManifests.wixobj" />
-        <BundleMsiWixSrcFiles Include="$(WixRoot)\upgradePolicies.wixobj" />
+      <BundleMsiWixSrcFiles Include="$(WixRoot)\bundle.wixobj" />
+      <BundleMsiWixSrcFiles Include="$(WixRoot)\WorkloadManifests.wixobj" />
+      <BundleMsiWixSrcFiles Include="$(WixRoot)\upgradePolicies.wixobj" />
     </ItemGroup>
 
     <CreateLightCommandPackageDrop
@@ -349,10 +372,10 @@
   </Target>
 
   <Target Name="GenerateToolsetNupkg"
-          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateSdkMsi"
+          DependsOnTargets="MsiTargetsSetupInputOutputs;GenerateSdkMsi"
           Inputs="$(SdkMSIInstallerFile);
-                    $(ToolsetInstallerNuspecFile);
-                    $(GenerateNupkgPowershellScript)"
+                  $(ToolsetInstallerNuspecFile);
+                  $(GenerateNupkgPowershellScript)"
           Outputs="$(ToolsetInstallerNupkgFile)">
     <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
                       '$(ArtifactsDir)' ^
@@ -367,8 +390,8 @@
   <Target Name="GenerateSdkPlaceholderNupkg"
           DependsOnTargets="MsiTargetsSetupInputOutputs;GenerateSdkPlaceholderMsi"
           Inputs="$(SdkPlaceholderMSIInstallerFile);
-                    $(SdkPlaceholderInstallerNuspecFile);
-                    $(GenerateNupkgPowershellScript)"
+                  $(SdkPlaceholderInstallerNuspecFile);
+                  $(GenerateNupkgPowershellScript)"
           Outputs="$(SdkPlaceholderInstallerNupkgFile)">
     <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
                       '$(ArtifactsDir)' ^
@@ -381,10 +404,10 @@
   </Target>
 
   <Target Name="GenerateTemplatesNupkgs"
-          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateTemplatesMsis;SetupTemplatesNupkgs"
+          DependsOnTargets="MsiTargetsSetupInputOutputs;GenerateTemplatesMsis;SetupTemplatesNupkgs"
           Inputs="@(TemplatesNupkgComponent->'%(MSIInstallerFile)');
-                    $(TemplatesInstallerNuspecFile);
-                    $(GenerateNupkgPowershellScript)"
+                  $(TemplatesInstallerNuspecFile);
+                  $(GenerateNupkgPowershellScript)"
           Outputs="@(TemplatesNupkgComponent->'%(NupkgFile)')">
     <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
                       '$(ArtifactsDir)' ^
@@ -411,7 +434,7 @@
 
   <Target Name="GenerateRuntimeAnalyzersNupkg"
           DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs"
-          Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' And '$(DotNetBuild)' != 'true' "
+          Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' And '$(DotNetBuild)' != 'true'"
           Inputs="$(RuntimeAnalyzersLayoutDirectory)/**/*;
                     $(SdkRuntimeAnalyzersNuspecFile);
                     $(GenerateNupkgPowershellScript)"
@@ -432,16 +455,6 @@
 
   <Target Name="GenerateMsis"
           BeforeTargets="Pack"
-          DependsOnTargets="GenerateLayout;
-                            MsiTargetsSetupInputOutputs;
-                            AcquireWix;
-                            GenerateSdkMsi;
-                            GenerateTemplatesMsis;
-                            GenerateSdkBundle;
-                            GenerateSdkPlaceholderMsi;
-                            GenerateToolsetNupkg;
-                            GenerateTemplatesNupkgs;
-                            GenerateSdkPlaceholderNupkg;
-                            GenerateRuntimeAnalyzersNupkg" />
+          DependsOnTargets="$(GenerateMsisDependsOn)" />
 
 </Project>
diff --git a/src/Installer/redist-installer/targets/GeneratePKG.targets b/src/Installer/redist-installer/targets/GeneratePKG.targets
index 0a66d31acf02..48d7000fb689 100644
--- a/src/Installer/redist-installer/targets/GeneratePKG.targets
+++ b/src/Installer/redist-installer/targets/GeneratePKG.targets
@@ -118,11 +118,6 @@
       </ResourcesReplacement>
     </ItemGroup>
 
-    <!-- Consumed By Publish -->
-    <ItemGroup>
-      <GeneratedInstallers Include="$(SdkPKGInstallerFile);$(CombinedFrameworkSdkHostPKGInstallerFile)" />
-    </ItemGroup>
-
     <ItemGroup>
       <SdkProductArchiveResourcesTemplateFiles Include="$(SdkPkgSourcesRootDirectory)/resources/**/*" />
 
diff --git a/src/Installer/redist-installer/targets/GenerateRuntimeAnalyzers.targets b/src/Installer/redist-installer/targets/GenerateRuntimeAnalyzers.targets
deleted file mode 100644
index e84a36f39ce9..000000000000
--- a/src/Installer/redist-installer/targets/GenerateRuntimeAnalyzers.targets
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-      <RuntimeAnalyzersLayoutDirectory>$(ArtifactsBinDir)$(Configuration)\RuntimeAnalyzers</RuntimeAnalyzersLayoutDirectory>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/Installer/redist-installer/targets/RestoreLayout.targets b/src/Installer/redist-installer/targets/RestoreLayout.targets
new file mode 100644
index 000000000000..e943ad4681a0
--- /dev/null
+++ b/src/Installer/redist-installer/targets/RestoreLayout.targets
@@ -0,0 +1,327 @@
+<Project TreatAsLocalProperty="PublicBaseURL">
+
+  <PropertyGroup>
+    <!-- Only the runtime OSX .pkgs have a `-internal` suffix -->
+    <InstallerStartSuffix Condition="$([MSBuild]::IsOSPlatform('OSX'))">-internal</InstallerStartSuffix>
+    <!-- Use the "x64" Rid when downloading Linux shared framework 'DEB' installer files. -->
+    <InstallerTargetArchitecture>$(Architecture)</InstallerTargetArchitecture>
+    <InstallerTargetArchitecture Condition="'$(IsRPMBasedDistro)' == 'true' and '$(Architecture)' == 'Arm64'">aarch64</InstallerTargetArchitecture>
+
+    <SharedFrameworkInstallerFileRid>$(NetRuntimeRid)</SharedFrameworkInstallerFileRid>
+    <SharedFrameworkInstallerFileRid Condition="'$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true'">$(InstallerTargetArchitecture)</SharedFrameworkInstallerFileRid>
+
+    <!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize -->
+    <!-- In unified build, the layout does match, so use the runtime package versions rather than the VS redist versions -->
+    <AspNetCoreBlobVersion>$(MicrosoftAspNetCoreAppRefInternalPackageVersion)</AspNetCoreBlobVersion>
+    <NetRuntimeBlobVersion>$(MicrosoftNETCorePlatformsPackageVersion)</NetRuntimeBlobVersion>
+    <WindowsDesktopBlobVersion>$(VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion)</WindowsDesktopBlobVersion>
+    <WindowsDesktopBlobVersion Condition="'$(DotNetBuildOrchestrator)' == 'true'">$(MicrosoftWindowsDesktopAppRuntimePackageVersion)</WindowsDesktopBlobVersion>
+    <NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
+
+    <AlternateArchitecture Condition="'$(Architecture)' == 'x86'">x64</AlternateArchitecture>
+    <AlternateArchitecture Condition="'$(Architecture)' == 'x64'">x86</AlternateArchitecture>
+    <DownloadedSharedHostInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
+    <DownloadedHostFxrInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
+    <DownloadedSharedFrameworkInstallerFileName Condition="'$(InstallerExtension)' != '' and '$(PgoInstrument)' != 'true'">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
+    <DownloadedSharedFrameworkInstallerFileName Condition="'$(InstallerExtension)' != '' and '$(PgoInstrument)' == 'true'">dotnet-runtime$(InstallerStartSuffix)$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
+    <DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != ''">windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName>
+    <DownloadedNetCoreAppTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppTargetingPackInstallerFileName>
+    <DownloadedNetCoreAppHostPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppHostPackInstallerFileName>
+    <DownloadedAlternateNetCoreAppHostPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_$(AlternateArchitecture)$(InstallerExtension)</DownloadedAlternateNetCoreAppHostPackInstallerFileName>
+    <DownloadedArm64NetCoreAppHostPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_arm64$(InstallerExtension)</DownloadedArm64NetCoreAppHostPackInstallerFileName>
+    <DownloadedWindowsDesktopTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWindowsDesktopTargetingPackInstallerFileName>
+    <DownloadedNetStandardTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetStandardTargetingPackInstallerFileName>
+    <!-- osx-arm64 netstandard targeting pack pkg is unavailable. Use osx-x64.
+          This should be OK, because the package is just a compressed file containing reference assemblies and
+          runtime independent manifest text files. -->
+    <DownloadedNetStandardTargetingPackInstallerFileName Condition="'$(SharedFrameworkInstallerFileRid)' == 'osx-arm64'">netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-osx-x64$(InstallerExtension)</DownloadedNetStandardTargetingPackInstallerFileName>
+
+    <SdkMSIInstallerFileName>$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFileName>
+    <SdkTemplatesMSIInstallerFileName>dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</SdkTemplatesMSIInstallerFileName>
+
+    <CombinedFrameworkHostArchiveFileName Condition="'$(PgoInstrument)' != 'true'">dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
+    <CombinedFrameworkHostArchiveFileName Condition="'$(PgoInstrument)' == 'true'">dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
+    <WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
+
+    <AspNetCoreInstallerRid Condition="'$(AspNetCoreInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreInstallerRid>
+    <AspNetCoreArchiveRid>$(AspNetCoreInstallerRid)</AspNetCoreArchiveRid>
+    <AspNetCoreInstallerRid Condition="('$(InstallerExtension)' == '.deb' OR '$(InstallerExtension)' == '.rpm') AND '$(Architecture)' != 'arm64'">x64</AspNetCoreInstallerRid>
+    <AspNetCoreInstallerRid Condition="'$(InstallerExtension)' == '.rpm' AND '$(Architecture)' == 'arm64'">aarch64</AspNetCoreInstallerRid>
+
+    <DownloadedAspNetCoreSharedFxInstallerFileName Condition="'$(InstallerExtension)' != '' AND !$([MSBuild]::IsOSPlatform('OSX'))">aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
+    <DownloadedAspNetCoreSharedFxInstallerFileName Condition="'$(InstallerExtension)' == '.msi'">aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
+    <DownloadedAspNetTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
+    <DownloadedAspNetTargetingPackInstallerFileName Condition="'$(InstallerExtension)' == '.msi'">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
+    <AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
+    <AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
+
+    <!-- URLs -->
+    <InternalBuild Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">true</InternalBuild>
+    <InternalBaseURL Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">https://dotnetbuilds.blob.core.windows.net/internal/</InternalBaseURL>
+    <!-- Base url for official releases. Used to obtain some assets from older releases when necessary. -->
+    <OfficialBaseURL>https://dotnetcli.blob.core.windows.net/dotnet/</OfficialBaseURL>
+    <PublicBaseURL Condition="'$(PublicBaseURL)' == ''">$(OfficialBaseURL)</PublicBaseURL>
+    <!-- MSBuild removes the '//' slashes when passing PublicBaseURL from the outer to the inner build. -->
+    <PublicBaseURL Condition="$(PublicBaseURL.StartsWith('file:')) and '$(OS)' != 'Windows_NT'">$([System.Text.RegularExpressions.Regex]::Replace('$(PublicBaseURL)', '%28file:\/{1,}%29%28.+%29', 'file:///%242'))</PublicBaseURL>
+
+    <!-- Generate the version specific URLs to the targeting packs, runtime packs, etc. -->
+    <NetRuntimeRootUrl>$(PublicBaseURL)Runtime/$(NetRuntimeBlobVersion)</NetRuntimeRootUrl>
+    <NetStandardTargetingPackRootUrl>$(OfficialBaseURL)Runtime/$(NETStandardTargetingPackBlobVersion)</NetStandardTargetingPackRootUrl>
+    <AspNetCoreSharedFxRootUrl>$(PublicBaseURL)aspnetcore/Runtime/$(AspNetCoreBlobVersion)</AspNetCoreSharedFxRootUrl>
+    <WinFormsAndWpfSharedFxRootUrl>$(PublicBaseURL)WindowsDesktop/$(WindowsDesktopBlobVersion)</WinFormsAndWpfSharedFxRootUrl>
+    <SdkRootUrl>$(PublicBaseURL)Sdk/$(FullNugetVersion)</SdkRootUrl>
+
+    <IncludeWpfAndWinForms Condition="'$(IncludeWpfAndWinForms)' == '' AND '$(Architecture)' == 'arm'">false</IncludeWpfAndWinForms>
+    <IncludeWpfAndWinForms Condition="'$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT'">true</IncludeWpfAndWinForms>
+    <IncludeWpfAndWinForms Condition="'$(IncludeWpfAndWinForms)' == ''">false</IncludeWpfAndWinForms>
+  </PropertyGroup>
+
+  <!-- BEGIN: Bundled layout packages -->
+  <ItemGroup>
+    <BundledLayoutPackage Include="Microsoft.NETCore.App.Ref"
+      PackageName="Microsoft.NETCore.App.Ref"
+      PackageVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
+      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
+
+    <BundledLayoutPackage Include="NETStandard.Library.Ref"
+      PackageName="NETStandard.Library.Ref"
+      PackageVersion="$(NETStandardLibraryRefPackageVersion)"
+      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
+
+    <BundledLayoutPackage Include="Microsoft.AspNetCore.App.Ref"
+      PackageName="Microsoft.AspNetCore.App.Ref"
+      PackageVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
+      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
+
+    <BundledLayoutPackage Include="Microsoft.NETCore.App.Host.$(SharedFrameworkRid)"
+      PackageName="Microsoft.NETCore.App.Host.$(SharedFrameworkRid)"
+      PackageVersion="$(MicrosoftNETCoreAppHostPackageVersion)"
+      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
+
+    <BundledLayoutPackage Include="Microsoft.NETCore.App.Runtime.$(SharedFrameworkRid)"
+      PackageName="Microsoft.NETCore.App.Runtime.$(SharedFrameworkRid)"
+      Condition="'$(BundleRuntimePacks)' == 'true'"
+      PackageVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
+      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
+
+    <BundledLayoutPackage Include="Microsoft.AspNetCore.App.Runtime.$(SharedFrameworkRid)"
+      PackageName="Microsoft.AspNetCore.App.Runtime.$(SharedFrameworkRid)"
+      Condition="'$(BundleRuntimePacks)' == 'true'"
+      PackageVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)"
+      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
+
+    <BundledLayoutPackage Include="Microsoft.WindowsDesktop.App.Ref"
+      PackageName="Microsoft.WindowsDesktop.App.Ref"
+      Condition="'$(IncludeWpfAndWinForms)' != 'false'"
+      PackageVersion="$(MicrosoftWindowsDesktopAppRefPackageVersion)"
+      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
+
+    <BundledLayoutPackage Include="runtime.$(SharedFrameworkRid).Microsoft.DotNet.ILCompiler"
+      Condition="'$(BundleNativeAotCompiler)' == 'true'"
+      PackageName="runtime.$(SharedFrameworkRid).Microsoft.DotNet.ILCompiler"
+      PackageVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
+      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
+
+    <BundledLayoutPackage Include="Microsoft.DotNet.ILCompiler"
+      Condition="'$(BundleNativeAotCompiler)' == 'true'"
+      PackageName="Microsoft.DotNet.ILCompiler"
+      PackageVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
+      RelativeLayoutPath="library-packs"
+      SkipExtractPackage="true" />
+
+    <BundledLayoutPackage Include="Microsoft.NET.ILLink.Tasks"
+      Condition="'$(BundleNativeAotCompiler)' == 'true'"
+      PackageName="Microsoft.NET.ILLink.Tasks"
+      PackageVersion="$(MicrosoftNETILLinkTasksPackageVersion)"
+      RelativeLayoutPath="library-packs"
+      SkipExtractPackage="true" />
+  </ItemGroup>
+  <!-- END: Bundled layout packages -->
+
+  <!-- Restore bundled packages -->
+  <ItemGroup>
+    <PackageDownload Include="@(BundledLayoutPackage->Metadata('PackageName'))" Version="[%(PackageVersion)]" />
+  </ItemGroup>
+
+  <!-- BEGIN: Bundled layout components -->
+  <ItemGroup>
+    <BundledLayoutComponent Include="CombinedSharedHostAndFrameworkArchive">
+      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
+      <DownloadFileName>$(CombinedFrameworkHostArchiveFileName)</DownloadFileName>
+      <RelativeLayoutPath></RelativeLayoutPath>
+    </BundledLayoutComponent>
+
+    <BundledLayoutComponent Include="DownloadedAspNetCoreSharedFxArchiveFile"
+                            Condition="'$(IncludeAspNetCoreRuntime)' != 'false'">
+      <BaseUrl>$(AspNetCoreSharedFxRootUrl)</BaseUrl>
+      <DownloadFileName>$(AspNetCoreSharedFxArchiveFileName)</DownloadFileName>
+      <RelativeLayoutPath></RelativeLayoutPath>
+      <DirectoriesToCopy>shared/Microsoft.AspNetCore.App</DirectoriesToCopy>
+    </BundledLayoutComponent>
+    <!-- The AspNet does not provide native MacOS PKG installers at this time; we use AspNet archives.
+          https://github.com/aspnet/AspNetCore/issues/8806 -->
+    <BundledLayoutComponent Include="DownloadedAspNetTargetingPackArchiveFile"
+                            Condition="'$(IncludeAspNetCoreRuntime)' != 'false' and '$(InstallerExtension)' == '.pkg' And '$(SkipBuildingInstallers)' != 'true' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'osx-arm64')">
+      <BaseUrl>$(AspNetCoreSharedFxRootUrl)</BaseUrl>
+      <DownloadFileName>$(AspNetTargetingPackArchiveFileName)</DownloadFileName>
+      <RelativeLayoutPath></RelativeLayoutPath>
+    </BundledLayoutComponent>
+
+    <BundledLayoutComponent Include="WinFormsAndWpfSharedFxArchiveFile"
+                            Condition="'$(IncludeWpfAndWinForms)' != 'false'">
+      <BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)</BaseUrl>
+      <DownloadFileName>$(WinFormsAndWpfSharedFxArchiveFileName)</DownloadFileName>
+      <DirectoriesToCopy>shared/Microsoft.WindowsDesktop.App</DirectoriesToCopy>
+    </BundledLayoutComponent>
+  </ItemGroup>
+  <!-- END: Bundled layout components -->
+
+  <!-- BEGIN: Bundled installer components -->
+  <ItemGroup Condition="'$(SkipBuildingInstallers)' != 'true'">
+    <BundledInstallerComponent Include="DownloadedSharedFrameworkInstallerFile"
+                                Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64' or '$(Rid)' == 'osx-arm64')">
+      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
+      <DownloadFileName>$(DownloadedSharedFrameworkInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+
+    <BundledInstallerComponent Include="DownloadedSharedHostInstallerFile"
+                                Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64' or '$(Rid)' == 'osx-arm64')">
+      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
+      <DownloadFileName>$(DownloadedSharedHostInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+
+    <BundledInstallerComponent Include="DownloadedHostFxrInstallerFile"
+                                Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64' or '$(Rid)' == 'osx-arm64')">
+      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
+      <DownloadFileName>$(DownloadedHostFxrInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+
+    <BundledInstallerComponent Include="DownloadedNetCoreAppTargetingPackInstallerFile"
+                                Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64' or '$(Rid)' == 'osx-arm64')">
+      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
+      <DownloadFileName>$(DownloadedNetCoreAppTargetingPackInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+
+    <!-- TODO: Should we somehow obtain a .NET Standard ARM64 package? -->
+    <BundledInstallerComponent Include="DownloadedNetStandardTargetingPackInstallerFile"
+                          Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'osx-arm64')">
+      <BaseUrl>$(NetStandardTargetingPackRootUrl)</BaseUrl>
+      <DownloadFileName>$(DownloadedNetStandardTargetingPackInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+
+    <BundledInstallerComponent Include="DownloadedNetCoreAppHostPackInstallerFile"
+                    Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64' or '$(Rid)' == 'osx-arm64')">
+      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
+      <DownloadFileName>$(DownloadedNetCoreAppHostPackInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+
+    <!-- These are apphosts from a different vertical which require a join in the VMR. -->
+    <BundledInstallerComponent Include="DownloadedAlternateNetCoreAppHostPackInstallerFile"
+                                Condition="'$(InstallerExtension)' == '.msi' and !$(Architecture.StartsWith('arm')) and ('$(DotNetBuild)' != 'true' or '$(GenerateSdkBundleOnly)' == 'true')">
+      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
+      <DownloadFileName>$(DownloadedAlternateNetCoreAppHostPackInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+
+    <!-- These are apphosts from a different vertical which require a join in the VMR. -->
+    <BundledInstallerComponent Include="DownloadedArm64NetCoreAppHostPackInstallerFile"
+                                Condition="'$(InstallerExtension)' == '.msi' And !$(Architecture.StartsWith('arm'))  and ('$(DotNetBuild)' != 'true' or '$(GenerateSdkBundleOnly)' == 'true')">
+      <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
+      <DownloadFileName>$(DownloadedArm64NetCoreAppHostPackInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+
+    <BundledInstallerComponent Include="DownloadedWindowsDesktopTargetingPackInstallerFile"
+                                Condition="'$(InstallerExtension)' == '.msi'">
+      <BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)</BaseUrl>
+      <DownloadFileName>$(DownloadedWindowsDesktopTargetingPackInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(SkipBuildingInstallers)' != 'true' and '$(IncludeAspNetCoreRuntime)' != 'false'">
+    <BundledInstallerComponent Include="DownloadedAspNetTargetingPackInstallerFile"
+                                Condition="'$(InstallerExtension)' != '.pkg' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
+      <BaseUrl>$(AspNetCoreSharedFxRootUrl)</BaseUrl>
+      <DownloadFileName>$(DownloadedAspNetTargetingPackInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+
+    <BundledInstallerComponent Include="DownloadedAspNetCoreSharedFxInstallerFile"
+                                Condition="'$(InstallerExtension)' != '.pkg' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
+      <BaseUrl>$(AspNetCoreSharedFxRootUrl)</BaseUrl>
+      <DownloadFileName>$(DownloadedAspNetCoreSharedFxInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(SkipBuildingInstallers)' != 'true' and '$(IncludeWpfAndWinForms)' != 'false'">
+    <BundledInstallerComponent Include="DownloadedWinFormsAndWpfSharedFrameworkInstallerFile"
+                                Condition="'$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64' or '$(Rid)' == 'osx-arm64')">
+      <BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)</BaseUrl>
+      <DownloadFileName>$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+  </ItemGroup>
+
+  <!-- When building the sdk bundle only, acquire sdk and template msis. -->
+  <ItemGroup Condition="'$(GenerateSdkBundleOnly)' == 'true'">
+    <BundledInstallerComponent Include="DownloadedSdkMSIInstallerFile">
+      <BaseUrl>$(SdkRootUrl)</BaseUrl>
+      <DownloadFileName>$(SdkMSIInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+    <BundledInstallerComponent Include="DownloadedSdkTemplatesMSIInstallerFile">
+      <BaseUrl>$(SdkRootUrl)</BaseUrl>
+      <DownloadFileName>$(SdkTemplatesMSIInstallerFileName)</DownloadFileName>
+    </BundledInstallerComponent>
+  </ItemGroup>
+  <!-- END: Bundled installer components -->
+
+  <Target Name="DownloadBundledComponents">
+    <ItemGroup>
+      <BundledLayoutComponent>
+        <DownloadDestination>$(DownloadsFolder)%(DownloadFileName)</DownloadDestination>
+      </BundledLayoutComponent>
+      <BundledInstallerComponent>
+        <DownloadDestination>$(DownloadsFolder)%(DownloadFileName)</DownloadDestination>
+      </BundledInstallerComponent>
+      <ComponentToDownload Include="@(BundledLayoutComponent);@(BundledInstallerComponent)">
+        <ShouldDownload Condition="!Exists('%(DownloadDestination)')">true</ShouldDownload>
+
+        <!--
+          Replaces the public base url with the private one.
+        -->
+        <PrivateBaseUrl>%(BaseUrl)</PrivateBaseUrl>
+        <PrivateBaseUrl Condition="'$(InternalBuild)' == 'true'">$([System.String]::new('%(ComponentToDownload.PrivateBaseUrl)').Replace('$(PublicBaseURL)', '$(InternalBaseURL)'))</PrivateBaseUrl>
+      </ComponentToDownload>
+
+      <!-- Now transform the group of components into a list of Uris,
+           with shared metadata DownloadDestination and potentially the encoded key token for the private url.
+           Then use task batching to send batched itemgroups to the DownloadFile task that have the same
+           DownloadDestination. -->
+
+      <UrisToDownload Include="%(ComponentToDownload.BaseUrl)/%(ComponentToDownload.DownloadFileName)" Condition="'%(ComponentToDownload.ShouldDownload)' == 'true'">
+        <ShouldDownload>%(ComponentToDownload.ShouldDownload)</ShouldDownload>
+        <DownloadDestination>%(ComponentToDownload.DownloadDestination)</DownloadDestination>
+      </UrisToDownload>
+    </ItemGroup>
+
+    <!-- If building in product source build mode, there is no need to attempt the external URIs. These are not desired,
+            and won't work anyway because the source build file URI doesn't use the same structure as the storage accounts.
+            For example, the dotnetbuilds uri for 'file:///vmr/dotnet2/artifacts/obj/x64/Release/blob-feed/assets//aspnetcore_base_runtime.version'
+            would end up 'https://dotnetbuilds.blob.core.windows.net/public//dotnet-runtime-8.0.0-rc.1.23381.3-centos.8-x64.tar.gz'. This is
+            missing the runtime version number directory. -->
+    <ItemGroup Condition="'$(DotNetBuildOrchestrator)' != 'true'">
+      <UrisToDownload Include="$([System.String]::Copy('%(ComponentToDownload.BaseUrl)').Replace($(PublicBaseURL), 'https://dotnetbuilds.blob.core.windows.net/public/'))/%(ComponentToDownload.DownloadFileName)"
+                      Condition="'%(ComponentToDownload.ShouldDownload)' == 'true'">
+        <ShouldDownload>%(ComponentToDownload.ShouldDownload)</ShouldDownload>
+        <DownloadDestination>%(ComponentToDownload.DownloadDestination)</DownloadDestination>
+      </UrisToDownload>
+      <UrisToDownload Include="%(ComponentToDownload.PrivateBaseUrl)/%(ComponentToDownload.DownloadFileName)"
+                      Condition="'%(ComponentToDownload.ShouldDownload)' == 'true' and '$(DotNetRuntimeSourceFeedKey)' != ''">
+        <ShouldDownload>%(ComponentToDownload.ShouldDownload)</ShouldDownload>
+        <DownloadDestination>%(ComponentToDownload.DownloadDestination)</DownloadDestination>
+        <token>$(DotNetRuntimeSourceFeedKey)</token>
+      </UrisToDownload>
+    </ItemGroup>
+
+    <DownloadFile Condition="'@(UrisToDownload)' != '' and %(ShouldDownload)"
+                  Uris="@(UrisToDownload)"
+                  DestinationPath="%(DownloadDestination)" />
+  </Target>
+
+</Project>
diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj
index 5f099843db78..f2da1b5ff2a8 100644
--- a/src/SourceBuild/content/repo-projects/dotnet.proj
+++ b/src/SourceBuild/content/repo-projects/dotnet.proj
@@ -10,20 +10,18 @@
        - We need an "empty" build after the last real repo for prebuilt detection to work - this is that file.
        - If we have a repo that is not in sdk's dependency tree, we can still build it by including it here.  -->
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'">
     <RepositoryReference Include="sdk" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(DotNetBuildPass)' == '2' and '$(TargetOS)' == 'windows' and '$(TargetArchitecture)' == 'x64'">
-    <!-- Building Windows Bundle Installers-->
-    <RepositoryReference Remove="@(RepositoryReference)" />
-    <RepositoryReference Include="sdk" DotNetBuildPass="2" />
-  </ItemGroup>
-
+  <!-- Build the cross-OS DACs. -->
   <ItemGroup Condition="'$(DotNetBuildPass)' == '2' and '$(TargetOS)' == 'windows' and '$(TargetArchitecture)' == 'x86'">
-    <!-- Building the cross-OS DACs -->
-    <RepositoryReference Remove="@(RepositoryReference)" />
     <RepositoryReference Include="runtime" DotNetBuildPass="2" />
   </ItemGroup>
 
+  <!-- Build the windows bundle and VS components. -->
+  <ItemGroup Condition="'$(DotNetBuildPass)' == '2' and '$(TargetOS)' == 'windows'">
+    <RepositoryReference Include="sdk" DotNetBuildPass="2" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index fa38b1d60404..5648eecd52a7 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -68,8 +68,7 @@
     <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(DotNetBuildPass)' == '2'">
-    <RepositoryReference Remove="@(RepositoryReference)" />
+  <ItemGroup Condition="'$(DotNetBuildPass)' == '2' and '$(TargetOS)' == 'windows' and '$(TargetArchitecture)' == 'x64'">
     <RepositoryReference Include="aspnetcore" DotNetBuildPass="2" />
   </ItemGroup>