diff --git a/Build.proj b/Build.proj
index 2d96f02056fe6..6352e423156b9 100644
--- a/Build.proj
+++ b/Build.proj
@@ -12,16 +12,6 @@
     <ProjectReference Include="@(ProjectToBuild)" />
   </ItemGroup>
 
-  <!--
-    Exclude installer depproj and pkgproj from static graph restore. We restore them below.
-    Remove when https://github.com/NuGet/Home/issues/9398 is fixed.
-  -->
-  <ItemGroup Condition="'$(MSBuildRestoreSessionId)' != ''">
-    <ProjectReference Remove="@(DepprojProjectToBuild)"  />
-    <ProjectReference Remove="@(PkgprojProjectToBuild)" />
-    <ProjectReference Remove="@(BundleProjectToBuild)" />
-  </ItemGroup>
-
   <!-- Custom arcade target which isn't available in Microsoft.Build.Traversal. -->
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
 
@@ -36,12 +26,4 @@
     <MSBuild Projects="$(RepoTasksDir)tasks.proj"
              Targets="BuildAndRestoreIncrementally"/>
   </Target>
-
-  <Target Name="RestoreWithoutStaticGraph"
-          BeforeTargets="Restore">
-    <MSBuild Projects="@(DepprojProjectToBuild);@(PkgprojProjectToBuild);@(BundleProjectToBuild)"
-             Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid());RestoreUseStaticGraphEvaluation=false"
-             Targets="Restore" />
-  </Target>
-
 </Project>
\ No newline at end of file
diff --git a/eng/Signing.props b/eng/Signing.props
index 5ebb3ba2c2e43..7def3013b8941 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -1,4 +1,4 @@
-<Project>
+<Project InitialTargets="SetupFilesToSign">
 
   <!-- If this file was pulled in via prepare-artifacts.proj (a non-SDK project, these files are already
        imported. -->
@@ -12,7 +12,7 @@
 
       During post build signing, there are no packages to sign during SignFinalPackages.
     -->
-    <AllowEmptySignList Condition="'$(SignFinalPackages)' != 'true' or '$(PostBuildSign)' == 'true'">true</AllowEmptySignList>
+    <AllowEmptySignList>true</AllowEmptySignList>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,10 +22,6 @@
     -->
     <ItemsToSign Remove="@(ItemsToSign)" />
 
-    <!-- Find bundle artifacts, which need multiple stages to fully sign. -->
-    <BundleInstallerEngineArtifact Include="$(ArtifactsPackagesDir)**/*engine.exe" />
-    <BundleInstallerExeArtifact Include="$(ArtifactsPackagesDir)**/*.exe" />
-
     <!-- apphost and comhost template files are not signed, by design. -->
     <FileSignInfo Include="apphost.exe;singlefilehost.exe;comhost.dll" CertificateName="None" />
 
@@ -49,126 +45,32 @@
     <FileExtensionSignInfo Include=".deb;.rpm" CertificateName="LinuxSign" />
   </ItemGroup>
 
-  <!-- When doing post build signing, the file containers (e.g. nupkg, msi, etc.) are
-       processed for signing (opened up, individually signed, etc.) and these individual ItemsToSign
-       elements are unnecessary. When signing within the build, we need to individually process
-       dll's, exes, etc. that go into msi's because these containers are not able to be processed
-       by SignTool after they are packed up. What makes this possible for post build signing
-       is that the build will produce a zip file containing the inputs to the Wix light linker
-       which can be used to create the installer later, after the inputs have been signed and replaced. -->
-  <Choose>
-    <When Condition="'$(PostBuildSign)' != 'true'">
-      <ItemGroup Condition="'$(SignBinaries)' == 'true'">
-        <!-- Sign CoreCLR. -->
-        <ItemsToSign Include="$(CoreCLRSharedFrameworkDir)*.dll" />
-        <ItemsToSign Include="$(CoreCLRSharedFrameworkDir)*.exe" />
-
-        <ItemsToSign Include="$(CoreCLRArtifactsPath)System.Private.CoreLib.dll" />
-
-        <ItemsToSign Include="$(CoreCLRCrossgen2Dir)crossgen2.exe" />
-        <ItemsToSign Include="$(CoreCLRCrossgen2Dir)crossgen2.dll" />
-        <ItemsToSign Include="$(CoreCLRCrossgen2Dir)ILCompiler.DependencyAnalysisFramework.dll" />
-        <ItemsToSign Include="$(CoreCLRCrossgen2Dir)ILCompiler.ReadyToRun.dll" />
-        <ItemsToSign Include="$(CoreCLRCrossgen2Dir)ILCompiler.TypeSystem.ReadyToRun.dll" />
-        <ItemsToSign Include="$(CoreCLRCrossgen2Dir)jitinterface_$(TargetArchitecture).dll" />
-
-        <ItemsToSign Include="$(CoreCLRCrossgen2Dir)clrjit_win_x86_$(TargetArchitecture).dll" />
-        <ItemsToSign Include="$(CoreCLRCrossgen2Dir)clrjit_win_arm_$(TargetArchitecture).dll" />
-        <ItemsToSign Include="$(CoreCLRCrossgen2Dir)clrjit_unix_arm_$(TargetArchitecture).dll" />
-        <ItemsToSign Condition="'$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)clrjit_win_x64_$(TargetArchitecture).dll" />
-        <ItemsToSign Condition="'$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)clrjit_win_arm64_$(TargetArchitecture).dll" />
-        <ItemsToSign Condition="'$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)clrjit_unix_x64_$(TargetArchitecture).dll" />
-        <ItemsToSign Condition="'$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)clrjit_unix_arm64_$(TargetArchitecture).dll" />
-
-        <ItemsToSign Include="$(CoreCLRArtifactsPath)$(CoreCLRCrossTargetComponentDirName)/sharedFramework/*.dll" Condition="'$(CoreCLRCrossTargetComponentDirName)' != ''" />
-        <ItemsToSign Include="$(CoreCLRArtifactsPath)$(CoreCLRCrossTargetComponentDirName)/sharedFramework/*.exe" Condition="'$(CoreCLRCrossTargetComponentDirName)' != ''" />
-
-        <!-- Sign api-ms-win-core-xstate-l2-1-0 binary as it is only catalog signed in the current SDK. -->
-        <ItemsToSign
-          Condition="'$(Configuration)' == 'Release' and '$(TargetArchitecture)' == 'x86'"
-          Include="$(CoreCLRArtifactsPath)Redist\ucrt\DLLs\$(TargetArchitecture)\api-ms-win-core-xstate-l2-1-0.dll" />
-
-        <!-- Sign libraries. -->
-        <ItemsToSign Include="$(LibrariesNativeArtifactsPath)*.dll" />
-        <ItemsToSign Include="$(LibrariesSharedFrameworkRefArtifactsPath)*.dll" />
-        <!-- Most runtime artifacts will be crossgenned, so sign them post-crossgen. mscorlib isn't. -->
-        <ItemsToSign Include="$(LibrariesSharedFrameworkBinArtifactsPath)mscorlib.dll" />
-
-        <!-- Sign the host. -->
-        <ItemsToSign Include="$(BaseOutputRootPath)corehost/**/hostfxr.dll" />
-        <ItemsToSign Include="$(BaseOutputRootPath)corehost/**/hostpolicy.dll" />
-        <ItemsToSign Include="$(BaseOutputRootPath)corehost/**/dotnet.exe" />
-        <ItemsToSign Include="$(BaseOutputRootPath)corehost/**/ijwhost.dll" />
-        <ItemsToSign Include="$(BaseOutputRootPath)corehost/**/nethost.dll" />
-
-        <!-- Sign managed libraries in installer subset. -->
-        <ItemsToSign Include="$(ArtifactsBinDir)Microsoft.NET.HostModel/**/*.dll" />
-      </ItemGroup>
-
-      <!-- Sign ready-to-run binaries after crossgen is applied. -->
-      <ItemGroup Condition="'$(SignR2RBinaries)' == 'true'">
-        <ItemsToSign Include="$(CrossGenRootPath)**/*.dll" />
-      </ItemGroup>
-
-      <ItemGroup Condition="'$(SignMsiFiles)' == 'true'">
-        <ItemsToSign Include="$(ArtifactsPackagesDir)**/*.msi" />
-        <ItemsToSign Include="$(ArtifactsPackagesDir)**/*.cab" />
-      </ItemGroup>
-
-      <ItemGroup Condition="'$(SignBurnEngineFiles)' == 'true'">
-        <ItemsToSign Include="@(BundleInstallerEngineArtifact)" />
-      </ItemGroup>
-
-      <ItemGroup Condition="'$(SignBurnBundleFiles)' == 'true'">
-        <!-- Sign the bundles, now that the engine is reattached. Avoid re-signing the engine. -->
-        <ItemsToSign
-          Include="@(BundleInstallerExeArtifact)"
-          Exclude="@(BundleInstallerEngineArtifact)" />
-        <!-- Note: wixstdba is internal to the engine bundle and does not get signed. -->
-      </ItemGroup>
-
-      <ItemGroup Condition="'$(SignFinalPackages)' == 'true'">
-        <DownloadedSymbolPackages Include="$(DownloadDirectory)**\*.symbols.nupkg" />
-        <ItemsToSign Include="$(DownloadDirectory)**\*.nupkg" Exclude="@(DownloadedSymbolPackages)" />
-
-        <!-- The cross OS diagnostics symbol packages need to be signed as they are the only packages
-        that have a specific version of assets that are only meant to be indexed in symbol servers.
-        Since only *symbols.nupkg get indexed, and installer doesn't produce these, we need to glob them for signing. -->
-        <ItemsToSign Include="$(DownloadDirectory)**\*CrossOsDiag*.symbols.nupkg" />
-
-        <ItemsToSign Include="$(DownloadDirectory)**\*.deb" />
-        <ItemsToSign Include="$(DownloadDirectory)**\*.rpm" />
-      </ItemGroup>
-    </When>
-
-    <!-- When doing post build signing, we sign all artifacts we would push.
-         Symbol packages are included too. -->
-    <When Condition="'$(PostBuildSign)' == 'true'">
-      <ItemGroup>
-        <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.msi" Condition="'$(PrepareArtifacts)' == 'true'" />
-        <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.exe" Condition="'$(PrepareArtifacts)' == 'true'" />
-        <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.nupkg" Condition="'$(PrepareArtifacts)' == 'true'" />
-        <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.zip" Condition="'$(PrepareArtifacts)' == 'true'" />
-
-        <ItemsToSignWithoutPaths Include="@(ItemsToSignWithPaths->'%(Filename)%(Extension)')" />
-        <ItemsToSignPostBuild Include="@(ItemsToSignWithoutPaths->Distinct())" />
-      </ItemGroup>
-
-      <!-- Even when doing post build signing, sign mscordaccore*.dll and mscordbi.dll -->
-      <ItemGroup Condition="'$(SignBinaries)' == 'true'">
-        <ItemsToSign Include="$(CoreCLRSharedFrameworkDir)mscordaccore*.dll" />
-        <ItemsToSign Include="$(CoreCLRSharedFrameworkDir)mscordbi.dll" />
-        <ItemsToSign Include="$(CoreCLRArtifactsPath)$(CoreCLRCrossTargetComponentDirName)/sharedFramework/mscordaccore*.dll" Condition="'$(CoreCLRCrossTargetComponentDirName)' != ''" />
-        <ItemsToSign Include="$(CoreCLRArtifactsPath)$(CoreCLRCrossTargetComponentDirName)/sharedFramework/mscordbi.dll" Condition="'$(CoreCLRCrossTargetComponentDirName)' != ''" />
-      </ItemGroup>
-
-      <ItemGroup Condition="'$(SignFinalPackages)' == 'true'">
-        <!-- The cross OS diagnostics symbol packages need to be signed as they are the only packages
-        that have a specific version of assets that are only meant to be indexed in symbol servers.
-        Since only *symbols.nupkg get indexed, and installer doesn't produce these, we need to glob them for signing. -->
-        <ItemsToSign Include="$(DownloadDirectory)**\*CrossOsDiag*.nupkg" />
-      </ItemGroup>
-    </When>
-  </Choose>
+  <Target Name="SetupFilesToSign">
+    <!-- Ensure that we don't miss the DAC or DBI with the globbing below -->
+    <PropertyGroup Condition="'$(SignDiagnostics)' == 'true'">
+      <AllowEmptySignList>false</AllowEmptySignList>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(SignDiagnostics)' == 'true'">
+      <ItemsToSign Include="$(DiagnosticsFilesRoot)/**/mscordaccore*.dll" />
+      <ItemsToSign Include="$(DiagnosticsFilesRoot)/**/mscordbi.dll" />
+      <!--
+        The DAC should be signed with the SHA2 cert (both long and short name).
+        We already add the short-name DAC above, so add the long-name DAC here.
+      -->
+      <DacFileSignInfo Include="@(ItemsToSign->'%(FileName)%(Extension)')"
+                    Condition="$([System.String]::new('%(FileName)').StartsWith('mscordaccore'))" />
+      <FileSignInfo Include="@(DacFileSignInfo->ClearMetadata()->Distinct())"
+                    Exclude="mscordaccore.dll"
+                    CertificateName="MicrosoftSHA2" />
+    </ItemGroup>
+    
+    <ItemGroup Condition="'$(SignFinalPackages)' == 'true'">
+      <!-- The cross OS diagnostics symbol packages need to be signed as they are the only packages
+      that have a specific version of assets that are only meant to be indexed in symbol servers.
+      Since only *symbols.nupkg get indexed, and installer doesn't produce these, we need to glob them for signing. -->
+      <ItemsToSign Include="$(DownloadDirectory)**\*CrossOsDiag*.nupkg" />
+    </ItemGroup>
+  </Target>
 
 </Project>
diff --git a/eng/Subsets.props b/eng/Subsets.props
index 43843ea213934..1c84edcdae34f 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -7,38 +7,24 @@
 
     Examples:
 
-      ./build.sh CoreHost
+      ./build.sh host.native
 
-        This builds only the .NET Core Host.
+        This builds only the .NET host.
 
-      ./build.sh corehost installer.managed
+      ./build.sh libs+host.native
 
-        This builds the CoreHost and also the Managed installer portion (e.g. Microsoft.NET.HostModel)
-        projects. A space ' ' or '+' are the delimiters between multiple subsets to build.
+        This builds the .NET host and also the manged libraries portion.
+        A space ' ' or '+' are the delimiters between multiple subsets to build.
 
-      ./build.sh -test installer.tests
+      ./build.sh -test host.tests
 
         This builds and executes the installer test projects. (The '-test' argument is an Arcade SDK argument
         that indicates tests should be run. Otherwise, they'll only be built.)
-
-    Quirks:
-
-      This command looks useful, but doesn't work as expected:
-
-        ./build.sh -test /p:Subset=CoreHost-Test    # (Doesn't work!)
-
-      Intuitively, this should build the host, build the tests, then run the tests on the freshly
-      built host. What actually happens is the tests run on a previously built host. This is because
-      the depproj, pkgproj, and installer subsets process the host artifacts, and those didn't
-      rebuild because those subsets were disabled.
-
-      You can get around this limitation by running the corehost subset, manually copying host
-      artifacts to the test layout, then running the test subset.
   -->
 
   <PropertyGroup>
-    <DefaultSubsets>clr+mono+libs+installer</DefaultSubsets>
-    <DefaultSubsets Condition="'$(TargetsMobile)' == 'true'">mono+libs+installer</DefaultSubsets>
+    <DefaultSubsets>clr+mono+libs+host+packs</DefaultSubsets>
+    <DefaultSubsets Condition="'$(TargetsMobile)' == 'true'">mono+libs+packs</DefaultSubsets>
   </PropertyGroup>
 
   <!-- Init _subset here in to allow RuntimeFlavor to be set as early as possible -->
@@ -63,9 +49,11 @@
 
     <DefaultLibrariesSubsets>libs.native+libs.ref+libs.src+libs.pretest+libs.packages</DefaultLibrariesSubsets>
 
-    <DefaultInstallerSubsets>corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles+installers+installer.tests</DefaultInstallerSubsets>
-    <DefaultInstallerSubsets Condition="'$(RuntimeFlavor)' == 'Mono'">installer.pkgprojs</DefaultInstallerSubsets>
-    <DefaultInstallerSubsets Condition="'$(RuntimeFlavor)' == 'Mono' and '$(TargetsMobile)' != 'true'">corehost+$(DefaultInstallerSubsets)</DefaultInstallerSubsets>
+    <DefaultHostSubsets>host.native+host.pkg+host.tools+host.tests</DefaultHostSubsets>
+    <DefaultHostSubsets Condition="'$(RuntimeFlavor)' == 'Mono'"></DefaultHostSubsets>
+    <DefaultHostSubsets Condition="'$(RuntimeFlavor)' == 'Mono' and '$(TargetsMobile)' != 'true'">host.native</DefaultHostSubsets>
+
+    <DefaultPacksSubsets>packs.product+packs.tests</DefaultPacksSubsets>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -73,8 +61,8 @@
     <_subset>$(_subset.Replace('+clr+', '+$(DefaultCoreClrSubsets)+'))</_subset>
     <_subset>$(_subset.Replace('+mono+', '+$(DefaultMonoSubsets)+'))</_subset>
     <_subset>$(_subset.Replace('+libs+', '+$(DefaultLibrariesSubsets)+'))</_subset>
-    <_subset>$(_subset.Replace('+installer+', '+$(DefaultInstallerSubsets)+'))</_subset>
-    <_subset>$(_subset.Replace('+installer.nocorehost+', '+$(DefaultInstallerSubsets.Replace('corehost+', ''))+'))</_subset>
+    <_subset>$(_subset.Replace('+host+', '+$(DefaultHostSubsets)+'))</_subset>
+    <_subset>$(_subset.Replace('+packs+', '+$(DefaultPacksSubsets)+'))</_subset>
 
     <!-- Surround _subset in dashes to simplify checks below -->
     <_subset>+$(_subset.Trim('+'))+</_subset>
@@ -117,19 +105,21 @@
     <SubsetName Include="Libs.Packages" Description="The projects that produce NuGet packages from libraries." />
     <SubsetName Include="Libs.Tests" OnDemand="true" Description="The test projects. Note that building this doesn't execute tests: you must also pass the '-test' argument." />
 
-    <!-- Installer -->
-    <SubsetName Include="Installer" Description="The .NET Core hosts, hosting libraries, bundles, and installers. Includes these projects' tests." />
-    <SubsetName Include="CoreHost" Description="The .NET Core hosts." />
-    <SubsetName Include="Installer.NoCoreHost" Description="Hosting libraries, bundles, and installers. Includes these projects' tests." />
-    <SubsetName Include="Installer.Managed" Description="The managed .NET hosting projects. This includes HostModel." />
-    <SubsetName Include="Installer.DepProjs" Description="The dependency projects. These gather shared framework files and run crossgen on them to turn them into ready-to-run (R2R) assemblies for the current platform." />
-    <SubsetName Include="Installer.PkgProjs" Description="The packaging projects. These produce NETCoreApp assets: NuGet packages, installers, zips, and Linux packages." />
-    <SubsetName Include="Bundles" Description="The shared framework bundle installer projects. Produces .exe installers for Windows." />
-    <SubsetName Include="Installers" Description="Generates additional installers. This produces the shared frameworks and their installers." />
-    <SubsetName Include="Installer.Tests" Description="The test projects. Note that building this doesn't execute tests: you must also pass the '-test' argument." />
-    <SubsetName Include="Installer.Publish" OnDemand="true" Description="Builds the installer publish infrastructure." />
+    <!-- Host -->
+    <SubsetName Include="Host" Description="The .NET hosts, packages, hosting libraries, and tests." />
+    <SubsetName Include="Host.Native" Description="The .NET hosts." />
+    <SubsetName Include="Host.Pkg" Description="The .NET host packages." />
+    <SubsetName Include="Host.Tools" Description="The .NET hosting libraries." />
+    <SubsetName Include="Host.Tests" Description="The .NET hosting tests." />
+
+    <!-- Packs -->
+    <SubsetName Include="Packs" Description="Builds the shared framework packs, archives, bundles, installers, and the framework pack tests." />
+    <SubsetName Include="Packs.Product" Description="Builds the shared framework packs, archives, bundles, and installers." />
+    <SubsetName Include="Packs.Installers" Description="Builds the shared framework bundles and installers." />
+    <SubsetName Include="Packs.Tests" Description="The framework pack tests." />
 
     <!-- Utility -->
+    <SubsetName Include="publish" OnDemand="true" Description="Generate asset manifests and prepare to publish to BAR." />
     <SubsetName Include="RegenerateDownloadTable" OnDemand="true" Description="Regenerates the nightly build download table" />
 
   </ItemGroup>
@@ -254,57 +244,62 @@
     <ProjectToBuild Include="$(LibrariesProjectRoot)tests.proj" Category="libs" Test="true" />
   </ItemGroup>
 
-  <!-- Installer sets -->
-  <ItemGroup Condition="$(_subset.Contains('+corehost+'))">
-    <CorehostProjectToBuild Include="$(InstallerProjectRoot)corehost\corehost.proj" SignPhase="Binaries" />
-    <ProjectToBuild Include="@(CorehostProjectToBuild)" BuildInParallel="true" Pack="true" Category="installer" />
+  <!-- Host sets -->
+  <ItemGroup Condition="$(_subset.Contains('+host.native+'))">
+    <CorehostProjectToBuild Include="$(InstallerProjectRoot)corehost\corehost.proj" SignPhase="Binaries" BuildInParallel="false" />
+    <ProjectToBuild Include="@(CorehostProjectToBuild)" Pack="true" Category="host" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(_subset.Contains('+installer.managed+'))">
+  <ItemGroup Condition="$(_subset.Contains('+host.tools+'))">
     <ManagedProjectToBuild Include="$(InstallerProjectRoot)managed\**\*.csproj" SignPhase="Binaries" />
-    <ManagedProjectToBuild Include="$(InstallerProjectRoot)pkg\packaging\pack-managed.proj" />
-    <ProjectToBuild Include="@(ManagedProjectToBuild)" BuildInParallel="true" Pack="true" Category="installer" />
-  </ItemGroup>
-
-  <ItemGroup Condition="$(_subset.Contains('+installer.depprojs+'))">
-    <DepprojProjectToBuild Condition="'$(RuntimeFlavor)' == 'CoreCLR'" Include="$(InstallerProjectRoot)pkg\projects\**\*.depproj" SignPhase="R2RBinaries" BuildInParallel="false" />
-    <DepprojProjectToBuild Condition="'$(RuntimeFlavor)' == 'Mono'" Include="$(InstallerProjectRoot)pkg\projects\**\*.depproj" SignPhase="Binaries" BuildInParallel="false" />
-    <ProjectToBuild Include="@(DepprojProjectToBuild)" Pack="true" Category="installer" />
+    <ProjectToBuild Include="@(ManagedProjectToBuild)" BuildInParallel="true" Pack="true" Category="host" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(_subset.Contains('+installer.pkgprojs+'))">
+  <ItemGroup Condition="$(_subset.Contains('+host.pkg+'))">
     <PkgprojProjectToBuild Include="$(InstallerProjectRoot)pkg\projects\**\*.pkgproj" SignPhase="MsiFiles" BuildInParallel="false" />
-    <ProjectToBuild Include="@(PkgprojProjectToBuild)" Pack="true" Category="installer" />
-  </ItemGroup>
-
-  <ItemGroup Condition="$(_subset.Contains('+bundles+'))">
-    <BundleProjectToBuild Include="$(InstallerProjectRoot)pkg\projects\**\*.bundleproj" SignPhase="BundleInstallerFiles" BuildInParallel="false" />
-    <ProjectToBuild Include="@(BundleProjectToBuild)" Pack="true" Category="installer" />
+    <ProjectToBuild Include="@(PkgprojProjectToBuild)" Pack="true" Category="host" />
   </ItemGroup>
-
-  <ItemGroup Condition="$(_subset.Contains('+installers+'))">
-    <InstallerProjectToBuild Include="$(InstallerProjectRoot)pkg\packaging\installers.proj" BuildInParallel="false" />
-    <InstallerProjectToBuild Include="$(InstallerProjectRoot)pkg\packaging\vs-insertion-packages.proj" BuildInParallel="false" />
-    <ProjectToBuild Include="@(InstallerProjectToBuild)" Pack="true" Category="installer" />
-  </ItemGroup>
-
-  <ItemGroup Condition="$(_subset.Contains('+installer.tests+'))">
+  
+  <ItemGroup Condition="$(_subset.Contains('+host.tests+'))">
     <TestProjectToBuild Include="$(InstallerProjectRoot)tests\Microsoft.NET.HostModel.Tests\AppHost.Bundle.Tests\AppHost.Bundle.Tests.csproj" />
     <TestProjectToBuild Include="$(InstallerProjectRoot)tests\Microsoft.NET.HostModel.Tests\Microsoft.NET.HostModel.AppHost.Tests\Microsoft.NET.HostModel.AppHost.Tests.csproj" />
     <TestProjectToBuild Include="$(InstallerProjectRoot)tests\Microsoft.NET.HostModel.Tests\Microsoft.NET.HostModel.Bundle.Tests\Microsoft.NET.HostModel.Bundle.Tests.csproj" />
     <TestProjectToBuild Include="$(InstallerProjectRoot)tests\Microsoft.NET.HostModel.Tests\Microsoft.NET.HostModel.ComHost.Tests\Microsoft.NET.HostModel.ComHost.Tests.csproj" />
     <TestProjectToBuild Include="$(InstallerProjectRoot)tests\HostActivation.Tests\HostActivation.Tests.csproj" />
+    <ProjectToBuild Include="@(TestProjectToBuild)" BuildInParallel="true" Test="true" Category="host" />
+  </ItemGroup>
+
+  <!-- Packs sets -->
+
+  <ItemGroup Condition="$(_subset.Contains('+packs.product+'))">
+    <SharedFrameworkProjectToBuild Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Ref.sfxproj" />
+    <SharedFrameworkProjectToBuild Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Runtime.sfxproj" />
+    <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Host.sfxproj" />
+    <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.sfxproj" />
+    <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-host.proj" />
+    <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-hostfxr.proj" />
+    <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-runtime-deps\*.proj" />
+    <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono'" Include="$(InstallerProjectRoot)pkg\sfx\bundle\Microsoft.NETCore.App.Bundle.bundleproj" />
+    <ProjectToBuild Include="@(SharedFrameworkProjectToBuild)" Category="packs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(_subset.Contains('+packs.installers+'))">
+    <InstallerProjectToBuild Include="$(InstallerProjectRoot)pkg\sfx\installers.proj" />
+    <ProjectToBuild Include="@(InstallerProjectToBuild)" Category="packs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(_subset.Contains('+packs.tests+'))">
     <TestProjectToBuild Include="$(InstallerProjectRoot)tests\Microsoft.DotNet.CoreSetup.Packaging.Tests\Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj" />
-    <ProjectToBuild Include="@(TestProjectToBuild)" BuildInParallel="true" Test="true" Category="installer" />
+    <ProjectToBuild Include="@(TestProjectToBuild)" BuildInParallel="true" Test="true" Category="packs" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(_subset.Contains('+installer.publish+'))">
-    <ProjectToBuild Include="$(InstallerProjectRoot)publish\prepare-artifacts.proj" Pack="true" BuildInParallel="false" Category="installer" />
+  <ItemGroup Condition="$(_subset.Contains('+publish+'))">
+    <ProjectToBuild Include="$(InstallerProjectRoot)publish\prepare-artifacts.proj" Pack="true" BuildInParallel="false" Category="publish" />
   </ItemGroup>
 
   <!-- Utility -->
   <ItemGroup Condition="$(_subset.Contains('+regeneratedownloadtable+'))">
-    <ProjectToBuild Include="$(RepoToolsLocalDir)regenerate-download-table.proj" Pack="true" BuildInParallel="false" Category="installer" />
+    <ProjectToBuild Include="$(RepoToolsLocalDir)regenerate-download-table.proj" Pack="true" BuildInParallel="false" />
   </ItemGroup>
 
   <!-- Set default configurations. -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 73c906cbd86c4..cbd6396574f27 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -38,10 +38,18 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.20552.5">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20552.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20562.3">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>9a1e99f6c326a67297b074453e96bdd0cb36e7e3</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20552.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index c3617745573a2..0163c8b6977ae 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -60,7 +60,9 @@
     <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.20552.5</MicrosoftDotNetGenFacadesVersion>
     <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.20552.5</MicrosoftDotNetXUnitExtensionsVersion>
     <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20552.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
+    <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.20552.5</MicrosoftDotNetBuildTasksArchivesVersion>
     <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.20552.5</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.20562.3</MicrosoftDotNetBuildTasksInstallersVersion>
     <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.20552.5</MicrosoftDotNetRemoteExecutorVersion>
     <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.20552.5</MicrosoftDotNetVersionToolsTasksVersion>
     <!-- Installer dependencies -->
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index 097941761a364..8cbde5f233ea2 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -12,41 +12,6 @@
     <LibrariesTargetOSConfigurationArchitecture Condition="'$(LibrariesTargetOSConfigurationArchitecture)' == ''">$(LibrariesTargetOS)-$(LibrariesConfiguration)-$(TargetArchitecture)</LibrariesTargetOSConfigurationArchitecture>
   </PropertyGroup>
 
-  <!--
-    If this is running and the output RID is not the same as the targeted RID, resolve live assets
-    for the targeted RID, if available. This is used to gather asset metadata for the platform
-    manifest. In CI (multi-machine lab) builds, CoreCLR and Libraries artifacts are all downloaded
-    onto the current machine from all platforms for the Installer portion of the build.
-
-    Higher priority than override paths: in official builds, the overrides are passed to the build,
-    but we need to point to the AllArtifacts locations when building the platform manifest.
-  -->
-  <PropertyGroup Condition="
-    '$(RuntimeIdentifier)' != '' and
-    '$(RuntimeIdentifier)' != '$(OutputRid)' and
-    '$(AllArtifactsDownloadPath)' != ''">
-    <!-- Convert the OS component in the RID into names that match the job IDs. -->
-    <ArtifactPlatform>$(RuntimeIdentifier)</ArtifactPlatform>
-    <ArtifactPlatform>$(ArtifactPlatform.Replace('win-', 'windows-'))</ArtifactPlatform>
-    <ArtifactPlatform>$(ArtifactPlatform.Replace('unix-', 'Unix-'))</ArtifactPlatform>
-    <ArtifactPlatform>$(ArtifactPlatform.Replace('linux-', 'Linux-'))</ArtifactPlatform>
-    <ArtifactPlatform>$(ArtifactPlatform.Replace('osx-', 'OSX-'))</ArtifactPlatform>
-    <ArtifactPlatform>$(ArtifactPlatform.Replace('freebsd-', 'FreeBSD-'))</ArtifactPlatform>
-    <ArtifactPlatform>$(ArtifactPlatform.Replace('netbsd-', 'NetBSD-'))</ArtifactPlatform>
-    <!-- Artifact name uses '_' rather than '-'. -->
-    <ArtifactPlatform>$(ArtifactPlatform.Replace('-', '_'))</ArtifactPlatform>
-
-    <CoreCLRArtifactsPath>$([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'CoreCLRProduct_$(ArtifactPlatform)_$(CoreCLRConfiguration)'))</CoreCLRArtifactsPath>
-    <MonoArtifactsPath>$([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'MonoProduct_$(ArtifactPlatform)_$(MonoConfiguration)'))</MonoArtifactsPath>
-    <LibrariesArtifactsPath>$([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'libraries_bin_$(ArtifactPlatform)_$(LibrariesConfiguration)'))</LibrariesArtifactsPath>
-
-    <!--
-      Use '*', calculating these in a static context based on RID is hard. Note that putting '*'
-      through a dir/path normalization function makes it not work, so avoid that.
-    -->
-    <LibrariesTargetOSConfigurationArchitecture>*</LibrariesTargetOSConfigurationArchitecture>
-  </PropertyGroup>
-
   <!-- Set up default live asset paths if no overrides provided. -->
   <PropertyGroup>
     <CoreCLRArtifactsPath Condition="'$(CoreCLRArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(CoreCLRTargetOS).$(TargetArchitecture).$(CoreCLRConfiguration)'))</CoreCLRArtifactsPath>
@@ -116,7 +81,7 @@
         Include="
           $(CoreCLRSharedFrameworkPdbDir)*.pdb;
           $(CoreCLRSharedFrameworkPdbDir)*.dbg;
-          $(CoreCLRSharedFrameworkPdbDir)*.dwarf" />
+          $(CoreCLRSharedFrameworkPdbDir)*.dwarf" IsNative="true" />
       <RuntimeFiles
         Include="$(CoreCLRArtifactsPdbDir)System.Private.CoreLib.pdb" />
       <RuntimeFiles Condition="Exists('$(CoreCLRArtifactsPdbDir)System.Private.CoreLib.ni.pdb')"
@@ -130,6 +95,7 @@
 
       <CoreCLRCrossTargetFiles>
         <TargetPath>runtime/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native</TargetPath>
+        <IsNative>true</IsNative>
       </CoreCLRCrossTargetFiles>
     </ItemGroup>
     <ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'">
diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml
index a80e985fef1d3..cf06bfbf503bc 100644
--- a/eng/pipelines/coreclr/perf.yml
+++ b/eng/pipelines/coreclr/perf.yml
@@ -48,7 +48,7 @@ jobs:
     platforms:
     - Browser_wasm
     jobParameters:
-      buildArgs: -s mono+libs+installer -c $(_BuildConfig)
+      buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
       nameSuffix: wasm
       isOfficialBuild: ${{ variables.isOfficialBuild }}
       extraStepsTemplate: /eng/pipelines/common/upload-artifact-step.yml
diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml
index beb779bc605b3..87e447a597963 100644
--- a/eng/pipelines/coreclr/templates/build-job.yml
+++ b/eng/pipelines/coreclr/templates/build-job.yml
@@ -123,11 +123,33 @@ jobs:
     - ${{ if eq(parameters.osGroup, 'windows') }}:
       - name: ninjaArg
         value: '-ninja'
+  
+    - name: SignType
+      value: $[ coalesce(variables.OfficialSignType, 'real') ]
 
     - ${{ parameters.variables }}
 
     steps:
 
+    # Install MicroBuild for signing the DAC and DBI
+    - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+      - task: NuGetAuthenticate@0
+
+      - ${{ if eq(parameters.osGroup, 'windows') }}:
+        # NuGet's http cache lasts 30 minutes. If we're on a static machine, this may interfere with
+        # auto-update PRs by preventing the CI build from fetching the new version. Delete the cache.
+        - powershell: Remove-Item -Recurse -ErrorAction Ignore "$env:LocalAppData\NuGet\v3-cache"
+          displayName: Clear NuGet http cache (if exists)
+
+        - task: MicroBuildSigningPlugin@2
+          displayName: Install MicroBuild plugin for Signing
+          inputs:
+            signType: $(SignType)
+            zipSources: false
+            feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
+          continueOnError: false
+          condition: and(succeeded(), in(variables['SignType'], 'real', 'test'))
+
     # Install native dependencies
     # Linux builds use docker images with dependencies preinstalled,
     # and FreeBSD builds use a build agent with dependencies
@@ -208,10 +230,15 @@ jobs:
             targetFolder: $(buildProductRootFolderPath)/sharedFramework
             overWrite: true
 
-    # Sign on Windows
-    - ${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.signBinaries, 'true'), ne(parameters.testGroup, 'clrTools')) }}:
-      - powershell: eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 /p:ArcadeBuild=true /p:OfficialBuild=true /p:TargetOS=$(osGroup) /p:TargetArchitecture=$(archType) /p:Configuration=$(_BuildConfig) /p:DotNetSignType=$env:_SignType -projects $(Build.SourcesDirectory)\eng\empty.csproj
-        displayName: Sign Binaries
+    # Sign diagnostic files on Windows
+    - ${{ if and(eq(parameters.osGroup, 'windows'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.testGroup, 'clrTools')) }}:
+      - powershell: >-
+          eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0
+          /p:DiagnosticsFilesRoot="$(buildProductRootFolderPath)"
+          /p:SignDiagnostics=true
+          /p:DotNetSignType=$(SignType)
+          -projects $(Build.SourcesDirectory)\eng\empty.csproj
+        displayName: Sign Diagnostic Binaries
 
       - task: PublishPipelineArtifact@1
         displayName: Publish Signing Logs
diff --git a/eng/pipelines/coreclr/templates/crossdac-build.yml b/eng/pipelines/coreclr/templates/crossdac-build.yml
index 216485692c649..0fe26d160ba16 100644
--- a/eng/pipelines/coreclr/templates/crossdac-build.yml
+++ b/eng/pipelines/coreclr/templates/crossdac-build.yml
@@ -5,16 +5,12 @@ parameters:
 
 steps:
   # Always build the crossdac, that way we know in CI/PR if things break to build.
-  - ${{ if eq(parameters.osGroup, 'windows') }}:
-    - ${{ if notin(parameters.archType, 'x86') }}:
-      - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -linuxdac $(officialBuildIdArg)
-        displayName: Build Cross OS Linux DAC for Windows
+  - ${{ if and(eq(parameters.osGroup, 'windows'), notin(parameters.archType, 'x86')) }}:
+    - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -linuxdac $(officialBuildIdArg)
+      displayName: Build Cross OS Linux DAC for Windows
 
-
-  - ${{ if eq(parameters.osGroup, 'windows') }}:
-    - ${{ if notin(parameters.archType, 'x86') }}:
-      - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -alpinedac $(officialBuildIdArg)
-        displayName: Build Cross OS Linux-musl DAC for Windows
+    - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -alpinedac $(officialBuildIdArg)
+      displayName: Build Cross OS Linux-musl DAC for Windows
 
     - task: CopyFiles@2
       displayName: Gather CrossDac Artifacts (Linux)
@@ -34,6 +30,23 @@ steps:
           !**/sharedFramework/**/*
         TargetFolder: '$(buildMuslDacStagingPath)'
 
+    # Sign diagnostic files on Windows
+    - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+      - powershell: >-
+          eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0
+          /p:DiagnosticsFilesRoot="$(buildLinuxDacStagingPath)"
+          /p:SignDiagnostics=true
+          /p:DotNetSignType=$(SignType)
+          -projects $(Build.SourcesDirectory)\eng\empty.csproj
+        displayName: Sign Linux CrossDac
+      - powershell: >-
+          eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0
+          /p:DiagnosticsFilesRoot="$(buildMuslDacStagingPath)"
+          /p:SignDiagnostics=true
+          /p:DotNetSignType=$(SignType)
+          -projects $(Build.SourcesDirectory)\eng\empty.csproj
+        displayName: Sign Linux-musl CrossDac
+
   - ${{ if eq(parameters.osGroup, 'Linux') }}:
     - task: CopyFiles@2
       displayName: Gather runtime for CrossDac
diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml
index 64d4da38f09d4..50db8eeaacd24 100644
--- a/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@ -21,19 +21,13 @@ parameters:
 
   packageDistroList:
   - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-debpkg-e5cf912-20175003025046
-    imageRid: ubuntu.14.04
-    rids: []
+    packageType: deb
+    packagingArgs: /p:BuildDebPackage=true
   - image: mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-c982313-20174116044113
-    imageRid: rhel.7
-    rids:
-    - centos.7
-    - fedora.27
-    - opensuse.42
-    - oraclelinux.7
-    - sles.12
+    packageType: rpm
+    packagingArgs: /p:BuildRpmPackage=true
 
   isOfficialBuild: false
-  useOfficialAllConfigurations: false
   buildFullPlatformManifest: false
 
   liveRuntimeBuildConfig: ''
@@ -117,7 +111,7 @@ jobs:
 
     - name: BaseJobBuildCommand
       value: >-
-        build.cmd -subset installer -ci
+        build.cmd -subset host+packs -ci
         $(BuildAction)
         -configuration $(_BuildConfig)
         $(LiveOverridePathArgs)
@@ -155,7 +149,7 @@ jobs:
 
     - name: BaseJobBuildCommand
       value: >-
-        $(Build.SourcesDirectory)/build.sh -subset installer -ci
+        $(Build.SourcesDirectory)/build.sh -subset packs -ci
         $(BuildAction)
         -configuration $(_BuildConfig)
         -os ${{ parameters.osGroup }}
@@ -191,7 +185,7 @@ jobs:
 
     - ${{ if eq(parameters.isOfficialBuild, true) }}:
       - name: BuildScript
-        value: ./eng/install-nuget-credprovider-then-build.sh --subset installer
+        value: ./eng/install-nuget-credprovider-then-build.sh --subset host+packs
       - name: MSBuildScript
         value: /root/runtime/eng/install-nuget-credprovider-then-msbuild.sh
 
@@ -217,7 +211,7 @@ jobs:
 
     - name: BuildArguments
       value: >-
-        -subset installer -ci
+        -subset host+packs -ci
         $(BuildAction)
         /p:CrossBuild=${{ parameters.crossBuild }}
         /p:PortableBuild=$(_PortableBuild)
@@ -233,23 +227,15 @@ jobs:
         $(OutputRidArg)
         /bl:msbuild.publish.binlog
 
-    # Tell the build to package up the bits from the portable build.
-    - name: PackagePortableBitsArgs
-      value: >-
-        /p:PortableBuild=false
-        /p:SharedFrameworkPublishDir=/root/sharedFrameworkPublish/
-        /p:InstallerSourceOSPlatformConfig=linux-x64.$(_BuildConfig)
-
     - name: DockerRunMSBuild
       value: >-
         docker run
         -v $(Build.SourcesDirectory):/root/runtime
-        -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/root/sharedFrameworkPublish/
         -w=/root/runtime
         $(PreserveNuGetAuthDockerArgs)
 
     - name: installersSubsetArg
-      value: --subset Installers
+      value: --subset packs.installers
 
     - name: BaseJobBuildCommand
       value: |
@@ -265,26 +251,16 @@ jobs:
     value: >-
       $(RuntimeArtifactsArgs)
       $(LibrariesConfigurationArg)
-      $(LibrariesAllConfigurationsOverridePathArg)
-      $(AllArtifactsArgs)
 
   - name: RuntimeArtifactsArgs
     value: ''
   - name: LibrariesConfigurationArg
     value: ''
-  - name: LibrariesAllConfigurationsOverridePathArg
-    value: ''
-  - name: AllArtifactsArgs
-    value: ''
 
   - name: RuntimeDownloadPath
     value: ''
   - name: LibrariesDownloadPath
     value: ''
-  - name: LibrariesDownloadPathAllConfigurations
-    value: ''
-  - name: AllArtifactsDownloadPath
-    value: ''
 
   - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
     - name: liveRuntimeLegName
@@ -316,60 +292,23 @@ jobs:
     - name: LibrariesConfigurationArg
       value: ' /p:LibrariesConfiguration=${{ parameters.liveLibrariesBuildConfig }}'
 
-  # Download allconfigurations bits to a separate location. It overlaps with the live libraries
-  # download and causes conflict when unzipping to the same location.
-  - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}:
-    - name: LibrariesDownloadPathAllConfigurations
-      value: 'artifacts/transport/librariesallconfigurations'
-    - name: LibrariesAllConfigurationsOverridePathArg
-      value: /p:LibrariesAllConfigurationsOverridePath=${{ parameters.buildCommandSourcesDirectory }}$(LibrariesDownloadPathAllConfigurations)
-    - name: LibrariesArtifactNameAllConfigurations
-      value: libraries_bin_official_allconfigurations
-
-  # Download all upstream platforms and incorporate in the platform manifest.
-  - ${{ if eq(parameters.buildFullPlatformManifest, true) }}:
-    - name: AllArtifactsDownloadPath
-      value: 'artifacts/transport/AllArtifacts'
-    - name: AllArtifactsArgs
-      value: >-
-        /p:AllArtifactsDownloadPath=${{ parameters.buildCommandSourcesDirectory }}$(AllArtifactsDownloadPath)
-        /p:BuildFullPlatformManifest=true
-
   dependsOn:
   - checkout
   - ${{ parameters.dependsOn }}
-  - ${{ if eq(parameters.dependsOnGlobalBuild, false) }}:
-    - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
-        - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}',
-            parameters.runtimeFlavor,
-            parameters.runtimeVariant,
-            parameters.osGroup,
-            parameters.osSubgroup,
-            parameters.archType,
-            parameters.liveRuntimeBuildConfig) }}
-    - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
-      - libraries_build_${{ format('{0}{1}_{2}_{3}',
-          parameters.osGroup,
-          parameters.osSubgroup,
-          parameters.archType,
-          parameters.liveLibrariesBuildConfig) }}
-    - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}:
-      - libraries_build_allconfigurations_windows_x64_Release
-    - ${{ if eq(parameters.buildFullPlatformManifest, true) }}:
-      - ${{ each platform in parameters.platforms }}:
-        - ${{ parameters.runtimeFlavor }}_${{ parameters.runtimeVariant }}_product_build_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }}
-        - libraries_build_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}
-
-  - ${{ if eq(parameters.dependsOnGlobalBuild, true) }}:
-    - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
-        - ${{ format('build_{0}{1}_{2}_{3}_{4}',
-            parameters.osGroup,
-            parameters.osSubgroup,
-            parameters.archType,
-            parameters.liveRuntimeBuildConfig,
-            parameters.globalBuildSuffix) }}
-    - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}:
-      - build_windows_x64_${{ parameters.liveLibrariesBuildConfig }}_AllConfigurations
+  - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
+    - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}',
+        parameters.runtimeFlavor,
+        parameters.runtimeVariant,
+        parameters.osGroup,
+        parameters.osSubgroup,
+        parameters.archType,
+        parameters.liveRuntimeBuildConfig) }}
+  - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
+    - libraries_build_${{ format('{0}{1}_{2}_{3}',
+        parameters.osGroup,
+        parameters.osSubgroup,
+        parameters.archType,
+        parameters.liveLibrariesBuildConfig) }}
 
   steps:
 
@@ -408,36 +347,6 @@ jobs:
 
   - template: /eng/pipelines/common/clone-checkout-bundle-step.yml
 
-  # Download and extract artifacts for earlier subsets.
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download artifacts for all platforms'
-    inputs:
-      buildType: current
-      downloadType: specific
-      downloadPath: '$(Build.SourcesDirectory)/__download__/AllPlatforms/'
-      allowPartiallySucceededBuilds: true
-      itemPattern: |
-        $(runtimeFlavorName)Product_*/**
-        libraries_bin_*/**
-        !*Logs*
-
-  - ${{ if eq(parameters.buildFullPlatformManifest, true) }}:
-    - ${{ each platform in parameters.platforms }}:
-      - task: ExtractFiles@1
-        displayName: 'Unzip $(runtimeFlavorName) artifacts: ${{ platform }}'
-        inputs:
-          archiveFilePatterns: |
-            $(Build.SourcesDirectory)/__download__/AllPlatforms/**/$(runtimeFlavorName)Product_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }}.*
-          destinationFolder: $(AllArtifactsDownloadPath)/$(runtimeFlavorName)Product_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }}/
-          cleanUnpackFolder: false
-      - task: ExtractFiles@1
-        displayName: 'Unzip Libraries artifacts: ${{ platform }}'
-        inputs:
-          archiveFilePatterns: |
-            $(Build.SourcesDirectory)/__download__/AllPlatforms/**/libraries_bin_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}.*
-          destinationFolder: $(AllArtifactsDownloadPath)/libraries_bin_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}/
-          cleanUnpackFolder: false
-
   - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
     - template: /eng/pipelines/common/download-artifact-step.yml
       parameters:
@@ -455,16 +364,6 @@ jobs:
         displayName: 'Libraries artifacts'
         cleanUnpackFolder: false
 
-  - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}:
-    - template: /eng/pipelines/common/download-artifact-step.yml
-      parameters:
-        unpackFolder: $(Build.SourcesDirectory)/$(LibrariesDownloadPathAllConfigurations)
-        # Always use '.zip' because AllConfigurations is built on Windows but used everywhere.
-        artifactFileName: '$(LibrariesArtifactNameAllConfigurations).zip'
-        artifactName: '$(LibrariesArtifactNameAllConfigurations)'
-        displayName: 'Libraries artifacts (AllConfigurations)'
-        cleanUnpackFolder: false
-
   - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}:
     - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO
       displayName: Install Build Dependencies
@@ -481,7 +380,7 @@ jobs:
 
   # Build corehost, sign and add entitlements to MacOS binaries
   - ${{ if eq(parameters.osGroup, 'OSX') }}:
-    - script: $(BaseJobBuildCommand) -subset corehost
+    - script: $(BaseJobBuildCommand) -subset host.native
       displayName: Build CoreHost
 
     - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -495,7 +394,7 @@ jobs:
             path: $(Build.SourcesDirectory)/artifacts/bin/osx-${{ parameters.archType }}.$(_BuildConfig)/corehost
             entitlementsFile: $(Build.SourcesDirectory)/eng/pipelines/common/entitlements.plist
 
-    - script: $(BaseJobBuildCommand) -subset installer.nocorehost
+    - script: $(BaseJobBuildCommand) -subset host.pkg+host.tools+packs
       displayName: Build and Package
 
   - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: 
@@ -506,33 +405,17 @@ jobs:
 
   # Only in glibc leg, we produce RPMs and Debs
   - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.platform, 'Linux_x64'), eq(parameters.osSubgroup, ''))}}:
-    - task: CopyFiles@2
-      displayName: 'Copy built Portable linux-x64 binaries to staging directory'
-      inputs:
-        SourceFolder: '$(Build.SourcesDirectory)/artifacts/obj/linux-x64.$(_BuildConfig)/sharedFrameworkPublish'
-        TargetFolder: '$(Build.StagingDirectory)/sharedFrameworkPublish'
-
     - ${{ each packageBuild in parameters.packageDistroList }}:
       # This leg's RID matches the build image. Build its distro-dependent packages, as well as
       # the distro-independent installers. (There's no particular reason to build the distro-
       # independent installers on this leg, but we need to do it somewhere.)
       - template: steps/build-linux-package.yml
         parameters:
-          distroRid: ${{ packageBuild.imageRid }}
+          packageType: ${{ packageBuild.packageType }}
           image: ${{ packageBuild.image }}
           packageStepDescription: Runtime Deps, Runtime, Framework Packs installers
           subsetArg: $(installersSubsetArg)
-
-      - ${{ each rid in packageBuild.rids }}:
-        # Build distro-dependent packages.
-        - template: steps/build-linux-package.yml
-          parameters:
-            distroRid: ${{ rid }}
-            image: ${{ packageBuild.image }}
-            outputRidArg: /p:OutputRid=${{ rid }}-${{ parameters.archType }}
-            packageStepDescription: Runtime Deps installers
-            packagingArgs: /p:BuildDistroIndependentInstallers=false
-            subsetArg: $(installersSubsetArg)
+          packagingArgs: ${{ packageBuild.packagingArgs }}
 
   - ${{ if ne(parameters.container, '') }}:
     # Files may be owned by root because builds don't set user ID. Later build steps run 'find' in
diff --git a/eng/pipelines/installer/jobs/steps/build-linux-package.yml b/eng/pipelines/installer/jobs/steps/build-linux-package.yml
index e0129ccff6317..95bae9624037a 100644
--- a/eng/pipelines/installer/jobs/steps/build-linux-package.yml
+++ b/eng/pipelines/installer/jobs/steps/build-linux-package.yml
@@ -1,7 +1,6 @@
 parameters:
-  distroRid: null
+  packageType: null
   image: null
-  outputRidArg: ''
   packageStepDescription: null
   packagingArgs: ''
   subsetArg: ''
@@ -13,12 +12,8 @@ steps:
     $(DockerRunMSBuild) ${{ parameters.image }} $(BuildScript) \
       --ci \
       ${{ parameters.subsetArg }} \
-      /p:UsePrebuiltPortableBinariesForInstallers=true \
-      $(PackagePortableBitsArgs) \
-      /p:GenerateProjectInstallers=true \
       ${{ parameters.packagingArgs }} \
       $(CommonMSBuildArgs) \
-      ${{ parameters.outputRidArg }} \
       $(LiveOverridePathArgs) \
-      /bl:artifacts/log/$(_BuildConfig)/msbuild.${{ parameters.distroRid }}.installers.binlog
-  displayName: Package ${{ parameters.packageStepDescription }} - ${{ parameters.distroRid }}
+      /bl:artifacts/log/$(_BuildConfig)/msbuild.${{ parameters.packageType }}.installers.binlog
+  displayName: Package ${{ parameters.packageStepDescription }} - ${{ parameters.packageType }}
diff --git a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml
index 7b0eba0b5cd02..121644bfaa692 100644
--- a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml
+++ b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml
@@ -44,7 +44,7 @@ jobs:
 
   - script: >-
       build.cmd -ci
-      -subset installer.publish
+      -subset publish
       -configuration Release
       /p:PublishRidAgnosticPackagesFromPlatform=${{ parameters.PublishRidAgnosticPackagesFromPlatform }}
       /p:OfficialBuildId=$(Build.BuildNumber)
diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
index 91e85294cfbe9..3a3c7954c267b 100644
--- a/eng/pipelines/runtime-official.yml
+++ b/eng/pipelines/runtime-official.yml
@@ -116,7 +116,7 @@ stages:
       # - windows_arm
       # - windows_arm64
       jobParameters:
-        buildArgs: -s mono+libs+installer -c $(_BuildConfig)
+        buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
         nameSuffix: AllSubsets_Mono
         isOfficialBuild: ${{ variables.isOfficialBuild }}
         extraStepsTemplate: /eng/pipelines/common/upload-unsigned-artifacts-step.yml
@@ -145,7 +145,7 @@ stages:
         buildConfig: release
         runtimeFlavor: mono
         jobParameters:
-          buildArgs: -s mono+libs+installer -c $(_BuildConfig)
+          buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
                      /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false
           nameSuffix: AllSubsets_Mono_LLVMJIT
           runtimeVariant: LLVMJIT
@@ -158,7 +158,7 @@ stages:
         buildConfig: release
         runtimeFlavor: mono
         jobParameters:
-          buildArgs: -s mono+libs+installer -c $(_BuildConfig)
+          buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
                       /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
           nameSuffix: AllSubsets_Mono_LLVMAOT
           runtimeVariant: LLVMAOT
@@ -215,8 +215,6 @@ stages:
         liveRuntimeBuildConfig: release
         liveLibrariesBuildConfig: Release
         isOfficialBuild: ${{ variables.isOfficialBuild }}
-        useOfficialAllConfigurations: true
-        buildFullPlatformManifest: true
       platforms:
       - OSX_arm64
       - OSX_x64
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index dd43cb33606d6..e84d08e83ef47 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -271,7 +271,7 @@ jobs:
     jobParameters:
       testGroup: innerloop
       nameSuffix: AllSubsets_Mono
-      buildArgs: -s mono+libs+installer -c $(_BuildConfig)
+      buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
       condition: >-
         or(
           eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
@@ -292,7 +292,7 @@ jobs:
     jobParameters:
       testGroup: innerloop
       nameSuffix: AllSubsets_Mono
-      buildArgs: -s mono+libs+installer -c $(_BuildConfig)
+      buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
       condition: >-
         or(
           eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
@@ -320,7 +320,7 @@ jobs:
     jobParameters:
       testGroup: innerloop
       nameSuffix: AllSubsets_Mono
-      buildArgs: -s mono+libs+installer+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
+      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
       timeoutInMinutes: 120
       condition: >-
         or(
@@ -365,7 +365,7 @@ jobs:
     jobParameters:
       testGroup: innerloop
       nameSuffix: AllSubsets_Mono
-      buildArgs: -s mono+libs+installer+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
+      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
       timeoutInMinutes: 120
       condition: >-
         or(
@@ -473,7 +473,7 @@ jobs:
     jobParameters:
       testGroup: innerloop
       nameSuffix: AllSubsets_Mono_LLVMJIT
-      buildArgs: -s mono+libs+installer -c $(_BuildConfig)
+      buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
                  /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false
       condition: >-
         or(
@@ -493,7 +493,7 @@ jobs:
     jobParameters:
       testGroup: innerloop
       nameSuffix: AllSubsets_Mono_LLVMJIT
-      buildArgs: -s mono+libs+installer -c $(_BuildConfig)
+      buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
                  /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false
       condition: >-
         or(
@@ -516,7 +516,7 @@ jobs:
     jobParameters:
       testGroup: innerloop
       nameSuffix: AllSubsets_Mono_LLVMAOT
-      buildArgs: -s mono+libs+installer -c $(_BuildConfig)
+      buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
                  /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
       condition: >-
         or(
@@ -535,7 +535,7 @@ jobs:
     jobParameters:
       testGroup: innerloop
       nameSuffix: AllSubsets_Mono_LLVMAOT
-      buildArgs: -s mono+libs+installer -c $(_BuildConfig)
+      buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
                  /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
       condition: >-
         or(
diff --git a/eng/pipelines/runtimelab.yml b/eng/pipelines/runtimelab.yml
index 38425c1407e93..dc205da3682b1 100644
--- a/eng/pipelines/runtimelab.yml
+++ b/eng/pipelines/runtimelab.yml
@@ -71,7 +71,7 @@ stages:
         jobParameters:
           timeoutInMinutes: 100
           testGroup: innerloop
-          buildArgs: -s clr+libs+installer -c debug -runtimeConfiguration Checked
+          buildArgs: -s clr+libs+host+packs -c debug -runtimeConfiguration Checked
           extraStepsTemplate: /eng/pipelines/runtimelab/runtimelab-post-build-steps.yml
           extraStepsParameters:
             uploadRuntimeTests: true
@@ -94,7 +94,7 @@ stages:
           uploadLibrariesTests: ${{ eq(variables.isOfficialBuild, false) }}
           uploadUnsignedArtifacts: false
         ${{ if eq(variables.isOfficialBuild, false) }}:
-          buildArgs: -s clr+libs+libs.tests+installer -c $(_BuildConfig) /p:ArchiveTests=true
+          buildArgs: -s clr+libs+libs.tests+host+packs -c $(_BuildConfig) /p:ArchiveTests=true
         ${{ if eq(variables.isOfficialBuild, true) }}:
           buildArgs: -s clr+libs -c $(_BuildConfig)
 
diff --git a/global.json b/global.json
index 31ac6fc0ef7c6..2dd857c94fd16 100644
--- a/global.json
+++ b/global.json
@@ -16,6 +16,7 @@
     "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20552.5",
     "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20552.5",
     "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20560.1",
+    "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20552.5",
     "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
     "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",
     "Microsoft.Build.NoTargets": "2.0.1",
diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props
index 319906aef6544..c7fa3122d8509 100644
--- a/src/installer/Directory.Build.props
+++ b/src/installer/Directory.Build.props
@@ -107,10 +107,6 @@
 
     <AssetOutputPath Condition="'$(AssetOutputPath)'==''">$(ArtifactsShippingPackagesDir)</AssetOutputPath>
     <SymbolPackageOutputPath Condition="'$(SymbolPackageOutputPath)'==''">$(ArtifactsShippingPackagesDir)</SymbolPackageOutputPath>
-
-    <!-- Use '/' instead of '\': used directly by WiX which doesn't accept trailing '\'. -->
-    <SharedFrameworkPublishDir>$(IntermediateOutputRootPath)sharedFrameworkPublish/</SharedFrameworkPublishDir>
-    <SharedFrameworkPublishSymbolsDir>$(IntermediateOutputRootPath)sharedFrameworkPublish.symbols\</SharedFrameworkPublishSymbolsDir>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/installer/managed/CommonManaged.props b/src/installer/managed/CommonManaged.props
index c96859a92e4a5..957ee4710e206 100644
--- a/src/installer/managed/CommonManaged.props
+++ b/src/installer/managed/CommonManaged.props
@@ -3,6 +3,7 @@
 
   <PropertyGroup>
     <IsPackable>true</IsPackable>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <AssemblyFileVersion>$(VersionPrefix)</AssemblyFileVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/src/installer/pkg/Directory.Build.props b/src/installer/pkg/Directory.Build.props
index 9f4442493b677..e2ffe40718bd1 100644
--- a/src/installer/pkg/Directory.Build.props
+++ b/src/installer/pkg/Directory.Build.props
@@ -6,11 +6,6 @@
     <DotNetHostBinDir>$(BaseOutputRootPath)corehost</DotNetHostBinDir>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- Disable NuGet static graph evaluation as pkgprojs do their own restore.  -->
-    <RestoreUseStaticGraphEvaluation>false</RestoreUseStaticGraphEvaluation>
-  </PropertyGroup>
-
   <PropertyGroup>
     <PackageLicenseFile>$(RepoRoot)LICENSE.TXT</PackageLicenseFile>
     <PackageThirdPartyNoticesFile>$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
@@ -28,45 +23,6 @@
     <SkipIndexCheck>true</SkipIndexCheck>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <PackagesIntermediateDir>$(IntermediateOutputRootPath)packages/</PackagesIntermediateDir>
-
-    <RpmTemplatesDir>$(MSBuildThisFileDirectory)packaging/rpm/templates/</RpmTemplatesDir>
-
-    <!--
-      Intermediate dir the debtool project is copied to. Use DebtoolAssemblyFile for "dotnet
-      deb-tool" commands, after depending on InitializeDotnetDebTool target.
-    -->
-    <DebToolBinDir>$(ArtifactsBinDir)dotnet-deb-tool\</DebToolBinDir>
-    <DebtoolAssemblyFile>$(DebToolBinDir)$(Configuration)\$(NetCoreAppCurrent)\dotnet-deb-tool.dll</DebtoolAssemblyFile>
-    <DotnetDebToolSourceDir>$(RepoRoot)tools-local/dotnet-deb-tool/</DotnetDebToolSourceDir>
-
-    <IsDebianBasedDistro
-      Condition="
-        $(PackageTargetRid.StartsWith('ubuntu')) or
-        $(PackageTargetRid.StartsWith('debian')) or
-        $(PackageTargetRid.StartsWith('linuxmint'))">true</IsDebianBasedDistro>
-    <BuildDebPackage Condition="'$(IsDebianBasedDistro)' == true and '$(TargetArchitecture)' == 'x64'">true</BuildDebPackage>
-    <BuildDebPackage Condition="'$(BuildLinuxPackages)' == true and '$(PortableBuild)' == true">true</BuildDebPackage>
-
-    <IsRPMBasedDistro Condition="'$(InstallerExtension)' == '.rpm'">true</IsRPMBasedDistro>
-    <BuildRpmPackage Condition="'$(IsRPMBasedDistro)' == true and '$(TargetArchitecture)' == 'x64'">true</BuildRpmPackage>
-    <BuildRpmPackage Condition="'$(BuildLinuxPackages)' == true and '$(PortableBuild)' == true">true</BuildRpmPackage>
-
-    <!--
-      Some Debian and RPM packages only need to be built once for all supported distros, as the bits
-      are portable. By default, build these packages, but in the official build this can be turned
-      off to avoid producing redundant packages.
-    -->
-    <BuildDistroIndependentInstallers Condition="'$(BuildDistroIndependentInstallers)' == ''">true</BuildDistroIndependentInstallers>
-
-    <!--
-      Allow packaging one build's outputs for a different RID. For example, package portable bits
-      for multiple Debian-based distros.
-    -->
-    <InstallerSourceOSPlatformConfig Condition="'$(InstallerSourceOSPlatformConfig)' == ''">$(OSPlatformConfig)</InstallerSourceOSPlatformConfig>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageIndex Include="$(PackageIndexFile)" />
   </ItemGroup>
diff --git a/src/installer/pkg/packaging/Directory.Build.props b/src/installer/pkg/packaging/Directory.Build.props
deleted file mode 100644
index 61f4f4d515aa6..0000000000000
--- a/src/installer/pkg/packaging/Directory.Build.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
-
-  <PropertyGroup>
-    <PackagingRoot>$(InstallerProjectRoot)pkg/packaging/</PackagingRoot>
-
-    <!-- The runtime package is distro-independent. (Runtime-deps packages vary per distro.) -->
-    <BuildRuntimeDebs>$(BuildDistroIndependentInstallers)</BuildRuntimeDebs>
-    <BuildRuntimeRpms>$(BuildDistroIndependentInstallers)</BuildRuntimeRpms>
-
-    <!-- Use trailing '/'. Heat.exe doesn't accept a trailing '\'.-->
-    <SharedHostPublishRoot>$(IntermediateOutputRootPath)sharedHost/</SharedHostPublishRoot>
-    <HostFxrPublishRoot>$(IntermediateOutputRootPath)hostFxr/</HostFxrPublishRoot>
-    <SharedFrameworkPublishRoot>$(IntermediateOutputRootPath)sharedFx/</SharedFrameworkPublishRoot>
-    <CombinedPublishRoot>$(IntermediateOutputRootPath)combined-framework-host/</CombinedPublishRoot>
-    <NetHostPublishRoot>$(IntermediateOutputRootPath)nethost/</NetHostPublishRoot>
-    <Crossgen2PublishRoot>$(IntermediateOutputRootPath)crossgen2/</Crossgen2PublishRoot>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json
deleted file mode 100644
index ba7090e7ebb79..0000000000000
--- a/src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "maintainer_name":".NET Team",
-    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
-
-    "package_name": "%HOSTFXR_DEBIAN_PACKAGE_NAME%",
-    "install_root": "/usr/share/dotnet",
-
-    "short_description": "%HOSTFXR_BRAND_NAME% %HOSTFXR_NUGET_VERSION%",
-    "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
-    "homepage": "https://dot.net/core",
-
-    "release":{
-        "package_version":"1.0.0.0",
-        "package_revision":"%HOSTFXR_REVISION%",
-        "urgency" : "low",
-        "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes"
-    },
-
-    "control": {
-        "priority":"standard",
-        "section":"libs",
-        "architecture":"amd64"
-    },
-
-    "copyright": "2017 Microsoft",
-    "license": {
-        "type": "MIT and ASL 2.0 and BSD",
-        "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-    },
-
-    "debian_dependencies":{
-        "dotnet-host" : {
-            "package_version": "%SHARED_HOST_DEBIAN_VERSION%"
-        },
-        "libc6":{},
-        "libgcc1":{},
-        "libstdc++6":{}
-    }
-}
diff --git a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config.json
deleted file mode 100644
index ee2554263cf81..0000000000000
--- a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "maintainer_name":".NET Team",
-    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
-
-    "package_name": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%",
-    "install_root": "/usr/share/dotnet",
-
-    "short_description": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%",
-    "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.",
-    "homepage": "https://dot.net/core",
-
-    "release":{
-        "package_version":"1.0.0.0",
-        "package_revision":"%RUNTIME_DEPS_REVISION%",
-        "urgency" : "low",
-        "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes"
-    },
-
-    "control": {
-        "priority":"standard",
-        "section":"libs",
-        "architecture":"amd64"
-    },
-
-    "copyright": "2018 Microsoft",
-    "license": {
-        "type": "MIT and ASL 2.0 and BSD",
-        "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-    },
-
-    "debian_dependencies":{
-        "libc6":{},
-        "libgcc1":{},
-        "libgssapi-krb5-2":{},
-        "libstdc++6":{},
-        "zlib1g":{},
-        "%SSL_DEPENDENCY_LIST%" : {},
-        "%LIBICU_DEPENDENCY_LIST%": {} 
-    },
-
-    "debian_ignored_dependencies" : [
-        "liblldb-3.5",
-        "liblldb-3.6"
-    ]
-}
diff --git a/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json
deleted file mode 100644
index b2d78ab93be6d..0000000000000
--- a/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "maintainer_name":".NET Team",
-    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
-
-    "package_name": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%",
-    "install_root": "/usr/share/dotnet",
-
-    "short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%",
-    "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
-    "homepage": "https://dot.net/core",
-
-    "release":{
-        "package_version":"1.0.0.0",
-        "package_revision":"%SHARED_FRAMEWORK_REVISION%",
-        "urgency" : "low",
-        "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes"
-    },
-
-    "control": {
-        "priority":"standard",
-        "section":"libs",
-        "architecture":"amd64"
-    },
-
-    "copyright": "2017 Microsoft",
-    "license": {
-        "type": "MIT and ASL 2.0 and BSD",
-        "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-    },
-
-    "debian_dependencies":{
-        "%HOSTFXR_DEBIAN_PACKAGE_NAME%" : {
-           "package_version": "%HOSTFXR_NUGET_VERSION%"
-         },
-         "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%" : {
-            "package_version": "%RUNTIME_DEPS_VERSION%"
-        } 
-    }
-}
diff --git a/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json
deleted file mode 100644
index dde2c2e3ac9ce..0000000000000
--- a/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "maintainer_name":".NET Team",
-    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
-
-    "package_name": "dotnet-host",
-    "install_root": "/usr/share/dotnet",
-
-    "short_description": "%SHARED_HOST_BRAND_NAME%",
-    "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
-    "homepage": "https://dot.net/core",
-
-    "release":{
-        "package_version":"1.0.0.0",
-        "package_revision":"%SHARED_HOST_REVISION%",
-        "urgency" : "low",
-        "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes"
-    },
-
-    "control": {
-        "priority":"standard",
-        "section":"libs",
-        "architecture":"amd64"
-    },
-
-    "copyright": "2017 Microsoft",
-    "license": {
-        "type": "MIT and ASL 2.0 and BSD",
-        "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-    },
-
-    "debian_dependencies":{
-        "libc6":{},
-        "libgcc1":{},
-        "libstdc++6":{}
-     },
-
-    "package_conflicts" : [
-        "dotnet",
-        "dotnet-nightly"
-    ],
-
-    "symlinks": {
-        "dotnet" : "/usr/bin/dotnet"
-    }
-}
diff --git a/src/installer/pkg/packaging/deb/package.props b/src/installer/pkg/packaging/deb/package.props
deleted file mode 100644
index 6ba97aaf68038..0000000000000
--- a/src/installer/pkg/packaging/deb/package.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <debPackaginfConfigPath>$(PackagingRoot)deb/</debPackaginfConfigPath>
-    <SharedHostDebPkgName>dotnet-host</SharedHostDebPkgName>
-    <SharedHostDebPkgName>$(SharedHostDebPkgName.ToLower())</SharedHostDebPkgName>  
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/deb/package.targets b/src/installer/pkg/packaging/deb/package.targets
deleted file mode 100644
index da9b8feffc320..0000000000000
--- a/src/installer/pkg/packaging/deb/package.targets
+++ /dev/null
@@ -1,358 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project='package.props' />
-
-  <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(InstallerTasksAssemblyPath)"/>
-
-  <PropertyGroup>
-    <DebianConfigJsonName>debian_config.json</DebianConfigJsonName>
-  </PropertyGroup>
-
-  <Target Name="GenerateDebs"
-          DependsOnTargets="TestDebuild;
-                            BuildDebs;"
-          Condition="'$(BuildDebPackage)'=='true'" />
-
-  <Target Name="GenerateRuntimeDebs" 
-          DependsOnTargets="
-            GetInstallerBrandingNames;
-            GenerateSharedHostDeb;
-            GenerateHostFxrDeb;
-            GenerateSharedFrameworkDeb;
-            GenerateRuntimeDependenciesDeb"
-          Condition="'$(BuildRuntimeDebs)' == 'true'" />
-
-  <Target Name="BuildDebs"
-          DependsOnTargets="InitializeDotnetDebTool;GenerateRuntimeDebs"
-          Condition="'$(BuildDebPackage)'=='true' and '$(DebuildPresent)' == 'true'" />
-
-  <Target Name="GenerateSharedHostDeb">
-    <PropertyGroup>
-      <DebPackageName>$(SharedHostDebPkgName)</DebPackageName>
-      <DebPackageVersion>$(HostPackageVersion)</DebPackageVersion>
-      <InputRoot>$(SharedHostPublishRoot)</InputRoot>
-      <DebFile>$(SharedHostInstallerFile)</DebFile>
-      <ConfigJsonName>dotnet-sharedhost-debian_config.json</ConfigJsonName>
-      <ConfigJsonFile>$(debPackaginfConfigPath)$(ConfigJsonName)</ConfigJsonFile>
-      <debIntermediatesDir>$(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion)</debIntermediatesDir>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <debLayoutDirectory>$(debIntermediatesDir)/debianLayoutDirectory/</debLayoutDirectory>
-      <debLayoutAbsolute>$(debLayoutDirectory)$</debLayoutAbsolute>
-      <debLayoutPackageRoot>$(debLayoutDirectory)package_root</debLayoutPackageRoot>
-      <debLayoutSamples>$(debLayoutDirectory)samples</debLayoutSamples>
-      <debLayoutDocs>$(debLayoutDirectory)docs</debLayoutDocs>
-    </PropertyGroup>
-
-    <RemoveDir Condition="Exists('$(debIntermediatesDir)')" Directories="$(debIntermediatesDir)" />
-    <MakeDir Directories="$(debIntermediatesDir)" />
-
-    <!-- Create empty debian layout -->
-    <RemoveDir Condition="Exists('$(debLayoutDirectory)')" Directories="$(debLayoutDirectory)" />
-    <MakeDir Directories="$(debLayoutDirectory)" />
-    <MakeDir Directories="$(debLayoutAbsolute)" />
-    <MakeDir Directories="$(debLayoutPackageRoot)" />
-    <MakeDir Directories="$(debLayoutSamples)" />
-    <MakeDir Directories="$(debLayoutDocs)" />
-
-    <!-- Copy files to debian layout -->
-    <ItemGroup>
-      <SHFiles Include="$(InputRoot)/**/*" />
-      <SHManpages Include="$(ManPagesDir)/**/*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(SHFiles)" DestinationFiles="@(SHFiles->'$(debLayoutPackageRoot)/%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(SHManpages)" DestinationFiles="@(SHManpages->'$(debLayoutDocs)/%(RecursiveDir)%(Filename)%(Extension)')" />
-
-    <!-- Replace config json variables -->
-    <ItemGroup>
-      <SharedHostTokenValue Include="%SHARED_HOST_BRAND_NAME%">
-        <ReplacementString>$(SharedHostBrandName)</ReplacementString>
-      </SharedHostTokenValue>
-      <SharedHostTokenValue Include="%SHARED_HOST_REVISION%">
-        <ReplacementString>$(HostPackageRelease)</ReplacementString>
-      </SharedHostTokenValue>
-    </ItemGroup>
-
-    <ReplaceFileContents InputFile="$(ConfigJsonFile)"
-                         DestinationFile="$(debLayoutDirectory)$(DebianConfigJsonName)"
-                         ReplacementItems="@(SharedHostTokenValue)" />
-
-    <Exec Command="$(DotNetTool) $(DebtoolAssemblyFile) -i $(debLayoutDirectory) -o $(debIntermediatesDir) -n $(DebPackageName) -v $(DebPackageVersion)"
-          WorkingDirectory="$(DebToolBinDir)"
-          IgnoreStandardErrorWarningFormat="true" />
-
-    <!-- Copy package to output -->
-    <ItemGroup>
-      <GeneratedDebFiles Remove="@(GeneratedDebFiles)" />
-      <GeneratedDebFiles Include="$(debIntermediatesDir)/*.deb" />
-    </ItemGroup>
-
-    <Error Text="@(GeneratedDebFiles->Count()) .deb files generated." Condition="'@(GeneratedDebFiles->Count())' != 1" />
-
-    <Copy SourceFiles="@(GeneratedDebFiles)"
-          DestinationFiles="$(DebFile)"
-          OverwriteReadOnlyFiles="True"
-          SkipUnchangedFiles="False"
-          UseHardlinksIfPossible="False" />
-
-  </Target>
-
-  <Target Name="GenerateHostFxrDeb">
-    <PropertyGroup>
-      <DebPackageName>$(HostFxrDebPkgName)</DebPackageName>
-      <DebPackageVersion>$(HostResolverPackageVersion)</DebPackageVersion>
-      <InputRoot>$(HostFxrPublishRoot)</InputRoot>
-      <DebFile>$(HostFxrInstallerFile)</DebFile>
-      <ConfigJsonName>dotnet-hostfxr-debian_config.json</ConfigJsonName>
-      <ConfigJsonFile>$(debPackaginfConfigPath)$(ConfigJsonName)</ConfigJsonFile>
-      <debIntermediatesDir>$(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion)</debIntermediatesDir>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <debLayoutDirectory>$(debIntermediatesDir)/debianLayoutDirectory/</debLayoutDirectory>
-      <debLayoutAbsolute>$(debLayoutDirectory)$</debLayoutAbsolute>
-      <debLayoutPackageRoot>$(debLayoutDirectory)package_root</debLayoutPackageRoot>
-      <debLayoutSamples>$(debLayoutDirectory)samples</debLayoutSamples>
-      <debLayoutDocs>$(debLayoutDirectory)docs</debLayoutDocs>
-    </PropertyGroup>
-
-    <RemoveDir Condition="Exists('$(debIntermediatesDir)')" Directories="$(debIntermediatesDir)" />
-    <MakeDir Directories="$(debIntermediatesDir)" />
-
-    <!-- Create empty debian layout -->
-    <RemoveDir Condition="Exists('$(debLayoutDirectory)')" Directories="$(debLayoutDirectory)" />
-    <MakeDir Directories="$(debLayoutDirectory)" />
-    <MakeDir Directories="$(debLayoutAbsolute)" />
-    <MakeDir Directories="$(debLayoutPackageRoot)" />
-    <MakeDir Directories="$(debLayoutSamples)" />
-    <MakeDir Directories="$(debLayoutDocs)" />
-
-    <!-- Copy files to debian layout -->
-    <ItemGroup>
-      <HFFiles Include="$(InputRoot)/**/*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(HFFiles)" DestinationFiles="@(HFFiles->'$(debLayoutPackageRoot)/%(RecursiveDir)%(Filename)%(Extension)')" />
-
-    <!-- Replace config json variables -->
-    <ItemGroup>
-      <HostFxrTokenValue Include="%HOSTFXR_BRAND_NAME%">
-        <ReplacementString>$(HostFxrBrandName)</ReplacementString>
-      </HostFxrTokenValue>
-      <HostFxrTokenValue Include="%SHARED_HOST_DEBIAN_VERSION%">
-        <ReplacementString>$(HostPackageVersion)</ReplacementString>
-      </HostFxrTokenValue>
-      <HostFxrTokenValue Include="%HOSTFXR_NUGET_VERSION%">
-        <ReplacementString>$(HostResolverPackageVersion)</ReplacementString>
-      </HostFxrTokenValue>
-      <HostFxrTokenValue Include="%HOSTFXR_DEBIAN_PACKAGE_NAME%">
-        <ReplacementString>$(DebPackageName)</ReplacementString>
-      </HostFxrTokenValue>
-      <HostFxrTokenValue Include="%HOSTFXR_REVISION%">
-        <ReplacementString>$(HostResolverPackageRelease)</ReplacementString>
-      </HostFxrTokenValue>
-    </ItemGroup>
-
-    <ReplaceFileContents InputFile="$(ConfigJsonFile)"
-                         DestinationFile="$(debLayoutDirectory)$(DebianConfigJsonName)"
-                         ReplacementItems="@(HostFxrTokenValue)" />
-
-    <Exec Command="$(DotNetTool) $(DebtoolAssemblyFile) -i $(debLayoutDirectory) -o $(debIntermediatesDir) -n $(DebPackageName) -v $(DebPackageVersion)"
-          WorkingDirectory="$(DebToolBinDir)"
-          IgnoreStandardErrorWarningFormat="true" />
-
-    <!-- Copy package to output -->
-    <ItemGroup>
-      <GeneratedDebFiles Remove="@(GeneratedDebFiles)" />
-      <GeneratedDebFiles Include="$(debIntermediatesDir)/*.deb" />
-    </ItemGroup>
-
-    <Error Text="@(GeneratedDebFiles->Count()) .deb files generated." Condition="'@(GeneratedDebFiles->Count())' != 1" />
-
-    <Copy SourceFiles="@(GeneratedDebFiles)"
-          DestinationFiles="$(DebFile)"
-          OverwriteReadOnlyFiles="True"
-          SkipUnchangedFiles="False"
-          UseHardlinksIfPossible="False" />
-
-  </Target>
-
-  <Target Name="GenerateSharedFrameworkDeb">
-  
-    <PropertyGroup>
-      <DebPackageName>$(SharedFxDebPkgName)</DebPackageName>
-      <DebPackageVersion>$(RuntimePackageVersion)</DebPackageVersion>
-      <InputRoot>$(SharedFrameworkPublishRoot)</InputRoot>
-      <DebFile>$(SharedFrameworkInstallerFile)</DebFile>
-      <ConfigJsonName>dotnet-sharedframework-debian_config.json</ConfigJsonName>
-      <ConfigJsonFile>$(debPackaginfConfigPath)$(ConfigJsonName)</ConfigJsonFile>
-      <debIntermediatesDir>$(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion)</debIntermediatesDir>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <debLayoutDirectory>$(debIntermediatesDir)/debianLayoutDirectory/</debLayoutDirectory>
-      <debLayoutAbsolute>$(debLayoutDirectory)$</debLayoutAbsolute>
-      <debLayoutPackageRoot>$(debLayoutDirectory)package_root</debLayoutPackageRoot>
-      <debLayoutSamples>$(debLayoutDirectory)samples</debLayoutSamples>
-      <debLayoutDocs>$(debLayoutDirectory)docs</debLayoutDocs>
-    </PropertyGroup>
-
-    <RemoveDir Condition="Exists('$(debIntermediatesDir)')" Directories="$(debIntermediatesDir)" />
-    <MakeDir Directories="$(debIntermediatesDir)" />
-
-    <!-- Create empty debian layout -->
-    <RemoveDir Condition="Exists('$(debLayoutDirectory)')" Directories="$(debLayoutDirectory)" />
-    <MakeDir Directories="$(debLayoutDirectory)" />
-    <MakeDir Directories="$(debLayoutAbsolute)" />
-    <MakeDir Directories="$(debLayoutPackageRoot)" />
-    <MakeDir Directories="$(debLayoutSamples)" />
-    <MakeDir Directories="$(debLayoutDocs)" />
-
-    <!-- Copy files to debian layout -->
-    <ItemGroup>
-      <SFFiles Include="$(InputRoot)/**/*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(SFFiles)" DestinationFiles="@(SFFiles->'$(debLayoutPackageRoot)/%(RecursiveDir)%(Filename)%(Extension)')"/>
-
-    <!-- Replace config json variables -->
-    <ItemGroup>
-      <SharedFrameworkTokenValue Include="%HOSTFXR_DEBIAN_PACKAGE_NAME%">
-        <ReplacementString>$(HostFxrDebPkgName)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%HOSTFXR_NUGET_VERSION%">
-        <ReplacementString>$(HostResolverPackageVersion)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%">
-        <ReplacementString>$(SharedFxDebPkgName)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%SHARED_FRAMEWORK_NUGET_NAME%">
-        <ReplacementString>$(SharedFrameworkName)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%SHARED_FRAMEWORK_NUGET_VERSION%">
-        <ReplacementString>$(RuntimePackageVersion)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%SHARED_FRAMEWORK_BRAND_NAME%">
-        <ReplacementString>$(SharedFrameworkBrandName)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%">
-        <ReplacementString>$(RuntimeDependenciesDebPkgName)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%RUNTIME_DEPS_VERSION%">
-        <ReplacementString>$(RuntimeDepsDebPackageVersion)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%SHARED_FRAMEWORK_REVISION%">
-        <ReplacementString>$(RuntimePackageRelease)</ReplacementString>
-      </SharedFrameworkTokenValue>
-
-    </ItemGroup>
-
-    <ReplaceFileContents InputFile="$(ConfigJsonFile)"
-                         DestinationFile="$(debLayoutDirectory)$(DebianConfigJsonName)"
-                         ReplacementItems="@(SharedFrameworkTokenValue)" />
-
-    <Exec Command="$(DotNetTool) $(DebtoolAssemblyFile) -i $(debLayoutDirectory) -o $(debIntermediatesDir) -n $(DebPackageName) -v $(DebPackageVersion)"
-          WorkingDirectory="$(DebToolBinDir)"
-          IgnoreStandardErrorWarningFormat="true" />
-
-    <!-- Copy package to output -->
-    <ItemGroup>
-      <GeneratedDebFiles Remove="@(GeneratedDebFiles)" />
-      <GeneratedDebFiles Include="$(debIntermediatesDir)/*.deb" />
-    </ItemGroup>
-
-    <Error Text="@(GeneratedDebFiles->Count()) .deb files generated." Condition="'@(GeneratedDebFiles->Count())' != 1" />
-
-    <Copy SourceFiles="@(GeneratedDebFiles)"
-          DestinationFiles="$(DebFile)"
-          OverwriteReadOnlyFiles="True"
-          SkipUnchangedFiles="False"
-          UseHardlinksIfPossible="False" />
-
-  </Target>
-  
-  <Target Name="GenerateRuntimeDependenciesDeb">
-    <PropertyGroup>
-      <DebPackageName>$(RuntimeDependenciesDebPkgName)</DebPackageName>
-      <DebPackageVersion>$(RuntimeDepsDebPackageVersion)</DebPackageVersion>
-      <DebFile>$(DotnetRuntimeDependenciesPackageInstallerFile)</DebFile>
-      <ConfigJsonName>dotnet-runtime-deps-debian_config.json</ConfigJsonName>
-      <ConfigJsonFile>$(debPackaginfConfigPath)$(ConfigJsonName)</ConfigJsonFile>
-      <debIntermediatesDir>$(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion)</debIntermediatesDir>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <debLayoutDirectory>$(debIntermediatesDir)/debianLayoutDirectory/</debLayoutDirectory>
-      <debLayoutAbsolute>$(debLayoutDirectory)$</debLayoutAbsolute>
-      <debLayoutPackageRoot>$(debLayoutDirectory)package_root</debLayoutPackageRoot>
-      <debLayoutSamples>$(debLayoutDirectory)samples</debLayoutSamples>
-      <debLayoutDocs>$(debLayoutDirectory)docs</debLayoutDocs>
-    </PropertyGroup>
-
-    <!-- Error out if the configuration file doesn't exist -->
-    <Error Condition="!Exists('$(ConfigJsonFile)')" Text="Config file does not exist : '$(ConfigJsonFile)'" />
-
-    <RemoveDir Condition="Exists('$(debIntermediatesDir)')" Directories="$(debIntermediatesDir)" />
-    <MakeDir Directories="$(debIntermediatesDir)" />
-
-    <!-- Create empty debian layout -->
-    <RemoveDir Condition="Exists('$(debLayoutDirectory)')" Directories="$(debLayoutDirectory)" />
-    <MakeDir Directories="$(debLayoutDirectory)" />
-    <MakeDir Directories="$(debLayoutAbsolute)" />
-    <MakeDir Directories="$(debLayoutPackageRoot)" />
-    <MakeDir Directories="$(debLayoutSamples)" />
-    <MakeDir Directories="$(debLayoutDocs)" />
-
-    <!-- Replace config json variables -->
-    <ItemGroup>
-      <SharedFrameworkTokenValue Include="%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%">
-        <ReplacementString>$(RuntimeDependenciesDebPkgName)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%RUNTIME_DEPS_VERSION%">
-        <ReplacementString>$(RuntimeDepsDebPackageVersion)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%RUNTIME_DEPS_REVISION%">
-        <ReplacementString>$(RuntimeDepsDebPackageRelease)</ReplacementString>
-      </SharedFrameworkTokenValue>
-
-      <!--
-        In every runtime deps Deb package, include alternatives known to work with .NET.
-        Specifying these as "or" dependencies lets us create one package that works on many distros.
-      -->
-      <SharedFrameworkTokenValue
-        Include="%SSL_DEPENDENCY_LIST%"
-        ReplacementString="libssl1.0.0 | libssl1.0.2 | libssl1.1" />
-
-      <KnownLibIcuVersion Include="72;71;70;69;68;67;66;65;63;60;57;55;52" />
-      <SharedFrameworkTokenValue
-        Include="%LIBICU_DEPENDENCY_LIST%"
-        ReplacementString="libicu | @(KnownLibIcuVersion -> 'libicu%(Identity)', ' | ')" />
-    </ItemGroup>
-
-    <ReplaceFileContents InputFile="$(ConfigJsonFile)"
-                         DestinationFile="$(debLayoutDirectory)$(DebianConfigJsonName)"
-                         ReplacementItems="@(SharedFrameworkTokenValue)" />
-
-    <Exec Command="$(DotNetTool) $(DebtoolAssemblyFile) -i $(debLayoutDirectory) -o $(debIntermediatesDir) -n $(DebPackageName) -v $(DebPackageVersion)"
-          WorkingDirectory="$(DebToolBinDir)"
-          IgnoreStandardErrorWarningFormat="true" />
-
-    <!-- Copy package to output -->
-    <ItemGroup>
-      <GeneratedDebFiles Remove="@(GeneratedDebFiles)" />
-      <GeneratedDebFiles Include="$(debIntermediatesDir)/*.deb" />
-    </ItemGroup>
-
-    <Error Text="@(GeneratedDebFiles->Count()) .deb files generated." Condition="'@(GeneratedDebFiles->Count())' != 1" />
-
-    <Copy SourceFiles="@(GeneratedDebFiles)"
-          DestinationFiles="$(DebFile)"
-          OverwriteReadOnlyFiles="True"
-          SkipUnchangedFiles="False"
-          UseHardlinksIfPossible="False" />
-
-  </Target>
-
-</Project>
diff --git a/src/installer/pkg/packaging/installers.proj b/src/installer/pkg/packaging/installers.proj
deleted file mode 100644
index a3494e48efaed..0000000000000
--- a/src/installer/pkg/packaging/installers.proj
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <!-- RuntimeIdentifier must be set or CoreCLRCrossgen2Dir does not get set properly. -->
-    <EnsureRuntimeIdentifierSet>true</EnsureRuntimeIdentifierSet>
-  </PropertyGroup>
-  <Import Project="Directory.Build.props" />
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-
-  <PropertyGroup>
-    <PackageTargets>
-      GetInstallerLocations;
-      GenerateVersionBadge;
-      GenerateCompressedFiles;
-      GenerateInstallers;
-      GenerateProjectInstallers;
-    </PackageTargets>
-  </PropertyGroup>
-
-  <Target Name="Build"
-          DependsOnTargets="
-            BuildDependencies;
-            BuildInstallers;
-            SignCombinedInstallers"
-          Condition="'$(DOTNET_BUILD_SKIP_PACKAGING)' != 'true'" />
-
-  <Target Name="BuildInstallers"
-          DependsOnTargets="
-            EnsureSignedR2RBinaries;
-            $(PackageTargets)"
-          Condition="'$(DOTNET_BUILD_SKIP_PACKAGING)' != 'true'" />
-
-  <Target Name="SignCombinedInstallers"
-          Condition="
-            '$(TargetOS)' == 'windows' and
-            '$(SkipSigning)' != 'true'"
-          DependsOnTargets="
-            EnsureSignedBurnEngineFiles;
-            EnsureSignedBurnBundleFiles" />
-
-  <!--
-    To build installers, we need shared fx layouts to be built first. Call MSBuild on the
-    requirements so that parallel MSBuild does the ordering work.
-
-    Also ensures NuGet packages are built and signed.
-  -->
-  <Target Name="BuildDependencies"
-          Condition="'$(UsePrebuiltPortableBinariesForInstallers)' != 'true'"
-          DependsOnTargets="GetSharedFrameworkProjects">
-    <MSBuild
-      Projects="
-        @(SharedFrameworkProject);
-        pack-managed.proj"
-      Targets="Build" />
-  </Target>
-
-  <Target Name="EnsureSignedR2RBinaries" Condition="'$(TargetOS)' == 'windows'" >
-    <MSBuild Projects="$(SigningToolsDir)\SignR2RBinaries.proj" Targets="Build" />
-  </Target>
-
-  <Target Name="EnsureSignedMsiFiles" Condition="'$(TargetOS)' == 'windows'" >
-    <MSBuild Projects="$(SigningToolsDir)\SignMsiFiles.proj" Targets="Build" />
-  </Target>
-
-  <Target Name="EnsureSignedBurnEngineFiles" Condition="'$(TargetOS)' == 'windows'" >
-    <MSBuild Projects="$(SigningToolsDir)\SignBurnEngineFiles.proj" Targets="Build" />
-  </Target>
-
-  <Target Name="EnsureSignedBurnBundleFiles" Condition="'$(TargetOS)' == 'windows'" >
-    <MSBuild Projects="$(SigningToolsDir)\SignBurnBundleFiles.proj" Targets="Build" />
-  </Target>
-
-  <Target Name="GenerateProjectInstallers" Condition="'$(GenerateProjectInstallers)' == 'true'">
-    <ItemGroup>
-      <_InstallerProject Include="$(InstallerProjectRoot)pkg\projects\**\*.pkgproj" />
-      <_InstallerProject Include="$(InstallerProjectRoot)pkg\projects\**\*.sfxproj" />
-    </ItemGroup>
-
-    <MSBuild Projects="@(_InstallerProject)" Targets="GenerateInstallers" />
-  </Target>
-
-  <Target Name="InitPackage">
-    <ItemGroup>
-      <OutDirs Include="$(SharedHostPublishRoot)" />
-      <OutDirs Include="$(HostFxrPublishRoot)" />
-      <OutDirs Include="$(SharedFrameworkPublishRoot)" />
-      <OutDirs Include="$(NetHostPublishRoot)" />
-      <OutDirs Include="$(Crossgen2PublishRoot)" />
-    </ItemGroup>
-
-    <RemoveDir Directories="@(OutDirs)" />
-
-    <!-- copy shared host layout -->
-    <Copy SourceFiles="$(SharedFrameworkPublishDir)dotnet$(ExeSuffix)"
-          DestinationFolder="$(SharedHostPublishRoot)" />
-
-    <Copy SourceFiles="$(InstallerProjectRoot)pkg\THIRD-PARTY-NOTICES.TXT"
-          DestinationFiles="$(SharedHostPublishRoot)ThirdPartyNotices.txt" />
-
-    <Copy SourceFiles="$(RepoRoot)LICENSE.TXT"
-          DestinationFiles="$(SharedHostPublishRoot)LICENSE.txt"
-          Condition="'$(TargetsUnix)' == 'true'"/>
-
-    <Copy SourceFiles="$(InstallerProjectRoot)pkg\LICENSE-MSFT.TXT"
-          DestinationFiles="$(SharedHostPublishRoot)LICENSE.txt"
-          Condition="'$(TargetsUnix)' != 'true'"/>
-
-    <!-- copy host fxr -->
-    <ItemGroup>
-      <HostFxrFiles Include="$(SharedFrameworkPublishDir)host\**\*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(HostFxrFiles)"
-           DestinationFolder="$(HostFxrPublishRoot)host/%(HostFxrFiles.RecursiveDir)" />
-
-    <!-- copy shared framwork layout -->
-    <ItemGroup>
-      <SharedFxFiles Include="$(SharedFrameworkPublishDir)shared\**\*" />
-    </ItemGroup>
-    <Copy Sourcefiles="@(SharedFxFiles)"
-          DestinationFolder="$(SharedFrameworkPublishRoot)shared/%(SharedFxFiles.RecursiveDir)" />
-    
-    <!-- copy crossgen2 -->
-    <ItemGroup>
-      <Crossgen2Files Include="$(CoreCLRCrossgen2Dir)*" />
-      <Crossgen2Files Include="$(RepoRoot)THIRD-PARTY-NOTICES.TXT" />
-      <Crossgen2Files Include="$(RepoRoot)LICENSE.TXT" />
-    </ItemGroup>
-
-    <Copy Sourcefiles="@(Crossgen2Files)"
-          DestinationFolder="$(Crossgen2PublishRoot)%(Crossgen2Files.RecursiveDir)" />
-
-    <!-- Copy nethost -->
-    <PropertyGroup>
-      <_NetHostOutputDir>$(ArtifactsBinDir)$(InstallerSourceOSPlatformConfig)\corehost\</_NetHostOutputDir>
-    </PropertyGroup>
-    <ItemGroup>
-      <NetHostFiles Include="$(_NetHostOutputDir)nethost.h" />
-      <NetHostFiles Include="$(_NetHostOutputDir)$(LibPrefix)nethost$(LibSuffix)" />
-      <NetHostFiles Include="$(_NetHostOutputDir)$(StaticLibPrefix)nethost$(StaticLibSuffix)" />
-      <NetHostFiles Condition="'$(TargetOS)' == 'windows'" Include="$(_NetHostOutputDir)nethost.lib" />
-    </ItemGroup>
-    <Copy SourceFiles="@(NetHostFiles)"
-          DestinationFolder="$(NetHostPublishRoot)" />
-
-    <!-- Fix file permits -->
-    <!-- Reset everything to user readable/writeable and group and world readable. -->
-    <Exec Condition="'$(TargetOS)' != 'windows'"
-          Command='find %(OutDirs.Identity) -type f -name "*" -exec chmod 644 {} \;' />
-    <!-- Generally, dylibs and sos have 'x' -->
-    <Exec Condition="'$(TargetOS)' != 'windows'"
-          Command='find %(OutDirs.Identity) -type f -name "*.dylib" -exec chmod 755 {} \;' />
-    <Exec Condition="'$(TargetOS)' != 'windows'"
-          Command='find %(OutDirs.Identity) -type f -name "*.so" -exec chmod 755 {} \;' />
-    <!-- Executables (those without dots) are executable -->
-    <Exec Condition="'$(TargetOS)' != 'windows'"
-          Command='find %(OutDirs.Identity) -type f ! -name "*.*" -exec chmod 755 {} \;' />
-
-
-    <!-- Copy all to combined directory -->
-    <ItemGroup>
-      <CombinedFiles Include="$(SharedHostPublishRoot)\**\*" />
-      <CombinedFiles Include="$(HostFxrPublishRoot)/**\*" />
-      <CombinedFiles Include="$(SharedFrameworkPublishRoot)/**\*" />
-    </ItemGroup>
-    <RemoveDir Directories="@(CombinedPublishRoot)" />
-    <Copy SourceFiles="@(CombinedFiles)"
-          DestinationFolder="$(CombinedPublishRoot)/%(CombinedFiles.RecursiveDir)" />
-
-    <!-- create output dir -->
-    <MakeDir Condition="!Exists('$(AssetOutputPath)')"
-             Directories="$(AssetOutputPath)" />
-  </Target>
-
-  <Target Name="GenerateVersionBadge">
-    <PropertyGroup>
-      <templateSvg>$(MSBuildThisFileDirectory)version_badge.svg</templateSvg>
-    </PropertyGroup>
-
-    <MakeDir  Condition="!Exists('$(BaseOutputRootPath)')" Directories="$(BaseOutputRootPath)" />
-
-    <WriteLinesToFile
-      File="$(OutputVersionBadge)"
-      Lines="$([System.IO.File]::ReadAllText('$(templateSvg)').Replace('ver_number', '$(ProductVersion)'))"
-      Overwrite="true"
-                      />
-  </Target>
-
-  <Target Name="GenerateCompressedFiles"
-          DependsOnTargets="
-            InitPackage;
-            GetInstallerLocations;
-            GenerateZip;
-            GenerateTarBall"
-          Condition="'$(UsePrebuiltPortableBinariesForInstallers)' != 'true'"/>
-
-  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(InstallerTasksAssemblyPath)"/>
-  <Target Name="GenerateZip"
-          Condition="'$(TargetOS)'=='windows'">
-
-    <ZipFileCreateFromDirectory
-        SourceDirectory="$(CombinedPublishRoot)"
-        DestinationArchive="$(AssetOutputPath)$(CombinedCompressedFile)"
-        OverwriteDestination="true" />
-
-    <ZipFileCreateFromDirectory
-        SourceDirectory="$(HostFxrPublishRoot)"
-        DestinationArchive="$(AssetOutputPath)$(HostFxrCompressedFile)"
-        OverwriteDestination="true" />
-
-    <ZipFileCreateFromDirectory
-        SourceDirectory="$(NetHostPublishRoot)"
-        DestinationArchive="$(AssetOutputPath)$(NetHostCompressedFile)"
-        OverwriteDestination="true" />
-
-    <ZipFileCreateFromDirectory
-        SourceDirectory="$(Crossgen2PublishRoot)"
-        DestinationArchive="$(AssetOutputPath)$(Crossgen2CompressedFile)"
-        OverwriteDestination="true" />
-
-    <ZipFileCreateFromDirectory
-        SourceDirectory="$(SharedFrameworkPublishRoot)"
-        DestinationArchive="$(AssetOutputPath)$(SharedFrameworkCompressedFile)"
-        OverwriteDestination="true" />
-
-    <ZipFileCreateFromDirectory
-        SourceDirectory="$(SharedFrameworkPublishSymbolsDir)"
-        DestinationArchive="$(AssetOutputPath)$(SharedFrameworkSymbolsCompressedFile)"
-        OverwriteDestination="true" />
-  </Target>
-
-  <Target Name="GenerateTarBall"
-          Condition="'$(TargetOS)'!='windows'">
-
-    <!-- tar command will throw 'file changed as we read it' on some distros.  ignore that error.
-         we use -C so that we get a relative folder structure which is compressed rather than the full path -->
-    <Exec Command="tar -C $(CombinedPublishRoot) -czf $(AssetOutputPath)$(CombinedCompressedFile) ."
-          IgnoreExitCode="true"
-          IgnoreStandardErrorWarningFormat="true" />
-    <Exec Command="tar -C $(HostFxrPublishRoot) -czf $(AssetOutputPath)$(HostFxrCompressedFile) ."
-          IgnoreExitCode="true"
-          IgnoreStandardErrorWarningFormat="true" />
-    <Exec Command="tar -C $(NetHostPublishRoot) -czf $(AssetOutputPath)$(NetHostCompressedFile) ."
-          IgnoreExitCode="true"
-          IgnoreStandardErrorWarningFormat="true" />
-    <Exec Command="tar -C $(Crossgen2PublishRoot) -czf $(AssetOutputPath)$(Crossgen2CompressedFile) ."
-          IgnoreExitCode="true"
-          IgnoreStandardErrorWarningFormat="true" />
-    <Exec Command="tar -C $(SharedFrameworkPublishRoot) -czf $(AssetOutputPath)$(SharedFrameworkCompressedFile) ."
-          IgnoreExitCode="true"
-          IgnoreStandardErrorWarningFormat="true" />
-    <Exec Command="tar -C $(SharedFrameworkPublishSymbolsDir) -czf $(AssetOutputPath)$(SharedFrameworkSymbolsCompressedFile) ."
-          IgnoreExitCode="true"
-          IgnoreStandardErrorWarningFormat="true" />
-    <Error Condition="!Exists('$(AssetOutputPath)$(CombinedCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(CombinedCompressedFile)" />
-    <Error Condition="!Exists('$(AssetOutputPath)$(HostFxrCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(HostFxrCompressedFile)" />
-    <Error Condition="!Exists('$(AssetOutputPath)$(NetHostCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(NetHostCompressedFile)" />
-    <Error Condition="!Exists('$(AssetOutputPath)$(Crossgen2CompressedFile)')" Message="Unable to create $(AssetOutputPath)$(Crossgen2CompressedFile)" />
-    <Error Condition="!Exists('$(AssetOutputPath)$(SharedFrameworkCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(SharedFrameworkCompressedFile)" />
-    <Error Condition="!Exists('$(AssetOutputPath)$(SharedFrameworkSymbolsCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(SharedFrameworkSymbolsCompressedFile)" />
-  </Target>
-
-  <Import Project="osx\package.targets" />
-  <Import Project="deb\package.targets" />
-  <Import Project="rpm\package.targets" />
-
-  <PropertyGroup>
-   <InstallerDependsOn>
-     GeneratePkgs;
-     GenerateDebs;
-     GenerateRpms;
-   </InstallerDependsOn>
-  </PropertyGroup>
-  <Target Name="GenerateInstallers" DependsOnTargets="InitPackage;$(InstallerDependsOn)" />
-
-  </Project>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/conclusion.html
deleted file mode 100644
index a7031e4d8dcd7..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/conclusion.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Congratulations! You've successfully installed .NET CLI!</title>
-</head>
-<body>
-        <div align="center" style="font-family: Helvetica;">  
-            <h1>The installation was successful.</h1>
-            <p>.NET CLI was successfully installed.</p>
-        <h2>
-            Install dependencies
-        </h2>
-        <p>
-        In order to be able to use .NET on OS X, you need to install <b>OpenSSL</b> version <b>1.0.1/1.0.2</b>. 
-        There are many ways to install/update your libssl. Using <a href="https://brew.sh">Homebrew</a> is the easiest. 
-        You can view the instructions <a href="http://brewformulas.org/Openssl">here</a> or if you're updating, <a href="https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/osx-instructions.md#openssl">on this page</a>.
-        </p>
-        </div>
-</body>
-</html>
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/welcome.html
deleted file mode 100644
index 94cadedb4fb96..0000000000000
--- a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title styles="color:white">Welcome to the .NET CLI installer.</title>
-</head>
-<body>
-    <font face="Helvetica">
-        <h3>
-            Microsoft .NET CLI
-        </h3>
-        <p>
-            .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.
-        </p>
-        <p>
-            This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. 
-        </p>
-    </font>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/package.props b/src/installer/pkg/packaging/osx/package.props
deleted file mode 100644
index 447ffe38c7efb..0000000000000
--- a/src/installer/pkg/packaging/osx/package.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OSXScriptRoot>$(PackagingRoot)osx/</OSXScriptRoot>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/osx/package.targets b/src/installer/pkg/packaging/osx/package.targets
deleted file mode 100644
index 722676fffc197..0000000000000
--- a/src/installer/pkg/packaging/osx/package.targets
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<Import Project='package.props' />
-    
-  <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(InstallerTasksAssemblyPath)"/>
-
-  <Target Name="InitPkg"
-          Condition="'$(TargetOS)' == 'OSX' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">
-    <MakeDir Condition="!Exists('$(PackagesIntermediateDir)')"
-             Directories="$(PackagesIntermediateDir)" />
-  </Target>
-
-  <Target Name="GeneratePkgs"
-          Condition="'$(TargetOS)' == 'OSX' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'"
-          DependsOnTargets="GetInstallerBrandingNames;InitPkg">
-    <ItemGroup>
-        <OSXPackages Include="sharedframework">
-            <Id>$(SharedFxComponentId)</Id>
-            <Root>$(SharedFrameworkPublishRoot)</Root>
-            <Script>$(OSXScriptRoot)sharedframework/scripts</Script>
-            <OutFile>$(PackagesIntermediateDir)$(SharedFxComponentId).pkg</OutFile>
-            <InstallerFile>$(SharedFrameworkInstallerFile)</InstallerFile>
-        </OSXPackages>
-        <OSXPackages Include="sharedhost">
-            <Id>$(SharedHostComponentId)</Id>
-            <Root>$(SharedHostPublishRoot)</Root>
-            <Script>$(OSXScriptRoot)sharedhost/scripts</Script>
-            <OutFile>$(PackagesIntermediateDir)$(SharedHostComponentId).pkg</OutFile>
-            <InstallerFile>$(SharedHostInstallerFile)</InstallerFile>
-        </OSXPackages>
-        <OSXPackages Include="hostfxr">
-            <Id>$(HostFxrComponentId)</Id>
-            <Root>$(HostFxrPublishRoot)</Root>
-            <Script>$(OSXScriptRoot)hostfxr/scripts</Script>
-            <OutFile>$(PackagesIntermediateDir)$(HostFxrComponentId).pkg</OutFile>
-            <InstallerFile>$(HostFxrInstallerFile)</InstallerFile>
-        </OSXPackages>
-    </ItemGroup>
-
-    <PropertyGroup>
-        <InstallLocation>/usr/local/share/dotnet</InstallLocation>
-        <CommonArgs>--version $(SharedFrameworkNugetVersion) --install-location $(InstallLocation)</CommonArgs>
-    </PropertyGroup>
-
-    <Exec Command="pkgbuild --root %(OSXPackages.Root) --identifier %(OSXPackages.Id)  $(CommonArgs) --scripts %(OSXPackages.Script) %(OSXPackages.OutFile)" />
-
-    <Copy SourceFiles="%(OSXPackages.OutFile)" DestinationFiles="%(OSXPackages.InstallerFile)" />
-
-    <!-- GenerateSharedFrameworkProductArchive -->
-    <PropertyGroup>
-        <SharedFxScriptRoot>$(OSXScriptRoot)sharedframework/</SharedFxScriptRoot>
-        <ResourcePath>$(PackagesIntermediateDir)resources</ResourcePath>
-        <OutFilePath>$(CombinedInstallerFile)</OutFilePath>
-        <TemplateFile>shared-framework-distribution-template.xml</TemplateFile>
-        <DistributionFile>$(PackagesIntermediateDir)$(TemplateFile)</DistributionFile>
-    </PropertyGroup>
-
-    <!-- Copy Resources directory to Package intermediate location-->
-    <MakeDir Condition="!Exists('$(ResourcePath')"
-             Directories="$(ResourcePath)" />
-    <ItemGroup>
-      <ResourceFiles Include="$(OSXScriptRoot)sharedframework/resources\**\*" />
-      <ResourceFiles Include="$(OSXScriptRoot)resources/**/*" />
-    </ItemGroup>
-
-    <Copy Sourcefiles="@(ResourceFiles)"
-          DestinationFolder="$(ResourcePath)/%(ResourceFiles.RecursiveDir)" />
-  
-    <!-- Replace Product brand in Conclusion file -->
-    <PropertyGroup>
-       <ConclusionPage>conclusion.html</ConclusionPage>
-    </PropertyGroup>
-    <ItemGroup>
-      <UIFiles Include="$(PackagesIntermediateDir)resources/**/*$(ConclusionPage)" />
-    </ItemGroup>
-        
-    <ReplaceFileContents
-        InputFile="%(UIFiles.Identity)"
-        DestinationFile="%(UIFiles.Identity)"
-        ReplacementPatterns="{SharedFxBrandName}"
-        ReplacementStrings="$(SharedFrameworkBrandName)" />
-
-    <ItemGroup>
-      <ConfigPattern Include="{SharedFxComponentId}" /> <ConfigReplace Include="$(SharedFxComponentId)" />
-      <ConfigPattern Include="{SharedHostComponentId}" /> <ConfigReplace Include="$(SharedHostComponentId)" />
-      <ConfigPattern Include="{HostFxrComponentId}" /> <ConfigReplace Include="$(HostFxrComponentId)" />
-      <ConfigPattern Include="{SharedFrameworkNugetName}" /> <ConfigReplace Include="$(SharedFrameworkName)'" />
-      <ConfigPattern Include="{SharedFrameworkNugetVersion}" /> <ConfigReplace Include="$(SharedFrameworkNugetVersion)" />
-      <ConfigPattern Include="{SharedFxBrandName}" /> <ConfigReplace Include="$(SharedFrameworkBrandName)" />
-      <ConfigPattern Include="{SharedHostBrandName}" /> <ConfigReplace Include="$(SharedHostBrandName)" />
-      <ConfigPattern Include="{HostFxrBrandName}" /> <ConfigReplace Include="$(HostFxrBrandName)" />      
-    </ItemGroup>
-
-    <ReplaceFileContents
-        InputFile="$(SharedFxScriptRoot)$(TemplateFile)"
-        DestinationFile="$(DistributionFile)"
-        ReplacementPatterns="@(ConfigPattern)"
-        ReplacementStrings="@(ConfigReplace)" />
-    
-    <Exec Command="productbuild --version $(ProductVersion) --identifier $(SharedPackageId) --package-path $(PackagesIntermediateDir) --resources $(ResourcePath) --distribution $(DistributionFile) $(OutFilePath)" />
-  </Target>
-
-</Project>
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/dotnetbackground.png b/src/installer/pkg/packaging/osx/sharedframework/resources/dotnetbackground.png
deleted file mode 100644
index 16a6bf22ba789..0000000000000
Binary files a/src/installer/pkg/packaging/osx/sharedframework/resources/dotnetbackground.png and /dev/null differ
diff --git a/src/installer/pkg/packaging/osx/sharedframework/scripts/postinstall b/src/installer/pkg/packaging/osx/sharedframework/scripts/postinstall
deleted file mode 100755
index 734abc33de6ec..0000000000000
--- a/src/installer/pkg/packaging/osx/sharedframework/scripts/postinstall
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the .NET Foundation under one or more agreements.
-# The .NET Foundation licenses this file to you under the MIT license.
-#
-
-PACKAGE=$1
-INSTALL_DESTINATION=$2
-
-# A temporary fix for the permissions issue(s)
-chmod -R 755 $INSTALL_DESTINATION/shared
-
-exit 0
diff --git a/src/installer/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml b/src/installer/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml
deleted file mode 100644
index b910e9f83de2b..0000000000000
--- a/src/installer/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<installer-gui-script minSpecVersion="1">
-    <title>{SharedFxBrandName} (x64)</title>
-    <background file="dotnetbackground.png" mime-type="image/png"/>
-    <options customize="never" require-scripts="false" />
-    <welcome file="welcome.html" mime-type="text/html" />
-    <conclusion file="conclusion.html" mime-type="text/html" />
-    <volume-check>
-        <allowed-os-versions>
-            <os-version min="10.13" />
-        </allowed-os-versions>
-    </volume-check>
-    <choices-outline>
-        <line choice="{SharedFxComponentId}.pkg" />
-        <line choice="{SharedHostComponentId}.pkg" />
-        <line choice="{HostFxrComponentId}.pkg" />
-    </choices-outline>
-    <choice id="{SharedFxComponentId}.pkg" visible="true" title="{SharedFxBrandName} (x64)" description="The .NET Shared Framework">
-        <pkg-ref id="{SharedFxComponentId}.pkg" />
-    </choice>
-    <choice id="{HostFxrComponentId}.pkg" visible="true" title="{HostFxrBrandName} (x64)" description="The .NET HostFxr">
-        <pkg-ref id="{HostFxrComponentId}.pkg" />
-    </choice>
-    <choice id="{SharedHostComponentId}.pkg" visible="true" title="{SharedHostBrandName} (x64)" description="The .NET Shared Host." >
-        <pkg-ref id="{SharedHostComponentId}.pkg" />
-    </choice>
-    <pkg-ref id="{SharedFxComponentId}.pkg">{SharedFxComponentId}.pkg</pkg-ref>
-    <pkg-ref id="{HostFxrComponentId}.pkg">{HostFxrComponentId}.pkg</pkg-ref>
-    <pkg-ref id="{SharedHostComponentId}.pkg">{SharedHostComponentId}.pkg</pkg-ref>
-</installer-gui-script>
diff --git a/src/installer/pkg/packaging/pack-managed.proj b/src/installer/pkg/packaging/pack-managed.proj
deleted file mode 100644
index acefdfff86d10..0000000000000
--- a/src/installer/pkg/packaging/pack-managed.proj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-  </PropertyGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-  <!--
-    Ensure managed binaries are signed (if necessary) then call the Pack target on them. These
-    packages are used in other parts of the build, so this can't wait for Arcade's Pack stage.
-  -->
-  <Target Name="Build">
-    <MSBuild Projects="$(SigningToolsDir)\SignBinaries.proj" Targets="Build" />
-
-    <ItemGroup>
-      <ManagedProject Include="$(InstallerProjectRoot)managed\**\*.csproj" />
-    </ItemGroup>
-
-    <MSBuild Projects="@(ManagedProject)" Targets="Pack" />
-  </Target>
-
-</Project>
diff --git a/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json
deleted file mode 100644
index 2b2d08b4f29e7..0000000000000
--- a/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "maintainer_name": ".NET Team",
-  "maintainer_email": "dotnetpackages@dotnetfoundation.org",
-  "vendor": ".NET Foundation",
-  
-  "package_name": "%HOSTFXR_RPM_PACKAGE_NAME%",
-  "install_root": "/usr/share/dotnet",
-  "install_doc": "/usr/share/doc/%HOSTFXR_RPM_PACKAGE_NAME%/",
-  
-  "short_description": "%HOSTFXR_BRAND_NAME% %HOSTFXR_NUGET_VERSION%",
-  "long_description": ".NET is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.",
-  "homepage": "https://github.com/dotnet/core",
-  
-  "release":{
-        "package_version":"1.0.0.0",
-        "package_revision":"%HOSTFXR_REVISION%",
-        "urgency" : "low",
-        "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes"
-  },
-  
-  "control": {
-        "priority":"standard",
-        "section":"libs",
-        "architecture":"amd64"
-  },
-  
-  "copyright": "2017 Microsoft",
-  
-  "license": {
-    "type": "MIT and ASL 2.0 and BSD",
-    "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-  },
-  
-  "rpm_dependencies": [{
-      "package_name": "dotnet-host",
-      "package_version": "%SHARED_HOST_RPM_VERSION%"
-    }],
-
-  "directories" : [
-        "/usr/share/dotnet/host",
-        "/usr/share/doc/%HOSTFXR_RPM_PACKAGE_NAME%"
-    ]
-}
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_centos.7-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_centos.7-x64.json
deleted file mode 100644
index 2ab384b5923d7..0000000000000
--- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_centos.7-x64.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "maintainer_name": ".NET Team",
-    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
-    "vendor": ".NET Foundation",
-
-    "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%",
-    "install_root": "/usr/share/dotnet",
-
-    "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%",
-    "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.",
-    "homepage": "https://dot.net/core",
-
-    "release":{
-        "package_version":"1.0.0.0",
-        "package_revision":"%RUNTIME_DEPS_REVISION%",
-        "urgency" : "low",
-        "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes"
-    },
-
-    "control": {
-        "priority":"standard",
-        "section":"libs",
-        "architecture":"amd64"
-    },
-
-    "copyright": "2018 Microsoft",
-    "license": {
-        "type": "MIT",
-        "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-    },
-    
-    "rpm_dependencies":[{
-        "package_name": "openssl-libs",
-        "package_version": ""
-    },
-    {
-        "package_name": "libicu",
-        "package_version": ""
-    },
-    {
-        "package_name": "krb5-libs",
-        "package_version": ""
-    }]
-}
diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_fedora.27-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_fedora.27-x64.json
deleted file mode 100644
index fb1c925c70648..0000000000000
--- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_fedora.27-x64.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "maintainer_name": ".NET Team",
-    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
-    "vendor": ".NET Foundation",
-
-    "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%",
-    "install_root": "/usr/share/dotnet",
-
-    "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%",
-    "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.",
-    "homepage": "https://dot.net/core",
-
-    "release":{
-        "package_version":"1.0.0.0",
-        "package_revision":"%RUNTIME_DEPS_REVISION%",
-        "urgency" : "low",
-        "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes"
-    },
-
-    "control": {
-        "priority":"standard",
-        "section":"libs",
-        "architecture":"amd64"
-    },
-
-    "copyright": "2018 Microsoft",
-    "license": {
-        "type": "MIT",
-        "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-    },
-    
-    "rpm_dependencies":[{
-        "package_name": "compat-openssl10",
-        "package_version": ""
-    },
-    {
-        "package_name": "libicu",
-        "package_version": ""
-    },
-    {
-        "package_name": "krb5-libs",
-        "package_version": ""
-    }]
-}
diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_opensuse.42-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_opensuse.42-x64.json
deleted file mode 100644
index 1c208459b79dd..0000000000000
--- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_opensuse.42-x64.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "maintainer_name": ".NET Team",
-    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
-    "vendor": ".NET Foundation",
-
-    "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%",
-    "install_root": "/usr/share/dotnet",
-
-    "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%",
-    "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.",
-    "homepage": "https://dot.net/core",
-
-    "release":{
-        "package_version":"1.0.0.0",
-        "package_revision":"%RUNTIME_DEPS_REVISION%",
-        "urgency" : "low",
-        "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes"
-    },
-
-    "control": {
-        "priority":"standard",
-        "section":"libs",
-        "architecture":"amd64"
-    },
-
-    "copyright": "2018 Microsoft",
-    "license": {
-        "type": "MIT",
-        "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-    },
-    
-    "rpm_dependencies":[{
-        "package_name": "libopenssl1_0_0",
-        "package_version": ""
-    },
-    {
-        "package_name": "libicu",
-        "package_version": ""
-    },
-    {
-        "package_name": "krb5",
-        "package_version": ""
-    }]
-}
diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_oraclelinux.7-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_oraclelinux.7-x64.json
deleted file mode 100644
index 2ab384b5923d7..0000000000000
--- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_oraclelinux.7-x64.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "maintainer_name": ".NET Team",
-    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
-    "vendor": ".NET Foundation",
-
-    "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%",
-    "install_root": "/usr/share/dotnet",
-
-    "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%",
-    "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.",
-    "homepage": "https://dot.net/core",
-
-    "release":{
-        "package_version":"1.0.0.0",
-        "package_revision":"%RUNTIME_DEPS_REVISION%",
-        "urgency" : "low",
-        "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes"
-    },
-
-    "control": {
-        "priority":"standard",
-        "section":"libs",
-        "architecture":"amd64"
-    },
-
-    "copyright": "2018 Microsoft",
-    "license": {
-        "type": "MIT",
-        "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-    },
-    
-    "rpm_dependencies":[{
-        "package_name": "openssl-libs",
-        "package_version": ""
-    },
-    {
-        "package_name": "libicu",
-        "package_version": ""
-    },
-    {
-        "package_name": "krb5-libs",
-        "package_version": ""
-    }]
-}
diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_rhel.7-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_rhel.7-x64.json
deleted file mode 100644
index 2ab384b5923d7..0000000000000
--- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_rhel.7-x64.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "maintainer_name": ".NET Team",
-    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
-    "vendor": ".NET Foundation",
-
-    "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%",
-    "install_root": "/usr/share/dotnet",
-
-    "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%",
-    "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.",
-    "homepage": "https://dot.net/core",
-
-    "release":{
-        "package_version":"1.0.0.0",
-        "package_revision":"%RUNTIME_DEPS_REVISION%",
-        "urgency" : "low",
-        "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes"
-    },
-
-    "control": {
-        "priority":"standard",
-        "section":"libs",
-        "architecture":"amd64"
-    },
-
-    "copyright": "2018 Microsoft",
-    "license": {
-        "type": "MIT",
-        "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-    },
-    
-    "rpm_dependencies":[{
-        "package_name": "openssl-libs",
-        "package_version": ""
-    },
-    {
-        "package_name": "libicu",
-        "package_version": ""
-    },
-    {
-        "package_name": "krb5-libs",
-        "package_version": ""
-    }]
-}
diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_sles.12-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_sles.12-x64.json
deleted file mode 100644
index fc854bb6c957d..0000000000000
--- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_sles.12-x64.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "maintainer_name": ".NET Team",
-    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
-    "vendor": ".NET Foundation",
-
-    "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%",
-    "install_root": "/usr/share/dotnet",
-
-    "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%",
-    "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.",
-    "homepage": "https://dot.net/core",
-
-    "release":{
-        "package_version":"1.0.0.0",
-        "package_revision":"%RUNTIME_DEPS_REVISION%",
-        "urgency" : "low",
-        "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes"
-    },
-
-    "control": {
-        "priority":"standard",
-        "section":"libs",
-        "architecture":"amd64"
-    },
-
-    "copyright": "2018 Microsoft",
-    "license": {
-        "type": "MIT",
-        "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-    },
-    
-    "rpm_dependencies":[{
-        "package_name": "libopenssl1_1",
-        "package_version": ""
-    },
-    {
-        "package_name": "libicu",
-        "package_version": ""
-    },
-    {
-        "package_name": "krb5",
-        "package_version": ""
-    }]
-}
diff --git a/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json
deleted file mode 100644
index e41d25617c87f..0000000000000
--- a/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "maintainer_name": ".NET Team",
-    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
-    "vendor": ".NET Foundation",
-
-    "package_name": "%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%",
-    "install_root": "/usr/share/dotnet",
-    "install_doc": "/usr/share/doc/%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%/",
-
-    "short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME%",
-    "long_description": ".NET is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.",
-    "homepage": "https://github.com/dotnet/core",
-
-    "release":{
-        "package_version":"1.0.0.0",
-        "package_revision":"%SHARED_FRAMEWORK_REVISION%",
-        "urgency" : "low",
-        "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes"
-    },
-   
-    "control": {
-        "priority":"standard",
-        "section":"libs",
-        "architecture":"amd64"
-    },
-
-    "copyright": "2017 Microsoft",
-    "license": {
-        "type": "MIT and ASL 2.0 and BSD",
-        "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-    },
-    
-  "rpm_dependencies": [{
-      "package_name": "%HOSTFXR_RPM_PACKAGE_NAME%",
-      "package_version": "%HOSTFXR_NUGET_VERSION%"
-      },
-      {
-       "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%",
-       "package_version": "%RUNTIME_DEPS_VERSION%"
-      }],
-   
-    "directories" : [
-        "/usr/share/dotnet/shared",
-        "/usr/share/doc/%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%"
-    ]
-}
diff --git a/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json
deleted file mode 100644
index e443287e6594f..0000000000000
--- a/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "maintainer_name": ".NET Team",
-    "maintainer_email": "dotnetpackages@dotnetfoundation.org",
-    "vendor": ".NET Foundation",
-
-    "package_name": "dotnet-host",
-    "install_root": "/",
-    "install_doc": "/usr/share/doc/dotnet-host/",
-    "install_man": "/usr/share/man/man1",
-
-    "short_description": "%SHARED_HOST_BRAND_NAME%",
-    "long_description": ".NET is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.",
-    "homepage": "https://github.com/dotnet/core",
-
-    "release":{
-        "package_version":"1.0.0.0",
-        "package_revision":"%SHARED_HOST_REVISION%",
-        "urgency" : "low",
-        "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes"
-    },
-    
-    "control": {
-        "priority":"standard",
-        "section":"libs",
-        "architecture":"amd64"
-    },
-
-    "copyright": "2017 Microsoft",
-    "license": {
-        "type": "MIT and ASL 2.0 and BSD",
-        "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-    },
-
-    "package_conflicts" : [
-        "dotnet",
-        "dotnet-nightly"
-    ],
-
-    "directories" : [
-        "/usr/share/dotnet",
-        "/usr/share/doc/dotnet-host"
-    ]
-}
diff --git a/src/installer/pkg/packaging/rpm/package.props b/src/installer/pkg/packaging/rpm/package.props
deleted file mode 100644
index 90ab81b71917a..0000000000000
--- a/src/installer/pkg/packaging/rpm/package.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <rpmConfigJsonName>rpm_config.json</rpmConfigJsonName>
-    <rpmPackagingConfigPath>$(PackagingRoot)rpm/</rpmPackagingConfigPath>
-    <SharedHostRpmPkgName>dotnet-host</SharedHostRpmPkgName>
-    <SharedHostRpmPkgName>$(SharedHostRpmPkgName.ToLower())</SharedHostRpmPkgName>
-
-    <TemplatesDir>$(RpmTemplatesDir)</TemplatesDir>
-    <ScriptsDir>$(MSBuildThisFileDirectory)/scripts</ScriptsDir>
-  </PropertyGroup>
-</Project>
diff --git a/src/installer/pkg/packaging/rpm/package.targets b/src/installer/pkg/packaging/rpm/package.targets
deleted file mode 100644
index 85cbbb5795fa6..0000000000000
--- a/src/installer/pkg/packaging/rpm/package.targets
+++ /dev/null
@@ -1,434 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<Import Project='package.props' />
-
-  <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(InstallerTasksAssemblyPath)"/>
-  <UsingTask TaskName="BuildFPMToolPreReqs" AssemblyFile="$(InstallerTasksAssemblyPath)"/>
-
-  <Target Name="GenerateRpms"
-          DependsOnTargets="TestFPMTool;BuildRpms;"
-          Condition="'$(BuildRpmPackage)'=='true'" />
-  
-  <Target Name="GenerateRuntimeRpms" 
-          DependsOnTargets="
-            GetInstallerBrandingNames;
-            GenerateSharedHostRpm;
-            GenerateHostFxrRpm;
-            GenerateSharedFrameworkRpm"
-          Condition="'$(BuildRuntimeRpms)' == 'true'" />
-
-  <Target Name="BuildRpms"
-          DependsOnTargets="GenerateRuntimeRpms; GenerateRuntimeDependenciesRpms"
-          Condition="'$(BuildRpmPackage)'=='true' and '$(FPMPresent)'=='true'" />
-
-  <Target Name="GenerateSharedHostRpm">
-    <PropertyGroup>
-      <RpmPackageName>$(SharedHostRpmPkgName)</RpmPackageName>
-      <RpmPackageVersion>$(HostPackageVersion)</RpmPackageVersion>
-      <InputRoot>$(SharedHostPublishRoot)</InputRoot>
-      <RpmFile>$(SharedHostInstallerFile)</RpmFile>
-      <ConfigJsonName>dotnet-sharedhost-rpm_config.json</ConfigJsonName>
-      <ConfigJsonFile>$(rpmPackagingConfigPath)$(ConfigJsonName)</ConfigJsonFile>
-      <RpmIntermediatesDir>$(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion)</RpmIntermediatesDir>
-      <UsrShareDotnetPath>usr/share/dotnet/</UsrShareDotnetPath>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <rpmLayoutDirectory>$(RpmIntermediatesDir)/rpmLayoutDirectory/</rpmLayoutDirectory>
-      <rpmLayoutPackageRoot>$(rpmLayoutDirectory)package_root/</rpmLayoutPackageRoot>
-      <rpmLayoutUsrShareDotnetDir>$(rpmLayoutPackageRoot)$(UsrShareDotnetPath)</rpmLayoutUsrShareDotnetDir>
-      <rpmLayoutUsrBinDir>$(rpmLayoutPackageRoot)usr/bin/</rpmLayoutUsrBinDir>
-      <rpmLayoutDocs>$(rpmLayoutDirectory)docs</rpmLayoutDocs>                <!-- Man Pages -->
-      <rpmLayoutTemplates>$(rpmLayoutDirectory)templates</rpmLayoutTemplates> <!-- Copyright, Changelog -->
-    </PropertyGroup>
-
-    <RemoveDir Condition="Exists('$(RpmIntermediatesDir)')" Directories="$(RpmIntermediatesDir)" />
-    <MakeDir Directories="$(RpmIntermediatesDir)" />
-    
-    <!-- Create empty rpm layout -->
-    <RemoveDir Condition="Exists('$(rpmLayoutDirectory)')" Directories="$(rpmLayoutDirectory)" />
-    <MakeDir Directories="$(rpmLayoutDirectory)" />
-    <MakeDir Directories="$(rpmLayoutPackageRoot)" />
-    <MakeDir Directories="$(rpmLayoutUsrShareDotnetDir)" />
-    <MakeDir Directories="$(rpmLayoutUsrBinDir)" />
-    <MakeDir Directories="$(rpmLayoutDocs)" />
-    <MakeDir Directories="$(rpmLayoutTemplates)" />
-
-    <!-- Copy files to rpm layout -->
-    <ItemGroup>
-        <SHFiles Include="$(InputRoot)/**/*" />
-        <SHManpages Include="$(ManPagesDir)/**/*" />
-        <SHTemplatesFiles Include="$(TemplatesDir)/**/*" />
-    </ItemGroup>
-
-    <!--
-      Detect no files being found and emit an early error to avoid breaking the build in a way that
-      prevents binlog publish in the official build.
-
-      We create a temporary symlink before calling FPM, and if FPM fails due to not finding some of
-      these files, the build terminates before deleting the symlink. The symlink causes the 'find'
-      command to fail. AzDO uses 'find' to find the binlogs, so we get into a bad state.
-    -->
-    <Error Condition="'@(SHFiles)' == ''" Text="No SHFiles found." />
-    <Error Condition="'@(SHManpages)' == ''" Text="No SHManpages found." />
-    <Error Condition="'@(SHTemplatesFiles)' == ''" Text="No SHTemplatesFiles found." />
-
-    <Copy SourceFiles="@(SHFiles)" DestinationFiles="@(SHFiles->'$(rpmLayoutUsrShareDotnetDir)/%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(SHManpages)" DestinationFiles="@(SHManpages->'$(rpmLayoutDocs)/%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(SHTemplatesFiles)" DestinationFiles="@(SHTemplatesFiles->'$(rpmLayoutTemplates)/%(RecursiveDir)%(Filename)%(Extension)')" />
-
-    <!--
-      Create symlink so the dotnet host is in PATH. It points to where dotnet will be installed, so
-      it may seem to point to the wrong place in the build machine's layout.
-    -->
-    <Exec Command="ln -sf &quot;/$(UsrShareDotnetPath)dotnet&quot; &quot;$(rpmLayoutUsrBinDir)dotnet&quot;" />
-
-    <!-- Replace config json variables -->
-    <ItemGroup>
-      <SharedHostTokenValue Include="%SHARED_HOST_BRAND_NAME%">
-        <ReplacementString>$(SharedHostBrandName)</ReplacementString>
-      </SharedHostTokenValue>
-      <SharedHostTokenValue Include="%SHARED_HOST_REVISION%">
-        <ReplacementString>$(HostPackageRelease)</ReplacementString>
-      </SharedHostTokenValue>
-    </ItemGroup>
-
-    <ReplaceFileContents InputFile="$(ConfigJsonFile)"
-                         DestinationFile="$(rpmLayoutDirectory)$(rpmConfigJsonName)"
-                         ReplacementItems="@(SharedHostTokenValue)" />
-    
-    <!-- Call the task to build the pre-reqs (parameters, copyright, changelog) for calling the FPM tool -->
-    <BuildFPMToolPreReqs  InputDir="$(rpmLayoutDirectory)"
-                          OutputDir="$(RpmIntermediatesDir)"
-                          PackageVersion="$(RpmPackageVersion)"
-                          ConfigJsonFile="$(rpmLayoutDirectory)$(rpmConfigJsonName)">
-                          <Output TaskParameter="FPMParameters" PropertyName="FPMCmdParameters" />
-    </BuildFPMToolPreReqs>
-
-    <!-- Build the RPM package by calling the FPM tool and passing the parameter list -->
-    <Exec Command="fpm $(FPMCmdParameters)" WorkingDirectory="$(RpmIntermediatesDir)" />
-
-   <!-- Copy package to output -->   
-    <ItemGroup>
-      <GeneratedRpmFiles Remove="@(GeneratedRpmFiles)" />
-      <GeneratedRpmFiles Include="$(RpmIntermediatesDir)/*.rpm" />
-    </ItemGroup>
-
-    <Error Text="@(GeneratedRpmFiles->Count()) .rpm files generated." Condition="'@(GeneratedRpmFiles->Count())' != 1" />
-
-    <Copy SourceFiles="@(GeneratedRpmFiles)"
-          DestinationFiles="$(RpmFile)"
-          OverwriteReadOnlyFiles="True"
-          SkipUnchangedFiles="False"
-          UseHardlinksIfPossible="False" />
-
-    <!--
-      Clean up dotnet symlink. Later build steps are confused and fail because the symlink points to
-      a path that doesn't exist on the build machine.
-    -->
-    <Delete Files="$(rpmLayoutUsrBinDir)dotnet" />
-  </Target>
-
-  <Target Name="GenerateHostFxrRpm">
-    <PropertyGroup>
-      <RpmPackageName>$(HostFxrRpmPkgName)</RpmPackageName>
-      <RpmPackageVersion>$(HostResolverPackageVersion)</RpmPackageVersion>
-      <InputRoot>$(HostFxrPublishRoot)</InputRoot>
-      <RpmFile>$(HostFxrInstallerFile)</RpmFile>
-      <ConfigJsonName>dotnet-hostfxr-rpm_config.json</ConfigJsonName>
-      <ConfigJsonFile>$(rpmPackagingConfigPath)$(ConfigJsonName)</ConfigJsonFile>
-      <RpmIntermediatesDir>$(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion)</RpmIntermediatesDir>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <rpmLayoutDirectory>$(RpmIntermediatesDir)/rpmLayoutDirectory/</rpmLayoutDirectory>
-      <rpmLayoutPackageRoot>$(rpmLayoutDirectory)package_root</rpmLayoutPackageRoot>
-      <rpmLayoutDocs>$(rpmLayoutDirectory)docs</rpmLayoutDocs>
-      <rpmLayoutTemplates>$(rpmLayoutDirectory)templates</rpmLayoutTemplates> <!-- Copyright, Changelog -->
-    </PropertyGroup>
-
-    <RemoveDir Condition="Exists('$(RpmIntermediatesDir)')" Directories="$(RpmIntermediatesDir)" />
-    <MakeDir Directories="$(RpmIntermediatesDir)" />
-
-    <!-- Create empty rpm layout -->
-    <RemoveDir Condition="Exists('$(rpmLayoutDirectory)')" Directories="$(rpmLayoutDirectory)" />
-    <MakeDir Directories="$(rpmLayoutDirectory)" />
-    <MakeDir Directories="$(rpmLayoutPackageRoot)" />
-    <MakeDir Directories="$(rpmLayoutDocs)" />
-    <MakeDir Directories="$(rpmLayoutTemplates)" />
-
-    <!-- Copy files to rpm layout -->
-    <ItemGroup>
-        <HFFiles Include="$(InputRoot)/**/*" />
-        <HFTemplatesFiles Include="$(TemplatesDir)/**/*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(HFFiles)" DestinationFiles="@(HFFiles->'$(rpmLayoutPackageRoot)/%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(HFTemplatesFiles)" DestinationFiles="@(HFTemplatesFiles->'$(rpmLayoutTemplates)/%(RecursiveDir)%(Filename)%(Extension)')" />
-
-    <!-- Replace config json variables -->
-    <ItemGroup>
-      <HostFxrTokenValue Include="%HOSTFXR_BRAND_NAME%">
-        <ReplacementString>$(HostFxrBrandName)</ReplacementString>
-      </HostFxrTokenValue>
-      <HostFxrTokenValue Include="%SHARED_HOST_RPM_VERSION%">
-        <ReplacementString>$(HostPackageVersion)</ReplacementString>
-      </HostFxrTokenValue>
-      <HostFxrTokenValue Include="%HOSTFXR_NUGET_VERSION%">
-        <ReplacementString>$(HostResolverPackageVersion)</ReplacementString>
-      </HostFxrTokenValue>
-      <HostFxrTokenValue Include="%HOSTFXR_RPM_PACKAGE_NAME%">
-        <ReplacementString>$(RpmPackageName)</ReplacementString>
-      </HostFxrTokenValue>
-      <HostFxrTokenValue Include="%HOSTFXR_REVISION%">
-        <ReplacementString>$(HostResolverPackageRelease)</ReplacementString>
-      </HostFxrTokenValue>
-    </ItemGroup>
-
-    <ReplaceFileContents InputFile="$(ConfigJsonFile)"
-                         DestinationFile="$(rpmLayoutDirectory)$(rpmConfigJsonName)"
-                         ReplacementItems="@(HostFxrTokenValue)" />
-
-    <!-- Call the task to build the pre-reqs (parameters, copyright, changelog) for calling the FPM tool -->
-    <BuildFPMToolPreReqs  InputDir="$(rpmLayoutDirectory)"
-                          OutputDir="$(RpmIntermediatesDir)"
-                          PackageVersion="$(RpmPackageVersion)"
-                          ConfigJsonFile="$(rpmLayoutDirectory)$(rpmConfigJsonName)">
-                          <Output TaskParameter="FPMParameters" PropertyName="FPMCmdParameters" />
-    </BuildFPMToolPreReqs>
-
-    <!-- Build the RPM package by calling the FPM tool and passing the parameter list -->
-    <Exec Command="fpm $(FPMCmdParameters)"  WorkingDirectory="$(RpmIntermediatesDir)" />
-    
-    <!-- Copy package to output -->
-    <ItemGroup>
-      <GeneratedRpmFiles Remove="@(GeneratedRpmFiles)" />
-      <GeneratedRpmFiles Include="$(RpmIntermediatesDir)/*.rpm" />
-    </ItemGroup>
-
-    <Error Text="@(GeneratedRpmFiles->Count()) .rpm files generated." Condition="'@(GeneratedRpmFiles->Count())' != 1" />
-
-    <Copy SourceFiles="@(GeneratedRpmFiles)"
-          DestinationFiles="$(RpmFile)"
-          OverwriteReadOnlyFiles="True"
-          SkipUnchangedFiles="False"
-          UseHardlinksIfPossible="False" />
-
-  </Target>
-
-  <Target Name="GenerateSharedFrameworkRpm">
-    <PropertyGroup>
-      <RpmPackageName>$(SharedFxRpmPkgName)</RpmPackageName>
-      <RpmPackageVersion>$(RuntimePackageVersion)</RpmPackageVersion>
-      <InputRoot>$(SharedFrameworkPublishRoot)</InputRoot>
-      <RpmFile>$(SharedFrameworkInstallerFile)</RpmFile>
-      <ConfigJsonName>dotnet-sharedframework-rpm_config.json</ConfigJsonName>
-      <ConfigJsonFile>$(rpmPackagingConfigPath)$(ConfigJsonName)</ConfigJsonFile>
-      <RpmIntermediatesDir>$(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion)</RpmIntermediatesDir>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <rpmLayoutDirectory>$(RpmIntermediatesDir)/rpmLayoutDirectory/</rpmLayoutDirectory>
-      <rpmLayoutPackageRoot>$(rpmLayoutDirectory)package_root</rpmLayoutPackageRoot>
-      <rpmLayoutDocs>$(rpmLayoutDirectory)docs</rpmLayoutDocs>
-      <rpmLayoutTemplates>$(rpmLayoutDirectory)templates</rpmLayoutTemplates> <!-- Copyright, Changelog -->
-    </PropertyGroup>
-
-    <RemoveDir Condition="Exists('$(RpmIntermediatesDir)')" Directories="$(RpmIntermediatesDir)" />
-    <MakeDir Directories="$(RpmIntermediatesDir)" />
-
-    <!-- Create empty rpm layout -->
-    <RemoveDir Condition="Exists('$(rpmLayoutDirectory)')" Directories="$(rpmLayoutDirectory)" />
-    <MakeDir Directories="$(rpmLayoutDirectory)" />
-    <MakeDir Directories="$(rpmLayoutPackageRoot)" />
-    <MakeDir Directories="$(rpmLayoutDocs)" />
-    <MakeDir Directories="$(rpmLayoutTemplates)" />
-
-    <!-- Copy files to rpm layout -->
-    <ItemGroup>
-        <SFFiles Include="$(InputRoot)/**/*" />
-        <SFTemplatesFiles Include="$(TemplatesDir)/**/*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(SFFiles)" DestinationFiles="@(SFFiles->'$(rpmLayoutPackageRoot)/%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(SFTemplatesFiles)" DestinationFiles="@(SFTemplatesFiles->'$(rpmLayoutTemplates)/%(RecursiveDir)%(Filename)%(Extension)')" />
-
-    <!-- Replace config json variables -->
-    <ItemGroup>
-      <SharedFrameworkTokenValue Include="%HOSTFXR_RPM_PACKAGE_NAME%">
-        <ReplacementString>$(HostFxrRpmPkgName)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%HOSTFXR_NUGET_VERSION%">
-        <ReplacementString>$(HostResolverPackageVersion)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%RUNTIME_DEPS_RPM_PACKAGE_NAME%">
-        <ReplacementString>$(RuntimeDependenciesRpmPkgName)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%RUNTIME_DEPS_VERSION%">
-        <ReplacementString>$(RuntimeDepsRpmPackageVersion)</ReplacementString> 
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%">
-        <ReplacementString>$(SharedFxRpmPkgName)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%SHARED_FRAMEWORK_NUGET_NAME%">
-        <ReplacementString>$(SharedFrameworkName)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%SHARED_FRAMEWORK_NUGET_VERSION%">
-        <ReplacementString>$(RuntimePackageVersion)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%SHARED_FRAMEWORK_BRAND_NAME%">
-        <ReplacementString>$(SharedFrameworkBrandName)</ReplacementString>
-      </SharedFrameworkTokenValue>
-      <SharedFrameworkTokenValue Include="%SHARED_FRAMEWORK_REVISION%">
-        <ReplacementString>$(RuntimePackageRelease)</ReplacementString>
-      </SharedFrameworkTokenValue>
-    </ItemGroup>
-
-    <ReplaceFileContents InputFile="$(ConfigJsonFile)"
-                         DestinationFile="$(rpmLayoutDirectory)$(rpmConfigJsonName)"
-                         ReplacementItems="@(SharedFrameworkTokenValue)" />
-
-    <!-- Call the task to build the pre-reqs (parameters, copyright, changelog) for calling the FPM tool -->
-    <BuildFPMToolPreReqs  InputDir="$(rpmLayoutDirectory)"
-                          OutputDir="$(RpmIntermediatesDir)"
-                          PackageVersion="$(RpmPackageVersion)"
-                          ConfigJsonFile="$(rpmLayoutDirectory)$(rpmConfigJsonName)">
-                          <Output TaskParameter="FPMParameters" PropertyName="FPMCmdParameters" />
-    </BuildFPMToolPreReqs>
-
-    <!-- Build the RPM package by calling the FPM tool and passing the parameter list -->
-    <Exec Command="fpm $(FPMCmdParameters)"  WorkingDirectory="$(RpmIntermediatesDir)" />
-    
-    <!-- Copy package to output -->
-    <ItemGroup>
-      <GeneratedRpmFiles Remove="@(GeneratedRpmFiles)" />
-      <GeneratedRpmFiles Include="$(RpmIntermediatesDir)/*.rpm" />
-    </ItemGroup>
-
-    <Error Text="@(GeneratedRpmFiles->Count()) .rpm files generated." Condition="'@(GeneratedRpmFiles->Count())' != 1" />
-
-    <Copy SourceFiles="@(GeneratedRpmFiles)"
-          DestinationFiles="$(RpmFile)"
-          OverwriteReadOnlyFiles="True"
-          SkipUnchangedFiles="False"
-          UseHardlinksIfPossible="False" />
-
-  </Target>
-  
-  <Target Name="GenerateRuntimeDependenciesRpms">
-
-    <PropertyGroup>
-      <SharedProperties>
-        rpmPackagingConfigPath=$(rpmPackagingConfigPath);
-        DotnetRuntimeDependenciesPackageInstallerFile=$(DotnetRuntimeDependenciesPackageInstallerFile);
-        OutputRid=$(OutputRid);
-        RuntimeDependenciesRpmPkgName=$(RuntimeDependenciesRpmPkgName);
-        RuntimeDepsRpmPackageVersion=$(RuntimeDepsRpmPackageVersion);
-        RuntimeDepsRpmPackageRelease=$(RuntimeDepsRpmPackageRelease);
-        TemplatesDir=$(TemplatesDir)
-      </SharedProperties>
-      <DepsConfigFilePrefix>dotnet-runtime-deps-rpm_config_</DepsConfigFilePrefix>
-    </PropertyGroup>
-
-    <!-- non-portable build - build a single dotnet-runtime-deps package using OutputRid -->
-    <ItemGroup Condition="'$(PortableBuild)' != 'true'">
-      <DepsProjects Include="$(MSBuildProjectFullPath)">
-        <Properties>DepsRid=$(OutputRid);$(SharedProperties)</Properties>
-      </DepsProjects>
-    </ItemGroup>
-
-    <!-- portable build - build all dotnet-runtime-deps packages for all targets discovered in config filenames -->
-    <ItemGroup Condition="'$(PortableBuild)' == 'true'">
-      <ConfigJsonFilenames Include="$(rpmPackagingConfigPath)$(DepsConfigFilePrefix)*.json" />
-      <Rids Include="$([System.Text.RegularExpressions.Regex]::Match('%(ConfigJsonFilenames.Filename)', '$(DepsConfigFilePrefix)([A-Za-z0-9_\-\.]+)').Groups[1].Value)" />
-      <DepsProjects Include="$(MSBuildProjectFullPath)">
-        <Properties>DepsRid=%(Rids.Identity);$(SharedProperties)</Properties>
-      </DepsProjects>
-    </ItemGroup>
-
-    <MSBuild Projects="@(DepsProjects)" Targets="GenerateSingleRuntimeDependenciesRpm" />
-
-  </Target>
-
-  <Target Name="GenerateSingleRuntimeDependenciesRpm">
-    <PropertyGroup>
-      <RpmFile>$([System.String]::Copy('$(DotnetRuntimeDependenciesPackageInstallerFile)').Replace('$(OutputRid)', '$(DepsRid)'))</RpmFile>
-      <RpmPackageName>$(RuntimeDependenciesRpmPkgName)</RpmPackageName>
-      <RpmPackageVersion>$(RuntimeDepsRpmPackageVersion)</RpmPackageVersion>
-      <ConfigJsonName>dotnet-runtime-deps-rpm_config_$(DepsRid).json</ConfigJsonName>
-      <ConfigJsonFile>$(rpmPackagingConfigPath)$(ConfigJsonName)</ConfigJsonFile>
-      <RpmIntermediatesDir>$(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion)</RpmIntermediatesDir>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <RpmLayoutDirectory>$(RpmIntermediatesDir)/rpmLayoutDirectory/</RpmLayoutDirectory>
-      <RpmLayoutPackageRoot>$(RpmLayoutDirectory)package_root</RpmLayoutPackageRoot>
-      <RpmLayoutDocs>$(RpmLayoutDirectory)docs</RpmLayoutDocs>
-      <RpmLayoutTemplates>$(RpmLayoutDirectory)templates</RpmLayoutTemplates> <!-- Copyright, Changelog -->
-    </PropertyGroup>
-
-    <!-- Error out if the configuration file doesn't exist -->
-    <Error Condition="!Exists('$(ConfigJsonFile)')" Text="Config file does not exist : '$(ConfigJsonFile)'" />
-
-    <RemoveDir Condition="Exists('$(RpmIntermediatesDir)')" Directories="$(RpmIntermediatesDir)" />
-    <MakeDir Directories="$(RpmIntermediatesDir)" />
-
-    <!-- Create empty rpm layout -->
-    <RemoveDir Condition="Exists('$(RpmLayoutDirectory)')" Directories="$(RpmLayoutDirectory)" />
-    <MakeDir Directories="$(RpmLayoutDirectory)" />
-    <MakeDir Directories="$(RpmLayoutPackageRoot)" />
-    <MakeDir Directories="$(RpmLayoutDocs)" />
-    <MakeDir Directories="$(RpmLayoutTemplates)" />
-    
-     <!-- Copy files to rpm layout -->
-    <ItemGroup>
-         <RDTemplatesFiles Include="$(TemplatesDir)/**/*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(RDTemplatesFiles)" DestinationFiles="@(RDTemplatesFiles->'$(RpmLayoutTemplates)/%(RecursiveDir)%(Filename)%(Extension)')" />
-
-    <!-- Replace config json variables -->
-    <ItemGroup>
-      <RuntimeDependenciesTokenValue Include="%RUNTIME_DEPS_RPM_PACKAGE_NAME%">
-        <ReplacementString>$(RpmPackageName)</ReplacementString>
-      </RuntimeDependenciesTokenValue>
-      <RuntimeDependenciesTokenValue Include="%RUNTIME_DEPS_VERSION%">
-        <ReplacementString>$(RuntimeDepsRpmPackageVersion)</ReplacementString> 
-      </RuntimeDependenciesTokenValue>
-      <RuntimeDependenciesTokenValue Include="%RUNTIME_DEPS_REVISION%">
-        <ReplacementString>$(RuntimeDepsRpmPackageRelease)</ReplacementString>
-      </RuntimeDependenciesTokenValue>
-    </ItemGroup>
-    
-    <ReplaceFileContents InputFile="$(ConfigJsonFile)"
-                         DestinationFile="$(RpmLayoutDirectory)$(rpmConfigJsonName)"
-                         ReplacementItems="@(RuntimeDependenciesTokenValue)" />
-
-    <!-- Call the task to build the pre-reqs (parameters, copyright, changelog) for calling the FPM tool -->
-    <BuildFPMToolPreReqs  InputDir="$(RpmLayoutDirectory)"
-                          OutputDir="$(RpmIntermediatesDir)"
-                          PackageVersion="$(RpmPackageVersion)"
-                          ConfigJsonFile="$(RpmLayoutDirectory)$(rpmConfigJsonName)">
-                          <Output TaskParameter="FPMParameters" PropertyName="FPMCmdParameters" />
-    </BuildFPMToolPreReqs>
-
-    <!-- Build the RPM package by calling the FPM tool and passing the parameter list -->
-    <Exec Command="fpm $(FPMCmdParameters)"  WorkingDirectory="$(RpmIntermediatesDir)" />
-
-    <!-- Copy package to output -->
-    <ItemGroup>
-      <GeneratedRpmFiles Remove="@(GeneratedRpmFiles)" />
-      <GeneratedRpmFiles Include="$(RpmIntermediatesDir)/*.rpm" />
-    </ItemGroup>
-
-    <Error Text="@(GeneratedRpmFiles->Count()) .rpm files generated." Condition="'@(GeneratedRpmFiles->Count())' != 1" />
-
-    <Copy SourceFiles="@(GeneratedRpmFiles)"
-          DestinationFiles="$(RpmFile)"
-          OverwriteReadOnlyFiles="True"
-          SkipUnchangedFiles="False"
-          UseHardlinksIfPossible="False" />
-
-  </Target>
-
-</Project>
diff --git a/src/installer/pkg/packaging/rpm/templates/changelog b/src/installer/pkg/packaging/rpm/templates/changelog
deleted file mode 100644
index e61dbc607cb80..0000000000000
--- a/src/installer/pkg/packaging/rpm/templates/changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-* {DATE} {MAINTAINER_NAME} <{MAINTAINER_EMAIL}> - {PACKAGE_VERSION}-{PACKAGE_REVISION}
-- {CHANGELOG_MESSAGE}
diff --git a/src/installer/pkg/packaging/rpm/templates/copyright b/src/installer/pkg/packaging/rpm/templates/copyright
deleted file mode 100644
index a44f2cbd65168..0000000000000
--- a/src/installer/pkg/packaging/rpm/templates/copyright
+++ /dev/null
@@ -1,8 +0,0 @@
-Comment: Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license.
-
-Files: *
-Copyright: {COPYRIGHT_TEXT}
-License: {LICENSE_NAME}
-
-License: {LICENSE_NAME}
- {LICENSE_TEXT}
diff --git a/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml
deleted file mode 100644
index b9d9593496a84..0000000000000
--- a/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: dotnet-sdk
-version: 3.1.201
-summary: Cross-Platform .NET Core SDK
-description: |
-  .NET Core SDK. https://dot.net/core.
-
-grade: stable
-confinement: classic
-
-apps:
-  dotnet:
-    command: dotnet
-
-architectures:
-  - build-on: [amd64]
-    run-on: [armhf]
-
-base: core
-
-parts:
-  dotnet-sdk:
-      plugin: dump
-      source: https://download.visualstudio.microsoft.com/download/pr/ccbcbf70-9911-40b1-a8cf-e018a13e720e/03c0621c6510f9c6f4cca6951f2cc1a4/dotnet-sdk-3.1.201-linux-arm.tar.gz
-      source-checksum: sha512/f37d0e55c9f593c6951bea5a6bb1ea3194486956efe08a2a0f266b419d912cdcbf4ac279358976f0bfa1fe560c333ca5d5437f8e8c718bb5963991e4395e0cd7
-      stage-packages:
-        - libicu55
-        - libssl1.0.0
-        - libcurl3
-        - libgssapi-krb5-2
-        - libstdc++6
-        - zlib1g
-        - libgcc1
-        - libtinfo5
-        - liblttng-ust0
-        - liburcu4
-
-  runtime-wrapper:
-      plugin: dump
-      source: .
-
diff --git a/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml
deleted file mode 100644
index c9e2ab7efb6c2..0000000000000
--- a/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: dotnet-sdk
-version: 5.0.100-preview.2.20176.6
-summary: Cross-Platform .NET Core SDK
-description: |
-  .NET Core SDK. https://dot.net/core.
-
-grade: stable
-confinement: classic
-
-apps:
-  dotnet:
-    command: dotnet
-
-architectures:
-  - build-on: [amd64]
-    run-on: [armhf]
-
-base: core
-
-parts:
-  dotnet-sdk:
-      plugin: dump
-      source: https://download.visualstudio.microsoft.com/download/pr/f87574ee-c128-4e91-b436-68c99d801daf/b296bea9d987a4edaa71df47cd2e7aca/dotnet-sdk-5.0.100-preview.2.20176.6-linux-arm64.tar.gz
-      source-checksum: sha512/53cbf213e2e97b909b256d931f061178f26e5647424f144266d4af2e12d6443ef7398207a8f4e6f220c61db9ce49de3dc09d88417288a6a61d9b05e1def6b279
-      stage-packages:
-        - libicu55
-        - libssl1.0.0
-        - libcurl3
-        - libgssapi-krb5-2
-        - libstdc++6
-        - zlib1g
-        - libgcc1
-        - libtinfo5
-        - liblttng-ust0
-        - liburcu4
-
-  runtime-wrapper:
-      plugin: dump
-      source: .
-
diff --git a/src/installer/pkg/packaging/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml
deleted file mode 100644
index 94a9af147619c..0000000000000
--- a/src/installer/pkg/packaging/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: dotnet-sdk
-version: 5.0.100-preview.2.20176.6
-summary: Cross-Platform .NET Core SDK
-description: |
-  .NET Core SDK. https://dot.net/core.
-
-grade: stable
-confinement: classic
-
-apps:
-  dotnet:
-    command: dotnet
-
-architectures:
-  - build-on: [amd64]
-    run-on: [arm64]
-
-base: core18
-
-parts:
-  dotnet-sdk:
-      plugin: dump
-      source: https://download.visualstudio.microsoft.com/download/pr/f87574ee-c128-4e91-b436-68c99d801daf/b296bea9d987a4edaa71df47cd2e7aca/dotnet-sdk-5.0.100-preview.2.20176.6-linux-arm64.tar.gz
-      source-checksum: sha512/53cbf213e2e97b909b256d931f061178f26e5647424f144266d4af2e12d6443ef7398207a8f4e6f220c61db9ce49de3dc09d88417288a6a61d9b05e1def6b279
-      stage-packages:
-        - libicu60
-        - libssl1.0.0
-        - libcurl3
-        - libgssapi-krb5-2
-        - libstdc++6
-        - zlib1g
-        - libgcc1
-        - libtinfo5
-        - liblttng-ust0
-        - liburcu6
-
-  runtime-wrapper:
-      plugin: dump
-      source: .
-
diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml
deleted file mode 100644
index bfd43ef2e9934..0000000000000
--- a/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: dotnet-runtime-21
-base: core18
-version: 2.1.15
-summary: Cross-Platform .NET Core Runtime. 
-description: |
-  .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core.
-  .NET Core is a general purpose development platform maintained by Microsoft. 
-
-grade: stable
-confinement: strict
-
-apps:
-  dotnet:
-    command: dotnet
-    plugs:
-      - network
-      - network-bind
-      - removable-media
-      - home
-
-slots:
-  dotnet-runtime:
-    content: dotnet-runtime-21
-    interface: content
-    read: [/]
-
-parts:
-  dotnet-runtime:
-    plugin: dump
-    source: https://download.visualstudio.microsoft.com/download/pr/d2fb0b54-01ce-452c-b2a2-86dbef286265/055ad7740827cbe862d14ceb7ea54fac/dotnet-runtime-2.1.15-linux-x64.tar.gz
-    source-checksum: sha512/cfd7f7caea7e896dd4d68a05c827c86f38595f24e854edb3f934715ee1268e2623f17ff768215e465fe596cd474497384be2b1381f04ddd6d555665a341f65f6
-    stage-packages:
-      - libicu60
-      - libssl1.0.0
-      - libcurl3
-      - libgssapi-krb5-2
-      - liblttng-ust0
-      - libstdc++6
-      - zlib1g
-      - libgcc1
-      - lldb
-      - libunwind8
-      - libtinfo5
-      - libdb5.3
-      - libc6
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml
deleted file mode 100644
index 9276af3d01f02..0000000000000
--- a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: dotnet-runtime-30
-base: core18
-version: 3.0.2
-summary: Cross-Platform .NET Core Runtime. 
-description: |
-  .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core.
-  .NET Core is a general purpose development platform maintained by Microsoft. 
-
-grade: stable
-confinement: strict
-
-apps:
-  dotnet:
-    command: dotnet
-    plugs:
-      - network
-      - network-bind
-      - removable-media
-      - home
-
-slots:
-  dotnet-runtime:
-    content: dotnet-runtime-30
-    interface: content
-    read: [/]
-
-parts:
-  dotnet-runtime:
-    plugin: dump
-    source: https://download.visualstudio.microsoft.com/download/pr/7647815e-9c28-40a5-96ea-c6ac4ebe2020/c026b1e93a5d6750a7666d3fe36a87f5/dotnet-runtime-3.0.2-linux-x64.tar.gz
-    source-checksum: sha512/c8f0e4eb220fa896c4a803a8d9d0c704ae7b8383801a977036f3089b1d779159f5a2d9293dc11ff5f4f6c76febc6f70f6cfcdff0debd3243cad5eb635f853d45
-    stage-packages:
-      - libicu60
-      - libssl1.0.0
-      - libcurl3
-      - libgssapi-krb5-2
-      - liblttng-ust0
-      - libstdc++6
-      - zlib1g
-      - libgcc1
-      - lldb
-      - libunwind8
-      - libtinfo5
-      - libdb5.3
-      - libc6
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml
deleted file mode 100644
index a81092e3026fd..0000000000000
--- a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: dotnet-runtime-31
-base: core18
-version: 3.1.1
-summary: Cross-Platform .NET Core Runtime. 
-description: |
-  .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core.
-  .NET Core is a general purpose development platform maintained by Microsoft. 
-
-grade: stable
-confinement: strict
-
-apps:
-  dotnet:
-    command: dotnet
-    plugs:
-      - network
-      - network-bind
-      - removable-media
-      - home
-
-slots:
-  dotnet-runtime:
-    content: dotnet-runtime-31
-    interface: content
-    read: [/]
-
-parts:
-  dotnet-runtime:
-    plugin: dump
-    source: https://download.visualstudio.microsoft.com/download/pr/e060c2eb-1476-4d70-857c-24f5eead2070/ff0e007b7373c04f754b3818ffdb2134/dotnet-runtime-3.1.1-linux-x64.tar.gz
-    source-checksum: sha512/991a89ac7b52d3bf6c00359ce94c5a3f7488cd3d9e4663ba0575e1a5d8214c5fcc459e2cb923c369c2cdb789a96f0b1dfb5c5aae1a04df6e7f1f365122072611
-    stage-packages:
-      - libicu60
-      - libssl1.0.0
-      - libcurl3
-      - libgssapi-krb5-2
-      - liblttng-ust0
-      - libstdc++6
-      - zlib1g
-      - libgcc1
-      - libtinfo5
-      - libdb5.3
-      - libc6
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-5.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-5.0/snap/snapcraft.yaml
deleted file mode 100644
index 8dd11b75f409f..0000000000000
--- a/src/installer/pkg/packaging/snaps/dotnet-runtime-5.0/snap/snapcraft.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: dotnet-runtime-50
-base: core18
-version: 5.0.0-preview.2.20167.3
-summary: Cross-Platform .NET Core Runtime. 
-description: |
-  .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core.
-  .NET Core is a general purpose development platform maintained by Microsoft. 
-
-grade: stable
-confinement: strict
-
-apps:
-  dotnet:
-    command: dotnet
-    plugs:
-      - network
-      - network-bind
-      - removable-media
-      - home
-
-slots:
-  dotnet-runtime:
-    content: dotnet-runtime-50
-    interface: content
-    read: [/]
-
-parts:
-  dotnet-runtime:
-    plugin: dump
-    source: https://download.visualstudio.microsoft.com/download/pr/169871b7-ce8f-4518-a342-209f98342569/4bb2abeecf4b064eac907fb28f96b5ca/aspnetcore-runtime-5.0.0-preview.2.20167.3-linux-x64.tar.gz
-    source-checksum: sha512/c155a94b463020f413b9cc6650219b27c08f331f9d1926966e4c4471b1a3cc79e199fbbd4747e8ad89bd03d66cd90cbc68a5554c54e931ac59f7508810303327
-    stage-packages:
-      - libicu60
-      - libssl1.0.0
-      - libcurl3
-      - libgssapi-krb5-2
-      - liblttng-ust0
-      - libstdc++6
-      - zlib1g
-      - libgcc1
-      - libtinfo5
-      - libdb5.3
-      - libc6
\ No newline at end of file
diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml
deleted file mode 100644
index 66a40385f282e..0000000000000
--- a/src/installer/pkg/packaging/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: dotnet-sdk
-version: 2.1.804
-summary: Cross-Platform .NET Core SDK
-description: |
-  .NET Core SDK. https://dot.net/core.
-
-grade: stable
-confinement: classic
-
-apps:
-  dotnet:
-    command: dotnet
-
-base: core18
-
-parts:
-  dotnet-sdk:
-      plugin: dump
-      source: https://download.visualstudio.microsoft.com/download/pr/9ba4d9b0-3fca-40ed-b5a2-1552dfa4f89e/8e5e555b543a7afd8fd764e080d25671/dotnet-sdk-2.1.804-linux-x64.tar.gz
-      source-checksum: sha512/82b039856dadd2b47fa56a262d1a1a389132f0db037d4ee5c0872f2949c2cd447c33a978e1f532783119aa416860e03f26b840863ca3a97392a4b77f8df5bf66
-      stage-packages:
-        - libicu60
-        - libssl1.0.0
-        - libcurl3
-        - libgssapi-krb5-2
-        - libstdc++6
-        - zlib1g
-        - libgcc1
-        - libtinfo5
-        - liblttng-ust0
-        - liburcu6
-        - lldb
-
-  runtime-wrapper:
-      plugin: dump
-      source: .
-
diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml
deleted file mode 100644
index c5b5b1371f294..0000000000000
--- a/src/installer/pkg/packaging/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: dotnet-sdk
-version: 3.1.200
-summary: Cross-Platform .NET Core SDK
-description: |
-  .NET Core SDK. https://dot.net/core.
-
-grade: stable
-confinement: classic
-
-apps:
-  dotnet:
-    command: dotnet
-
-base: core18
-
-parts:
-  dotnet-sdk:
-      plugin: dump
-      source: https://download.visualstudio.microsoft.com/download/pr/daec2daf-b458-4ae1-9046-b8ba09b5fb49/733e2d73b41640d6e6bdf1cc6b9ef03b/dotnet-sdk-3.1.200-linux-x64.tar.gz
-      source-checksum: sha512/5b9398c7bfe7f67cd9f38fdd4e6e429e1b6aaac0fe04672be0f8dca26580fb46906fd1d2deea6a7d3fb07d77e898f067d3ac1805fe077dc7c1adf9515c9bc9a9
-      stage-packages:
-        - libicu60
-        - libssl1.0.0
-        - libcurl3
-        - libgssapi-krb5-2
-        - libstdc++6
-        - zlib1g
-        - libgcc1
-        - libtinfo5
-        - liblttng-ust0
-        - liburcu6
-
-  runtime-wrapper:
-      plugin: dump
-      source: .
-
diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml
deleted file mode 100644
index 02eaa69deef59..0000000000000
--- a/src/installer/pkg/packaging/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: dotnet-sdk
-version: 5.0.100-preview.2.20176.6
-summary: Cross-Platform .NET Core SDK
-description: |
-  .NET Core SDK. https://dot.net/core.
-
-grade: stable
-confinement: classic
-
-apps:
-  dotnet:
-    command: dotnet
-
-base: core18
-
-parts:
-  dotnet-sdk:
-      plugin: dump
-      source: https://download.visualstudio.microsoft.com/download/pr/727a5825-d29a-4f45-beaa-053399f8b5ee/5f15827ceb4851ef87a008f5de0acf6c/dotnet-sdk-5.0.100-preview.2.20176.6-linux-x64.tar.gz
-      source-checksum: sha512/fface8ff5facdec10d11f8249b426a71cd5bc17aa4e4b1fbe85f4a462e55bdb648a456973a3257f0a700be1aeb0f9bb41639ceca12c2e67d1571e4544ae62bd7
-      stage-packages:
-        - libicu60
-        - libssl1.0.0
-        - libcurl3
-        - libgssapi-krb5-2
-        - libstdc++6
-        - zlib1g
-        - libgcc1
-        - libtinfo5
-        - liblttng-ust0
-        - liburcu6
-
-  runtime-wrapper:
-      plugin: dump
-      source: .
-
diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime b/src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime
deleted file mode 100755
index 31ac85be70543..0000000000000
--- a/src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-dotnet_runtime_snaps=$(ls "$SNAP/../.." | grep dotnet-runtime)
-
-for snap in "$dotnet_runtime_snaps"
-do
-  runtime_dir=$(realpath "$SNAP/../../$snap/current/shared/Microsoft.NETCore.App")
-  if [ -d "$runtime_dir" ]; then
-    runtime_version=$(ls "$runtime_dir")
-    runtime_path="$SNAP_DATA/Microsoft.NETCore.App/$runtime_version"
-    if [ ! -d "$runtime_path" ]; then
-      sudo ln -s "$runtime_dir/$runtime_version" "$runtime_path"
-    fi
-  fi
-done
-
-exec $SNAP/dotnet "$@"
diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml
deleted file mode 100644
index 8f9c7cc3fe823..0000000000000
--- a/src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: dotnet-sdk
-version: $(DOTNET_SDK_VERSION)
-summary: Cross-Platform .NET Core SDK
-description: |
-  .NET Core SDK. https://dot.net/core.
-
-grade: devel
-confinement: classic
-
-apps:
-  dotnet:
-    command: dotnet
-
-base: core18
-
-parts:
-  dotnet-sdk:
-    plugin: dump
-    source: $(SOURCE_TARGZ)
-    source-checksum: sha512/$(SOURCE_TARGZ_SHA)
-    stage-packages:
-      - libicu60
-      - libssl1.0.0
-      - libcurl3
-      - libgssapi-krb5-2
-      - libstdc++6
-      - zlib1g
-      - libgcc1
-      - lldb
-      - libunwind8
-      - libtinfo5
-      - liblttng-ust0
-      - liburcu6
-  runtime-wrapper:
-      plugin: dump
-      source: .
diff --git a/src/installer/pkg/packaging/version_badge.svg b/src/installer/pkg/packaging/version_badge.svg
deleted file mode 100644
index 956523b78df3c..0000000000000
--- a/src/installer/pkg/packaging/version_badge.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="240" height="20">
-    <mask id="a">
-        <rect width="240" height="20" rx="0" fill="#fff" />
-    </mask>
-    <g mask="url(#a)">
-        <path fill="#555" d="M0 0h52v20H0z" />
-        <path fill="#007ec6" d="M52 0h188v20H52z" />
-        <path fill="url(#b)" d="M0 0h240v20H0z" />
-    </g>
-    <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-        <text x="26" y="15" fill="#010101" fill-opacity=".3">version</text>
-        <text x="26" y="14">version</text>
-        <text x="146" y="15" fill="#010101" fill-opacity=".3">ver_number</text>
-        <text x="146" y="14">ver_number</text>
-    </g>
-</svg>
diff --git a/src/installer/pkg/packaging/vs-insertion-packages.proj b/src/installer/pkg/packaging/vs-insertion-packages.proj
deleted file mode 100644
index fd69aea557f75..0000000000000
--- a/src/installer/pkg/packaging/vs-insertion-packages.proj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-  </PropertyGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-  <!--
-    Ensure MSIs are built and signed (if necessary) then call the target that generates the MSI
-    insertion NuGet packages on each project. Bundle installers aren't inserted, so this is enough.
-  -->
-  <Target Name="Build" DependsOnTargets="GetSharedFrameworkProjects">
-    <MSBuild Projects="$(SigningToolsDir)\SignMsiFiles.proj" Targets="Build" />
-    <MSBuild Projects="@(PkgprojProjectToBuild);@(SharedFrameworkProject)" Targets="GenerateVSInsertionNupkg" />
-  </Target>
-
-  <Target Name="Test" />
-
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj
deleted file mode 100644
index a363542fa6251..0000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <VersionProp>AppHostVersion</VersionProp>
-    <SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
-  </PropertyGroup>
-
-  <Import Project="$(MSBuildProjectName).props" />
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props
deleted file mode 100644
index 3f6f90f8cf47a..0000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ItemGroup>
-    <NativeBinary Include="$(DotNetHostBinDir)/apphost$(ApplicationFileExtension)" />
-    <NativeBinary Include="$(DotNetHostBinDir)/singlefilehost$(ApplicationFileExtension)" />
-    <NativeBinary Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)nethost$(LibraryFileExtension)" />
-    <NativeBinary Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)nethost$(StaticLibraryFileExtension)" />
-    <NativeBinary Include="$(DotNetHostBinDir)/coreclr_delegates.h" />
-    <NativeBinary Include="$(DotNetHostBinDir)/hostfxr.h" />
-    <NativeBinary Include="$(DotNetHostBinDir)/nethost.h" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetOS)' == 'windows'">
-    <NativeBinary Include="$(DotNetHostBinDir)/comhost.dll" />
-    <NativeBinary Include="$(DotNetHostBinDir)/ijwhost.dll" />
-    <NativeBinary Include="$(DotNetHostBinDir)/ijwhost.lib" />
-    <!-- The libnethost.lib is a static library for the nethost scenario.
-        The symbols file is also shipped to enable users to fully debug
-        binaries that link against the static version. -->
-    <NativeBinary Include="$(DotNetHostBinDir)/libnethost.lib" />
-    <NativeBinary Include="$(DotNetHostBinDir)/PDB/libnethost.pdb" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
-    <File Include="@(NativeBinary)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj
index e8e11eb273146..50aa1919abb0c 100644
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj
+++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj
@@ -4,50 +4,9 @@
     <VersionProp>HostVersion</VersionProp>
 
     <InstallerName>dotnet-host</InstallerName>
-    <GenerateSharedFrameworkPart>true</GenerateSharedFrameworkPart>
     <SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
   </PropertyGroup>
 
-  <Target Name="SetupHostSpecificWixBuild"
-          DependsOnTargets="GetInstallerBrandingNames"
-          BeforeTargets="GetWixBuildConfiguration">
-    <PropertyGroup>
-      <WixProductMoniker>$(SharedHostBrandName)</WixProductMoniker>
-      <RegKeyProductName>sharedhost</RegKeyProductName>
-      <WixDependencyKeyName>Dotnet_CLI_SharedHost</WixDependencyKeyName>
-      <VSInsertionShortComponentName>SharedHost</VSInsertionShortComponentName>
-
-      <PublishRootDir>$(IntermediateOutputPath)publishRoot/</PublishRootDir>
-    </PropertyGroup>
-
-    <!-- Always clean this up to avoid side-by-side versions in unclean dev builds. -->
-    <RemoveDir Directories="$(PublishRootDir)" />
-
-    <!-- copy shared host layout -->
-    <Copy SourceFiles="$(DotNetHostBinDir)/dotnet$(ApplicationFileExtension)"
-          DestinationFolder="$(PublishRootDir)" />
-
-    <Copy SourceFiles="$(InstallerProjectRoot)pkg\THIRD-PARTY-NOTICES.TXT"
-          DestinationFiles="$(PublishRootDir)ThirdPartyNotices.txt" />
-
-    <Copy SourceFiles="$(RepoRoot)LICENSE.TXT"
-          DestinationFiles="$(PublishRootDir)LICENSE.txt"
-          Condition="'$(TargetsUnix)' == 'true'"/>
-
-    <Copy SourceFiles="$(InstallerProjectRoot)pkg\LICENSE-MSFT.TXT"
-          DestinationFiles="$(PublishRootDir)LICENSE.txt"
-          Condition="'$(TargetsUnix)' != 'true'"/>
-
-    <ItemGroup>
-      <WixSrcFile Include="host.wxs" />
-
-      <WixExtraComponentGroupRefId Include="InstallSharedHostandDetectionKeys" />
-
-      <CandleVariables Include="ExtraPropertyRefIds" Value="ProductCPU;RTM_ProductVersion" />
-      <CandleVariables Include="HostSrc" Value="$(PublishRootDir)" />
-    </ItemGroup>
-  </Target>
-
   <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
     <NativeBinary Include="$(DotNetHostBinDir)/dotnet$(ApplicationFileExtension)" />
     <File Include="@(NativeBinary)">
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj
index ccca328154d66..203b5dcaebef3 100644
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj
+++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj
@@ -9,5 +9,11 @@
     <Dependency Include="Microsoft.NETCore.DotNetHostResolver" VersionProp="HostResolverVersion" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildProjectName).props" />
+  <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
+    <NativeBinary Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostpolicy$(LibraryFileExtension)"/>
+    <File Include="@(NativeBinary)">
+      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
+      <IsNative>true</IsNative>
+    </File>
+  </ItemGroup>
 </Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props
deleted file mode 100644
index 6b1b70b6c2063..0000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
-    <NativeBinary Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostpolicy$(LibraryFileExtension)"/>
-    <File Include="@(NativeBinary)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj
index bb16d54c5bce2..58653556eef24 100644
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj
+++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj
@@ -4,7 +4,6 @@
     <VersionProp>HostResolverVersion</VersionProp>
 
     <InstallerName>dotnet-hostfxr</InstallerName>
-    <GenerateSharedFrameworkPart>true</GenerateSharedFrameworkPart>
     <SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
   </PropertyGroup>
 
@@ -12,40 +11,12 @@
     <Dependency Include="Microsoft.NETCore.DotNetAppHost" VersionProp="AppHostVersion" />
   </ItemGroup>
 
-  <Target Name="SetupHostResolverSpecificWixBuild"
-          DependsOnTargets="
-            GetProductVersions;
-            GetInstallerBrandingNames"
-          BeforeTargets="GetWixBuildConfiguration">
-    <PropertyGroup>
-      <WixProductMoniker>$(HostFxrBrandName)</WixProductMoniker>
-      <RegKeyProductName>hostfxr</RegKeyProductName>
-      <WixDependencyKeyName>Dotnet_CLI_HostFxr</WixDependencyKeyName>
-      <VSInsertionShortComponentName>HostFXR</VSInsertionShortComponentName>
-
-      <PublishRootDir>$(IntermediateOutputPath)publishRoot/</PublishRootDir>
-    </PropertyGroup>
-
-    <!-- Always clean this up to avoid side-by-side versions in unclean dev builds. -->
-    <RemoveDir Directories="$(PublishRootDir)" />
-
-    <!-- Copy files to staging location to easily set up relative directory for WiX. -->
-    <Copy
-      SourceFiles="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostfxr$(LibraryFileExtension)"
-      DestinationFolder="$(PublishRootDir)host/fxr/$(HostResolverVersion)" />
-
-    <ItemGroup>
-      <CandleVariables Include="AuthoredRegistryKeys;RegKeyNugetVersionValue" Value="true" />
-
-      <DirectoryToHarvest
-        Include="$(PublishRootDir)"
-        Name="install-files"
-        SubstituteVar="HostFxrSrc"
-        ComponentGroupName="InstallFiles"
-        DirectoryRef="DOTNETHOME" />
-    </ItemGroup>
-  </Target>
-
-  <Import Project="$(MSBuildProjectName).props" />
+  <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
+    <NativeBinary Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostfxr$(LibraryFileExtension)"/>
+    <File Include="@(NativeBinary)">
+      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
+      <IsNative>true</IsNative>
+    </File>
+  </ItemGroup>
 
 </Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props
deleted file mode 100644
index 81d8d72da34c9..0000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
-    <NativeBinary Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostfxr$(LibraryFileExtension)"/>
-    <File Include="@(NativeBinary)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-
-</Project>
diff --git a/src/installer/pkg/projects/descriptions.json b/src/installer/pkg/projects/descriptions.json
index 4b4ae7f6d83b5..b262318a3b3c1 100644
--- a/src/installer/pkg/projects/descriptions.json
+++ b/src/installer/pkg/projects/descriptions.json
@@ -28,25 +28,5 @@
         "Name": "Microsoft.NETCore.DotNetHost",
         "Description": "Provides an executable implementation of the Microsoft DotNet Framework and SDK launcher module",
         "CommonTypes": [ ]
-    },
-    {
-        "Name": "Microsoft.NETCore",
-        "Description": "Provides a set of packages that can be used when building portable libraries on .NETCore based platforms.",
-        "CommonTypes": [ ]
-    },
-    {
-        "Name": "Microsoft.NETCore.App",
-        "Description": "A set of .NET APIs that are included in the default .NET application model.",
-        "CommonTypes": [ ]
-    },
-    {
-        "Name": "Microsoft.NETCore.App.Internal",
-        "Description": "Transport package for .NET App runtime assets.",
-        "CommonTypes": [ ]
-    },
-    {
-        "Name": "Microsoft.NETCore.App.Ref",
-        "Description": "A set of .NET APIs that are included in the default .NET application model. Contains reference assemblies, documentation, and other design-time assets.",
-        "CommonTypes": [ ]
     }
 ]
diff --git a/src/installer/pkg/projects/netcoreapp/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/Directory.Build.props
deleted file mode 100644
index 36885e8e8b63f..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/Directory.Build.props
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
-
-  <!--
-    Determine CoreCLR/Libraries TargetOS based on Installer TargetOS. For example,
-    Installer uses Unix when applicable, but others go straight to Linux.
-  -->
-  <PropertyGroup>
-    <CoreCLRTargetOS Condition="'$(TargetsWindows)' == 'true'">windows</CoreCLRTargetOS>
-    <CoreCLRTargetOS Condition="'$(TargetsLinux)' == 'true'">Linux</CoreCLRTargetOS>
-    <CoreCLRTargetOS Condition="'$(TargetsOSX)' == 'true'">OSX</CoreCLRTargetOS>
-    <CoreCLRTargetOS Condition="'$(TargetsiOS)' == 'true'">iOS</CoreCLRTargetOS>
-    <CoreCLRTargetOS Condition="'$(TargetstvOS)' == 'true'">tvOS</CoreCLRTargetOS>
-    <CoreCLRTargetOS Condition="'$(TargetsAndroid)' == 'true'">Android</CoreCLRTargetOS>
-    <CoreCLRTargetOS Condition="'$(TargetsBrowser)' == 'true'">Browser</CoreCLRTargetOS>
-    <CoreCLRTargetOS Condition="'$(TargetsFreeBSD)' == 'true'">FreeBSD</CoreCLRTargetOS>
-    <CoreCLRTargetOS Condition="'$(TargetsNetBSD)' == 'true'">NetBSD</CoreCLRTargetOS>
-    <CoreCLRTargetOS Condition="'$(TargetsIllumos)' == 'true'">illumos</CoreCLRTargetOS>
-    <CoreCLRTargetOS Condition="'$(TargetsSolaris)' == 'true'">Solaris</CoreCLRTargetOS>
-    <LibrariesTargetOS>$(CoreCLRTargetOS)</LibrariesTargetOS>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ShortFrameworkName>dotnet</ShortFrameworkName>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props
deleted file mode 100644
index 40e6a6f9e6375..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props
+++ /dev/null
@@ -1,38 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <IsFrameworkPackage>true</IsFrameworkPackage>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
-
-  <PropertyGroup>
-    <FrameworkListName>$(NetCoreAppCurrentBrandName)</FrameworkListName>
-    <FrameworkListTargetFrameworkIdentifier>$(NetCoreAppCurrentIdentifier)</FrameworkListTargetFrameworkIdentifier>
-    <FrameworkListTargetFrameworkVersion>$(NetCoreAppCurrentVersion)</FrameworkListTargetFrameworkVersion>
-    <FrameworkListFrameworkName>$(SharedFrameworkName)</FrameworkListFrameworkName>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- LINUX -->
-
-    <!-- OSX -->
-    <SingleFileHostIncludeFilename Include="libSystem.IO.Compression.Native.dylib" />
-    <SingleFileHostIncludeFilename Include="libSystem.Native.dylib" />
-    <SingleFileHostIncludeFilename Include="libSystem.Net.Security.Native.dylib" />
-    <SingleFileHostIncludeFilename Include="libSystem.Security.Cryptography.Native.Apple.dylib" />
-    <SingleFileHostIncludeFilename Include="libSystem.Security.Cryptography.Native.OpenSsl.dylib" />
-    
-    <!-- Windows -->
-    <SingleFileHostIncludeFilename Include="clrcompression.dll" />
-    <SingleFileHostIncludeFilename Include="mscordaccore.dll" />
-  </ItemGroup>
-  
-  <!-- Redistribute package content from other nuget packages. -->
-  <ItemGroup Condition="
-    '$(FrameworkPackType)' != 'apphost' AND
-    '$(ExcludeDepprojReference)' != 'true'">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)..\src\netcoreapp.depproj">
-      <AdditionalProperties Condition="'$(PackageTargetRuntime)' != ''">RuntimeIdentifier=$(PackageTargetRuntime)</AdditionalProperties>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
deleted file mode 100644
index 32a1ce3ac47d7..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
+++ /dev/null
@@ -1,113 +0,0 @@
-<Project>
-
-  <!--
-    Use framework pack tooling to support building RID-specific crossgen2 packs.
-    Consider porting to central infrastructure: https://github.com/dotnet/runtime/issues/1867
-  -->
-  <PropertyGroup>
-    <FrameworkPackType>crossgen2</FrameworkPackType>
-    <BuildRidSpecificPacks>true</BuildRidSpecificPacks>
-    <SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
-  </PropertyGroup>
-
-  <!--
-    Get installer properties, in particular for MSIs.
-    Consider porting to central infrastructure: https://github.com/dotnet/runtime/issues/1867
-  -->
-  <Target Name="GetCrossgen2PackInstallerProperties"
-          Condition="'$(FrameworkPackType)' == 'crossgen2'"
-          BeforeTargets="GetInstallerProperties">
-    <PropertyGroup>
-      <InstallerName>$(ShortFrameworkName)-crossgen2-pack</InstallerName>
-      <WixProductMoniker>$(Crossgen2PackBrandName)</WixProductMoniker>
-      <VSInsertionShortComponentName>Crossgen2Pack</VSInsertionShortComponentName>
-    </PropertyGroup>
-  </Target>
-
-  <PropertyGroup>
-    <RIDPropsFile>$(MSBuildThisFileDirectory)crossgenRIDs.props</RIDPropsFile>
-  </PropertyGroup>
-
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <!--
-    We're publishing crossgen2 as a self-contained application against the live runtime bits,
-    so we need to assemble the self-contained framework here.
-  -->
-  <Target Name="GetCrossgen2Files"
-          DependsOnTargets="ConvertItems"
-          BeforeTargets="GetPackageFiles">
-    <ItemGroup>
-      <RuntimeFile Include="@(File->HasMetadata('TargetPath'))" Exclude="$(PackageIconFullPath)" />
-      <File Remove="@(RuntimeFile)" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <TargetOSComponent>unix</TargetOSComponent>
-      <TargetOSComponent Condition="'$(TargetOS)' == 'windows'">win</TargetOSComponent>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <Crossgen2File Include="$(CoreCLRCrossgen2Dir)crossgen2$(ExeSuffix)" />
-      <Crossgen2File Include="$(CoreCLRCrossgen2Dir)crossgen2.dll" />
-      <Crossgen2File Include="$(CoreCLRCrossgen2Dir)ILCompiler*.dll" />
-      <Crossgen2File Include="$(CoreCLRCrossgen2Dir)Microsoft.DiaSymReader.dll" />
-      <Crossgen2File Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)jitinterface_$(TargetArchitecture)$(LibraryFileExtension)" />
-      <Crossgen2File Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_win_x86_$(TargetArchitecture)$(LibraryFileExtension)" />
-      <Crossgen2File Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_win_arm_$(TargetArchitecture)$(LibraryFileExtension)" />
-      <Crossgen2File Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_unix_arm_$(TargetArchitecture)$(LibraryFileExtension)" />
-      <Crossgen2File Condition="'$(TargetArchitecture)' == 'arm64' or  '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_win_x64_$(TargetArchitecture)$(LibraryFileExtension)" />
-      <Crossgen2File Condition="'$(TargetArchitecture)' == 'arm64' or  '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_win_arm64_$(TargetArchitecture)$(LibraryFileExtension)" />
-      <Crossgen2File Condition="'$(TargetArchitecture)' == 'arm64' or  '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_unix_x64_$(TargetArchitecture)$(LibraryFileExtension)" />
-      <Crossgen2File Condition="'$(TargetArchitecture)' == 'arm64' or  '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_unix_arm64_$(TargetArchitecture)$(LibraryFileExtension)" />
-      <!-- Include the native and managed files from the Microsoft.NETCore.App shared framework -->
-      <Crossgen2File Include="@(RuntimeFile)" Condition="'%(RuntimeFile.TargetPath)' == 'runtimes/$(PackageRID)/native' and '%(RuntimeFile.Extension)' != '$(StaticLibraryFileExtension)'" />
-      <Crossgen2File Include="@(RuntimeFile)" Condition="'%(RuntimeFile.TargetPath)' == 'runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent)'" />
-      <!-- Include the native hosting layer -->
-      <Crossgen2File Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostfxr$(LibraryFileExtension)" />
-      <Crossgen2File Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostpolicy$(LibraryFileExtension)" />
-    </ItemGroup>
-
-    <MSBuild Projects="$(CoreClrProjectRoot)src/tools/aot/crossgen2/crossgen2.csproj"
-            Targets="Restore"
-            Properties="
-            Configuration=$(RuntimeConfiguration);
-            SelfContained=true;
-            RuntimeIdentifier=$(PackageRID)">
-    <Output TaskParameter="TargetOutputs" ItemName="Crossgen2File" />
-    </MSBuild>
-
-    <MSBuild Projects="$(CoreClrProjectRoot)src/tools/aot/crossgen2/crossgen2.csproj"
-            Targets="GenerateDepsJsonFile"
-            Properties="
-            Configuration=$(RuntimeConfiguration);
-            GenerateDependencyFile=true;
-            IncludeFileVersionsInDependencyFile=false;
-            SelfContained=true;
-            RemoveLongNameDac=true;
-            RuntimeGraphPath=$(LiveRuntimeIdentifierGraphPath);
-            RuntimeIdentifier=$(PackageRID)">
-    <Output TaskParameter="TargetOutputs" ItemName="Crossgen2File" />
-    </MSBuild>
-
-    <ItemGroup>
-      <!-- Avoid having two copies of System.Private.CoreLib.ni.pdb in the same directory -->
-      <Crossgen2File Update="@(Crossgen2File)" SavedIdentity="%(Identity)" />
-      <Crossgen2FileDistinct Include="@(Crossgen2File->'%(Filename)%(Extension)'->Distinct())" />
-
-      <File Include="@(Crossgen2FileDistinct->'%(SavedIdentity)')" RemoveMetadata="SavedIdentity">
-        <TargetPath>tools</TargetPath>
-      </File>
-      <!-- 
-        System.Private.CoreLib's R2R pdb ends up in two locations (CoreCLR and the depproj output).
-        Remove them here and let the symbol file location infra find exactly one.
-      -->
-      <CoreLibSymbolFile Include="@(Crossgen2File)" Condition="'%(FileName)%(Extension)' == 'System.Private.CoreLib.ni.pdb'" />
-      <File Remove="@(CoreLibSymbolFile)" />
-    </ItemGroup>
-
-  </Target>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj
deleted file mode 100644
index 8daa78d3ec711..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj
+++ /dev/null
@@ -1,33 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <!--
-    Create AppHost Pack based on legacy DotNetAppHost package. This can be collapsed once the legacy
-    package is no longer used.
-  -->
-  <Import Project="..\..\Microsoft.NETCore.DotNetAppHost\Microsoft.NETCore.DotNetAppHost.props" />
-
-  <!--
-    These files are not signed, because they're templates: they are modified by the SDK on the
-    user's machine before use. We have a signing validation exception for Visual Studio insertion's
-    signature validation. However, the exceptions are based on the file IDs, which are not stable
-    because product version is in the path. We need to force these IDs to be stable by modifying
-    the WiX source file. https://github.com/dotnet/core-setup/issues/7327
-  -->
-  <ItemGroup>
-    <HeatOutputFileElementToStabilize Include="native\apphost.exe" ReplacementId="apphosttemplateapphostexe" />
-    <HeatOutputFileElementToStabilize Include="native\singlefilehost.exe" ReplacementId="staticapphosttemplateapphostexe" />
-    <HeatOutputFileElementToStabilize Include="native\comhost.dll" ReplacementId="comhosttemplatecomhostdll" />
-  </ItemGroup>
-
-  <!--
-    See https://github.com/dotnet/core-setup/issues/7846. Cross-arch MSI installers are needed for
-    C++/CLI project system support.
-  -->
-  <ItemGroup>
-    <CrossArchSdkMsiInstallerArch Include="x64;x86" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
-  </PropertyGroup>
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj
deleted file mode 100644
index 450e84155921a..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <ItemGroup>
-    <!-- File contents are copied from https://github.com/dotnet/sdk/blob/ec2f3741092f164daeb023e7caa4364c810461e2/src/Tasks/Common/targets/Microsoft.NET.DefaultPackageConflictOverrides.targets#L15 -->
-    <File Include="PackageOverrides.txt" TargetPath="data/" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
-  </PropertyGroup>
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj
deleted file mode 100644
index 003e5b8c52b9d..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <!--
-    Don't include host resolver or host policy in iOS or Android runtime packs, because there is no
-    shared framework on those platforms.
-  -->
-  <PropertyGroup>
-    <ExcludeHostAssets Condition="'$(TargetsMobile)' == 'true'">true</ExcludeHostAssets>
-  </PropertyGroup>
-  <!--
-    Include HostPolicy and HostResolver based on legacy packages. This can be collapsed once the
-    legacy packages are no longer used.
-  -->
-  <Import Condition="'$(ExcludeHostAssets)' != 'true'" Project="..\..\Microsoft.NETCore.DotNetHostPolicy\Microsoft.NETCore.DotNetHostPolicy.props" />
-  <Import Condition="'$(ExcludeHostAssets)' != 'true'" Project="..\..\Microsoft.NETCore.DotNetHostResolver\Microsoft.NETCore.DotNetHostResolver.props" />
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/crossgenRIDs.props b/src/installer/pkg/projects/netcoreapp/pkg/crossgenRIDs.props
deleted file mode 100644
index f10ef9947ce63..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/pkg/crossgenRIDs.props
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project>
-
-  <!-- Crossgen2 currently only builds for a subset of RIDs. -->
-  <PropertyGroup>
-    <BuildOnUnknownPlatforms>false</BuildOnUnknownPlatforms>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <PackageRID Condition="'$(PackageRID)' == ''">$(OutputRid)</PackageRID>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <OfficialBuildRID Include="linux-x64" />
-    <OfficialBuildRID Include="linux-musl-x64" />
-    <OfficialBuildRID Include="win-x64"/>
-  </ItemGroup>
-
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props
deleted file mode 100644
index 03473f6c66f5b..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
-
-  <PropertyGroup>
-    <PreventImplementationReference Condition="'$(PackageTargetRuntime)' != ''">true</PreventImplementationReference>
-    <BuildTargetPath>build/$(NetCoreAppCurrent)/</BuildTargetPath>
-
-    <IsShipping>false</IsShipping>
-  </PropertyGroup>
-
-  <!-- Identity / Reference package content -->
-  <ItemGroup Condition="'$(PackageTargetRuntime)' == ''">
-    <!-- reference RID specific packages to generate lineup -->
-    <LineupProjectReference Include="@(RuntimeProject)" />
-
-    <!-- references the host packages -->
-    <Dependency
-      Include="Microsoft.NETCore.DotNetHostPolicy"
-      VersionFromProject="$(InstallerProjectRoot)pkg\projects\Microsoft.NETCore.DotNetHostPolicy\Microsoft.NETCore.DotNetHostPolicy.pkgproj"
-      TargetFramework="$(NetCoreAppCurrent)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj
deleted file mode 100644
index a46f80401902f..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <!-- Make this Internal package's runtime.json point to the non-Internal runtime packages. -->
-    <RuntimeProjectFile>$(MSBuildThisFileDirectory)Microsoft.NETCore.App.pkgproj</RuntimeProjectFile>
-    <SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
-  </PropertyGroup>
-
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <!--
-      Normally, one pkgproj produces both the lineup package and runtime packages. This pkgproj only
-      produces the lineup, and the runtime packages are built from a different project.
-
-      The build tries to produce runtime packages based on the runtime package dependencies. Disable
-      that to avoid errors.
-    -->
-    <BuildRuntimePackages>false</BuildRuntimePackages>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Dependency Include="Microsoft.NETCore.Platforms" Version="$(Version)" TargetFramework="$(NetCoreAppCurrent)" />
-    <Dependency Include="Microsoft.NETCore.Targets" Version="$(Version)" TargetFramework="$(NetCoreAppCurrent)" />
-  </ItemGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj
deleted file mode 100644
index 5636c4b32e44c..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj
+++ /dev/null
@@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <!--
-      This project builds the runtime packages, but the lineup package is now
-      Microsoft.NETCore.App.Internal.
-    -->
-    <BuildLineupPackage>false</BuildLineupPackage>
-
-    <ShouldVerifyClosure>true</ShouldVerifyClosure>
-
-    <FrameworkListTargetPath>data/</FrameworkListTargetPath>
-    <SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- windows.winmd is not part of the framework -->
-    <IgnoredReference Include="Windows" />
-
-    <!-- Exclude shims from the closure verification -->
-    <ExcludeFromClosure Include="mscorlib" />
-    <ExcludeFromClosure Include="System" />
-    <ExcludeFromClosure Include="System.Configuration" />
-    <ExcludeFromClosure Include="System.Core" />
-    <ExcludeFromClosure Include="System.Data" />
-    <ExcludeFromClosure Include="System.Drawing" />
-    <ExcludeFromClosure Include="System.Net" />
-    <ExcludeFromClosure Include="System.Security" />
-    <ExcludeFromClosure Include="System.ServiceModel.Web" />
-    <ExcludeFromClosure Include="System.ServiceProcess" />
-    <ExcludeFromClosure Include="System.Transactions" />
-    <ExcludeFromClosure Include="WindowsBase" />
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj
deleted file mode 100644
index d5ae432d189a4..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <ExcludeDepprojReference>true</ExcludeDepprojReference>
-  </PropertyGroup>
-
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <!-- Exclude runtime.json from the package. -->
-    <IncludeRuntimeJson>false</IncludeRuntimeJson>
-    <IsLineupPackage>false</IsLineupPackage>
-
-    <!-- Prevent old baseline dependencies. -->
-    <ExcludeLineupReference>true</ExcludeLineupReference>
-
-    <BuildRuntimePackages>false</BuildRuntimePackages>
-
-    <IsShipping>false</IsShipping>
-    <SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Dependency Include="Microsoft.NETCore.Platforms" Version="$(Version)" />
-  </ItemGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.Bundle.bundleproj
deleted file mode 100644
index b7c0b13386156..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.Bundle.bundleproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <!--
-      Name, used to generate the bundle upgrade code. Must stay the same to allow bundles in a given
-      product band to upgrade in place.
-    -->
-    <BundleInstallerUpgradeCodeSeed>.NET Core Shared Framework Bundle Installer</BundleInstallerUpgradeCodeSeed>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <BundleComponentReference Include="Microsoft.NETCore.App.SharedFx.sfxproj" />
-    <BundleComponentReference Include="..\..\Microsoft.NETCore.DotNetHostResolver\Microsoft.NETCore.DotNetHostResolver.pkgproj" />
-    <BundleComponentReference Include="..\..\Microsoft.NETCore.DotNetHost\Microsoft.NETCore.DotNetHost.pkgproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <CandleVariables Include="BundleThmDir" Value="$(MSBuildProjectDirectory)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.SharedFx.sfxproj b/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.SharedFx.sfxproj
deleted file mode 100644
index e2905a88d3703..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.SharedFx.sfxproj
+++ /dev/null
@@ -1,86 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <SfxIdentity>Microsoft.NETCore.App</SfxIdentity>
-    <SfxPackageIdentity>$(SfxIdentity).Internal</SfxPackageIdentity>
-
-    <!--
-      Lay out the sfx in the legacy location for old packaging to keep working for now. This can be
-      removed when the legacy infra is phased out.
-    -->
-    <SharedFrameworkLayoutDir>$(SharedFrameworkPublishDir)</SharedFrameworkLayoutDir>
-
-    <GenerateRuntimeGraph>true</GenerateRuntimeGraph>
-
-    <!-- These components are installed by the root shared framework, but not others. -->
-    <IncludeWerRelatedKeys>true</IncludeWerRelatedKeys>
-    <IncludeBreadcrumbStoreFolder>true</IncludeBreadcrumbStoreFolder>
-
-    <!-- The zip/tarball is built by legacy infrastructure. -->
-    <GenerateCompressedArchive>false</GenerateCompressedArchive>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PkgProjectReference Include="..\pkg\legacy\Microsoft.NETCore.App.Internal.pkgproj" />
-    <PkgProjectReference Include="..\pkg\legacy\Microsoft.NETCore.App.pkgproj" />
-    <PkgProjectReference Include="..\..\Microsoft.NETCore.DotNetAppHost\Microsoft.NETCore.DotNetAppHost.pkgproj" />
-    <PkgProjectReference Include="..\..\Microsoft.NETCore.DotNetHost\Microsoft.NETCore.DotNetHost.pkgproj" />
-    <PkgProjectReference Include="..\..\Microsoft.NETCore.DotNetHostPolicy\Microsoft.NETCore.DotNetHostPolicy.pkgproj" />
-    <PkgProjectReference Include="..\..\Microsoft.NETCore.DotNetHostResolver\Microsoft.NETCore.DotNetHostResolver.pkgproj" />
-  </ItemGroup>
-
-  <!--
-    Make sure the installer file is generated with the old infra's name and location. This allows
-    the existing infra to bundle it without any changes. This can be removed when the legacy infra
-    is phased out.
-  -->
-  <Target Name="PutSharedFrameworkMsiInLegacyLocation"
-          DependsOnTargets="GetInstallerLocations"
-          BeforeTargets="GetInstallerProperties">
-    <PropertyGroup>
-      <InstallerFile>$(SharedFrameworkInstallerFile)</InstallerFile>
-    </PropertyGroup>
-  </Target>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-  <!-- Clean up artifacts that dotnet-publish generates which we don't need -->
-  <Target Name="DeleteUnnecessaryPublishOutputs" AfterTargets="Publish">
-    <ItemGroup>
-      <ToDelete Include="$(PublishDir)apphost$(ExeSuffix)" />
-      <ToDelete Include="$(PublishDir)singlefilehost$(ExeSuffix)" />
-      <ToDelete Include="$(PublishDir)$(LibPrefix)comhost$(LibSuffix)" />
-      <ToDelete Include="$(PublishDir)$(LibPrefix)hostfxr$(LibSuffix)" />
-      <ToDelete Include="$(PublishDir)$(LibPrefix)ijwhost$(LibSuffix)" />
-      <ToDelete Include="$(PublishDir)$(LibPrefix)nethost$(LibSuffix)" />
-      <ToDelete Include="$(PublishDir)$(LibPrefix)nethost.h" />
-      <!--
-        On Windows, LibSuffix is .dll (for dynamic libraries), but for these particular files, we also
-        build a .lib (static library). Make sure neither is included.
-
-        We only build this library on Windows, so other static library formats don't need to be
-        handled yet.
-      -->
-      <ToDelete Include="$(PublishDir)ijwhost.lib" />
-      <ToDelete Include="$(PublishDir)nethost.lib" />
-      <ToDelete Include="$(PublishDir)libnethost.lib" />
-    </ItemGroup>
-
-    <Delete Files="@(ToDelete)" />
-  </Target>
-
-  <!--
-    Since the libraries configuration might be different than the installer configuration, we need to add additional restore sources
-    to be able to find packages produced in the libraries phase and consumed in the installer phase.
-  -->
-  <PropertyGroup>
-    <RestoreSources Condition="Exists('$(LibrariesShippingPackagesDir)')">$(RestoreSources);$(LibrariesShippingPackagesDir)</RestoreSources>
-    <RestoreSources Condition="Exists('$(LibrariesNonShippingPackagesDir)')">$(RestoreSources);$(LibrariesNonShippingPackagesDir)</RestoreSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(LibrariesPackagesDir)' != '$(LibrariesAllConfigPackagesDir)'">
-    <RestoreSources Condition="Exists('$(LibrariesAllConfigShippingPackagesDir)')">$(RestoreSources);$(LibrariesAllConfigShippingPackagesDir)</RestoreSources>
-    <RestoreSources Condition="Exists('$(LibrariesAllConfigNonShippingPackagesDir)')">$(RestoreSources);$(LibrariesAllConfigNonShippingPackagesDir)</RestoreSources>
-  </PropertyGroup>
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets
deleted file mode 100644
index 47b1b703c4249..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets
+++ /dev/null
@@ -1,126 +0,0 @@
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--
-    Get paths from packages that are needed for crossgen. Only relevant for runtime-specific builds.
-  -->
-  <Target Name="GetCorePackagePaths"
-          DependsOnTargets="ResolveReferences">
-    <PropertyGroup>
-      <_diaSymReaderPackageDir>$(NuGetPackageRoot)microsoft.diasymreader.native/$(MicrosoftDiaSymReaderNativeVersion)/</_diaSymReaderPackageDir>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(TargetArchitecture)' == 'arm' AND '$(OS)' == 'Windows_NT'">
-      <_crossHostArch>x86</_crossHostArch>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(TargetArchitecture)' == 'arm' AND '$(OS)' != 'Windows_NT'">
-      <_crossHostArch>x64</_crossHostArch>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(TargetArchitecture)' == 'armel' AND '$(OS)' != 'Windows_NT'">
-      <_crossHostArch>x64</_crossHostArch>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(BuildArchitecture)' != 'arm64'">
-      <_crossHostArch>x64</_crossHostArch>
-    </PropertyGroup>
-    <PropertyGroup>
-      <_crossDir Condition="'$(_crossHostArch)' != ''">/$(_crossHostArch)_$(TargetArchitecture)</_crossDir>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="GetCrossgenToolPaths"
-          DependsOnTargets="GetCorePackagePaths">
-    <ItemGroup>
-      <!-- Find crossgen tool assets in package cache to allow ExcludeAssets=All. -->
-      <_diaSymReaderAssembly Include="$(_diaSymReaderPackageDir)**\Microsoft.DiaSymReader.Native.*.dll" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <_runtimeDirectory>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'sharedFramework'))</_runtimeDirectory>
-      <_crossGenPath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', '$(CoreCLRCrossTargetComponentDirName)', 'sharedFramework', 'crossgen$(ApplicationFileExtension)'))</_crossGenPath>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <_coreLibDirectory>$(CoreCLRArtifactsPath)</_coreLibDirectory>
-      <_fxLibDirectory>$(LibrariesSharedFrameworkBinArtifactsPath)</_fxLibDirectory>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <_jitPath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', '$(CoreCLRCrossTargetComponentDirName)', 'sharedFramework', '$(LibraryFilePrefix)clrjit$(LibraryFileExtension)'))</_jitPath>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'@(_diaSymReaderAssembly)' != ''">
-      <_diaSymReaderToolDir>%(_diaSymReaderAssembly.RootDir)%(_diaSymReaderAssembly.Directory)</_diaSymReaderToolDir>
-    </PropertyGroup>
-
-    <!--
-      DiaSymReader can't be built from source, so use an unrelated default directory in that case.
-      This is used as the working directory for crossgen calls.
-    -->
-    <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
-      <_diaSymReaderToolDir>$(IntermediateOutputPath)</_diaSymReaderToolDir>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <!--
-        The following path must be passed to crossgen to locate all dependencies. Include it first
-        so in case of conflicts, DLLs are found in the framework being crossgenned.
-      -->
-      <_crossgenPlatformDirectories Include="%(_filesToCrossGen.RootDir)%(_filesToCrossGen.Directory)" />
-      <!-- the following path *must* be passed to crossgen as it has the CoreLib.ni.dll, it will not use the IL copy. -->
-      <_crossgenPlatformDirectories Include="$(_runtimeDirectory)" />
-      <_crossgenPlatformDirectories Include="$(_coreLibDirectory)" />
-      <_crossgenPlatformDirectories Include="$(_fxLibDirectory)" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <!-- Use PathSeparator so that we get a ':' on unix and ';' on windows
-           Escape the value so that the ';' doesn't result multiple lines when writing to the RSP file -->
-      <_pathSeparatorEscaped>$([MSBuild]::Escape($([System.IO.Path]::PathSeparator.ToString())))</_pathSeparatorEscaped>
-      <_crossgenPlatformAssemblies>@(_crossgenPlatformDirectories->'%(Identity)', '$(_pathSeparatorEscaped)')</_crossgenPlatformAssemblies>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="GetFilesFromPackageResolve">
-    <ItemGroup>
-      <!-- RID-specific: include all runtime files. -->
-      <RidSpecificFilesToPackage Include="@(ReferenceCopyLocalPaths)">
-        <!-- ResolveNugetPackageAssets doesn't preserve the asset type (native),
-             calculate it by looking for native in the path -->
-        <IsNative Condition="$([System.String]::new('%(Identity)').ToLowerInvariant().Replace('\', '/').Contains('/native/'))">true</IsNative>
-      </RidSpecificFilesToPackage>
-      <!-- !!!BEGIN CHANGE Persist existing TargetPath. !!!-->
-      <RidSpecificFilesToPackage Condition="'%(RidSpecificFilesToPackage.TargetPath)' == ''">
-      <!-- !!!END CHANGE !!! -->
-        <TargetPath Condition="'%(RidSpecificFilesToPackage.IsNative)' != 'true'">runtimes/$(PackageRID)/lib/$(PackageTargetFramework)</TargetPath>
-        <TargetPath Condition="'%(RidSpecificFilesToPackage.IsNative)' == 'true'">runtimes/$(PackageRID)/native</TargetPath>
-      </RidSpecificFilesToPackage>
-      <!-- Ensure localization resource files make it to their subdirs. -->
-      <RidSpecificFilesToPackage Condition="'%(RidSpecificFilesToPackage.DestinationSubDirectory)' != ''">
-        <TargetPath>%(RidSpecificFilesToPackage.TargetPath)/%(RidSpecificFilesToPackage.DestinationSubDirectory)</TargetPath>
-      </RidSpecificFilesToPackage>
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
-      <FilesToPackage Include="@(RidSpecificFilesToPackage)" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(PackageTargetRuntime)' == ''">
-      <!-- Not RID-specific: include all reference files. -->
-      <FilesToPackage Include="@(Reference)">
-        <TargetPath>ref/$(PackageTargetFramework)</TargetPath>
-      </FilesToPackage>
-
-      <!-- include all doc files -->
-      <_docFilesToPackage Include="%(FilesToPackage.RootDir)%(FilesToPackage.Directory)**\%(FilesToPackage.FileName).xml" />
-
-      <FilesToPackage Include="@(_docFilesToPackage)">
-        <TargetPath>ref/$(PackageTargetFramework)/%(RecursiveDir)</TargetPath>
-      </FilesToPackage>
-    </ItemGroup>
-
-    <!-- Add versions file with the hashes of the repos we consume -->
-    <ItemGroup Condition="'$(FrameworkPackageName)' != ''">
-      <FilesToPackage Include="$(IntermediateOutputPath)\$(FrameworkPackageName).versions.txt">
-        <TargetPath></TargetPath>
-      </FilesToPackage>
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj
deleted file mode 100644
index 79bf46786a4c1..0000000000000
--- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <FrameworkPackageName>Microsoft.NETCore.App</FrameworkPackageName>
-    <BuildFullPlatformManifest>false</BuildFullPlatformManifest>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="$(NETStandardLibraryPackage)" Version="$(NETStandardLibraryVersion)" />
-  </ItemGroup>
-
-  <!-- This tool is a prebuilt not buildable from source. -->
-  <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
-    <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(PackageTargetRuntime)' == ''">
-    <!-- Bring in NETStandard.Library for build-tools. -->
-    <DependenciesToPackage Include="NETStandard.Library" />
-  </ItemGroup>
-
-  <!--
-    Platform manifest needs to include all System*Native items from 3.1 release. This itemgroup adds
-    them explicitly, to fill the gap that appeared when the names of these libraries were changed
-    in 5.0 to conform to a specific Android naming convention. The library name change was a fix
-    for https://github.com/dotnet/runtime/issues/33118. For more details of the issue and fix see
-    https://github.com/dotnet/runtime/issues/33450.
-  -->
-  <ItemGroup>
-    <_pastShimFiles Include="System.Globalization.Native.dylib" />
-    <_pastShimFiles Include="System.Globalization.Native.so" />
-    <_pastShimFiles Include="System.IO.Compression.Native.a" />
-    <_pastShimFiles Include="System.IO.Compression.Native.dylib" />
-    <_pastShimFiles Include="System.IO.Compression.Native.so" />
-    <_pastShimFiles Include="System.Native.a" />
-    <_pastShimFiles Include="System.Native.dylib" />
-    <_pastShimFiles Include="System.Native.so" />
-    <_pastShimFiles Include="System.Net.Http.Native.a" />
-    <_pastShimFiles Include="System.Net.Http.Native.dylib" />
-    <_pastShimFiles Include="System.Net.Http.Native.so" />
-    <_pastShimFiles Include="System.Net.Security.Native.a" />
-    <_pastShimFiles Include="System.Net.Security.Native.dylib" />
-    <_pastShimFiles Include="System.Net.Security.Native.so" />
-    <_pastShimFiles Include="System.Security.Cryptography.Native.Apple.a" />
-    <_pastShimFiles Include="System.Security.Cryptography.Native.Apple.dylib" />
-    <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.a" />
-    <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.dylib" />
-    <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.so" />
-    <SharedFrameworkRuntimeFiles Include="@(_pastShimFiles)" TargetPath="runtimes/" />
-  </ItemGroup>
-
-  <!-- get paths from packages that are needed for cross-gen and other includes,
-       only relevant for runtime-specific builds -->
-  <Target Name="GetPackagePaths"
-          Condition="'$(PackageTargetRuntime)' != ''"
-          DependsOnTargets="GetCorePackagePaths" />
-
-  <Target Name="GetDependencyVersionFiles" />
-
-  <Target Name="AddRuntimeFilesToPackage" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild" BeforeTargets="GetFilesFromPackageResolve">
-    <ItemGroup>
-      <RuntimeFiles>
-        <TargetPath>runtimes/$(PackageRID)/native</TargetPath>
-      </RuntimeFiles>
-
-      <RuntimeFiles Condition="'%(FileName)' == 'crossgen'">
-        <TargetPath>tools</TargetPath>
-      </RuntimeFiles>
-
-      <RuntimeFiles Condition="'$(TargetsMobile)' == 'true'"
-        Include="@(MonoCrossFiles)">
-        <TargetPath>runtimes/$(PackageRID)/native/cross</TargetPath>
-      </RuntimeFiles>
-      <RuntimeFiles Condition="'$(TargetsMobile)' == 'true'"
-        Include="@(MonoIncludeFiles)">
-        <TargetPath>runtimes/$(PackageRID)/native/include/%(RecursiveDir)</TargetPath>
-      </RuntimeFiles>
-
-      <CoreCLRCrossTargetFiles Condition="'%(FileName)' == 'clrjit' or '%(FileName)' == 'libclrjit'">
-        <TargetPath>runtimes/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native</TargetPath>
-      </CoreCLRCrossTargetFiles>
-      <CoreCLRCrossTargetFiles Condition="'%(FileName)' == 'crossgen'">
-        <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
-      </CoreCLRCrossTargetFiles>
-      <CoreCLRCrossTargetFiles Condition="$([System.String]::new('%(FileName)').StartsWith('mscordaccore')) and '$(TargetsWindows)' == 'true'">
-        <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
-      </CoreCLRCrossTargetFiles>
-      <CoreCLRCrossTargetFiles Condition="'%(FileName)%(Extension)' == 'mscordbi.dll' and '$(TargetsWindows)' == 'true'">
-        <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
-      </CoreCLRCrossTargetFiles>
-      <ReferenceCopyLocalPaths Include="@(RuntimeFiles);@(CoreCLRCrossTargetFiles);" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="AddFrameworkFilesToPackage" DependsOnTargets="ResolveLibrariesFromLocalBuild" BeforeTargets="GetFilesFromPackageResolve">
-    <ItemGroup>
-      <LibrariesRefAssemblies TargetPath="ref/$(NetCoreAppCurrent)" />
-      <Reference Include="@(LibrariesRefAssemblies)" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(PackageRID)' != ''">
-      <LibrariesRuntimeFiles Condition="'%(IsNative)' != 'true'" TargetPath="runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent)" />
-      <LibrariesRuntimeFiles Condition="'%(IsNative)' == 'true'" TargetPath="$([System.String]::new('runtimes/$(PackageRID)/native/%(LibrariesRuntimeFiles.NativeSubDirectory)%(RecursiveDir)').TrimEnd('/'))" />
-      <ReferenceCopyLocalPaths Include="@(LibrariesRuntimeFiles)" 
-          Condition="'%(LibrariesRuntimeFiles.Extension)' != '.a' or '$(TargetsMobile)' == 'true'"/>
-    </ItemGroup>
-
-    <ItemGroup>
-      <_docFilesToPackage Include="$(ArtifactsBinDir)/docs/%(LibrariesRefAssemblies.FileName).xml" Condition="Exists('$(ArtifactsBinDir)/docs/%(LibrariesRefAssemblies.FileName).xml')"/>
-    </ItemGroup>
-  </Target>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-  <Import Project="localnetcoreapp.override.targets" />
-</Project>
diff --git a/src/installer/pkg/sfx/Directory.Build.props b/src/installer/pkg/sfx/Directory.Build.props
new file mode 100644
index 0000000000000..a078c899d8159
--- /dev/null
+++ b/src/installer/pkg/sfx/Directory.Build.props
@@ -0,0 +1,25 @@
+<Project>
+  <PropertyGroup>
+    <EnsureRuntimeIdentifierSet>true</EnsureRuntimeIdentifierSet>
+  </PropertyGroup>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <!-- The built-in packaging targets make PackageLicenseFile and PackageLicenseExpression
+         mututally exclusive. Use PackageLicenseExpression if it's available. -->
+    <PackageLicenseFile Condition="'$(PackageLicenseExpression)' != ''"></PackageLicenseFile>
+    <PackageThirdPartyNoticesFile>$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
+    <!-- This link should be updated for each release milestone, currently this points to 1.0.0 -->
+    <ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799417</ReleaseNotes>
+    <ProjectUrl>https://dot.net</ProjectUrl>
+    <Authors>Microsoft</Authors>
+    <MinClientVersion>2.12</MinClientVersion>
+    <LicenseFile>$(RepoRoot)LICENSE.TXT</LicenseFile>
+    <ProductBrandPrefix>Microsoft .NET</ProductBrandPrefix>
+    <GenerateInstallers>true</GenerateInstallers>
+    <GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
+  </PropertyGroup>
+
+  <Import Project="$(RepositoryEngineeringDir)native\naming.props" />
+</Project>
diff --git a/src/installer/pkg/sfx/Directory.Build.targets b/src/installer/pkg/sfx/Directory.Build.targets
new file mode 100644
index 0000000000000..0ea3761da20eb
--- /dev/null
+++ b/src/installer/pkg/sfx/Directory.Build.targets
@@ -0,0 +1,19 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
+
+  <PropertyGroup>
+    <Title>$(PackageId)</Title>
+    <RuntimeDisclaimer>Internal implementation package not meant for direct consumption. Please do not reference directly.</RuntimeDisclaimer>
+    <MinimumNuGet3VersionDescription>When using NuGet 3.x, this package requires at least version 3.4.</MinimumNuGet3VersionDescription>
+  </PropertyGroup>
+
+  <Target Name="GeneratePackageDescription"
+          BeforeTargets="GenerateNuspec"
+          DependsOnTargets="InitializeSourceControlInformationFromSourceControlManager">
+    <PropertyGroup>
+      <PackageDescription Condition="'$(Description)' == ''">$(RuntimeDisclaimer) %0A$(SourceRevisionId) %0A$(MinimumNuGet3VersionDescription)</PackageDescription>
+      <PackageDescription Condition="'$(Description)' != ''">$(RuntimeDisclaimer) %0A$(Description) %0A$(SourceRevisionId) %0A$(MinimumNuGet3VersionDescription)</PackageDescription>
+    </PropertyGroup>
+  </Target>
+
+</Project>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
new file mode 100644
index 0000000000000..71ea5d2b395bc
--- /dev/null
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
@@ -0,0 +1,403 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
+
+  <PropertyGroup>
+    <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
+    <SharedFrameworkFriendlyName>.NET Runtime</SharedFrameworkFriendlyName>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageOverridesFile Include="$(MSBuildThisFileDirectory)PackageOverrides.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- LINUX -->
+
+    <!-- OSX -->
+    <SingleFileHostIncludeFilename Include="libSystem.IO.Compression.Native.dylib" />
+    <SingleFileHostIncludeFilename Include="libSystem.Native.dylib" />
+    <SingleFileHostIncludeFilename Include="libSystem.Net.Security.Native.dylib" />
+    <SingleFileHostIncludeFilename Include="libSystem.Security.Cryptography.Native.Apple.dylib" />
+    <SingleFileHostIncludeFilename Include="libSystem.Security.Cryptography.Native.OpenSsl.dylib" />
+    
+    <!-- Windows -->
+    <SingleFileHostIncludeFilename Include="clrcompression.dll" />
+    <SingleFileHostIncludeFilename Include="mscordaccore.dll" />
+  </ItemGroup>
+
+  <!--
+    Platform manifest needs to include all System*Native items from 3.1 release. This itemgroup adds
+    them explicitly, to fill the gap that appeared when the names of these libraries were changed
+    in 5.0 to conform to a specific Android naming convention. The library name change was a fix
+    for https://github.com/dotnet/runtime/issues/33118. For more details of the issue and fix see
+    https://github.com/dotnet/runtime/issues/33450.
+  -->
+  <ItemGroup>
+    <_pastShimFiles Include="System.Globalization.Native.dylib" />
+    <_pastShimFiles Include="System.Globalization.Native.so" />
+    <_pastShimFiles Include="System.IO.Compression.Native.a" />
+    <_pastShimFiles Include="System.IO.Compression.Native.dylib" />
+    <_pastShimFiles Include="System.IO.Compression.Native.so" />
+    <_pastShimFiles Include="System.Native.a" />
+    <_pastShimFiles Include="System.Native.dylib" />
+    <_pastShimFiles Include="System.Native.so" />
+    <_pastShimFiles Include="System.Net.Http.Native.a" />
+    <_pastShimFiles Include="System.Net.Http.Native.dylib" />
+    <_pastShimFiles Include="System.Net.Http.Native.so" />
+    <_pastShimFiles Include="System.Net.Security.Native.a" />
+    <_pastShimFiles Include="System.Net.Security.Native.dylib" />
+    <_pastShimFiles Include="System.Net.Security.Native.so" />
+    <_pastShimFiles Include="System.Security.Cryptography.Native.Apple.a" />
+    <_pastShimFiles Include="System.Security.Cryptography.Native.Apple.dylib" />
+    <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.a" />
+    <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.dylib" />
+    <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.so" />
+    <PlatformManifestFileEntry Include="@(_pastShimFiles)" IsNative="true" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <UseDefaultPlatformManifestFallbackVersions>true</UseDefaultPlatformManifestFallbackVersions>
+    <WindowsForwarderFileVersion>10.0.19041.1</WindowsForwarderFileVersion>
+    <MicrosoftDiaSymReaderNativeFileVersion>14.12.25830.2</MicrosoftDiaSymReaderNativeFileVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PlatformManifestFileEntry Include="libSystem.Globalization.Native.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Globalization.Native.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.IO.Compression.Native.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.IO.Compression.Native.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.IO.Compression.Native.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Native.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Native.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Native.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Net.Http.Native.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Net.Http.Native.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Net.Http.Native.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Net.Security.Native.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Net.Security.Native.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Net.Security.Native.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Security.Cryptography.Native.Apple.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Security.Cryptography.Native.Apple.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Security.Cryptography.Native.OpenSsl.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Security.Cryptography.Native.OpenSsl.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Security.Cryptography.Native.OpenSsl.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="coreclr.dll" IsNative="true" />
+    <PlatformManifestFileEntry Include="libcoreclr.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="libcoreclr.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="clretwrc.dll" IsNative="true" />
+    <PlatformManifestFileEntry Include="clrjit.dll" IsNative="true" />
+    <PlatformManifestFileEntry Include="libclrjit.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="libclrjit.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="dbgshim.dll" IsNative="true" />
+    <PlatformManifestFileEntry Include="libdbgshim.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="libdbgshim.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="mscordaccore.dll" IsNative="true" />
+    <PlatformManifestFileEntry Include="libmscordaccore.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="libmscordaccore.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="mscordbi.dll" IsNative="true" />
+    <PlatformManifestFileEntry Include="libmscordbi.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="libmscordbi.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="mscorrc.dll" IsNative="true" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-console-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-console-l1-2-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-datetime-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-debug-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-errorhandling-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-file-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-file-l1-2-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-file-l2-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-handle-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-heap-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-interlocked-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-libraryloader-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-localization-l1-2-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-memory-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-namedpipe-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-processenvironment-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-processthreads-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-processthreads-l1-1-1.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-profile-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-rtlsupport-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-string-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-synch-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-synch-l1-2-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-sysinfo-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-timezone-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-core-util-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-conio-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-convert-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-environment-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-filesystem-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-heap-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-locale-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-math-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-multibyte-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-private-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-process-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-runtime-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-stdio-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-string-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-time-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="api-ms-win-crt-utility-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="API-MS-Win-core-xstate-l2-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
+    <PlatformManifestFileEntry Include="ucrtbase.dll" IsNative="true" />
+    <PlatformManifestFileEntry Include="System.Private.CoreLib.dll" />
+    <PlatformManifestFileEntry Include="Microsoft.CSharp.dll" />
+    <PlatformManifestFileEntry Include="Microsoft.VisualBasic.dll" />
+    <PlatformManifestFileEntry Include="Microsoft.Win32.Primitives.dll" />
+    <PlatformManifestFileEntry Include="Microsoft.Win32.Registry.dll" />
+    <PlatformManifestFileEntry Include="mscorlib.dll" />
+    <PlatformManifestFileEntry Include="netstandard.dll" />
+    <PlatformManifestFileEntry Include="System.AppContext.dll" />
+    <PlatformManifestFileEntry Include="System.Buffers.dll" />
+    <PlatformManifestFileEntry Include="System.Collections.Concurrent.dll" />
+    <PlatformManifestFileEntry Include="System.Collections.dll" />
+    <PlatformManifestFileEntry Include="System.Collections.Immutable.dll" />
+    <PlatformManifestFileEntry Include="System.Collections.NonGeneric.dll" />
+    <PlatformManifestFileEntry Include="System.Collections.Specialized.dll" />
+    <PlatformManifestFileEntry Include="System.ComponentModel.Annotations.dll" />
+    <PlatformManifestFileEntry Include="System.ComponentModel.DataAnnotations.dll" />
+    <PlatformManifestFileEntry Include="System.ComponentModel.dll" />
+    <PlatformManifestFileEntry Include="System.ComponentModel.EventBasedAsync.dll" />
+    <PlatformManifestFileEntry Include="System.ComponentModel.Primitives.dll" />
+    <PlatformManifestFileEntry Include="System.ComponentModel.TypeConverter.dll" />
+    <PlatformManifestFileEntry Include="System.Configuration.dll" />
+    <PlatformManifestFileEntry Include="System.Console.dll" />
+    <PlatformManifestFileEntry Include="System.Core.dll" />
+    <PlatformManifestFileEntry Include="System.Data.Common.dll" />
+    <PlatformManifestFileEntry Include="System.Data.DataSetExtensions.dll" />
+    <PlatformManifestFileEntry Include="System.Data.dll" />
+    <PlatformManifestFileEntry Include="System.Diagnostics.Contracts.dll" />
+    <PlatformManifestFileEntry Include="System.Diagnostics.Debug.dll" />
+    <PlatformManifestFileEntry Include="System.Diagnostics.DiagnosticSource.dll" />
+    <PlatformManifestFileEntry Include="System.Diagnostics.FileVersionInfo.dll" />
+    <PlatformManifestFileEntry Include="System.Diagnostics.Process.dll" />
+    <PlatformManifestFileEntry Include="System.Diagnostics.StackTrace.dll" />
+    <PlatformManifestFileEntry Include="System.Diagnostics.TextWriterTraceListener.dll" />
+    <PlatformManifestFileEntry Include="System.Diagnostics.Tools.dll" />
+    <PlatformManifestFileEntry Include="System.Diagnostics.TraceSource.dll" />
+    <PlatformManifestFileEntry Include="System.Diagnostics.Tracing.dll" />
+    <PlatformManifestFileEntry Include="System.dll" />
+    <PlatformManifestFileEntry Include="System.Drawing.dll" />
+    <PlatformManifestFileEntry Include="System.Drawing.Primitives.dll" />
+    <PlatformManifestFileEntry Include="System.Dynamic.Runtime.dll" />
+    <PlatformManifestFileEntry Include="System.Formats.Asn1.dll" />
+    <PlatformManifestFileEntry Include="System.Globalization.Calendars.dll" />
+    <PlatformManifestFileEntry Include="System.Globalization.dll" />
+    <PlatformManifestFileEntry Include="System.Globalization.Extensions.dll" />
+    <PlatformManifestFileEntry Include="System.IO.Compression.Brotli.dll" />
+    <PlatformManifestFileEntry Include="System.IO.Compression.dll" />
+    <PlatformManifestFileEntry Include="System.IO.Compression.FileSystem.dll" />
+    <PlatformManifestFileEntry Include="System.IO.Compression.ZipFile.dll" />
+    <PlatformManifestFileEntry Include="System.IO.dll" />
+    <PlatformManifestFileEntry Include="System.IO.FileSystem.AccessControl.dll" />
+    <PlatformManifestFileEntry Include="System.IO.FileSystem.dll" />
+    <PlatformManifestFileEntry Include="System.IO.FileSystem.DriveInfo.dll" />
+    <PlatformManifestFileEntry Include="System.IO.FileSystem.Primitives.dll" />
+    <PlatformManifestFileEntry Include="System.IO.FileSystem.Watcher.dll" />
+    <PlatformManifestFileEntry Include="System.IO.IsolatedStorage.dll" />
+    <PlatformManifestFileEntry Include="System.IO.MemoryMappedFiles.dll" />
+    <PlatformManifestFileEntry Include="System.IO.Pipelines.dll" />
+    <PlatformManifestFileEntry Include="System.IO.Pipes.AccessControl.dll" />
+    <PlatformManifestFileEntry Include="System.IO.Pipes.dll" />
+    <PlatformManifestFileEntry Include="System.IO.UnmanagedMemoryStream.dll" />
+    <PlatformManifestFileEntry Include="System.Linq.dll" />
+    <PlatformManifestFileEntry Include="System.Linq.Expressions.dll" />
+    <PlatformManifestFileEntry Include="System.Linq.Parallel.dll" />
+    <PlatformManifestFileEntry Include="System.Linq.Queryable.dll" />
+    <PlatformManifestFileEntry Include="System.Memory.dll" />
+    <PlatformManifestFileEntry Include="System.Net.dll" />
+    <PlatformManifestFileEntry Include="System.Net.Connections.dll" />
+    <PlatformManifestFileEntry Include="System.Net.Http.dll" />
+    <PlatformManifestFileEntry Include="System.Net.Http.Json.dll" />
+    <PlatformManifestFileEntry Include="System.Net.HttpListener.dll" />
+    <PlatformManifestFileEntry Include="System.Net.Mail.dll" />
+    <PlatformManifestFileEntry Include="System.Net.NameResolution.dll" />
+    <PlatformManifestFileEntry Include="System.Net.NetworkInformation.dll" />
+    <PlatformManifestFileEntry Include="System.Net.Ping.dll" />
+    <PlatformManifestFileEntry Include="System.Net.Quic.dll" />
+    <PlatformManifestFileEntry Include="System.Net.Primitives.dll" />
+    <PlatformManifestFileEntry Include="System.Net.Requests.dll" />
+    <PlatformManifestFileEntry Include="System.Net.Security.dll" />
+    <PlatformManifestFileEntry Include="System.Net.ServicePoint.dll" />
+    <PlatformManifestFileEntry Include="System.Net.Sockets.dll" />
+    <PlatformManifestFileEntry Include="System.Net.WebClient.dll" />
+    <PlatformManifestFileEntry Include="System.Net.WebHeaderCollection.dll" />
+    <PlatformManifestFileEntry Include="System.Net.WebProxy.dll" />
+    <PlatformManifestFileEntry Include="System.Net.WebSockets.Client.dll" />
+    <PlatformManifestFileEntry Include="System.Net.WebSockets.dll" />
+    <PlatformManifestFileEntry Include="System.Numerics.dll" />
+    <PlatformManifestFileEntry Include="System.Numerics.Vectors.dll" />
+    <PlatformManifestFileEntry Include="System.ObjectModel.dll" />
+    <PlatformManifestFileEntry Include="System.Private.DataContractSerialization.dll" />
+    <PlatformManifestFileEntry Include="System.Private.Uri.dll" />
+    <PlatformManifestFileEntry Include="System.Private.Xml.dll" />
+    <PlatformManifestFileEntry Include="System.Private.Xml.Linq.dll" />
+    <PlatformManifestFileEntry Include="System.Reflection.DispatchProxy.dll" />
+    <PlatformManifestFileEntry Include="System.Reflection.dll" />
+    <PlatformManifestFileEntry Include="System.Reflection.Emit.dll" />
+    <PlatformManifestFileEntry Include="System.Reflection.Emit.ILGeneration.dll" />
+    <PlatformManifestFileEntry Include="System.Reflection.Emit.Lightweight.dll" />
+    <PlatformManifestFileEntry Include="System.Reflection.Extensions.dll" />
+    <PlatformManifestFileEntry Include="System.Reflection.Metadata.dll" />
+    <PlatformManifestFileEntry Include="System.Reflection.Primitives.dll" />
+    <PlatformManifestFileEntry Include="System.Reflection.TypeExtensions.dll" />
+    <PlatformManifestFileEntry Include="System.Resources.Reader.dll" />
+    <PlatformManifestFileEntry Include="System.Resources.ResourceManager.dll" />
+    <PlatformManifestFileEntry Include="System.Resources.Writer.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.CompilerServices.Unsafe.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.CompilerServices.VisualC.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.Extensions.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.Handles.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.InteropServices.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.InteropServices.RuntimeInformation.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.Intrinsics.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.Loader.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.Numerics.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.Serialization.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.Serialization.Formatters.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.Serialization.Json.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.Serialization.Primitives.dll" />
+    <PlatformManifestFileEntry Include="System.Runtime.Serialization.Xml.dll" />
+    <PlatformManifestFileEntry Include="System.Security.AccessControl.dll" />
+    <PlatformManifestFileEntry Include="System.Security.Claims.dll" />
+    <PlatformManifestFileEntry Include="System.Security.Cryptography.Algorithms.dll" />
+    <PlatformManifestFileEntry Include="System.Security.Cryptography.Cng.dll" />
+    <PlatformManifestFileEntry Include="System.Security.Cryptography.Csp.dll" />
+    <PlatformManifestFileEntry Include="System.Security.Cryptography.Encoding.dll" />
+    <PlatformManifestFileEntry Include="System.Security.Cryptography.OpenSsl.dll" />
+    <PlatformManifestFileEntry Include="System.Security.Cryptography.Primitives.dll" />
+    <PlatformManifestFileEntry Include="System.Security.Cryptography.X509Certificates.dll" />
+    <PlatformManifestFileEntry Include="System.Security.dll" />
+    <PlatformManifestFileEntry Include="System.Security.Principal.dll" />
+    <PlatformManifestFileEntry Include="System.Security.Principal.Windows.dll" />
+    <PlatformManifestFileEntry Include="System.Security.SecureString.dll" />
+    <PlatformManifestFileEntry Include="System.ServiceModel.Web.dll" />
+    <PlatformManifestFileEntry Include="System.ServiceProcess.dll" />
+    <PlatformManifestFileEntry Include="System.Text.Encoding.CodePages.dll" />
+    <PlatformManifestFileEntry Include="System.Text.Encoding.dll" />
+    <PlatformManifestFileEntry Include="System.Text.Encoding.Extensions.dll" />
+    <PlatformManifestFileEntry Include="System.Text.Encodings.Web.dll" />
+    <PlatformManifestFileEntry Include="System.Text.Json.dll" />
+    <PlatformManifestFileEntry Include="System.Text.RegularExpressions.dll" />
+    <PlatformManifestFileEntry Include="System.Threading.Channels.dll" />
+    <PlatformManifestFileEntry Include="System.Threading.dll" />
+    <PlatformManifestFileEntry Include="System.Threading.Overlapped.dll" />
+    <PlatformManifestFileEntry Include="System.Threading.Tasks.Dataflow.dll" />
+    <PlatformManifestFileEntry Include="System.Threading.Tasks.dll" />
+    <PlatformManifestFileEntry Include="System.Threading.Tasks.Extensions.dll" />
+    <PlatformManifestFileEntry Include="System.Threading.Tasks.Parallel.dll" />
+    <PlatformManifestFileEntry Include="System.Threading.Thread.dll" />
+    <PlatformManifestFileEntry Include="System.Threading.ThreadPool.dll" />
+    <PlatformManifestFileEntry Include="System.Threading.Timer.dll" />
+    <PlatformManifestFileEntry Include="System.Transactions.dll" />
+    <PlatformManifestFileEntry Include="System.Transactions.Local.dll" />
+    <PlatformManifestFileEntry Include="System.ValueTuple.dll" />
+    <PlatformManifestFileEntry Include="System.Web.dll" />
+    <PlatformManifestFileEntry Include="System.Web.HttpUtility.dll" />
+    <PlatformManifestFileEntry Include="System.Windows.dll" />
+    <PlatformManifestFileEntry Include="System.Xml.dll" />
+    <PlatformManifestFileEntry Include="System.Xml.Linq.dll" />
+    <PlatformManifestFileEntry Include="System.Xml.ReaderWriter.dll" />
+    <PlatformManifestFileEntry Include="System.Xml.Serialization.dll" />
+    <PlatformManifestFileEntry Include="System.Xml.XDocument.dll" />
+    <PlatformManifestFileEntry Include="System.Xml.XmlDocument.dll" />
+    <PlatformManifestFileEntry Include="System.Xml.XmlSerializer.dll" />
+    <PlatformManifestFileEntry Include="System.Xml.XPath.dll" />
+    <PlatformManifestFileEntry Include="System.Xml.XPath.XDocument.dll" />
+    <PlatformManifestFileEntry Include="WindowsBase.dll" />
+    <PlatformManifestFileEntry Include="clrcompression.dll" IsNative="true" />
+    <PlatformManifestFileEntry Include="Microsoft.VisualBasic.Core.dll" />
+    <PlatformManifestFileEntry Include="createdump.exe" IsNative="true" />
+    <PlatformManifestFileEntry Include="createdump" IsNative="true" />
+    <PlatformManifestFileEntry Include="libcoreclrtraceptprovider.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="hostpolicy.dll" IsNative="true" />
+    <PlatformManifestFileEntry Include="libhostpolicy.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="libhostpolicy.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="hostfxr.dll" IsNative="true" />
+    <PlatformManifestFileEntry Include="libhostfxr.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="libhostfxr.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="Microsoft.DiaSymReader.Native.x86.dll" IsNative="true" FallbackFileVersion="$(MicrosoftDiaSymReaderNativeFileVersion)" />
+    <PlatformManifestFileEntry Include="Microsoft.DiaSymReader.Native.amd64.dll" IsNative="true" FallbackFileVersion="$(MicrosoftDiaSymReaderNativeFileVersion)" />
+    <PlatformManifestFileEntry Include="Microsoft.DiaSymReader.Native.arm.dll" IsNative="true" FallbackFileVersion="$(MicrosoftDiaSymReaderNativeFileVersion)" />
+    <!-- Mono-specific files -->
+    <PlatformManifestFileEntry Include="libmonosgen-2.0.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libmonosgen-2.0.so" IsNative="true" />
+    <PlatformManifestFileEntry Include="libmonosgen-2.0.dylib" IsNative="true" />
+    <PlatformManifestFileEntry Include="llc" IsNative="true" />
+    <PlatformManifestFileEntry Include="mono-aot-cross" IsNative="true" />
+    <PlatformManifestFileEntry Include="opt" IsNative="true" />
+    <!-- Mono WASM-specific files -->
+    <PlatformManifestFileEntry Include="libmono-ee-interp.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libmono-icall-table.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libmono-ilgen.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libmono-profiler-aot.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="System.Private.Runtime.InteropServices.Javascript.dll" />
+    <PlatformManifestFileEntry Include="dotnet.js" IsNative="true" />
+    <PlatformManifestFileEntry Include="dotnet.wasm" IsNative="true" />
+    <PlatformManifestFileEntry Include="dotnet.timezones.blat" IsNative="true" />
+    <PlatformManifestFileEntry Include="icudt.dat" IsNative="true" />
+    <PlatformManifestFileEntry Include="icudt_no_CJK.dat" IsNative="true" />
+    <PlatformManifestFileEntry Include="icudt_CJK.dat" IsNative="true" />
+    <PlatformManifestFileEntry Include="icudt_EFIGS.dat" IsNative="true" />
+    <PlatformManifestFileEntry Include="icudt_optimal.dat" IsNative="true" />
+    <PlatformManifestFileEntry Include="icudt_optimal_no_CJK.dat" IsNative="true" />
+    <PlatformManifestFileEntry Include="libicui18n.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libicuuc.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="binding_support.js" IsNative="true" />
+    <PlatformManifestFileEntry Include="dotnet_support.js" IsNative="true" />
+    <PlatformManifestFileEntry Include="library_mono.js" IsNative="true" />
+    <PlatformManifestFileEntry Include="pal_random.js" IsNative="true" />
+    <PlatformManifestFileEntry Include="corebindings.c" IsNative="true" />
+    <PlatformManifestFileEntry Include="driver.c" IsNative="true" />
+    <PlatformManifestFileEntry Include="pinvoke.c" IsNative="true" />
+    <PlatformManifestFileEntry Include="pinvoke-table.h" IsNative="true" />
+    <PlatformManifestFileEntry Include="pinvoke.h" IsNative="true" />
+  </ItemGroup>
+
+ <ItemGroup>
+    <!-- Exclude shims from the closure verification -->
+    <ExcludeFromClosure Include="mscorlib" />
+    <ExcludeFromClosure Include="System" />
+    <ExcludeFromClosure Include="System.Configuration" />
+    <ExcludeFromClosure Include="System.Core" />
+    <ExcludeFromClosure Include="System.Data" />
+    <ExcludeFromClosure Include="System.Drawing" />
+    <ExcludeFromClosure Include="System.Net" />
+    <ExcludeFromClosure Include="System.Security" />
+    <ExcludeFromClosure Include="System.ServiceModel.Web" />
+    <ExcludeFromClosure Include="System.ServiceProcess" />
+    <ExcludeFromClosure Include="System.Transactions" />
+    <ExcludeFromClosure Include="WindowsBase" />
+ </ItemGroup>
+
+  <ItemGroup>
+    <!-- Add a reference to Microsoft.DiaSymReader.Native if one does not already exist. -->
+    <PackageReference Include="Microsoft.DiaSymReader.Native"
+                      Exclude="@(PackageReference)"
+                      Version="$(MicrosoftDiaSymReaderNativeVersion)"
+                      IsImplicitlyDefined="true"
+                      ExcludeAssets="all" />
+    <!-- Generate the PkgMicrosoft_DiaSymReader_Native property no matter who added the reference. -->
+    <PackageReference Update="Microsoft.DiaSymReader.Native"
+                      GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <_hostArch>$(TargetArchitecture)</_hostArch>
+    <_longNameTargetArch>$(TargetArchitecture)</_longNameTargetArch>
+    <_hostArch Condition="'$(_hostArch)' == 'x64'">amd64</_hostArch>
+    <_longNameTargetArch Condition="'$(_longNameTargetArch)' == 'x64'">amd64</_longNameTargetArch>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetArchitecture)' == 'arm' AND '$(OS)' == 'Windows_NT'">
+    <_hostArch>x86</_hostArch>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetArchitecture)' == 'arm' AND '$(OS)' != 'Windows_NT'">
+    <_hostArch>amd64</_hostArch>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(BuildArchitecture)' != 'arm64'">
+    <_hostArch>amd64</_hostArch>
+  </PropertyGroup>
+</Project>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets
new file mode 100644
index 0000000000000..be753f2b2723f
--- /dev/null
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets
@@ -0,0 +1,17 @@
+<Project>
+  <Target Name="AddLongNameDacToPlatformManifest" DependsOnTargets="GetAssemblyVersion" BeforeTargets="GetFilesToPackage">
+    <ItemGroup>
+      <PlatformManifestFileEntry Include="mscordaccore_$(_hostArch)_$(_longNameTargetArch)_$(FileVersion).dll" />
+      <PlatformManifestFileEntry Include="mscordaccore_$(_longNameTargetArch)_$(_longNameTargetArch)_$(FileVersion).dll" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="ReturnProductVersion" Returns="$(Version)" />
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
+  </ItemGroup>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
+</Project>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj
new file mode 100644
index 0000000000000..ed0ed5da583db
--- /dev/null
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj
@@ -0,0 +1,110 @@
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
+
+  <PropertyGroup>
+    <SkipBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</SkipBuild>
+    <PlatformPackageType>RuntimePack</PlatformPackageType>
+    <SharedFrameworkName>Microsoft.NETCore.App.Crossgen2</SharedFrameworkName>
+    <OverridePackageId>Microsoft.NETCore.App.Crossgen2.$(RuntimeIdentifier)</OverridePackageId>
+    <ArchiveName>dotnet-crossgen2</ArchiveName>
+    <SharedFrameworkHostFileNameOverride>crossgen2</SharedFrameworkHostFileNameOverride>
+    <RuntimeIdentifiers>win-x64;linux-x64;linux-musl-x64</RuntimeIdentifiers>
+    <GenerateInstallers>false</GenerateInstallers>
+    <GetSharedFrameworkFilesForReadyToRunDependsOn>
+        AddRuntimeFilesToPackage;
+        AddFrameworkFilesToPackage
+    </GetSharedFrameworkFilesForReadyToRunDependsOn>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <!-- Disable crossgen on FreeBSD, NetBSD, illumos and Solaris for now. This can be revisited when we have full support. -->
+    <PublishReadyToRun Condition="'$(TargetOS)'=='FreeBSD' Or '$(TargetOS)'=='NetBSD' Or '$(TargetOS)'=='illumos' Or '$(TargetOS)'=='Solaris'">false</PublishReadyToRun>
+    <HostJsonTargetPath>tools/</HostJsonTargetPath>
+    <PermitDllAndExeFilesLackingFileVersion>true</PermitDllAndExeFilesLackingFileVersion>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <TargetOSComponent>unix</TargetOSComponent>
+    <TargetOSComponent Condition="'$(TargetOS)' == 'windows'">win</TargetOSComponent>
+    <TargetSpec>$(TargetOSComponent)-$(TargetArchitecture)</TargetSpec>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)crossgen2$(ExeSuffix)" TargetPath="tools/" />
+    <Reference Include="$(CoreCLRCrossgen2Dir)crossgen2.dll" />
+    <Reference Include="$(CoreCLRCrossgen2Dir)ILCompiler*.dll" />
+    <Reference Include="$(CoreCLRCrossgen2Dir)Microsoft.DiaSymReader.dll" />
+    <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)jitinterface_$(TargetArchitecture)$(LibraryFileExtension)" TargetPath="tools/" />
+    <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_win_x86_$(TargetArchitecture)$(LibraryFileExtension)" TargetPath="tools/"  />
+    <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_win_arm_$(TargetArchitecture)$(LibraryFileExtension)" TargetPath="tools/"  />
+    <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_unix_arm_$(TargetArchitecture)$(LibraryFileExtension)" TargetPath="tools/"  />
+    <NativeRuntimeAsset Condition="'$(TargetArchitecture)' == 'arm64' or  '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_win_x64_$(TargetArchitecture)$(LibraryFileExtension)"  TargetPath="tools/" />
+    <NativeRuntimeAsset Condition="'$(TargetArchitecture)' == 'arm64' or  '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_win_arm64_$(TargetArchitecture)$(LibraryFileExtension)" TargetPath="tools/"  />
+    <NativeRuntimeAsset Condition="'$(TargetArchitecture)' == 'arm64' or  '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_unix_x64_$(TargetArchitecture)$(LibraryFileExtension)" TargetPath="tools/" />
+    <NativeRuntimeAsset Condition="'$(TargetArchitecture)' == 'arm64' or  '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)$(LibraryFilePrefix)clrjit_unix_arm64_$(TargetArchitecture)$(LibraryFileExtension)" TargetPath="tools/"  />
+    <!-- Include the native hosting layer  -->
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostfxr$(LibraryFileExtension)" TargetPath="tools/" />
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostpolicy$(LibraryFileExtension)" TargetPath="tools/" />
+  </ItemGroup>
+
+  <Target Name="AddRuntimeFilesToPackage" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild">
+    <ItemGroup>
+      <CrossgenFile Include="@(RuntimeFiles)" Condition="'%(Filename)' == 'crossgen'" />
+      <ReferenceCopyLocalPaths Include="@(RuntimeFiles)" Exclude="@(CrossgenFile)" />
+      <ReferenceCopyLocalPaths TargetPath="tools/" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="AddFrameworkFilesToPackage" DependsOnTargets="ResolveLibrariesFromLocalBuild">
+    <ItemGroup>
+      <ReferenceCopyLocalPaths Include="@(LibrariesRuntimeFiles)" TargetPath="tools/" />
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup Condition="'$(TargetOS)' == 'windows'">
+    <_diaSymArch Condition="'$(_hostArch)' != ''">$(_hostArch)</_diaSymArch>
+    <_diaSymReaderPath>$(PkgMicrosoft_DiaSymReader_Native)/runtimes/win/native/Microsoft.DiaSymReader.Native.$(_diaSymArch).dll</_diaSymReaderPath>
+    <_diaSymReaderPathIfExists Condition="Exists('$(_diaSymReaderPath)')">$(_diaSymReaderPath)</_diaSymReaderPathIfExists>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(_diaSymReaderPathIfExists)' != ''">
+    <NativeRuntimeAsset Include="$(_diaSymReaderPathIfExists)" TargetPath="tools/" />
+  </ItemGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
+
+  <Target Name="ResolveReadyToRunCompilers" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild">
+    <ItemGroup Condition="'$(RuntimeFlavor)' != 'Mono'">
+      <_crossTargetJit Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" />
+      <_clrjit Include="@(RuntimeFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" />
+      <_crossTargetCrossgen Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ApplicationFileExtension)'" />
+      <_crossgen Include="@(RuntimeFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ApplicationFileExtension)'" />
+    </ItemGroup>
+    <ItemGroup Condition="'@(_crossTargetJit)' != '' and '@(_crossTargetCrossgen)' != ''">
+      <CrossgenTool Include="@(_crossTargetCrossgen->ClearMetadata())"
+                    JitPath="@(_crossTargetJit)"
+                    DiaSymReader="$(_diaSymReaderPathIfExists)" />
+    </ItemGroup>
+    <ItemGroup Condition="'@(_crossTargetJit)' == '' and '@(_crossTargetCrossgen)' == ''">
+      <CrossgenTool Include="@(_crossgen->ClearMetadata())"
+                    JitPath="@(_clrjit)"
+                    DiaSymReader="$(_diaSymReaderPathIfExists)" />
+    </ItemGroup>
+  </Target>
+
+
+  <Target Name="GetFilesToPublish">
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+          Targets="_GetAllSharedFrameworkFiles"
+          RemoveProperties="OutputPath;SymbolsOutputPath">
+      <Output TaskParameter="TargetOutputs" ItemName="_FilesToPackage" />
+    </MSBuild>
+    <ItemGroup>
+      <_PackagedFilesToPublish Include="@(_FilesToPackage)" Condition="'%(_FilesToPackage.PackOnly)' != 'true'" />
+    </ItemGroup>
+    <ItemGroup>
+      <FilesToPublish Include="@(_PackagedFilesToPublish)"
+                       TargetPath="" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj
new file mode 100644
index 0000000000000..b62fef82dd0db
--- /dev/null
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj
@@ -0,0 +1,66 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" />
+
+  <PropertyGroup>
+    <SkipBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</SkipBuild>
+    <PlatformPackageType>AppHostPack</PlatformPackageType>
+    <UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
+    <ArchiveName>dotnet-apphost-pack</ArchiveName>
+    <InstallerName>dotnet-apphost-pack</InstallerName>
+    <VSInsertionShortComponentName>NetCore.AppHostPack</VSInsertionShortComponentName>
+  </PropertyGroup>
+
+  <!--
+    See https://github.com/dotnet/core-setup/issues/7846. Cross-arch MSI installers are needed for
+    C++/CLI project system support.
+  -->
+  <ItemGroup>
+    <CrossArchSdkMsiInstallerArch Include="x86;x64" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/apphost$(ApplicationFileExtension)" />
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/singlefilehost$(ApplicationFileExtension)" />
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)nethost$(LibraryFileExtension)" />
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)nethost$(StaticLibraryFileExtension)" />
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/nethost.h" />
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/hostfxr.h" />
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/coreclr_delegates.h" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetOS)' == 'windows'">
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/comhost.dll" />
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/ijwhost.dll" />
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/ijwhost.lib" />
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/libnethost.lib" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <_SymbolFiles Condition="'$(TargetOS)' == 'windows'"
+                    Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)PDB/%(Filename).pdb')"
+                    IsSymbolFile="true"
+                    IsNative="true" />
+    <_SymbolFiles Condition="'$(TargetOS)' != 'windows'"
+                    Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)PDB/%(Filename)%(Extension)%(SymbolFileExtension)')"
+                    IsSymbolFile="true"
+                    IsNative="true" />
+  </ItemGroup>
+
+  <Target Name="AddSymbolFiles" BeforeTargets="GetFilesToPackage">
+    <ItemGroup>
+        <FilesToPackage Include="@(_SymbolFiles)" Condition="Exists('%(Identity)')" />
+    </ItemGroup>
+  </Target>
+
+  <!--
+    These files are not signed, because they're templates: they are modified by the SDK on the
+    user's machine before use. We have a signing validation exception for Visual Studio insertion's
+    signature validation. However, the exceptions are based on the file IDs, which are not stable
+    because product version is in the path. We need to force these IDs to be stable by modifying
+    the WiX source file. https://github.com/dotnet/core-setup/issues/7327
+  -->
+  <ItemGroup>
+    <HeatOutputFileElementToStabilize Include="native\apphost.exe" ReplacementId="apphosttemplateapphostexe" />
+    <HeatOutputFileElementToStabilize Include="native\singlefilehost.exe" ReplacementId="staticapphosttemplateapphostexe" />
+    <HeatOutputFileElementToStabilize Include="native\comhost.dll" ReplacementId="comhosttemplatecomhostdll" />
+  </ItemGroup>
+</Project>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
new file mode 100644
index 0000000000000..327ba6421fd6e
--- /dev/null
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" />
+
+  <PropertyGroup>
+    <PlatformPackageType>TargetingPack</PlatformPackageType>
+    <UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
+    <ArchiveName>dotnet-targeting-pack</ArchiveName>
+    <InstallerName>dotnet-targeting-pack</InstallerName>
+    <VSInsertionShortComponentName>NetCore.TargetingPack</VSInsertionShortComponentName>
+    <Description>A set of .NET APIs that are included in the default .NET application model. Contains reference assemblies, documentation, and other design-time assets.</Description>
+  </PropertyGroup>
+
+  <Target Name="AddFrameworkFilesToPackage" DependsOnTargets="ResolveLibrariesFromLocalBuild" BeforeTargets="GetFilesToPackage">
+    <ItemGroup>
+      <ReferencePath Include="@(LibrariesRefAssemblies)" />
+      <DocFilesToPackage Include="$(ArtifactsBinDir)/docs/%(LibrariesRefAssemblies.FileName).xml" Condition="Exists('$(ArtifactsBinDir)/docs/%(LibrariesRefAssemblies.FileName).xml')"/>
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj
new file mode 100644
index 0000000000000..b1923524d4a8c
--- /dev/null
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj
@@ -0,0 +1,125 @@
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
+
+  <PropertyGroup>
+    <PlatformPackageType>RuntimePack</PlatformPackageType>
+    <ArchiveName>dotnet-runtime-internal</ArchiveName>
+    <InstallerName Condition="'$(TargetOS)' != 'OSX'">dotnet-runtime</InstallerName>
+    <InstallerName Condition="'$(TargetOS)' == 'OSX'">dotnet-runtime-internal</InstallerName>
+    <GenerateSymbolsArchive>true</GenerateSymbolsArchive>
+    <SymbolsArchiveName>dotnet-runtime-symbols</SymbolsArchiveName>
+    <VSInsertionShortComponentName>NetCore.SharedFramework</VSInsertionShortComponentName>
+    <UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
+    <GetSharedFrameworkFilesForReadyToRunDependsOn>
+        AddRuntimeFilesToPackage;
+        AddFrameworkFilesToPackage
+    </GetSharedFrameworkFilesForReadyToRunDependsOn>
+    <PublishReadyToRun Condition="'$(RuntimeFlavor)' != 'Mono'">true</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(RuntimeFlavor)' == 'Mono'">false</PublishReadyToRun>
+    <!-- Disable crossgen on FreeBSD, NetBSD, illumos and Solaris for now. This can be revisited when we have full support. -->
+    <PublishReadyToRun Condition="'$(TargetOS)'=='FreeBSD' Or '$(TargetOS)'=='NetBSD' Or '$(TargetOS)'=='illumos' Or '$(TargetOS)'=='Solaris'">false</PublishReadyToRun>
+    <!-- These components are installed by the root shared framework, but not others. -->
+    <IncludeWerRelatedKeys>true</IncludeWerRelatedKeys>
+    <IncludeBreadcrumbStoreFolder>true</IncludeBreadcrumbStoreFolder>
+    <MacOSPackageDescription>The .NET Shared Framework</MacOSPackageDescription>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RuntimeFlavor)' == 'Mono' and '$(TargetsMobile)' != 'true'">
+    <RuntimeSpecificFrameworkSuffix>Mono</RuntimeSpecificFrameworkSuffix>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(MonoEnableLLVM)' == 'true' and '$(RuntimeFlavor)' == 'Mono' and '$(TargetsMobile)' != 'true' and '$(TargetsBrowser)' != 'true'">
+    <RuntimeSpecificFrameworkSuffix>Mono.LLVM</RuntimeSpecificFrameworkSuffix>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(MonoBundleLLVMOptimizer)' == 'true' and '$(RuntimeFlavor)' == 'Mono' and '$(TargetsMobile)' != 'true' and '$(TargetsBrowser)' != 'true'">
+    <RuntimeSpecificFrameworkSuffix>Mono.LLVM.AOT</RuntimeSpecificFrameworkSuffix>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(RuntimeSpecificFrameworkSuffix)' != ''">
+    <OverridePackageId>$(SharedFrameworkName).Runtime.$(RuntimeSpecificFrameworkSuffix).$(RuntimeIdentifier)</OverridePackageId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <LinuxPackageDependency Include="dotnet-hostfxr-$(MajorVersion).$(MinorVersion);dotnet-runtime-deps-$(MajorVersion).$(MinorVersion)" Version="$(Version)" />
+  </ItemGroup>
+
+  <!-- Mobile uses a different hosting model, so we don't include the .NET host components. -->
+  <ItemGroup Condition="'$(TargetsMobile)' != 'true'">
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostpolicy$(LibraryFileExtension)" />
+    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostfxr$(LibraryFileExtension)" PackOnly="true" />
+  </ItemGroup>
+
+  <Target Name="AddRuntimeFilesToPackage" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild">
+    <ItemGroup>
+      <RuntimeFiles Condition="'%(RuntimeFiles.IsNative)' == 'true'">
+        <TargetPath>runtimes/$(RuntimeIdentifier)/native</TargetPath>
+      </RuntimeFiles>
+
+      <RuntimeFiles Condition="'%(FileName)' == 'crossgen'">
+        <TargetPath>tools</TargetPath>
+      </RuntimeFiles>
+
+      <RuntimeFiles Condition="'$(TargetsMobile)' == 'true'"
+        Include="@(MonoCrossFiles)">
+        <TargetPath>runtimes/$(RuntimeIdentifier)/native/cross</TargetPath>
+      </RuntimeFiles>
+      <RuntimeFiles Condition="'$(TargetsMobile)' == 'true'"
+        Include="@(MonoIncludeFiles)"
+        ExcludeFromDataFiles="true">
+        <TargetPath>runtimes/$(RuntimeIdentifier)/native/include/%(RecursiveDir)</TargetPath>
+      </RuntimeFiles>
+
+      <CoreCLRCrossTargetFiles Condition="'%(FileName)' == 'clrjit' or '%(FileName)' == 'libclrjit'">
+        <TargetPath>runtimes/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native</TargetPath>
+        </CoreCLRCrossTargetFiles>
+      <CoreCLRCrossTargetFiles Condition="'%(FileName)' == 'crossgen'">
+        <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
+        </CoreCLRCrossTargetFiles>
+      <CoreCLRCrossTargetFiles Condition="$([System.String]::new('%(FileName)').StartsWith('mscordaccore')) and '$(TargetsWindows)' == 'true'">
+        <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
+        </CoreCLRCrossTargetFiles>
+      <CoreCLRCrossTargetFiles Condition="'%(FileName)%(Extension)' == 'mscordbi.dll' and '$(TargetsWindows)' == 'true'">
+        <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
+        </CoreCLRCrossTargetFiles>
+      <ReferenceCopyLocalPaths Include="@(RuntimeFiles);@(CoreCLRCrossTargetFiles);" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="AddFrameworkFilesToPackage" DependsOnTargets="ResolveLibrariesFromLocalBuild">
+    <ItemGroup>
+      <ReferenceCopyLocalPaths Include="@(LibrariesRuntimeFiles)"
+        Condition="'%(LibrariesRuntimeFiles.Extension)' != '.a' or '$(TargetsMobile)' == 'true'" />
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup Condition="'$(TargetOS)' == 'windows'">
+    <_diaSymArch Condition="'$(_hostArch)' != ''">$(_hostArch)</_diaSymArch>
+    <_diaSymReaderPath>$(PkgMicrosoft_DiaSymReader_Native)/runtimes/win/native/Microsoft.DiaSymReader.Native.$(_diaSymArch).dll</_diaSymReaderPath>
+    <_diaSymReaderPathIfExists Condition="Exists('$(_diaSymReaderPath)')">$(_diaSymReaderPath)</_diaSymReaderPathIfExists>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(_diaSymReaderPathIfExists)' != ''">
+    <NativeRuntimeAsset Include="$(_diaSymReaderPathIfExists)" />
+  </ItemGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
+
+  <Target Name="ResolveReadyToRunCompilers" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild">
+    <ItemGroup Condition="'$(RuntimeFlavor)' != 'Mono'">
+      <_crossTargetJit Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" />
+      <_clrjit Include="@(RuntimeFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" />
+      <_crossTargetCrossgen Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ApplicationFileExtension)'" />
+      <_crossgen Include="@(RuntimeFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ApplicationFileExtension)'" />
+    </ItemGroup>
+    <ItemGroup Condition="'@(_crossTargetJit)' != '' and '@(_crossTargetCrossgen)' != ''">
+      <CrossgenTool Include="@(_crossTargetCrossgen->ClearMetadata())"
+                    JitPath="@(_crossTargetJit)"
+                    DiaSymReader="$(_diaSymReaderPathIfExists)" />
+    </ItemGroup>
+    <ItemGroup Condition="'@(_crossTargetJit)' == '' and '@(_crossTargetCrossgen)' == ''">
+      <CrossgenTool Include="@(_crossgen->ClearMetadata())"
+                    JitPath="@(_clrjit)"
+                    DiaSymReader="$(_diaSymReaderPathIfExists)" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/PackageOverrides.txt b/src/installer/pkg/sfx/Microsoft.NETCore.App/PackageOverrides.txt
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/pkg/PackageOverrides.txt
rename to src/installer/pkg/sfx/Microsoft.NETCore.App/PackageOverrides.txt
diff --git a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj
new file mode 100644
index 0000000000000..9d3caba9e8aed
--- /dev/null
+++ b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+
+  <PropertyGroup>
+    <!--
+      Name, used to generate the bundle upgrade code. Must stay the same to allow bundles in a given
+      product band to upgrade in place.
+    -->
+    <SkipBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</SkipBuild>
+    <BundleInstallerUpgradeCodeSeed>.NET Core Shared Framework Bundle Installer</BundleInstallerUpgradeCodeSeed>
+    <BundleThemeDirectory>$(MSBuildProjectDirectory)</BundleThemeDirectory>
+    <ArchiveName>dotnet-runtime</ArchiveName>
+    <InstallerName>dotnet-runtime</InstallerName>
+    <InstallerRuntimeIdentifiers>win-x86;win-x64;win-arm64;osx-x64</InstallerRuntimeIdentifiers>
+    <BundleNameSuffix>Runtime</BundleNameSuffix>
+    <MacOSBundleTemplate>$(MSBuildProjectDirectory)/shared-framework-distribution-template.xml</MacOSBundleTemplate>
+    <MacOSBundleIdentifierName>com.microsoft.dotnet.Microsoft.NETCore.App.$(ProductVersion).osx.x64</MacOSBundleIdentifierName>
+    <MacOSBundleResourcesPath>osx_resources</MacOSBundleResourcesPath>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <BundleComponentReference Include="../Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj" />
+    <BundleComponentReference Include="../installers/dotnet-hostfxr.proj" />
+    <BundleComponentReference Include="../installers/dotnet-host.proj" />
+  </ItemGroup>
+
+  <Target Name="PublishToDisk">
+    <Error Condition="'$(OutputPath)' == ''" Text="Publishing to disk requires the OutputPath to be set to the root of the path to write to." />
+
+    <MSBuild Projects="@(BundleComponentReference)"
+             Targets="PublishToDisk"
+             Properties="OutputPath=$(OutputPath)" />
+  </Target>
+
+</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/bundle.thm b/src/installer/pkg/sfx/bundle/bundle.thm
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/bundle.thm
rename to src/installer/pkg/sfx/bundle/bundle.thm
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/bundle.wxl b/src/installer/pkg/sfx/bundle/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/bundle.wxl
rename to src/installer/pkg/sfx/bundle/bundle.wxl
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/conclusion.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/conclusion.html
rename to src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/conclusion.html
diff --git a/src/installer/pkg/packaging/osx/resources/cs.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/cs.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/eula.rtf
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/welcome.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/welcome.html
rename to src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/welcome.html
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/de.lproj/conclusion.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/conclusion.html
rename to src/installer/pkg/sfx/bundle/osx_resources/de.lproj/conclusion.html
diff --git a/src/installer/pkg/packaging/osx/resources/de.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/de.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/de.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/de.lproj/eula.rtf
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/de.lproj/welcome.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/welcome.html
rename to src/installer/pkg/sfx/bundle/osx_resources/de.lproj/welcome.html
diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/dotnetbackground.png b/src/installer/pkg/sfx/bundle/osx_resources/dotnetbackground.png
similarity index 100%
rename from src/installer/pkg/packaging/osx/hostfxr/resources/dotnetbackground.png
rename to src/installer/pkg/sfx/bundle/osx_resources/dotnetbackground.png
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/en.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/en.lproj/conclusion.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/en.lproj/conclusion.html
rename to src/installer/pkg/sfx/bundle/osx_resources/en.lproj/conclusion.html
diff --git a/src/installer/pkg/packaging/osx/resources/en.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/en.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/en.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/en.lproj/eula.rtf
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/en.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/en.lproj/welcome.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/en.lproj/welcome.html
rename to src/installer/pkg/sfx/bundle/osx_resources/en.lproj/welcome.html
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/es.lproj/conclusion.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/conclusion.html
rename to src/installer/pkg/sfx/bundle/osx_resources/es.lproj/conclusion.html
diff --git a/src/installer/pkg/packaging/osx/resources/es.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/es.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/es.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/es.lproj/eula.rtf
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/es.lproj/welcome.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/welcome.html
rename to src/installer/pkg/sfx/bundle/osx_resources/es.lproj/welcome.html
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/conclusion.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/conclusion.html
rename to src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/conclusion.html
diff --git a/src/installer/pkg/packaging/osx/resources/fr.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/fr.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/eula.rtf
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/welcome.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/welcome.html
rename to src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/welcome.html
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/it.lproj/conclusion.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/conclusion.html
rename to src/installer/pkg/sfx/bundle/osx_resources/it.lproj/conclusion.html
diff --git a/src/installer/pkg/packaging/osx/resources/it.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/it.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/it.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/it.lproj/eula.rtf
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/it.lproj/welcome.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/welcome.html
rename to src/installer/pkg/sfx/bundle/osx_resources/it.lproj/welcome.html
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/conclusion.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/conclusion.html
rename to src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/conclusion.html
diff --git a/src/installer/pkg/packaging/osx/resources/ja.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/ja.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/eula.rtf
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/welcome.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/welcome.html
rename to src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/welcome.html
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/conclusion.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/conclusion.html
rename to src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/conclusion.html
diff --git a/src/installer/pkg/packaging/osx/resources/ko.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/ko.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/eula.rtf
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/welcome.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/welcome.html
rename to src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/welcome.html
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/conclusion.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/conclusion.html
rename to src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/conclusion.html
diff --git a/src/installer/pkg/packaging/osx/resources/pl.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/pl.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/eula.rtf
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/welcome.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/welcome.html
rename to src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/welcome.html
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/conclusion.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/conclusion.html
rename to src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/conclusion.html
diff --git a/src/installer/pkg/packaging/osx/resources/pt-br.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/pt-br.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/eula.rtf
diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/welcome.html
similarity index 100%
rename from src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/welcome.html
rename to src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/welcome.html
diff --git a/src/installer/pkg/packaging/osx/resources/ru.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/ru.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/ru.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/ru.lproj/eula.rtf
diff --git a/src/installer/pkg/packaging/osx/resources/tr.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/tr.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/tr.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/tr.lproj/eula.rtf
diff --git a/src/installer/pkg/packaging/osx/resources/zh-hans.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/zh-hans.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/zh-hans.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/zh-hans.lproj/eula.rtf
diff --git a/src/installer/pkg/packaging/osx/resources/zh-hant.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/zh-hant.lproj/eula.rtf
similarity index 100%
rename from src/installer/pkg/packaging/osx/resources/zh-hant.lproj/eula.rtf
rename to src/installer/pkg/sfx/bundle/osx_resources/zh-hant.lproj/eula.rtf
diff --git a/src/installer/pkg/sfx/bundle/shared-framework-distribution-template.xml b/src/installer/pkg/sfx/bundle/shared-framework-distribution-template.xml
new file mode 100644
index 0000000000000..2a1f0b8c7242f
--- /dev/null
+++ b/src/installer/pkg/sfx/bundle/shared-framework-distribution-template.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<installer-gui-script minSpecVersion="1">
+    <background file="dotnetbackground.png" mime-type="image/png"/>
+    <options customize="never" require-scripts="false" />
+    <welcome file="welcome.html" mime-type="text/html" />
+    <conclusion file="conclusion.html" mime-type="text/html" />
+    <volume-check>
+        <allowed-os-versions>
+            <os-version min="10.13" />
+        </allowed-os-versions>
+    </volume-check>
+</installer-gui-script>
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1028/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1028/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1028/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/1028/bundle.wxl
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1029/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1029/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1029/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/1029/bundle.wxl
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1031/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1031/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1031/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/1031/bundle.wxl
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1033/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1033/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1033/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/1033/bundle.wxl
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1036/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1036/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1036/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/1036/bundle.wxl
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1040/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1040/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1040/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/1040/bundle.wxl
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1041/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1041/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1041/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/1041/bundle.wxl
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1042/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1042/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1042/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/1042/bundle.wxl
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1045/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1045/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1045/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/1045/bundle.wxl
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1046/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1046/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1046/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/1046/bundle.wxl
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1049/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1049/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1049/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/1049/bundle.wxl
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1055/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1055/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1055/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/1055/bundle.wxl
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/2052/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/2052/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/2052/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/2052/bundle.wxl
diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/3082/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/3082/bundle.wxl
similarity index 100%
rename from src/installer/pkg/projects/netcoreapp/sfx/theme/3082/bundle.wxl
rename to src/installer/pkg/sfx/bundle/theme/3082/bundle.wxl
diff --git a/src/installer/pkg/sfx/installers.proj b/src/installer/pkg/sfx/installers.proj
new file mode 100644
index 0000000000000..5e7d5908d7a56
--- /dev/null
+++ b/src/installer/pkg/sfx/installers.proj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <ItemGroup>
+    <InstallerProjectReference Include="Microsoft.NETCore.App/*.sfxproj" />
+    <InstallerProjectReference Include="installers/*.proj" />
+    <InstallerProjectReference Include="bundle/*.bundleproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BuildDebPackage)' == 'true'">
+    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BuildRpmPackage)' == 'true'">
+    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj" />
+    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj" />
+    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj" />
+    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj" />
+    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj" />
+    <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj" />
+  </ItemGroup>
+
+  <Target Name="BuildInstallerProjects" BeforeTargets="Build">
+    <MSBuild Projects="@(InstallerProjectReference)"
+             Targets="GenerateInstallers"
+             SkipNonexistentTargets="true" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/sfx/installers/Directory.Build.targets b/src/installer/pkg/sfx/installers/Directory.Build.targets
new file mode 100644
index 0000000000000..d108af94975de
--- /dev/null
+++ b/src/installer/pkg/sfx/installers/Directory.Build.targets
@@ -0,0 +1,7 @@
+<Project>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
+  </ItemGroup>
+  
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
+</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/sfx/installers/dotnet-host.proj b/src/installer/pkg/sfx/installers/dotnet-host.proj
new file mode 100644
index 0000000000000..aa2563c72c922
--- /dev/null
+++ b/src/installer/pkg/sfx/installers/dotnet-host.proj
@@ -0,0 +1,64 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <PropertyGroup>
+    <SkipBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</SkipBuild>
+    <GenerateInstallers>true</GenerateInstallers>
+    <InstallerName>dotnet-host</InstallerName>
+    <InstallerName Condition="'$(TargetOS)' == 'OSX'">dotnet-host-internal</InstallerName>
+    <PackageBrandNameSuffix>Host</PackageBrandNameSuffix>
+    <VSInsertionShortComponentName>NetCore.SharedHost</VSInsertionShortComponentName>
+    <UseCustomDirectoryHarvesting>true</UseCustomDirectoryHarvesting>
+    <WixIncludeRegistryKeys>true</WixIncludeRegistryKeys>
+    <RegKeyProductName>sharedhost</RegKeyProductName>
+    <WixDependencyKeyName>Dotnet_CLI_SharedHost</WixDependencyKeyName>
+    <OutputFilesCandleVariable>HostSrc</OutputFilesCandleVariable>
+    <VersionInstallerName>false</VersionInstallerName>
+    <UseBrandingNameInLinuxPackageDescription>true</UseBrandingNameInLinuxPackageDescription>
+    <MacOSComponentNamePackType>sharedhost</MacOSComponentNamePackType>
+    <IncludeVersionInMacOSComponentName>false</IncludeVersionInMacOSComponentName>
+    <MacOSScriptsDirectory>osx_scripts/host</MacOSScriptsDirectory>
+    <MacOSPackageDescription>The .NET Shared Host.</MacOSPackageDescription>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <WixSrcFile Include="host.wxs" />
+    <WixExtraComponentGroupRefId Include="InstallSharedHostandDetectionKeys" />
+    <CandleVariables Include="ExtraPropertyRefIds" Value="ProductCPU;RTM_ProductVersion" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Manpage Include="$(ManPagesDir)/**/*" />
+  </ItemGroup>
+
+  <Target Name="PublishToDisk">
+    <Error Condition="'$(OutputPath)' == ''" Text="Publishing to disk requires the OutputPath to be set to the root of the path to write to." />
+
+    <ItemGroup>
+      <FilesToPublish Include="$(DotNetHostBinDir)\dotnet$(ApplicationFileExtension)"
+            Destination="$(OutputPath)dotnet$(ApplicationFileExtension)" />
+      <FilesToPublish Include="$(InstallerProjectRoot)pkg\THIRD-PARTY-NOTICES.TXT"
+            Destination="$(OutputPath)ThirdPartyNotices.txt" />
+      <FilesToPublish Include="$(RepoRoot)LICENSE.TXT"
+            Destination="$(OutputPath)LICENSE.txt"
+            Condition="'$(TargetsUnix)' == 'true'"/>
+      <FilesToPublish Include="$(InstallerProjectRoot)pkg\LICENSE-MSFT.TXT"
+            Destination="$(OutputPath)LICENSE.txt"
+            Condition="'$(TargetsUnix)' != 'true'"/>
+    </ItemGroup>
+
+    <Copy SourceFiles="@(FilesToPublish)"
+          DestinationFiles="%(FilesToPublish.Destination)" />
+  </Target>
+
+  <Target Name="AddLinuxPackageInformation" BeforeTargets="GetDebInstallerJsonProperties;GetRpmInstallerJsonProperties">
+    <ItemGroup Condition="'$(GenerateDeb)' == 'true'">
+      <LinuxPackageDependency Include="libc6;libgcc1;libstdc++6" />
+    </ItemGroup>
+    <ItemGroup>
+      <DebJsonProperty Include="symlinks" Object="{ &quot;dotnet&quot;: &quot;/usr/bin/dotnet&quot; }" />
+      <RpmJsonProperty Include="directories" Object="[ &quot;/usr/share/dotnet&quot;, &quot;/usr/share/doc/dotnet-host&quot; ]" />
+      <PackageConflictsProperty Include="package_conflicts" Object="[ &quot;dotnet&quot;, &quot;dotnet-nightly&quot; ]" />
+      <DebJsonProperty Include="@(PackageConflictsProperty)" />
+      <RpmJsonProperty Include="@(PackageConflictsProperty)" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj b/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj
new file mode 100644
index 0000000000000..da5edcaa54964
--- /dev/null
+++ b/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <PropertyGroup>
+    <SkipBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</SkipBuild>
+    <GenerateInstallers>true</GenerateInstallers>
+    <ArchiveName>dotnet-hostfxr-internal</ArchiveName>
+    <InstallerName>dotnet-hostfxr</InstallerName>
+    <InstallerName Condition="'$(TargetOS)' == 'OSX'">dotnet-hostfxr-internal</InstallerName>
+    <PackageBrandNameSuffix>Host FX Resolver</PackageBrandNameSuffix>
+    <PlatformPackageType>ToolPack</PlatformPackageType>
+    <VSInsertionShortComponentName>NetCore.HostFXR</VSInsertionShortComponentName>
+    <WixIncludeRegistryKeys>true</WixIncludeRegistryKeys>
+    <RegKeyProductName>hostfxr</RegKeyProductName>
+    <WixDependencyKeyName>Dotnet_CLI_HostFxr</WixDependencyKeyName>
+    <OutputFilesCandleVariable>HostFxrSrc</OutputFilesCandleVariable>
+    <UseBrandingNameInLinuxPackageDescription>true</UseBrandingNameInLinuxPackageDescription>
+    <MacOSComponentNamePackType>hostfxr</MacOSComponentNamePackType>
+    <MacOSScriptsDirectory>osx_scripts/hostfxr</MacOSScriptsDirectory>
+    <MacOSPackageDescription>The .NET HostFxr</MacOSPackageDescription>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <CandleVariables Include="AuthoredRegistryKeys;RegKeyNugetVersionValue" Value="true" />
+  </ItemGroup>
+
+  <Target Name="PublishToDisk">
+    <Error Condition="'$(OutputPath)' == ''" Text="Publishing to disk requires the OutputPath to be set to the root of the path to write to." />
+
+    <Copy SourceFiles="$(DotNetHostBinDir)\$(LibraryFilePrefix)hostfxr$(LibraryFileExtension)"
+          DestinationFolder="$(OutputPath)/host/fxr/$(Version)" />
+  </Target>
+
+  <Target Name="AddLinuxPackageInformation" BeforeTargets="GetDebInstallerJsonProperties;GetRpmInstallerJsonProperties">
+    <ItemGroup Condition="'$(GenerateDeb)' == 'true'">
+      <LinuxPackageDependency Include="libc6;libgcc1;libstdc++6" />
+      <LinuxPackageDependency Include="dotnet-host" Version="$(Version)" />
+    </ItemGroup>
+    <ItemGroup>
+      <RpmJsonProperty Include="directories" Object="[ &quot;/usr/share/dotnet&quot;, &quot;/usr/share/doc/$(VersionedInstallerName)&quot; ]" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.props b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.props
new file mode 100644
index 0000000000000..a6ee5fb0c0739
--- /dev/null
+++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
+
+  <PropertyGroup>
+    <PackageBrandNameSuffix>Runtime Dependencies</PackageBrandNameSuffix>
+    <InstallerName>dotnet-runtime-deps</InstallerName>
+    <InstallerRuntimeIdentifiers>linux-$(TargetArchitecture)</InstallerRuntimeIdentifiers>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.targets b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.targets
new file mode 100644
index 0000000000000..946b645737655
--- /dev/null
+++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.targets
@@ -0,0 +1,8 @@
+<Project>
+  <Target Name="PublishToDisk">
+    <Error Condition="'$(OutputPath)' == ''" Text="Publishing to disk requires the OutputPath to be set to the root of the path to write to." />
+    <MakeDir Directories="$(OutputPath)" />
+  </Target>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
+</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj
new file mode 100644
index 0000000000000..687887134c419
--- /dev/null
+++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <PropertyGroup>
+    <GenerateInstallers Condition="'$(BuildRpmPackage)' != 'true'">false</GenerateInstallers>
+    <PackageTargetOS>centos.7</PackageTargetOS>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <LinuxPackageDependency Include="openssl-libs;libicu;krb5-libs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj
new file mode 100644
index 0000000000000..1898ecbdfa6c6
--- /dev/null
+++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <PropertyGroup>
+    <GenerateInstallers Condition="'$(BuildDebPackage)' != 'true'">false</GenerateInstallers>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DebianIgnoredDependencies>
+      [
+        "liblldb-3.5",
+        "liblldb-3.6"
+      ]
+    </DebianIgnoredDependencies>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <LinuxPackageDependency Include="libc6;libgcc1;libgssapi-krb5-2;libstdc++6;zlib1g"/>
+    <LinuxPackageDependency Include="libssl1.0.0 | libssl1.0.2 | libssl1.1" />
+    <KnownLibIcuVersion Include="72;71;70;69;68;67;66;65;63;60;57;55;52" />
+    <LibIcuPackageDependency Include="libicu" Dependencies="libicu | @(KnownLibIcuVersion -> 'libicu%(Identity)', ' | ')" />
+    <LinuxPackageDependency
+      Include="@(LibIcuPackageDependency->Metadata('Dependencies'))" />
+    <DebJsonProperty Include="debian_ignored_dependencies" Object="$(DebianIgnoredDependencies)" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj
new file mode 100644
index 0000000000000..044f9326b4b79
--- /dev/null
+++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <PropertyGroup>
+    <GenerateInstallers Condition="'$(BuildRpmPackage)' != 'true'">false</GenerateInstallers>
+    <PackageTargetOS>fedora.27</PackageTargetOS>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <LinuxPackageDependency Include="compat-openssl10;libicu;krb5-libs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj
new file mode 100644
index 0000000000000..6453d117728d4
--- /dev/null
+++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <PropertyGroup>
+    <GenerateInstallers Condition="'$(BuildRpmPackage)' != 'true'">false</GenerateInstallers>
+    <PackageTargetOS>opensuse.42</PackageTargetOS>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <LinuxPackageDependency Include="libopenssl1_0_0;libicu;krb5" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj
new file mode 100644
index 0000000000000..76afbe1850cd8
--- /dev/null
+++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <PropertyGroup>
+    <GenerateInstallers Condition="'$(BuildRpmPackage)' != 'true'">false</GenerateInstallers>
+    <PackageTargetOS>oraclelinux.7</PackageTargetOS>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <LinuxPackageDependency Include="openssl-libs;libicu;krb5-libs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj
new file mode 100644
index 0000000000000..258b3696d7b69
--- /dev/null
+++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <PropertyGroup>
+    <GenerateInstallers Condition="'$(BuildRpmPackage)' != 'true'">false</GenerateInstallers>
+    <PackageTargetOS>rhel.7</PackageTargetOS>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <LinuxPackageDependency Include="openssl-libs;libicu;krb5-libs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj
new file mode 100644
index 0000000000000..912692f5d7f26
--- /dev/null
+++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <PropertyGroup>
+    <GenerateInstallers Condition="'$(BuildRpmPackage)' != 'true'">false</GenerateInstallers>
+    <PackageTargetOS>sles.12</PackageTargetOS>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <LinuxPackageDependency Include="libopenssl1_1;libicu;krb5" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/host.wxs b/src/installer/pkg/sfx/installers/host.wxs
similarity index 100%
rename from src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/host.wxs
rename to src/installer/pkg/sfx/installers/host.wxs
diff --git a/src/installer/pkg/packaging/osx/sharedhost/scripts/postinstall b/src/installer/pkg/sfx/installers/osx_scripts/host/postinstall
old mode 100755
new mode 100644
similarity index 87%
rename from src/installer/pkg/packaging/osx/sharedhost/scripts/postinstall
rename to src/installer/pkg/sfx/installers/osx_scripts/host/postinstall
index 531cb93fd382f..33d9db28f2fb9
--- a/src/installer/pkg/packaging/osx/sharedhost/scripts/postinstall
+++ b/src/installer/pkg/sfx/installers/osx_scripts/host/postinstall
@@ -2,6 +2,7 @@
 #
 # Licensed to the .NET Foundation under one or more agreements.
 # The .NET Foundation licenses this file to you under the MIT license.
+# See the LICENSE file in the project root for more information.
 #
 
 PACKAGE=$1
diff --git a/src/installer/pkg/packaging/osx/hostfxr/scripts/postinstall b/src/installer/pkg/sfx/installers/osx_scripts/hostfxr/postinstall
old mode 100755
new mode 100644
similarity index 85%
rename from src/installer/pkg/packaging/osx/hostfxr/scripts/postinstall
rename to src/installer/pkg/sfx/installers/osx_scripts/hostfxr/postinstall
index 2d0ceb8278693..b8c5e60b92d99
--- a/src/installer/pkg/packaging/osx/hostfxr/scripts/postinstall
+++ b/src/installer/pkg/sfx/installers/osx_scripts/hostfxr/postinstall
@@ -2,6 +2,7 @@
 #
 # Licensed to the .NET Foundation under one or more agreements.
 # The .NET Foundation licenses this file to you under the MIT license.
+# See the LICENSE file in the project root for more information.
 #
 
 PACKAGE=$1
diff --git a/src/installer/tests/Assets/TestProjects/Directory.Build.targets b/src/installer/tests/Assets/TestProjects/Directory.Build.targets
index 71982e083164d..f6350ac71558b 100644
--- a/src/installer/tests/Assets/TestProjects/Directory.Build.targets
+++ b/src/installer/tests/Assets/TestProjects/Directory.Build.targets
@@ -2,16 +2,16 @@
   <Import Project="$(MSBuildThisFileDirectory)..\TestUtils\TestProjects.targets" />
 
   <!--
-    Some known framework references are downstream of Core-Setup and don't exist with the build's
+    Some known framework references are downstream of dotnet/runtime and don't exist with the build's
     versions. Remove them before the SDK tries to download them.
   -->
   <Target Name="RemoveUpstackKnownFrameworkReferences"
           BeforeTargets="ProcessFrameworkReferences">
     <ItemGroup>
-    <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
-    <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App" />
-    <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WPF" />
-    <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WindowsForms" />
+      <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
+      <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App" />
+      <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WPF" />
+      <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WindowsForms" />
     </ItemGroup>
   </Target>
 
diff --git a/src/installer/tests/Directory.Build.targets b/src/installer/tests/Directory.Build.targets
index 7d93a09399835..6e2bc2f03f3d6 100644
--- a/src/installer/tests/Directory.Build.targets
+++ b/src/installer/tests/Directory.Build.targets
@@ -13,13 +13,9 @@
       Set up the shared framework copy this set of tests should use. There's no known reason to have
       one per test project, but RepoDirectoriesProvider may need some tweaking to share.
     -->
-    <ItemGroup>
-      <SharedFrameworkPublishFiles Include="$(SharedFrameworkPublishDir)**" />
-    </ItemGroup>
-
-    <Copy
-      SourceFiles="@(SharedFrameworkPublishFiles)"
-      DestinationFiles="@(SharedFrameworkPublishFiles->'$(TestsOutputDir)sharedFrameworkPublish/%(RecursiveDir)%(Filename)%(Extension)')" />
+    <MSBuild Projects="$(InstallerProjectRoot)pkg\sfx\bundle\Microsoft.NETCore.App.Bundle.bundleproj"
+             Targets="PublishToDisk"
+             Properties="OutputPath=$(TestsOutputDir)sharedFrameworkPublish/" />
 
     <!-- Create files with a name that describes what a test dir is. Useful if path abbreviated. -->
     <WriteLinesToFile
@@ -47,8 +43,8 @@
         specific path separators or the string compoarison will fail.
       -->
       <DirectorySeparatorChar>$([System.IO.Path]::DirectorySeparatorChar)</DirectorySeparatorChar>
-      <SystemPathTestsOutputDir>$([System.String]::Copy('$(TestsOutputDir)').Replace('/', '$(DirectorySeparatorChar)'))</SystemPathTestsOutputDir>
-      <SystemPathTestsOutputDir>$([System.String]::Copy('$(SystemPathTestsOutputDir)').Replace('\', '$(DirectorySeparatorChar)'))</SystemPathTestsOutputDir>
+      <SystemPathTestsOutputDir>$(TestsOutputDir.Replace('/', '$(DirectorySeparatorChar)'))</SystemPathTestsOutputDir>
+      <SystemPathTestsOutputDir>$(SystemPathTestsOutputDir.Replace('\', '$(DirectorySeparatorChar)'))</SystemPathTestsOutputDir>
 
       <!-- This is defined when building in Visual Studio, not DotNetRoot. -->
       <DotNetRoot Condition="'$(DotNetRoot)' == ''">$(NetCoreRoot)</DotNetRoot>
@@ -63,7 +59,7 @@
       the same as the package's version. Fetch this directly from the project to avoid guesswork.
     -->
     <MSBuild
-      Projects="$(InstallerProjectRoot)pkg\projects\netcoreapp\pkg\Microsoft.NETCore.App.Runtime.pkgproj"
+      Projects="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Ref.sfxproj"
       Targets="ReturnProductVersion">
       <Output TaskParameter="TargetOutputs" PropertyName="NETCoreAppRuntimePackageVersion" />
     </MSBuild>
@@ -102,24 +98,12 @@
   -->
   <Target Name="GetNETCoreAppRuntimePackVersion">
     <MSBuild
-      Projects="$(InstallerProjectRoot)pkg\projects\netcoreapp\pkg\Microsoft.NETCore.App.Runtime.pkgproj"
+      Projects="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Runtime.sfxproj"
       Targets="ReturnProductVersion">
       <Output TaskParameter="TargetOutputs" PropertyName="NETCoreAppRuntimePackVersion" />
     </MSBuild>
   </Target>
 
-  <!--
-    Fetch the package version of Microsoft.NETCore.App.Internal. The legacy App nupkg project
-    doesn't ship, so it never has a stable version.
-  -->
-  <Target Name="GetNETCoreAppInternalPackageVersion">
-    <MSBuild
-      Projects="$(InstallerProjectRoot)pkg\projects\netcoreapp\pkg\legacy\Microsoft.NETCore.App.Internal.pkgproj"
-      Targets="ReturnProductVersion">
-      <Output TaskParameter="TargetOutputs" PropertyName="NETCoreAppInternalPackageVersion" />
-    </MSBuild>
-  </Target>
-
   <Target Name="DetermineTestOutputDirectory">
     <PropertyGroup>
       <TestTargetRid Condition="'$(TestTargetRid)' == ''">$(HostRuntimeIdentifier)</TestTargetRid>
diff --git a/src/installer/tests/HostActivation.Tests/SharedFxLookup.cs b/src/installer/tests/HostActivation.Tests/SharedFxLookup.cs
index a33195e54174d..fd63e339ec05f 100644
--- a/src/installer/tests/HostActivation.Tests/SharedFxLookup.cs
+++ b/src/installer/tests/HostActivation.Tests/SharedFxLookup.cs
@@ -156,48 +156,5 @@ public void Multiple_SharedFxLookup_Uber_Wins_Over_NetCoreApp_On_PatchRollForwar
                 .And.HaveStdErrContaining(Path.Combine("7777.0.0", "System.Collections.Immutable.dll"))
                 .And.NotHaveStdErrContaining(Path.Combine("9999.1.0", "System.Collections.Immutable.dll"));
         }
-
-        [Fact]
-        public void CoreClrLookup_WithNoDirectorySeparatorInDeps()
-        {
-            var fixture = SharedFxLookupPortableAppFixture
-                .Copy();
-
-            var dotnet = fixture.BuiltDotnet;
-            var appDll = fixture.TestProject.AppDll;
-
-            string runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json");
-            SharedFramework.SetRuntimeConfigJson(runtimeConfig, "9999.0.0", null);
-
-            // Add versions in the exe folders
-            SharedFramework.AddAvailableSharedFxVersions(_builtSharedFxDir, _exeSharedFxBaseDir, "9999.0.0");
-            string sharedFxPath = Path.Combine(_exeSharedFxBaseDir, "9999.0.0");
-            string sharedFxDepsJsonPath = Path.Combine(sharedFxPath, "Microsoft.NETCore.App.deps.json");
-
-            // Modify the .deps.json for Microsoft.NETCore.App FX
-            JObject root = JObject.Parse(File.ReadAllText(sharedFxDepsJsonPath));
-            IEnumerable<JProperty> netCoreAppNativeAssets = root["targets"]
-                .Children<JProperty>().Where(p => p.Name.Contains("/"))
-                .Children().Children().OfType<JProperty>().Where(p => p.Name.Contains("runtime") && p.Name.Contains("Microsoft.NETCore.App"))
-                .Values()["native"].Children().OfType<JProperty>();
-
-            // Change the coreclr.dll asset to specify only "coreclr.dll" as the relative path (no directories).
-            string coreClrLibraryName = RuntimeInformationExtensions.GetSharedLibraryFileNameForCurrentPlatform("coreclr");
-            JProperty coreClrProperty = netCoreAppNativeAssets.First(p => p.Name.Contains(coreClrLibraryName));
-            JProperty newCoreClrProperty = new JProperty(coreClrProperty.Name.Substring(coreClrProperty.Name.LastIndexOf('/') + 1), coreClrProperty.Value);
-            coreClrProperty.Parent.Add(newCoreClrProperty);
-            coreClrProperty.Remove();
-
-            File.WriteAllText(sharedFxDepsJsonPath, root.ToString());
-
-            dotnet.Exec(appDll)
-                .WorkingDirectory(_currentWorkingDir)
-                .EnvironmentVariable("COREHOST_TRACE", "1")
-                .CaptureStdOut()
-                .CaptureStdErr()
-                .Execute()
-                .Should().Pass()
-                .And.HaveStdErrContaining($"CoreCLR path = '{Path.Combine(sharedFxPath, coreClrLibraryName)}'");
-        }
     }
 }
diff --git a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs
index d5d1aa12a8afc..4af9206f6b351 100644
--- a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs
+++ b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs
@@ -34,26 +34,12 @@ public static NuGetArtifactTester OpenOrNull(
         {
             id = id ?? project;
 
-            string nuspecPath = Path.Combine(
-                dirs.BaseArtifactsFolder,
-                "packages",
-                dirs.Configuration,
-                "specs",
-                $"{id}.nuspec");
-
-            if (!File.Exists(nuspecPath))
-            {
-                return null;
-            }
-
-            PackageIdentity builtIdentity = new NuspecReader(nuspecPath).GetIdentity();
-
             string nupkgPath = Path.Combine(
                 dirs.BaseArtifactsFolder,
                 "packages",
                 dirs.Configuration,
                 "Shipping",
-                $"{builtIdentity}.nupkg");
+                $"{id}.{dirs.MicrosoftNETCoreAppVersion}.nupkg");
 
             // If the nuspec exists, the nupkg should exist.
             Assert.True(File.Exists(nupkgPath));
@@ -106,10 +92,7 @@ public void IsRuntimePack()
             IsRuntimeSpecificPack();
 
             HasOnlyTheseDataFiles(
-                "data/RuntimeList.xml",
-                "data/PlatformManifest.txt");
-
-            HasGoodPlatformManifest();
+                "data/RuntimeList.xml");
 
             ContainsFrameworkList("RuntimeList.xml");
         }
diff --git a/src/installer/tests/PrepareTestAssets/PrepareTestAssets.proj b/src/installer/tests/PrepareTestAssets/PrepareTestAssets.proj
index 56ae5cbefef66..a93ca4447a0c6 100644
--- a/src/installer/tests/PrepareTestAssets/PrepareTestAssets.proj
+++ b/src/installer/tests/PrepareTestAssets/PrepareTestAssets.proj
@@ -4,12 +4,10 @@
 
   <Target Name="PrepareTestAssets"
           DependsOnTargets="
-            GetNETCoreAppInternalPackageVersion;
             GetNETCoreAppRuntimePackVersion;
             CleanTestAssets;
             GenerateTestRestoreSourcesNuGetConfig;
             CopyPotentiallyInternalPackagesForTestRestore;
-            PrepareStabilizedLegacyPackages;
             RestoreTestAssetProjects" />
 
   <Target Name="CleanTestAssets"
@@ -115,24 +113,6 @@
     <Copy SourceFiles="@(PackageCacheNupkgFile)" DestinationFolder="$(InternalNupkgCacheDir)" />
   </Target>
 
-  <Target Name="PrepareStabilizedLegacyPackages"
-          Condition="'$(NETCoreAppInternalPackageVersion)' != '$(NETCoreAppRuntimePackVersion)'">
-    <ItemGroup>
-      <NonShippingPackageToStabilizeFile Include="
-        $(ArtifactsNonShippingPackagesDir)Microsoft.*.nupkg;
-        $(ArtifactsNonShippingPackagesDir)runtime.*.nupkg;" />
-    </ItemGroup>
-
-    <!-- Workaround for NonShipping packages being unable to have stable versions, see https://github.com/dotnet/core-setup/issues/8112 -->
-    <Message Importance="High" Text="Generating stabilized legacy NETCoreApp packages..." />
-
-    <CopyNupkgAndChangeVersion
-      SourceFile="%(NonShippingPackageToStabilizeFile.Identity)"
-      TargetFile="$(TestStabilizedLegacyPackagesDir)@(NonShippingPackageToStabilizeFile -> '%(Filename)%(Extension)')"
-      OriginalVersion="$(NETCoreAppInternalPackageVersion)"
-      TargetVersion="$(NETCoreAppRuntimePackVersion)" />
-  </Target>
-
   <Target Name="RestoreTestAssetProjects">
     <ItemGroup>
       <TestAssetProjectToRestore Include="$(TestAssetsDir)**\*.csproj" />
diff --git a/src/installer/tests/TestUtils/RepoDirectoriesProvider.cs b/src/installer/tests/TestUtils/RepoDirectoriesProvider.cs
index 52b10e3e50c8a..507773773d30a 100644
--- a/src/installer/tests/TestUtils/RepoDirectoriesProvider.cs
+++ b/src/installer/tests/TestUtils/RepoDirectoriesProvider.cs
@@ -78,7 +78,7 @@ public RepoDirectoriesProvider(
                 Path.Combine(RepoRoot, ".packages");
 
             CorehostPackages = corehostPackages ?? Path.Combine(Artifacts, "corehost");
-            BuiltDotnet = builtDotnet ?? Path.Combine(BaseObjFolder, osPlatformConfig, "sharedFrameworkPublish");
+            BuiltDotnet = builtDotnet ?? Path.Combine(GetTestContextVariable("TEST_ARTIFACTS"), "sharedFrameworkPublish");
         }
 
         public string GetTestContextVariable(string name)