diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 980d8a938..18b776f5e 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <Import Project="targets\BuildCoreSdkTasks.targets" />
+  <Import Project="targets\Versions.targets" />
   <Import Project="targets\BundledComponents.targets" />
   <Import Project="targets\FileExtensions.targets" />
   <Import Project="targets\GetRuntimeInformation.targets" />
diff --git a/src/redist/targets/BundledComponents.targets b/src/redist/targets/BundledComponents.targets
index c73c3361b..5c4610240 100644
--- a/src/redist/targets/BundledComponents.targets
+++ b/src/redist/targets/BundledComponents.targets
@@ -1,7 +1,8 @@
 <Project>
-  <Target Name="SetupBundledComponents" DependsOnTargets="GetCurrentRuntimeInformation;SetupFileExtensions">
+  <Target Name="SetupBundledComponents" DependsOnTargets="GetCurrentRuntimeInformation;SetupFileExtensions;SetSdkVersionInfo">
     <PropertyGroup>
       <CoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl>
+      <DotnetExtensionsBlobRootUrl Condition="'$(DotnetExtensionsBlobRootUrl)' == ''">https://dotnetcli.blob.core.windows.net/dotnet/</DotnetExtensionsBlobRootUrl>
       
       <CoreSetupRid>$(HostRid)</CoreSetupRid>
       <CoreSetupRid Condition=" ('$(HostOSName)' == 'win' or '$(HostOSName)' == 'osx') and '$(DotNetBuildFromSource)' != 'true' ">$(HostMonikerRid)</CoreSetupRid>
@@ -101,6 +102,13 @@
         <DownloadFileName>$(DownloadedHostFxrInstallerFileName)</DownloadFileName>
         <AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
       </BundledInstallerComponent>
+    
+      <BundledLayoutComponent Include="ToolsetArchive">
+        <BaseUrl>$(CoreSetupBlobRootUrl)Toolset/$(ToolsetVersion)</BaseUrl>
+        <DownloadFileName>dotnet-toolset-internal-$(ToolsetVersion).zip</DownloadFileName>
+        <AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
+        <RelativeLayoutPath>sdk/$(SdkVersion)</RelativeLayoutPath>
+      </BundledLayoutComponent>
     </ItemGroup>
     
     <ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' ">
@@ -126,11 +134,31 @@
         <AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
       </BundledInstallerComponent>
     </ItemGroup>
+    
+    <PropertyGroup>
+      <IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT' ">true</IncludeWpfAndWinForms>
+      <IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' ">false</IncludeWpfAndWinForms>
+    </PropertyGroup>
+    
+    <ItemGroup Condition=" '$(IncludeWpfAndWinForms)' != 'false' ">
+      <BundledLayoutComponent Include="WinFormsAndWpfSharedFxArchiveFile">
+        <BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftDesktopUIPackageVersion)</BaseUrl>
+        <DownloadFileName>$(WinFormsAndWpfSharedFxArchiveFileName)</DownloadFileName>
+        <AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
+        <RelativeLayoutPath>shared</RelativeLayoutPath>
+      </BundledLayoutComponent>
+
+      <BundledInstallerComponent Include="DownloadedWinFormsAndWpfSharedFrameworkInstallerFile"
+                           Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
+        <BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftDesktopUIPackageVersion)</BaseUrl>
+        <DownloadFileName>$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)</DownloadFileName>
+        <AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
+      </BundledInstallerComponent>
+    </ItemGroup>
 
   </Target>
 
-  <Target Name="DownloadBundledComponents" DependsOnTargets="SetupBundledComponents"
-          AfterTargets="Build">
+  <Target Name="DownloadBundledComponents" DependsOnTargets="SetupBundledComponents">
     <ItemGroup>
       <BundledLayoutComponent>
         <DownloadDestination>$(IntermediateOutputPath)downloads\%(DownloadFileName)</DownloadDestination>
@@ -147,9 +175,19 @@
                   Uri="%(ComponentToDownload.BaseUrl)/%(ComponentToDownload.DownloadFileName)"
                   DestinationPath="%(ComponentToDownload.DownloadDestination)" />
     
+  </Target>
+
+  <Target Name="CleanPublishDir">
+    <!-- Remove everything from the publish directory so we don't have left over items from previous builds -->
+    <RemoveDir Directories="$(PublishDir)" />
+    <MakeDir Directories="$(PublishDir)" />
+  </Target>
+  
+  <Target Name="LayoutBundledComponents" DependsOnTargets="DownloadBundledComponents;CleanPublishDir"
+          AfterTargets="Build">
+
     <ExtractArchiveToDirectory SourceArchive="%(BundledLayoutComponent.DownloadDestination)"
-                               DestinationDirectory="$(PublishDir)" />
-
-
+                               DestinationDirectory="$(PublishDir)/%(BundledLayoutComponent.RelativeLayoutPath)" />
+  
   </Target>
 </Project>
diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets
new file mode 100644
index 000000000..c0d4fb9eb
--- /dev/null
+++ b/src/redist/targets/Versions.targets
@@ -0,0 +1,50 @@
+<Project>
+  <PropertyGroup>
+    <VersionMajor>3</VersionMajor>
+    <VersionMinor>0</VersionMinor>
+    <VersionPatch>100</VersionPatch>
+    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">alpha1</ReleaseSuffix>
+  </PropertyGroup>
+  
+  <Target Name="GetCoreSdkGitCommitInfo">
+    <Exec Command="git rev-list --count HEAD"
+          ConsoleToMSBuild="true"
+          Condition=" '$(GitCommitCount)' == '' ">
+      <Output TaskParameter="ConsoleOutput" PropertyName="GitCommitCount" />
+    </Exec>
+
+    <Exec Command="git rev-parse HEAD"
+          ConsoleToMSBuild="true"
+          Condition=" '$(GitCommitHash)' == '' ">
+      <Output TaskParameter="ConsoleOutput" PropertyName="GitCommitHash" />
+    </Exec>
+
+    <PropertyGroup>
+      <GitCommitCount>$(GitCommitCount.PadLeft(6,'0'))</GitCommitCount>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="SetSdkVersionInfo" DependsOnTargets="GetCoreSdkGitCommitInfo">
+    <PropertyGroup>
+      <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
+      <CliVersionNoSuffix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</CliVersionNoSuffix>
+      <CliVersionPrefix>$(CliVersionNoSuffix)-$(ReleaseSuffix)</CliVersionPrefix>
+      <CliBrandingVersion Condition=" '$(DropSuffix)' != 'true' ">$(CliVersionNoSuffix) - $(ReleaseSuffix)</CliBrandingVersion>
+      <CliBrandingVersion Condition=" '$(DropSuffix)' == 'true' ">$(CliVersionNoSuffix)</CliBrandingVersion>
+      <SimpleVersion Condition=" '$(DropSuffix)' != 'true' ">$(CliVersionNoSuffix).$(GitCommitCount)</SimpleVersion>
+      <SimpleVersion Condition=" '$(SimpleVersion)' == '' ">$(CliVersionNoSuffix)</SimpleVersion>
+
+      <VersionSuffix Condition=" '$(DropSuffix)' != 'true' ">$(ReleaseSuffix)-$(GitCommitCount)</VersionSuffix>
+
+      <FullNugetVersion>$(CliVersionNoSuffix)-$(ReleaseSuffix)-$(GitCommitCount)</FullNugetVersion>
+
+      <NugetVersion Condition=" '$(DropSuffix)' != 'true' ">$(FullNugetVersion)</NugetVersion>
+      <NugetVersion Condition=" '$(NugetVersion)' == '' ">$(CliVersionNoSuffix)</NugetVersion>
+
+      <SdkVersion>$(NugetVersion)</SdkVersion>
+      <SdkNugetVersion>$(NugetVersion)</SdkNugetVersion>
+
+    </PropertyGroup>
+  </Target>
+  
+</Project>