diff --git a/Directory.Build.props b/Directory.Build.props
index 251506303..d22528dda 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -13,6 +13,8 @@
 
     <IsShipping>true</IsShipping>
     <CoreSdkTargetFramework>netcoreapp3.0</CoreSdkTargetFramework>
+
+    <ArtifactsShippingSymbolsDir>$(ArtifactsDir)symbols\$(Configuration)\Shipping</ArtifactsShippingSymbolsDir>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DisableSourceLink)' == 'true'">
diff --git a/old/build_projects/dotnet-cli-build/AddMetadataIsPE.cs b/src/core-sdk-tasks/AddMetadataIsPE.cs
similarity index 100%
rename from old/build_projects/dotnet-cli-build/AddMetadataIsPE.cs
rename to src/core-sdk-tasks/AddMetadataIsPE.cs
diff --git a/old/build_projects/dotnet-cli-build/Crossgen.cs b/src/core-sdk-tasks/Crossgen.cs
similarity index 100%
rename from old/build_projects/dotnet-cli-build/Crossgen.cs
rename to src/core-sdk-tasks/Crossgen.cs
diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj
index 9c9cdd890..c2ee30446 100644
--- a/src/core-sdk-tasks/core-sdk-tasks.csproj
+++ b/src/core-sdk-tasks/core-sdk-tasks.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="NuGet.Versioning" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index c49bc5099..fc3f8d2a8 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -17,6 +17,7 @@
   <Import Project="targets\BundledTemplates.targets" />
   <Import Project="targets\BundledDotnetTools.targets" />
   <Import Project="targets\GenerateBundledVersions.targets" />
+  <Import Project="targets\Crossgen.targets" />
   <Import Project="targets\GenerateLayout.targets" />
   <Import Project="targets\FileExtensions.targets" />
   
diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets
index 9b51419bf..dd25cf282 100644
--- a/src/redist/targets/BuildCoreSdkTasks.targets
+++ b/src/redist/targets/BuildCoreSdkTasks.targets
@@ -32,5 +32,7 @@
   <UsingTask TaskName="DotNetDebTool" AssemblyFile="$(CoreSdkTaskDll)" />
   <UsingTask TaskName="BuildFPMToolPreReqs" AssemblyFile="$(CoreSdkTaskDll)"/>
   <UsingTask TaskName="GetUseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion" AssemblyFile="$(CoreSdkTaskDll)"/>
+  <UsingTask TaskName="AddMetadataIsPE" AssemblyFile="$(CoreSdkTaskDll)"/>
+  <UsingTask TaskName="Crossgen" AssemblyFile="$(CoreSdkTaskDll)"/>
 
 </Project>
diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets
new file mode 100644
index 000000000..dc4c4228c
--- /dev/null
+++ b/src/redist/targets/Crossgen.targets
@@ -0,0 +1,148 @@
+<Project>
+  <Target Name="CrossgenLayout"
+          Condition="'$(DISABLE_CROSSGEN)' == ''"
+          DependsOnTargets="SetSdkBrandingInfo">
+    
+    <PropertyGroup>
+      <RuntimeNETCoreAppPackageName>runtime.$(SharedFrameworkRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName>
+      <_crossDir Condition="'$(Architecture)' == 'arm64'">/x64_arm64</_crossDir>
+      <_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'win'">/x86_arm</_crossDir>
+      <_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'linux'">/x64_arm</_crossDir>
+      <CrossgenPath>$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/tools$(_crossDir)/crossgen$(ExeExtension)</CrossgenPath>
+      <LibCLRJitRid Condition="!$(Architecture.StartsWith('arm'))">$(SharedFrameworkRid)</LibCLRJitRid>
+      <LibCLRJitRid Condition="'$(Architecture)' == 'arm64'">x64_arm64</LibCLRJitRid>
+      <LibCLRJitRid Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'win'">x86_arm</LibCLRJitRid>
+      <LibCLRJitRid Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'linux'">x64_arm</LibCLRJitRid>
+      <LibCLRJitPath>$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
+      <SharedFrameworkNameVersionPath>$(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppPackageVersion)</SharedFrameworkNameVersionPath>
+    </PropertyGroup>
+
+    <!-- Download the runtime package with the crossgen executable in it -->
+    <ItemGroup>
+      <DownloadPackageProject Include="$(MSBuildThisFileDirectory)DownloadPackage.csproj">
+        <Properties>
+          PackageToRestore=$(RuntimeNETCoreAppPackageName);
+          PackageVersionToRestore=$(MicrosoftNETCoreAppPackageVersion);
+          TargetFramework=$(TargetFramework)
+        </Properties>
+      </DownloadPackageProject>
+    </ItemGroup>
+
+    <MSBuild
+      BuildInParallel="False"
+      Projects="@(DownloadPackageProject)">
+    </MSBuild>
+    
+    <ItemGroup>
+      <RoslynFiles Include="$(SdkOutputDirectory)Roslyn\bincore\**\*" />
+      <FSharpFiles Include="$(SdkOutputDirectory)FSharp\**\*" Exclude="$(SdkOutputDirectory)FSharp\FSharp.Build.dll" />
+      <RemainingFiles Include="$(SdkOutputDirectory)**\*" Exclude="@(RoslynFiles);@(FSharpFiles)" />
+
+      <!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
+      <RemainingFiles Remove="$(SdkOutputDirectory)TestHost*\**\*" />
+      <RemainingFiles Remove="$(SdkOutputDirectory)Sdks\**\*" />
+      <RemainingFiles Remove="$(SdkOutputDirectory)**\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
+
+      <!-- Add back the .NET Core assemblies in the Sdks folder -->
+      <RemainingFiles Include="$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk\tools\netcoreapp2.0\**\*" />
+      <RemainingFiles Include="$(SdkOutputDirectory)Sdks\NuGet.Build.Tasks.Pack\CoreCLR\**\*" />
+
+      <!-- Don't try to CrossGen .NET Framework support assemblies for .NET Standard -->
+      <RemainingFiles Remove="$(SdkOutputDirectory)Microsoft\Microsoft.NET.Build.Extensions\net*\**\*" />
+
+      <!-- Don't CrossGen bundled DotnetTools -->
+      <RemainingFiles Remove="$(SdkOutputDirectory)DotnetTools\**\*" />
+
+      <!-- Don't crossgen satellite assemblies -->
+      <RoslynFiles Remove="$(SdkOutputDirectory)Roslyn\bincore\**\*.resources.dll" />
+      <FSharpFiles Remove="$(SdkOutputDirectory)FSharp\**\*.resources.dll" />
+      <RemainingFiles Remove="$(SdkOutputDirectory)**\*.resources.dll" />
+
+      <DiasymReaderPath Include="$(SharedFrameworkNameVersionPath)/Microsoft.DiaSymReader.Native.*.dll" />
+    </ItemGroup>
+
+    <AddMetadataIsPE Items="@(RoslynFiles)">
+      <Output TaskParameter="ResultItems" ItemName="RoslynFilesWithPEMarker" />
+    </AddMetadataIsPE>
+    <AddMetadataIsPE Items="@(FSharpFiles)">
+      <Output TaskParameter="ResultItems" ItemName="FSharpFilesWithPEMarker" />
+    </AddMetadataIsPE>
+    <AddMetadataIsPE Items="@(RemainingFiles)">
+      <Output TaskParameter="ResultItems" ItemName="RemainingFilesWithPEMarker" />
+    </AddMetadataIsPE>
+
+    <ItemGroup>
+      <RoslynTargets Include="%(RoslynFilesWithPEMarker.FullPath)" Condition=" '%(RoslynFilesWithPEMarker.IsPE)' == 'True' " />
+      <FSharpTargets Include="%(FSharpFilesWithPEMarker.FullPath)" Condition=" '%(FSharpFilesWithPEMarker.IsPE)' == 'True' " />
+      <RemainingTargets Include="%(RemainingFilesWithPEMarker.FullPath)" Condition=" '%(RemainingFilesWithPEMarker.IsPE)' == 'True' " />
+
+      <RoslynFolders Include="@(RoslynTargets-&gt;DirectoryName()-&gt;Distinct())" />
+      <FSharpFolders Include="@(FSharpTargets-&gt;DirectoryName()-&gt;Distinct())" />
+      <RemainingFolders Include="@(RemainingTargets-&gt;DirectoryName()-&gt;Distinct())" />
+
+      <!-- FSharp.Build.dll causes the FSharp folder to be included. Remove it, as we don't want other FSharp dlls being included in the crossgen. -->
+      <RemainingFolders Remove="$(PublishDir)FSharp\**\*" />
+    </ItemGroup>
+
+    <!-- Ensure crossgen tool is executable.  See https://github.com/NuGet/Home/issues/4424 -->
+    <!-- Probably not needed anymore -->
+    <!--<Chmod Condition=" '$(OSName)' != 'win' "
+           Glob="$(CrossgenPath)"
+           Mode="u+x" />-->
+
+    <!-- Crossgen does not support generating symbols on Mac  -->
+    <PropertyGroup Condition="'$(CreateCrossgenSymbols)' == ''">
+      <CreateCrossgenSymbols>true</CreateCrossgenSymbols>
+      <CreateCrossgenSymbols Condition="'$(OSName)' == 'osx'">false</CreateCrossgenSymbols>
+    </PropertyGroup>
+
+    <Crossgen
+        SourceAssembly="%(RoslynTargets.FullPath)"
+        DestinationPath="%(RoslynTargets.FullPath)"
+        JITPath="$(LibCLRJitPath)"
+        CrossgenPath="$(CrossgenPath)"
+        ReadyToRun="True"
+        CreateSymbols="$(CreateCrossgenSymbols)"
+        DiasymReaderPath="@(DiasymReaderPath)"
+        PlatformAssemblyPaths="@(RoslynFolders);$(SharedFrameworkNameVersionPath)" />
+
+    <Crossgen
+        SourceAssembly="%(FSharpTargets.FullPath)"
+        DestinationPath="%(FSharpTargets.FullPath)"
+        JITPath="$(LibCLRJitPath)"
+        CrossgenPath="$(CrossgenPath)"
+        ReadyToRun="True"
+        CreateSymbols="$(CreateCrossgenSymbols)"
+        DiasymReaderPath="@(DiasymReaderPath)"
+        PlatformAssemblyPaths="@(FSharpFolders);$(SharedFrameworkNameVersionPath)" />
+
+    <Crossgen
+        SourceAssembly="%(RemainingTargets.FullPath)"
+        DestinationPath="%(RemainingTargets.FullPath)"
+        JITPath="$(LibCLRJitPath)"
+        CrossgenPath="$(CrossgenPath)"
+        ReadyToRun="True"
+        CreateSymbols="$(CreateCrossgenSymbols)"
+        DiasymReaderPath="@(DiasymReaderPath)"
+        PlatformAssemblyPaths="@(RemainingFolders);$(SharedFrameworkNameVersionPath)" />
+
+
+    <ItemGroup>
+      <PdbsToMove Include="$(SdkOutputDirectory)**/*.pdb" />
+      <PdbsToMove Include="$(SdkOutputDirectory)**/*.ni.*.map" />
+    </ItemGroup>
+
+    <!-- Move symbols to separate folder, they are not included in the layout but are published separately -->
+    <Move SourceFiles="@(PdbsToMove)"
+          DestinationFiles="@(PdbsToMove->'$(ArtifactsShippingSymbolsDir)/sdk/$(SdkVersion)/%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
+
+  <Target Name="ChmodLayout"
+        AfterTargets="CrossgenLayout"
+        Condition=" '$(OSName)' != 'win' ">
+
+    <Exec Command="find $(SdkOutputDirectory) -type d -exec chmod 755 {} \;" />
+    <Exec Command="find $(SdkOutputDirectory) -type f -exec chmod 644 {} \;" />
+    <Chmod Mode="755" Glob="$(SdkOutputDirectory)/FSharp/RunFsc.sh" />
+  </Target>
+</Project>
diff --git a/src/redist/targets/DownloadPackage.csproj b/src/redist/targets/DownloadPackage.csproj
new file mode 100644
index 000000000..a316ea118
--- /dev/null
+++ b/src/redist/targets/DownloadPackage.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Restore">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="$(PackageToRestore)" Version="$(PackageVersionToRestore)" />
+  </ItemGroup>
+  
+</Project>
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index ce59c552c..4bc8244bb 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -226,7 +226,8 @@
                             GenerateBundledVersions;
                             LayoutTemplates;
                             LayoutBundledTools;
-                            RetargetTools"
+                            RetargetTools;
+                            CrossgenLayout"
           AfterTargets="Build">
   
   </Target>