diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6c6f39ba4..179366cbf 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -2,70 +2,66 @@
 <Dependencies>
   <ProductDependencies>
     <!-- Winforms / WPF -->
-    <Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview6-27803-04">
+    <Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview7-27818-05">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>26202a4c7622b5a1fc266213c3bc3ea884dbba47</Sha>
+      <Sha>521f511254af16a0410fc2c7feb7ae9ae6ef15cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview6-27803-04">
+    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27818-05">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>26202a4c7622b5a1fc266213c3bc3ea884dbba47</Sha>
+      <Sha>521f511254af16a0410fc2c7feb7ae9ae6ef15cb</Sha>
     </Dependency>
-    <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview6-27803-04">
+    <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview7-27818-05">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>26202a4c7622b5a1fc266213c3bc3ea884dbba47</Sha>
+      <Sha>521f511254af16a0410fc2c7feb7ae9ae6ef15cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview6.19302.2">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview7.19315.2">
       <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>620c673705bb17b33cbc5ff32872d85a5fbf82b9</Sha>
+      <Sha>1521e6fa727370ad9d25478b1c32172ef6942cb3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview6.19302.2">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview7.19315.2">
       <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>620c673705bb17b33cbc5ff32872d85a5fbf82b9</Sha>
+      <Sha>1521e6fa727370ad9d25478b1c32172ef6942cb3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview6.19302.2">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview7.19315.2">
       <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>620c673705bb17b33cbc5ff32872d85a5fbf82b9</Sha>
+      <Sha>1521e6fa727370ad9d25478b1c32172ef6942cb3</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="3.0.0-preview6.19302.2">
+    <Dependency Name="dotnet-dev-certs" Version="3.0.0-preview7.19315.2">
       <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>620c673705bb17b33cbc5ff32872d85a5fbf82b9</Sha>
+      <Sha>1521e6fa727370ad9d25478b1c32172ef6942cb3</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="3.0.0-preview6.19302.2">
+    <Dependency Name="dotnet-user-secrets" Version="3.0.0-preview7.19315.2">
       <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>620c673705bb17b33cbc5ff32872d85a5fbf82b9</Sha>
+      <Sha>1521e6fa727370ad9d25478b1c32172ef6942cb3</Sha>
     </Dependency>
-    <Dependency Name="dotnet-watch" Version="3.0.0-preview6.19302.2">
+    <Dependency Name="dotnet-watch" Version="3.0.0-preview7.19315.2">
       <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>620c673705bb17b33cbc5ff32872d85a5fbf82b9</Sha>
+      <Sha>1521e6fa727370ad9d25478b1c32172ef6942cb3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta5.19303.2">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta5.19316.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>3f2e65dd99395dfb5741d943158243bc77c4ac80</Sha>
+      <Sha>88feb5983d2b7bce61bcf8dff10ba74231f876f6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview6.19303.12">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview7.19318.6">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>f06c3df41b82b41c8f970400712dd035162f6e91</Sha>
+      <Sha>50dfa6dc4362deed5bd911aab9927e5922e7e961</Sha>
     </Dependency>
-    <Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19302.1">
-      <Uri>https://github.com/dotnet/standard</Uri>
-      <Sha>5b593e7bb6f4f213c5b324f36c05c7581a1a3222</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview6.19303.1">
+    <Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview7.19317.2">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>9a92095d8ad0112291573385dc8f67adfdfe9322</Sha>
+      <Sha>a604702d687ad3ccdc5e0be45300588921cd7a51</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview6.19303.6">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview7.19318.1">
       <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>85ddd4bbfea8984bdfe3548528f16a3818746335</Sha>
+      <Sha>038d3d6cc275b189add510639bfd1bf58e52eabe</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup -->
-    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-preview6.19274.3" CoherentParentDependency="Microsoft.WindowsDesktop.App">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-preview7.19315.1" CoherentParentDependency="Microsoft.WindowsDesktop.App">
       <Uri>https://github.com/dotnet/winforms</Uri>
-      <Sha>2c7ad6c0dc07d8b6cb86822ad2830e5ead35a749</Sha>
+      <Sha>a446ca927d3ad4f9e6baa6544822eb1321655f85</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview6.19280.1" CoherentParentDependency="Microsoft.WindowsDesktop.App">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview7.19316.3" CoherentParentDependency="Microsoft.WindowsDesktop.App">
       <Uri>https://github.com/dotnet/wpf</Uri>
-      <Sha>99938500dd41b618debe19fb53cc1bd164c9ece8</Sha>
+      <Sha>308512f9ef2407b26baa7f3a266b278f4ff3c643</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index a216fdd21..f62a6774f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -12,31 +12,31 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview6.19303.12</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview7.19318.6</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-preview6.19274.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-preview7.19315.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview6.19280.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview7.19316.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview6.19302.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview6.19302.2</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview6.19302.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <dotnetdevcertsPackageVersion>3.0.0-preview6.19302.2</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>3.0.0-preview6.19302.2</dotnetusersecretsPackageVersion>
-    <dotnetwatchPackageVersion>3.0.0-preview6.19302.2</dotnetwatchPackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview7.19315.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview7.19315.2</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview7.19315.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <dotnetdevcertsPackageVersion>3.0.0-preview7.19315.2</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>3.0.0-preview7.19315.2</dotnetusersecretsPackageVersion>
+    <dotnetwatchPackageVersion>3.0.0-preview7.19315.2</dotnetwatchPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/cli -->
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview6.19303.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview7.19318.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta5.19303.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta5.19316.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
     <MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
     <MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19155.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
@@ -44,10 +44,10 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
-    <MicrosoftNETSdkPackageVersion>3.0.100-preview6.19303.1</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETSdkPackageVersion>3.0.100-preview7.19317.2</MicrosoftNETSdkPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview6-27803-04</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview7-27818-05</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNETCoreAppInternalPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppInternalPackageVersion>
     <MicrosoftNETCoreDotNetAppHostPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetAppHostPackageVersion>
     <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
@@ -55,11 +55,11 @@
     <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
     <NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackVersion>
     <NetCoreAppHostPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppHostPackVersion>
-    <NETStandardLibraryRefPackageVersion>2.1.0-preview6-27803-04</NETStandardLibraryRefPackageVersion>
+    <NETStandardLibraryRefPackageVersion>2.1.0-preview7-27818-05</NETStandardLibraryRefPackageVersion>
     <WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
     <AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
     <AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
-    <MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview6-27803-04</MicrosoftWindowsDesktopAppPackageVersion>
+    <MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview7-27818-05</MicrosoftWindowsDesktopAppPackageVersion>
     <MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
   </PropertyGroup>
   <!-- infrastructure and test only dependencies -->
diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props
index d103b00f0..9bd214aa9 100644
--- a/src/CopyToLatest/targets/BranchInfo.props
+++ b/src/CopyToLatest/targets/BranchInfo.props
@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Channel>release/3.0.1xx</Channel>
+    <Channel>master</Channel>
   </PropertyGroup>
 </Project>
diff --git a/src/SdkResolver/SdkResolver.csproj b/src/SdkResolver/SdkResolver.csproj
index 2cd928e14..70089c1f1 100644
--- a/src/SdkResolver/SdkResolver.csproj
+++ b/src/SdkResolver/SdkResolver.csproj
@@ -7,6 +7,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateRuntimeCofigurationFiles>false</GenerateRuntimeCofigurationFiles>
     <AssemblyName>UNUSED</AssemblyName>
+    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 676d3748c..0c7ef6dc2 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -75,6 +75,7 @@
         win-arm;
         osx-x64;
         linux-musl-x64;
+        linux-musl-arm64;
         linux-x64;
         linux-arm;
         linux-arm64" />
@@ -187,9 +188,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                               LatestRuntimeFrameworkVersion="$(_NETCoreAppPackageVersion)"
                               TargetingPackName="Microsoft.NETCore.App.Ref"
                               TargetingPackVersion="$(NetCoreAppTargetingPackVersion)"
-                              AppHostPackNamePattern="runtime.**RID**.Microsoft.NETCore.DotNetAppHost"
-                              AppHostRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
-                              RuntimePackNamePatterns="runtime.**RID**.Microsoft.NETCore.App%3Bruntime.**RID**.Microsoft.NETCore.DotNetHostResolver%3Bruntime.**RID**.Microsoft.NETCore.DotNetHostPolicy"
+                              RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
                               RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
                               PackagesToReference="Microsoft.NETCore.App/$(NetCoreAppTargetingPackVersion)"
                               IsTrimmable="true"
@@ -209,11 +208,37 @@ Copyright (c) .NET Foundation. All rights reserved.
                               LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)"
                               TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
                               TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)"
-                              RuntimePackNamePatterns="runtime.**RID**.Microsoft.WindowsDesktop.App"
+                              RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
                               RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
                               IsWindowsOnly="true"
                               />
 
+    <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF"
+                              TargetFramework="netcoreapp3.0"
+                              RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
+                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)"
+                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)"
+                              TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
+                              TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)"
+                              RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
+                              RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
+                              IsWindowsOnly="true"
+                              Profile="WPF"
+                              />
+
+    <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"
+                              TargetFramework="netcoreapp3.0"
+                              RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
+                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)"
+                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)"
+                              TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
+                              TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)"
+                              RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
+                              RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
+                              IsWindowsOnly="true"
+                              Profile="WindowsForms"
+                              />
+
     <KnownFrameworkReference Include="Microsoft.AspNetCore.App"
                               TargetFramework="netcoreapp3.0"
                               RuntimeFrameworkName="Microsoft.AspNetCore.App"
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index e3f643963..dffddf82c 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -17,11 +17,11 @@
       <SdkGenerateMsiPowershellScript>$(MSBuildThisFileDirectory)packaging/windows/clisdk/generatemsi.ps1</SdkGenerateMsiPowershellScript>
       <SdkStableFileIdForApphostTransform>$(MSBuildThisFileDirectory)packaging/windows/clisdk/stablefileidforapphosttransform.xslt</SdkStableFileIdForApphostTransform>
       <SdkGenerateBundlePowershellScript>$(MSBuildThisFileDirectory)packaging/windows/clisdk/generatebundle.ps1</SdkGenerateBundlePowershellScript>
-      <SdkGenerateNupkgPowershellScript>$(MSBuildThisFileDirectory)packaging/windows/clisdk/generatenupkg.ps1</SdkGenerateNupkgPowershellScript>
+      <GenerateNupkgPowershellScript>$(MSBuildThisFileDirectory)packaging/windows/clisdk/generatenupkg.ps1</GenerateNupkgPowershellScript>
 
-      <SdkInstallerNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec</SdkInstallerNuspecFile>
-      <SdkInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</SdkInstallerNupkgFile>
-      <VSToolsNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Tools.Net.Core.SDK.$(Architecture).nuspec</VSToolsNuspecFile>
+      <ToolsetInstallerNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec</ToolsetInstallerNuspecFile>
+      <ToolsetInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Toolset.$(Architecture).$(FullNugetVersion).nupkg</ToolsetInstallerNupkgFile>
+      <VSToolsNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec</VSToolsNuspecFile>
       <VSToolsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</VSToolsNupkgFile>
 
       <SdkResolverLayoutPath>$(ArtifactsDir)bin/SdkResolver/$(Configuration)</SdkResolverLayoutPath>
@@ -35,6 +35,7 @@
 
     <PropertyGroup>
       <SdkMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFile>
+      <SdkMSICabFile>$(ArtifactsShippingPackagesDir)d$(Architecture)-1.cab</SdkMSICabFile>
       <CombinedFrameworkSdkHostMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostMSIInstallerFile>
       <SdkBundleInstallerOutputGuidString>$(ProductBandCombinedHostHostFxrFrameworkSdkName)</SdkBundleInstallerOutputGuidString>
 
@@ -158,45 +159,48 @@
                       -InformationAction Continue " />
   </Target>
 
-  <Target Name="GenerateSdkNupkg"
-          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateSdkBundle"
+  <Target Name="GenerateToolsetNupkg"
+          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateSdkMsi;SignSdkMsi"
           Condition=" '$(OS)' == 'Windows_NT'"
-          Inputs="$(CombinedFrameworkSdkHostMSIInstallerFile);
-                    $(SdkInstallerNuspecFile);
-                    $(SdkGenerateNupkgPowershellScript)"
-          Outputs="$(SdkInstallerNupkgFile)">
+          Inputs="$(SdkMSIInstallerFile);
+                    $(ToolsetInstallerNuspecFile);
+                    $(GenerateNupkgPowershellScript)"
+          Outputs="$(ToolsetInstallerNupkgFile)">
 
-    <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript) ^
-                      '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^
+    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
+                      '$(SdkMSIInstallerFile)' ^
                       '$(FullNugetVersion)' ^
-                      '$(SdkInstallerNuspecFile)' ^
-                      '$(SdkInstallerNupkgFile)'" />
+                      '$(ToolsetInstallerNuspecFile)' ^
+                      '$(ToolsetInstallerNupkgFile)' ^
+                      '$(Architecture)' ^
+                      '$(SdkMSICabFile)'" />
   </Target>
 
   <Target Name="GenerateVSToolsNupkg"
-          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateSdkBundle"
+          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs"
           Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x86'"
           Inputs="$(RedistLayoutPath)/**/*;
                   $(VSToolsNuspecFile);
-                  $(SdkGenerateNupkgPowershellScript)"
+                  $(GenerateNupkgPowershellScript)"
           Outputs="$(VSToolsNupkgFile)">
 
-    <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript) ^
+    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
                     '$(RedistLayoutPath.TrimEnd('\'))' ^
                     '$(FullNugetVersion)' ^
                     '$(VSToolsNuspecFile)' ^
-                    '$(VSToolsNupkgFile)'" />
+                    '$(VSToolsNupkgFile)' ^
+                    '$(Architecture)'" />
   </Target>
 
   <Target Name="GenerateVSToolsResolverNupkg"
-          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateSdkBundle"
+          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs"
           Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x86'"
           Inputs="$(SdkResolverLayoutPath)/**/*;
                   $(VSToolsResolverNuspecFile);
-                  $(SdkGenerateNupkgPowershellScript)"
+                  $(GenerateNupkgPowershellScript)"
           Outputs="$(VSToolsResolverNupkgFile)">
 
-    <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript) ^
+    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
                     '$(SdkResolverLayoutPath.TrimEnd('\'))' ^
                     '$(FullNugetVersion)' ^
                     '$(VSToolsResolverNuspecFile)' ^
@@ -204,17 +208,17 @@
   </Target>
 
   <Target Name="GenerateSdkMSBuildExtensionsNupkg"
-          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateSdkBundle"
+          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs"
           Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "
           Inputs="$(MSBuildExtensionsLayoutDirectory)/**/*;
-                    $(SdkInstallerNuspecFile);
-                    $(SdkGenerateNupkgPowershellScript)"
+                    $(SdkMSBuildExtensionsNuspecFile);
+                    $(GenerateNupkgPowershellScript)"
           Outputs="$(SdkMSBuildExtensionsNupkgFile);$(SdkMSBuildExtensionsSwrFile)">
 
     <!-- Disabling this for now because we don't have the MSBuildExtensions available.
          https://github.com/dotnet/cli/issues/10260 -->
 
-    <!-- <Exec Command="powershell -NoProfile -NoLogo -InformationAction Continue $(SdkGenerateNupkgPowershellScript) ^
+    <!-- <Exec Command="powershell -NoProfile -NoLogo -InformationAction Continue $(GenerateNupkgPowershellScript) ^
                       '$(MSBuildExtensionsLayoutDirectory)' ^
                       '$(FullNugetVersion)' ^
                       '$(SdkMSBuildExtensionsNuspecFile)' ^
@@ -233,7 +237,7 @@
                             SignSdkMsi;
                             GenerateSdkBundle;
                             SignSdkBundle;
-                            GenerateSdkNupkg;
+                            GenerateToolsetNupkg;
                             GenerateVSToolsNupkg;
                             GenerateVSToolsResolverNupkg;
                             GenerateSdkMSBuildExtensionsNupkg"
diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets
index 7b4fd5a32..0e39f28d5 100644
--- a/src/redist/targets/Signing.targets
+++ b/src/redist/targets/Signing.targets
@@ -120,27 +120,6 @@
         <CertificateName>%(CertificateName)</CertificateName>
       </LayoutFileSignInfo>
       <DistinctLayoutFileSignInfo Include="@(LayoutFileSignInfo->Distinct())" />
-
-      <!-- Workaround: cert not recognized as for third parties, or assemblies don't have copyright set -->
-      <!--<FilesNotToSign Include="Newtonsoft.Json.dll"/>-->
-      <FilesNotToSign Include="Microsoft.TestPlatform.Extensions.BlameDataCollector.dll"/>
-      <FilesNotToSign Include="Microsoft.TestPlatform.TestHostRuntimeProvider.dll"/>
-      <FilesNotToSign Include="Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"/>
-      <FilesNotToSign Include="Microsoft.TestPlatform.Build.dll"/>
-      <FilesNotToSign Include="Microsoft.TestPlatform.CommunicationUtilities.dll"/>
-      <FilesNotToSign Include="Microsoft.TestPlatform.CoreUtilities.dll"/>
-      <FilesNotToSign Include="Microsoft.TestPlatform.CrossPlatEngine.dll"/>
-      <FilesNotToSign Include="Microsoft.TestPlatform.PlatformAbstractions.dll"/>
-      <FilesNotToSign Include="Microsoft.TestPlatform.Utilities.dll"/>
-      <FilesNotToSign Include="Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll"/>
-      <FilesNotToSign Include="Microsoft.VisualStudio.TestPlatform.Client.dll"/>
-      <FilesNotToSign Include="Microsoft.VisualStudio.TestPlatform.Common.dll"/>
-      <FilesNotToSign Include="Microsoft.VisualStudio.TestPlatform.ObjectModel.dll"/>
-      <FilesNotToSign Include="datacollector.dll"/>
-      <FilesNotToSign Include="vstest.console.dll"/>
-
-      <DistinctLayoutFileSignInfo Remove="@(FilesNotToSign)" />
-      <DistinctLayoutFileSignInfo Include="@(FilesNotToSign)" CertificateName="None" />
     </ItemGroup>
 
     <Error Condition="'$(AllowEmptySignList)' != 'true' AND '@(LayoutFilesToSign)' == ''"
diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets
index 0181f9835..d6b16b412 100644
--- a/src/redist/targets/Versions.targets
+++ b/src/redist/targets/Versions.targets
@@ -4,7 +4,7 @@
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>1</VersionSDKMinor>
     <VersionPatch>00</VersionPatch>
-    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview6</ReleaseSuffix>
+    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview7</ReleaseSuffix>
   </PropertyGroup>
   
   <Target Name="GetCoreSdkGitCommitInfo">
diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec
index b9dd3f55d..4d5b44e81 100644
--- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec
+++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec
@@ -9,10 +9,10 @@
         <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
         <projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>MSBuild extensions bundled with .NET Core SDK insertions to VS</description>
+        <description>MSBuild extensions bundled with .NET Core SDK for internal Visual Studio build consumption</description>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     </metadata>
     <files>
-        <file src="$DOTNET_BUNDLE$\**\*" />
+        <file src="$PAYLOAD_FILES$\**\*" />
     </files>
 </package>
diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec
deleted file mode 100644
index a62f9d2a1..000000000
--- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-    <metadata>
-        <id>VS.Redist.Common.Net.Core.SDK.x86</id>
-        <version>1.0.0</version>
-        <title>VS.Redist.Common.Net.Core.SDK.x86</title>
-        <authors>Microsoft</authors>
-        <owners>Microsoft</owners>
-        <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
-        <projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
-        <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>Windows Installer (x86) for .Net Core SDK</description>
-        <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    </metadata>
-    <files>
-        <file src="$DOTNET_BUNDLE$" />
-    </files>
-</package>
diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec
similarity index 63%
rename from src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec
rename to src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec
index d5d6a2565..ba0555841 100644
--- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec
+++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
-        <id>VS.Redist.Common.Net.Core.SDK.x64</id>
+        <id>VS.Redist.Common.NetCore.Toolset.$ARCH$</id>
         <version>1.0.0</version>
-        <title>VS.Redist.Common.Net.Core.SDK.x64</title>
+        <title>VS.Redist.Common.NetCore.Toolset.$ARCH$</title>
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
         <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
         <projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>Windows Installers (x64) for .Net Core SDK</description>
+        <description>.NET Core SDK Toolset ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     </metadata>
     <files>
-        <file src="$DOTNET_BUNDLE$" />
+        <file src="$PAYLOAD_FILES$" />
+        <file src="$DOTNET_CAB_FILE$" />
     </files>
 </package>
diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec
index b3e8a6930..bf30cb4e1 100644
--- a/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec
+++ b/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec
@@ -9,11 +9,11 @@
         <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
         <projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>.Net Core SDK MSBuild resolver for internal VS build consumption</description>
+        <description>.NET Core SDK MSBuild resolver as a .nupkg for internal Visual Studio build consumption</description>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     </metadata>
     <files>
-        <file src="$DOTNET_BUNDLE$\**\*" target="v15.0\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver" />
+        <file src="$PAYLOAD_FILES$\**\*" target="v15.0\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver" />
         <file src="VS.Tools.Net.Core.SDK.Resolver.cxspec" />
     </files>
 </package>
diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.x86.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec
similarity index 70%
rename from src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.x86.nuspec
rename to src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec
index 814067d06..b986d3440 100644
--- a/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.x86.nuspec
+++ b/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
-        <id>VS.Tools.Net.Core.SDK.x86</id>
+        <id>VS.Tools.Net.Core.SDK.$ARCH$</id>
         <version>1.0.0</version>
-        <title>VS.Tools.Net.Core.SDK.x86</title>
+        <title>VS.Tools.Net.Core.SDK.$ARCH$</title>
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
         <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
         <projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>.Net Core SDK (x86) as a .nupkg for internal VS build consumption</description>
+        <description>.NET Core SDK ($ARCH$) as a .nupkg for internal Visual Studio build consumption</description>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     </metadata>
     <files>
-        <file src="$DOTNET_BUNDLE$\**\*" />
+        <file src="$PAYLOAD_FILES$\**\*" />
         <file src="Init.cmd" />
     </files>
 </package>
diff --git a/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1 b/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1
index ffd020dca..db130d14e 100644
--- a/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1
@@ -2,17 +2,22 @@
 # Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 param(
-    [Parameter(Mandatory=$true)][string]$SdkBundlePath,
+    [Parameter(Mandatory=$true)][string]$ContentPath,
     [Parameter(Mandatory=$true)][string]$NugetVersion,
     [Parameter(Mandatory=$true)][string]$NuspecFile,
-    [Parameter(Mandatory=$true)][string]$NupkgFile
+    [Parameter(Mandatory=$true)][string]$NupkgFile,
+    [Parameter(Mandatory=$false)][string]$Architecture,
+    [Parameter(Mandatory=$false)][string]$CabPath
 )
 
 $RepoRoot = Convert-Path "$PSScriptRoot\..\..\..\..\..\.."
 $NuGetDir = Join-Path $RepoRoot "artifacts\Tools\nuget"
 $NuGetExe = Join-Path $NuGetDir "nuget.exe"
 $OutputDirectory = [System.IO.Path]::GetDirectoryName($NupkgFile)
-$SdkBundlePath = [System.IO.Path]::GetFullPath($SdkBundlePath)
+$ContentPath = [System.IO.Path]::GetFullPath($ContentPath)
+if ($CabPath) {
+    $CabPath = [System.IO.Path]::GetFullPath($CabPath)
+}
 
 if (-not (Test-Path $NuGetDir)) {
     New-Item -ItemType Directory -Force -Path $NuGetDir | Out-Null
@@ -28,5 +33,5 @@ if (Test-Path $NupkgFile) {
     Remove-Item -Force $NupkgFile
 }
 
-& $NuGetExe pack $NuspecFile -Version $NugetVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties DOTNET_BUNDLE=$SdkBundlePath
+& $NuGetExe pack $NuspecFile -Version $NugetVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties PAYLOAD_FILES=$ContentPath`;DOTNET_CAB_FILE=$CabPath`;ARCH=$Architecture
 Exit $LastExitCode