diff --git a/build.cmd b/build.cmd
index b07afe52bf66..a7507e505b93 100644
--- a/build.cmd
+++ b/build.cmd
@@ -658,7 +658,16 @@ if %__BuildCoreLib% EQU 1 (
 
         if "%__BuildManagedTools%" == "1" (
             echo %__MsgPrefix%Publishing crossgen2...
-            call %__ProjectDir%\dotnet.cmd publish --self-contained -r win-%__BuildArch% -c %__BuildType% -o "%__BinDir%\crossgen2" "%__ProjectDir%\src\tools\crossgen2\crossgen2\crossgen2.csproj"
+            call %__ProjectDir%\dotnet.cmd publish --self-contained -r win-%__BuildArch% -c %__BuildType% -o "%__BinDir%\crossgen2" "%__ProjectDir%\src\tools\crossgen2\crossgen2\crossgen2.csproj" /p:BuildArch=%__BuildArch%
+            
+            if not !errorlevel! == 0 (
+                echo %__ErrMsgPrefix%%__MsgPrefix%Error: Failed to build crossgen2.
+                echo     !__BuildLog!
+                echo     !__BuildWrn!
+                echo     !__BuildErr!
+                exit /b !errorlevel!
+            )
+
             copy /Y "%__BinDir%\clrjit.dll" "%__BinDir%\crossgen2\clrjitilc.dll"
             copy /Y "%__BinDir%\jitinterface.dll" "%__BinDir%\crossgen2\jitinterface.dll"
         )
diff --git a/build.sh b/build.sh
index cad8094726b9..5621c02ca7e2 100755
--- a/build.sh
+++ b/build.sh
@@ -444,7 +444,13 @@ build_CoreLib()
 
     if [[ "$__BuildManagedTools" -eq "1" ]]; then
         echo "Publishing crossgen2 for $__DistroRid"
-        "$__ProjectRoot/dotnet.sh" publish --self-contained -r $__DistroRid -c $__BuildType -o "$__BinDir/crossgen2" "$__ProjectRoot/src/tools/crossgen2/crossgen2/crossgen2.csproj"
+        "$__ProjectRoot/dotnet.sh" publish --self-contained -r $__DistroRid -c $__BuildType -o "$__BinDir/crossgen2" "$__ProjectRoot/src/tools/crossgen2/crossgen2/crossgen2.csproj" /p:BuildArch=$__BuildArch
+
+        local exit_code=$?
+        if [ $exit_code != 0 ]; then
+            echo "${__ErrMsgPrefix}Failed to build crossgen2."
+            exit $exit_code
+        fi
 
         if [ "$__HostOS" == "OSX" ]; then
             cp "$__BinDir/libclrjit.dylib" "$__BinDir/crossgen2/libclrjitilc.dylib"
diff --git a/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.builds b/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.builds
new file mode 100644
index 000000000000..85918b379ead
--- /dev/null
+++ b/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.Build.Traversal">
+  <ItemGroup>
+    <!-- identity project, runtime specific projects are included by props above -->
+    <Project Include="$(MSBuildProjectName).pkgproj" />
+  </ItemGroup>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(builds.targets))" />
+</Project>
diff --git a/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj b/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj
new file mode 100644
index 000000000000..bd4cc28d8e1e
--- /dev/null
+++ b/src/.nuget/Microsoft.NETCore.Crossgen2/Microsoft.NETCore.Crossgen2.pkgproj
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
+
+  <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
+    <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
+  </PropertyGroup>
+
+  <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
+
+  <PropertyGroup>
+    <!-- We're publishing crossgen2 as framework dependent application in the runtime package for now since we only have
+        two simple scenarios we want to support in the short term: win_x64 to win_x64 and linux_x64 to linux_x64 compilations.
+        Once we have more complex targets, especially cross-platform and cross-architecture, crossgen2 should move to its own
+        package, and become a self-contained package.
+    -->
+    <Crossgen2RuntimeConfigContents>
+{
+  "runtimeOptions": {
+    "tfm": "netcoreapp3.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "5.0.0-alpha1.0"
+    }
+  }
+}
+    </Crossgen2RuntimeConfigContents>
+    <Crossgen2RuntimeConfigFile>$(ArtifactsObjDir)crossgen2\crossgen2.runtimeconfig.json</Crossgen2RuntimeConfigFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ArchitectureSpecificToolFile Include="$(Crossgen2RuntimeConfigFile)" />
+  </ItemGroup>
+    
+  <Target Name="WriteCrossgen2RuntimeConfig" BeforeTargets="GetPackageFiles">
+    <!-- Emit the runtime config json file that will be packaged with crossgen2 -->
+    <WriteLinesToFile File="$(Crossgen2RuntimeConfigFile)" Lines="$(Crossgen2RuntimeConfigContents)" Overwrite="true" WriteOnlyWhenDifferent="true" />
+  </Target>
+
+</Project>
diff --git a/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Linux.Microsoft.NETCore.Crossgen2.props b/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Linux.Microsoft.NETCore.Crossgen2.props
new file mode 100644
index 000000000000..24e45ab5487d
--- /dev/null
+++ b/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Linux.Microsoft.NETCore.Crossgen2.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\crossgen2" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\crossgen2.dll" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\ILCompiler*.dll" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\Microsoft.DiaSymReader.dll" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\System.CommandLine.dll" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\libclrjitilc.so" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\libjitinterface.so" />
+  </ItemGroup>
+</Project>
diff --git a/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Windows_NT.Microsoft.NETCore.Crossgen2.props b/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Windows_NT.Microsoft.NETCore.Crossgen2.props
new file mode 100644
index 000000000000..67cda6514704
--- /dev/null
+++ b/src/.nuget/Microsoft.NETCore.Crossgen2/runtime.Windows_NT.Microsoft.NETCore.Crossgen2.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\crossgen2.exe" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\crossgen2.dll" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\ILCompiler*.dll" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\Microsoft.DiaSymReader.dll" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\System.CommandLine.dll" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\clrjitilc.dll" />
+    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen2\jitinterface.dll" />
+  </ItemGroup>
+</Project>
diff --git a/src/.nuget/descriptions.json b/src/.nuget/descriptions.json
index cde4d35416e5..0ab63e6c4d73 100644
--- a/src/.nuget/descriptions.json
+++ b/src/.nuget/descriptions.json
@@ -45,8 +45,13 @@
         "CommonTypes": [ ]
     },
     {
-	"Name": "Microsoft.NETCore.Native",
-	"Description": "Native shims for .NET Core runtime",
-	"CommonTypes": [ ]
+        "Name": "Microsoft.NETCore.Native",
+        "Description": "Native shims for .NET Core runtime",
+        "CommonTypes": [ ]
+    },
+    {
+        "Name": "Microsoft.NETCore.Crossgen2",
+        "Description": "The .NET Crossgen2 compiler.",
+        "CommonTypes": [ ]
     }
 ]
diff --git a/src/.nuget/packages.builds b/src/.nuget/packages.builds
index 080583950a7b..883d9c7a9829 100644
--- a/src/.nuget/packages.builds
+++ b/src/.nuget/packages.builds
@@ -22,6 +22,10 @@
     <ProjectReference Include="Microsoft.NETCore.ILDAsm\Microsoft.NETCore.ILDAsm.builds" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(BuildArch)'=='x64' And ('$(__BuildOS)' == 'Windows_NT' Or '$(__BuildOS)' == 'Linux')">
+    <ProjectReference Include="Microsoft.NETCore.Crossgen2\Microsoft.NETCore.Crossgen2.builds" />
+  </ItemGroup>
+
   <!-- Generate a version.txt file we include in our packages
        The InitializeSourceControlInformationFromSourceControlManager is part of Microsoft.Build.Tasks.Git
        and is responsible for setting SourceRevisionId -->
diff --git a/src/build.proj b/src/build.proj
index 02dc506244fc..4cf380346a27 100644
--- a/src/build.proj
+++ b/src/build.proj
@@ -10,7 +10,6 @@
     <ProjectReference Condition="'$(BuildManagedTools)' == 'true'" Include="tools/runincontext/runincontext.csproj" />
     <ProjectReference Condition="'$(BuildManagedTools)' == 'true'" Include="tools/r2rdump/R2RDump.csproj" />
     <ProjectReference Condition="'$(BuildManagedTools)' == 'true'" Include="tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj" />
-    <ProjectReference Condition="'$(BuildManagedTools)' == 'true'" Include="tools/crossgen2/crossgen2/crossgen2.csproj" />
     <ProjectReference Include="System.Private.CoreLib\System.Private.CoreLib.csproj" />
   </ItemGroup>
 
diff --git a/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj b/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj
index 8adc70d3d4af..696e59308f35 100644
--- a/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj
+++ b/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj
@@ -6,12 +6,12 @@
     <TargetFramework>netstandard1.3</TargetFramework>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <Platforms>x64;x86</Platforms>
+    <PlatformTargets Condition="'$(BuildArch)' != ''">$(BuildArch)</PlatformTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 
     <!-- We're binplacing these into an existing publish layout so that F5 build in VS updates
          the same bits tests expect to see in bin/crossgen2. That way we never need to wonder which
          binaries are up to date and which are stale. -->
-    <OutputPath>$(BinDir)/crossgen2</OutputPath>
     <GenerateDependencyFile>false</GenerateDependencyFile>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj b/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj
index 032f939696cb..7f46c381476f 100644
--- a/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj
+++ b/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj
@@ -7,12 +7,12 @@
     <DefineConstants>READYTORUN;$(DefineConstants)</DefineConstants>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <Platforms>x64;x86</Platforms>
+    <PlatformTargets Condition="'$(BuildArch)' != ''">$(BuildArch)</PlatformTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 
     <!-- We're binplacing these into an existing publish layout so that F5 build in VS updates
          the same bits tests expect to see in bin/crossgen2. That way we never need to wonder which
          binaries are up to date and which are stale. -->
-    <OutputPath>$(BinDir)/crossgen2</OutputPath>
     <GenerateDependencyFile>false</GenerateDependencyFile>
   </PropertyGroup>
   
diff --git a/src/tools/crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj b/src/tools/crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj
index fdcd0bfa2ec6..2948bc0a2972 100644
--- a/src/tools/crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj
+++ b/src/tools/crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj
@@ -7,12 +7,12 @@
     <TargetFramework>netstandard1.3</TargetFramework>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <Platforms>x64;x86</Platforms>
+    <PlatformTargets Condition="'$(BuildArch)' != ''">$(BuildArch)</PlatformTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 
     <!-- We're binplacing these into an existing publish layout so that F5 build in VS updates
          the same bits tests expect to see in bin/crossgen2. That way we never need to wonder which
          binaries are up to date and which are stale. -->
-    <OutputPath>$(BinDir)/crossgen2</OutputPath>
     <GenerateDependencyFile>false</GenerateDependencyFile>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tools/crossgen2/crossgen2/crossgen2.csproj b/src/tools/crossgen2/crossgen2/crossgen2.csproj
index f2ad4d259047..a33cd3b48e7e 100644
--- a/src/tools/crossgen2/crossgen2/crossgen2.csproj
+++ b/src/tools/crossgen2/crossgen2/crossgen2.csproj
@@ -6,12 +6,13 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <NoWarn>8002,NU1701</NoWarn>
     <Platforms>x64;x86</Platforms>
+    <PlatformTargets Condition="'$(BuildArch)' != ''">$(BuildArch)</PlatformTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 
     <!-- We're binplacing these into an existing publish layout so that F5 build in VS updates
          the same bits tests expect to see in bin/crossgen2. That way we never need to wonder which
          binaries are up to date and which are stale. -->
-    <OutputPath>$(BinDir)/crossgen2</OutputPath>
+    <OutputPath Condition="'$(BuildingInsideVisualStudio)' == 'true'">$(BinDir)/crossgen2</OutputPath>
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>