From 64c286c8b6f4712d07b5c7dfbcc6130efe318b8b Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 1 Apr 2022 10:22:28 -0700
Subject: [PATCH 01/43] Publish crossgen as AOT if supported by the target
 platform (#65948)

Publishes crossgen as an AOT binary on Windows+Linux x64+ARM64, otherwise publishes as an R2R single file.

Closes #60016

(cherry picked from commit 0d1e04ba2a9ebc9d21a7f65db00407dd0056b547)
---
 eng/Subsets.props                             |   3 +-
 eng/liveBuilds.targets                        |  15 +++
 eng/testing/tests.singlefile.targets          |   2 -
 .../SymbolReader/UnmanagedPdbSymbolReader.cs  |   2 +-
 .../tools/aot/ILCompiler/ILCompiler.props     |   6 +-
 .../tools/aot/crossgen2/crossgen2.csproj      |  49 +++++++-
 .../tools/aot/crossgen2/crossgen2.props       |  10 +-
 .../Microsoft.NETCore.App.Crossgen2.sfxproj   | 105 +++++++++---------
 8 files changed, 123 insertions(+), 69 deletions(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index b556df68ea642..bd1cda47e06d0 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -71,8 +71,7 @@
     <DefaultLibrariesSubsets Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or
                                         '$(BuildTargetFramework)' == '' or
                                         '$(BuildAllConfigurations)' == 'true'">libs.native+</DefaultLibrariesSubsets>
-    <DefaultLibrariesSubsets>$(DefaultLibrariesSubsets)libs.sfx+libs.oob</DefaultLibrariesSubsets>
-    <DefaultLibrariesSubsets Condition="'$(DotNetBuildFromSource)' != 'true'">$(DefaultLibrariesSubsets)+libs.pretest</DefaultLibrariesSubsets>
+    <DefaultLibrariesSubsets>$(DefaultLibrariesSubsets)libs.sfx+libs.oob+libs.pretest</DefaultLibrariesSubsets>
 
     <DefaultHostSubsets>host.native+host.tools</DefaultHostSubsets>
     <DefaultHostSubsets Condition="'$(DotNetBuildFromSource)' != 'true'">$(DefaultHostSubsets)+host.pkg+host.tests</DefaultHostSubsets>
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index a8e8fffe47011..0583f48aed5cf 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -49,6 +49,7 @@
     <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm' and '$(BuildArchitecture)' != 'arm' and '$(TargetsWindows)' == 'true'">x86</CoreCLRCrossTargetComponentDirName>
     <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm' and '$(BuildArchitecture)' != 'arm' and '$(TargetsLinux)' == 'true'">x64</CoreCLRCrossTargetComponentDirName>
     <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'armel' and '$(BuildArchitecture)' != 'armel' and '$(TargetsLinux)' == 'true'">x64</CoreCLRCrossTargetComponentDirName>
+    <SingleFileHostSourcePath>$(CoreCLRArtifactsPath)/corehost/singlefilehost$(ExeSuffix)</SingleFileHostSourcePath>
   </PropertyGroup>
 
   <Target Name="ResolveRuntimeFilesFromLocalBuild">
@@ -222,4 +223,18 @@
   <PropertyGroup>
     <BundledRuntimeIdentifierGraphFile>$(RuntimeIdGraphDefinitionFile)</BundledRuntimeIdentifierGraphFile>
   </PropertyGroup>
+
+  <Target Name="RewriteRuntimePackDir"
+          Condition="'$(RunningPublish)' == 'true'"
+          DependsOnTargets="ResolveRuntimeFilesFromLocalBuild"
+          BeforeTargets="ResolveRuntimePackAssets">
+      <ItemGroup>
+        <!-- Remove AspNetCore runtime pack since we don't build it locally -->
+        <ResolvedRuntimePack Remove="Microsoft.AspNetCore.App.Runtime.$(RuntimeIdentifier)" />
+
+        <ResolvedRuntimePack Update="Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)">
+          <PackageDirectory>$(MicrosoftNetCoreAppRuntimePackDir)</PackageDirectory>
+        </ResolvedRuntimePack>
+      </ItemGroup>
+  </Target>
 </Project>
diff --git a/eng/testing/tests.singlefile.targets b/eng/testing/tests.singlefile.targets
index e5f12a683a9f7..f95e1957de028 100644
--- a/eng/testing/tests.singlefile.targets
+++ b/eng/testing/tests.singlefile.targets
@@ -16,8 +16,6 @@
     <PublishSingleFile>true</PublishSingleFile>
     <UseAppHost>true</UseAppHost>
     <SelfContained>true</SelfContained>
-    <SingleFileHostSourcePath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)', 'corehost'))/singlefilehost</SingleFileHostSourcePath>
-    <SingleFileHostSourcePath Condition="'$(TargetOS)' == 'windows'">$(SingleFileHostSourcePath).exe</SingleFileHostSourcePath>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TestNativeAot)' == 'true'">
diff --git a/src/coreclr/tools/Common/TypeSystem/Ecma/SymbolReader/UnmanagedPdbSymbolReader.cs b/src/coreclr/tools/Common/TypeSystem/Ecma/SymbolReader/UnmanagedPdbSymbolReader.cs
index f6e5459a59f95..f7a7074cca5ff 100644
--- a/src/coreclr/tools/Common/TypeSystem/Ecma/SymbolReader/UnmanagedPdbSymbolReader.cs
+++ b/src/coreclr/tools/Common/TypeSystem/Ecma/SymbolReader/UnmanagedPdbSymbolReader.cs
@@ -25,7 +25,7 @@ namespace Internal.TypeSystem.Ecma
     /// </summary>
     public abstract class UnmanagedPdbSymbolReader : PdbSymbolReader
     {
-        public static PdbSymbolReader TryOpenSymbolReaderForMetadataFile(string metadataFileName, string searchPath)
+        public static PdbSymbolReader? TryOpenSymbolReaderForMetadataFile(string metadataFileName, string searchPath)
         {
             return null;
         }
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props
index 936823572cb95..61b23fd75d112 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props
@@ -120,16 +120,18 @@
     <TargetSpec>$(TargetOSComponent)_$(TargetArchitectureForLocalJitBuild)_$(TargetArchitectureForSharedLibraries)</TargetSpec>
 
     <JitInterfaceLibraryName>$(LibPrefix)jitinterface_$(TargetArchitectureForSharedLibraries)$(LibSuffix)</JitInterfaceLibraryName>
+    <!-- This will be provided when using the liveBuild, and unset otherwise. -->
+    <CoreCLRArtifactsPath Condition="'$(CoreCLRArtifactsPath)' == ''">$(RuntimeBinDir)$(CrossHostArch)</CoreCLRArtifactsPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="$(RuntimeBinDir)$(CrossHostArch)/$(JitInterfaceLibraryName)"
+    <Content Include="$(CoreCLRArtifactsPath)/$(JitInterfaceLibraryName)"
       CopyToOutputDirectory="PreserveNewest"
       CopyToPublishDirectory="PreserveNewest"
       Link="%(FileName)%(Extension)"
       />
 
-    <Content Include="$(RuntimeBinDir)$(CrossHostArch)/$(LibPrefix)clrjit_*_$(TargetArchitectureForSharedLibraries)$(LibSuffix)"
+    <Content Include="$(CoreCLRArtifactsPath)/$(LibPrefix)clrjit_*_$(TargetArchitectureForSharedLibraries)$(LibSuffix)"
       CopyToOutputDirectory="PreserveNewest"
       CopyToPublishDirectory="PreserveNewest"
       Link="%(FileName)%(Extension)"
diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 7959568995ac4..eae4b097b624b 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -1,9 +1,48 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
+
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
   <PropertyGroup>
-    <OutputPath>$(RuntimeBinDir)/crossgen2</OutputPath>
-    <!-- The default value for macOS is false -->
-    <UseAppHost>true</UseAppHost>
-    <AppHostRuntimeIdentifier>$(Crossgen2PackageRID)</AppHostRuntimeIdentifier>
+    <OutputPath>$(RuntimeBinDir)crossgen2</OutputPath>
+    <!-- Can't use NativeAOT in source build yet https://github.com/dotnet/runtime/issues/66859 and we
+         don't want to ship using NativeAOT on MacOS -->
+    <NativeAotSupported Condition="'$(DotNetBuildFromSource)' == 'true' or '$(TargetOS)' == 'osx'">false</NativeAotSupported>
+    <!-- Trimming is not currently working, but set the appropriate feature flags for NativeAOT -->
+    <PublishTrimmed Condition="'$(NativeAotSupported)' == 'true'">true</PublishTrimmed>
+    <RuntimeIdentifiers Condition="'$(RunningPublish)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
   </PropertyGroup>
+
   <Import Project="crossgen2.props" />
+
+  <PropertyGroup Condition="'$(NativeAotSupported)' != 'true'">
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <!-- Disable crossgen on NetBSD, illumos and Solaris for now. This can be revisited when we have full support. -->
+    <PublishReadyToRun Condition="'$(TargetOS)'=='NetBSD' Or '$(TargetOS)'=='illumos' Or '$(TargetOS)'=='Solaris'">false</PublishReadyToRun>
+    <!-- Disable crossgen on FreeBSD when cross building from Linux. -->
+    <PublishReadyToRun Condition="'$(TargetOS)'=='FreeBSD' and '$(CrossBuild)'=='true'">false</PublishReadyToRun>
+    <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
+  </PropertyGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
+  <PropertyGroup Condition="'$(NativeAotSupported)' == 'true'">
+    <IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
+    <IlcToolsPath Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
+    <CppCompilerAndLinker Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">clang-9</CppCompilerAndLinker>
+    <SysRoot Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
+    <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
+    <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
+    <IlcFrameworkPath>$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)</IlcFrameworkPath>
+    <IlcFrameworkNativePath>$(MicrosoftNetCoreAppRuntimePackNativeDir)</IlcFrameworkNativePath>
+    <TrimmerSingleWarn>false</TrimmerSingleWarn>
+
+    <!-- Forced by ILLink targets; we should fix the SDK -->
+    <SelfContained Condition="'$(RunningPublish)' == 'true'">true</SelfContained>
+  </PropertyGroup>
+
+  <Import Project="$(R2ROverridePath)" Condition="'$(R2ROverridePath)' != ''" />
+  <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.targets"
+          Condition="'$(NativeAotSupported)' == 'true' and '$(RunningPublish)' == 'true'" />
+
 </Project>
diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.props b/src/coreclr/tools/aot/crossgen2/crossgen2.props
index a0d31077248d5..d544530d81378 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.props
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.props
@@ -68,16 +68,18 @@
     <TargetSpec>$(TargetOSComponent)_$(TargetArchitectureForLocalJitBuild)_$(TargetArchitectureForSharedLibraries)</TargetSpec>
 
     <JitInterfaceLibraryName>$(LibPrefix)jitinterface_$(TargetArchitectureForSharedLibraries)$(LibSuffix)</JitInterfaceLibraryName>
+    <!-- This will be provided when using the liveBuild, and unset otherwise. -->
+    <CoreCLRArtifactsPath Condition="'$(CoreCLRArtifactsPath)' == ''">$(RuntimeBinDir)$(CrossHostArch)</CoreCLRArtifactsPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="$(RuntimeBinDir)$(CrossHostArch)/$(JitInterfaceLibraryName)"
+    <Content Include="$(CoreCLRArtifactsPath)/$(JitInterfaceLibraryName)"
       CopyToOutputDirectory="PreserveNewest"
       CopyToPublishDirectory="PreserveNewest"
       Link="%(FileName)%(Extension)"
       />
 
-    <Content Include="$(RuntimeBinDir)$(CrossHostArch)/$(LibPrefix)clrjit_*_$(TargetArchitectureForSharedLibraries)$(LibSuffix)"
+    <Content Include="$(CoreCLRArtifactsPath)/$(LibPrefix)clrjit_*_$(TargetArchitectureForSharedLibraries)$(LibSuffix)"
       CopyToOutputDirectory="PreserveNewest"
       CopyToPublishDirectory="PreserveNewest"
       Link="%(FileName)%(Extension)"
@@ -104,7 +106,9 @@
     <DiaSymReaderTargetArch>$(TargetArchitectureForSharedLibraries)</DiaSymReaderTargetArch>
     <DiaSymReaderTargetArch Condition="'$(DiaSymReaderTargetArch)' == 'x64'">amd64</DiaSymReaderTargetArch>
     <DiaSymReaderTargetArchFileName>Microsoft.DiaSymReader.Native.$(DiaSymReaderTargetArch).dll</DiaSymReaderTargetArchFileName>
-    <DiaSymReaderTargetArchPath>$(PkgMicrosoft_DiaSymReader_Native)\runtimes\win\native\$(DiaSymReaderTargetArchFileName)</DiaSymReaderTargetArchPath>
+    <DiaSymReaderTargetArchPath Condition="'$(PkgMicrosoft_DiaSymReader_Native)' != ''">$(PkgMicrosoft_DiaSymReader_Native)\runtimes\win\native\$(DiaSymReaderTargetArchFileName)</DiaSymReaderTargetArchPath>
+    <!-- When publishing we won't have the NuGet packages, so use the copy from the build artifacts directory. -->
+    <DiaSymReaderTargetArchPath Condition="'$(PkgMicrosoft_DiaSymReader_Native)' == ''">$(CoreCLRArtifactsPath)crossgen2/$(DiaSymReaderTargetArchFileName)</DiaSymReaderTargetArchPath>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetOS)' == 'windows'">
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
index 2dbe486d0538d..8841f1ab9b3b7 100644
--- 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
@@ -3,8 +3,9 @@
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
 
   <PropertyGroup>
-    <SkipBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</SkipBuild>
-    <PlatformPackageType>RuntimePack</PlatformPackageType>
+    <!-- Crossgen is not used for Mono, and does not currently create freebsd packages -->
+    <SkipBuild Condition="'$(RuntimeFlavor)' == 'Mono' or '$(RuntimeIdentifier)' == 'freebsd-x64'">true</SkipBuild>
+    <PlatformPackageType>ToolPack</PlatformPackageType>
     <SharedFrameworkName>$(SharedFrameworkName).Crossgen2</SharedFrameworkName>
     <PgoSuffix Condition="'$(PgoInstrument)' != ''">.PGO</PgoSuffix>
     <OverridePackageId>$(SharedFrameworkName)$(PgoSuffix).$(RuntimeIdentifier)</OverridePackageId>
@@ -13,56 +14,65 @@
     <!-- Build this pack for any RID if building from source. Otherwise, only build select RIDs. -->
     <RuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
     <GenerateInstallers>false</GenerateInstallers>
-    <GetSharedFrameworkFilesForReadyToRunDependsOn>
-        AddRuntimeFilesToPackage;
-        AddFrameworkFilesToPackage
-    </GetSharedFrameworkFilesForReadyToRunDependsOn>
-    <PublishReadyToRun>true</PublishReadyToRun>
-    <!-- Disable crossgen on NetBSD, illumos and Solaris for now. This can be revisited when we have full support. -->
-    <PublishReadyToRun Condition="'$(TargetOS)'=='NetBSD' Or '$(TargetOS)'=='illumos' Or '$(TargetOS)'=='Solaris'">false</PublishReadyToRun>
-    <!-- Disable crossgen on FreeBSD when cross building from Linux. -->
-    <PublishReadyToRun Condition="'$(TargetOS)'=='FreeBSD' and '$(CrossBuild)'=='true'">false</PublishReadyToRun>
     <HostJsonTargetPath>tools/</HostJsonTargetPath>
     <PermitDllAndExeFilesLackingFileVersion>true</PermitDllAndExeFilesLackingFileVersion>
+    <!-- Publishing as single-file or NativeAOT means we can't examine the interior DLLs -->
+    <ShouldVerifyClosure>false</ShouldVerifyClosure>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <TargetOSComponent>unix</TargetOSComponent>
-    <TargetOSComponent Condition="'$(TargetOS)' == 'windows'">win</TargetOSComponent>
-    <TargetSpec>$(TargetOSComponent)-$(TargetArchitecture)</TargetSpec>
-  </PropertyGroup>
+  <Target Name="PublishCrossgen"
+          BeforeTargets="GetFilesToPackage">
 
-  <ItemGroup>
-    <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)crossgen2$(ExeSuffix)" TargetPath="tools/" />
-    <Reference Include="$(CoreCLRCrossgen2Dir)crossgen2.dll" />
-    <Reference Include="$(CoreCLRCrossgen2Dir)ILCompiler*.dll" />
-    <Reference Condition="'$(DotNetBuildFromSource)' != 'true'" Include="$(CoreCLRCrossgen2Dir)Microsoft.DiaSymReader.dll" />
-    <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)$(LibPrefix)jitinterface_$(TargetArchitecture)$(LibSuffix)" TargetPath="tools/" />
-    <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)$(LibPrefix)clrjit_win_x86_$(TargetArchitecture)$(LibSuffix)" TargetPath="tools/"  />
-    <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)$(LibPrefix)clrjit_universal_arm_$(TargetArchitecture)$(LibSuffix)" TargetPath="tools/"  />
-    <NativeRuntimeAsset Condition="'$(TargetArchitecture)' == 'arm64' or  '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)$(LibPrefix)clrjit_win_x64_$(TargetArchitecture)$(LibSuffix)"  TargetPath="tools/" />
-    <NativeRuntimeAsset Condition="'$(TargetArchitecture)' == 'arm64' or  '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)$(LibPrefix)clrjit_unix_x64_$(TargetArchitecture)$(LibSuffix)" TargetPath="tools/" />
-    <NativeRuntimeAsset Condition="'$(TargetArchitecture)' == 'arm64' or  '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)$(LibPrefix)clrjit_universal_arm64_$(TargetArchitecture)$(LibSuffix)" TargetPath="tools/"  />
-    <!-- Include the native hosting layer  -->
-    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/$(LibPrefix)hostfxr$(LibSuffix)" TargetPath="tools/" />
-    <NativeRuntimeAsset Include="$(DotNetHostBinDir)/$(LibPrefix)hostpolicy$(LibSuffix)" TargetPath="tools/" />
-  </ItemGroup>
+    <!-- Copy System.Private.CoreLib from the coreclr bin directory to the runtime pack directory,
+         as we always need the copy of System.Private.CoreLib that matches exactly with the runtime. -->
+    <Copy SourceFiles="$(CoreCLRArtifactsPath)System.Private.CoreLib.dll"
+          DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)"
+          SkipUnchangedFiles="true" />
+
+    <MSBuild Projects="$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2.csproj"
+             Properties="RunningPublish=true
+              ;RuntimeIdentifier=$(RuntimeIdentifier)
+              ;CoreCLRArtifactsPath=$(CoreCLRArtifactsPath)
+              ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets"
+             Targets="Restore;Publish;PublishItemsOutputGroup">
+      <Output TaskParameter="TargetOutputs"
+              ItemName="_RawCrossgenPublishFiles" />
+    </MSBuild>
 
-  <Target Name="AddRuntimeFilesToPackage" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild">
     <ItemGroup>
-      <CrossgenFile Include="@(RuntimeFiles)" Condition="'%(Filename)' == 'crossgen'" />
-      <OptimizationDataFile Include="@(RuntimeFiles)" Condition="'%(Filename)' == 'StandardOptimizationData'" />
-      <ReferenceCopyLocalPaths Include="@(RuntimeFiles)" Exclude="@(CrossgenFile);@(OptimizationDataFile)" />
-      <ReferenceCopyLocalPaths TargetPath="tools/" />
+      <_CrossgenPublishFiles Include="@(_RawCrossgenPublishFiles->'%(OutputPath)')"
+                             KeepMetadata="REMOVE_ALL" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(NativeAotSupported)' != 'true'">
+      <FilesToPackage Include="@(_CrossgenPublishFiles)"
+                      Exclude="*.pdb;*.h;*.lib"
+                      TargetPath="tools/" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
+      <!-- Treat all native aot assets as native runtime assets -->
+      <FilesToPackage Include="@(_CrossgenPublishFiles->Distinct())"
+                          Condition="'%(Extension)' != '.pdb'"
+                          TargetPath="tools/" />
     </ItemGroup>
   </Target>
 
-  <Target Name="AddFrameworkFilesToPackage" DependsOnTargets="ResolveLibrariesFromLocalBuild">
-    <ItemGroup>
-      <ReferenceCopyLocalPaths Include="@(LibrariesRuntimeFiles)" TargetPath="tools/" />
-    </ItemGroup>
+  <Target Name="RunPublishedCrossgen" AfterTargets="PublishCrossgen"
+          Condition="'$(TargetOs)' == '$(HostOs)' and '$(TargetArchitecture)' == '$(BuildArchitecture)'">
+    <!-- Run the published crossgen if we're not cross-compiling -->
+    <Exec Command="@(FilesToPackage) $(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll --out $(IntermediateOutputPath)S.P.C.tmp" Condition="'%(FileName)%(Extension)' == 'crossgen2$(ExeSuffix)'"
+          ConsoleToMsBuild="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="CrossgenOutput" />
+      <Output TaskParameter="ExitCode" PropertyName="CrossgenExitCode" />
+    </Exec>
+    <Error Text="Crossgen failed with code $(CrossgenExitCode), output: $(CrossgenOutput)" Condition="$(CrossgenExitCode) != 0" />
   </Target>
 
+  <PropertyGroup>
+    <TargetOSComponent>unix</TargetOSComponent>
+    <TargetOSComponent Condition="'$(TargetOS)' == 'windows'">win</TargetOSComponent>
+    <TargetSpec>$(TargetOSComponent)-$(TargetArchitecture)</TargetSpec>
+  </PropertyGroup>
+
   <Target Name="AddCrossgen2SymbolFilesToPackage" BeforeTargets="GetFilesToPackage">
     <ItemGroup>
       <_Crossgen2SymbolFilesToPackage Include="@(Reference->'$(CoreCLRArtifactsPath)PDB\%(FileName).pdb')" />
@@ -75,22 +85,8 @@
     </ItemGroup>
   </Target>
 
-  <PropertyGroup Condition="'$(TargetOS)' == 'windows'">
-    <!-- DiaSymReader for the target architecture, which is placed into the package -->
-    <_diaSymTargetArch>$(TargetArchitecture)</_diaSymTargetArch>
-    <_diaSymTargetArch Condition="'$(TargetArchitecture)' == 'x64'">amd64</_diaSymTargetArch>
-    <_diaSymReaderTargetArchPath>$(PkgMicrosoft_DiaSymReader_Native)/runtimes/win/native/Microsoft.DiaSymReader.Native.$(_diaSymTargetArch).dll</_diaSymReaderTargetArchPath>
-  </PropertyGroup>
-
-  <ItemGroup Condition="Exists('$(_diaSymReaderTargetArchPath)')">
-    <NativeRuntimeAsset Include="$(_diaSymReaderTargetArchPath)" TargetPath="tools/" />
-  </ItemGroup>
-
-  <Import Project="$(Crossgen2SdkOverridePropsPath)" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
-  <Import Project="$(Crossgen2SdkOverrideTargetsPath)" />
-  <Import Project="ReadyToRun.targets" />
 
   <Target Name="GetFilesToPublish">
     <MSBuild Projects="$(MSBuildProjectFullPath)"
@@ -106,4 +102,5 @@
                        TargetPath="" />
     </ItemGroup>
   </Target>
+
 </Project>

From 66c295d76a77e35ab4be60dafe969f0820907071 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Wed, 6 Apr 2022 12:21:17 -0700
Subject: [PATCH 02/43] Set TargetFramework for the crossgen build to be
 NetCoreAppToolCurrent

---
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
index 8841f1ab9b3b7..251b552c09c92 100644
--- 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
@@ -33,7 +33,8 @@
              Properties="RunningPublish=true
               ;RuntimeIdentifier=$(RuntimeIdentifier)
               ;CoreCLRArtifactsPath=$(CoreCLRArtifactsPath)
-              ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets"
+              ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets
+              ;TargetFramework=$(NetCoreAppToolCurrent)"
              Targets="Restore;Publish;PublishItemsOutputGroup">
       <Output TaskParameter="TargetOutputs"
               ItemName="_RawCrossgenPublishFiles" />

From 0de9ffa27f576b42307444c129206c5e9c90e6e3 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Wed, 6 Apr 2022 12:23:47 -0700
Subject: [PATCH 03/43] Remove crossgen2packagerid property

---
 Directory.Build.props | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 5104b073389d7..c1d26f37c18de 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -183,10 +183,6 @@
 
     <PackageRID>$(_packageOS)-$(TargetArchitecture)</PackageRID>
 
-    <!-- Crossgen2 does not support armel, so we will use arm instead. -->
-    <Crossgen2PackageRID Condition="'$(TargetArchitecture)' == 'armel'">$(_packageOS)-arm</Crossgen2PackageRID>
-    <Crossgen2PackageRID Condition="'$(TargetArchitecture)' != 'armel'">$(PackageRID)</Crossgen2PackageRID>
-
     <OutputRid Condition="'$(OutputRid)' == ''">$(PackageRID)</OutputRid>
     <OutputRid Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)</OutputRid>
   </PropertyGroup>

From 5a229cf634063f08733157580407bc2586e33ebf Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Wed, 6 Apr 2022 16:49:14 -0700
Subject: [PATCH 04/43] Override in csproj

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj            | 6 ++++++
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                 | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index eae4b097b624b..10885a807bd11 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -45,4 +45,10 @@
   <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.targets"
           Condition="'$(NativeAotSupported)' == 'true' and '$(RunningPublish)' == 'true'" />
 
+  <!-- Somehow TargetFramework is getting set to something else in source build and it is breaking restore.
+       Reset it here-->
+  <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
+    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
+  </PropertyGroup>
+
 </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
index 251b552c09c92..8841f1ab9b3b7 100644
--- 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
@@ -33,8 +33,7 @@
              Properties="RunningPublish=true
               ;RuntimeIdentifier=$(RuntimeIdentifier)
               ;CoreCLRArtifactsPath=$(CoreCLRArtifactsPath)
-              ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets
-              ;TargetFramework=$(NetCoreAppToolCurrent)"
+              ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets"
              Targets="Restore;Publish;PublishItemsOutputGroup">
       <Output TaskParameter="TargetOutputs"
               ItemName="_RawCrossgenPublishFiles" />

From 8a52522f4050a8031a46f73306025d3d06270d62 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Wed, 6 Apr 2022 21:07:13 -0700
Subject: [PATCH 05/43] Try deleting first

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj          | 8 +++-----
 .../Microsoft.NETCore.App.Crossgen2.sfxproj               | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 10885a807bd11..114bed62c19f9 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -45,10 +45,8 @@
   <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.targets"
           Condition="'$(NativeAotSupported)' == 'true' and '$(RunningPublish)' == 'true'" />
 
-  <!-- Somehow TargetFramework is getting set to something else in source build and it is breaking restore.
-       Reset it here-->
-  <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
-    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
-  </PropertyGroup>
+  <Target Name="DeleteAssetsJson" Condition="'$(DotNetBuildFromSource)' == 'true'">
+    <Delete Files="$(ProjectAssetsFile)" />
+  </Target>
 
 </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
index 8841f1ab9b3b7..b04204dcea4af 100644
--- 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
@@ -34,7 +34,7 @@
               ;RuntimeIdentifier=$(RuntimeIdentifier)
               ;CoreCLRArtifactsPath=$(CoreCLRArtifactsPath)
               ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets"
-             Targets="Restore;Publish;PublishItemsOutputGroup">
+             Targets="DeleteAssetsJson;Restore;Publish;PublishItemsOutputGroup">
       <Output TaskParameter="TargetOutputs"
               ItemName="_RawCrossgenPublishFiles" />
     </MSBuild>

From 9dd8701ac52f37032ece9143859d3d3f349ac68c Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Thu, 7 Apr 2022 10:44:39 -0700
Subject: [PATCH 06/43] Log the assets.json file

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 114bed62c19f9..36270899e5d78 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -49,4 +49,13 @@
     <Delete Files="$(ProjectAssetsFile)" />
   </Target>
 
+  <Target Name="PrintAssetsJson" Condition="'$(DotNetBuildFromSource)' == 'true'" BeforeTargets="ResolvePackageAssets">
+    <ReadLinesFromFile File="$(ProjectAssetsFile)">
+      <Output TaskParameter="Lines" ItemName="_LinesFromFile" />
+    </ReadLinesFromFile>
+
+    <Message Text="FileContents: $(ProjectAssetsFile)" />
+    <Message Text="%(_LinesFromFile.Identity)" />
+  </Target>
+
 </Project>

From 21ebeb9fcda08db0cd8a51fe86a57592882ca27e Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Thu, 7 Apr 2022 14:33:36 -0700
Subject: [PATCH 07/43] Pass down DotNetBuildFromSource

---
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
index b04204dcea4af..8354fd01cd47b 100644
--- 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
@@ -33,7 +33,8 @@
              Properties="RunningPublish=true
               ;RuntimeIdentifier=$(RuntimeIdentifier)
               ;CoreCLRArtifactsPath=$(CoreCLRArtifactsPath)
-              ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets"
+              ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets
+              ;DotNetBuildFromSource=$(DotNetBuildFromSource)"
              Targets="DeleteAssetsJson;Restore;Publish;PublishItemsOutputGroup">
       <Output TaskParameter="TargetOutputs"
               ItemName="_RawCrossgenPublishFiles" />

From aa7c94060279795b07f496b3ddc5a868250935d0 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Thu, 7 Apr 2022 16:08:59 -0700
Subject: [PATCH 08/43] Up the message importance

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 36270899e5d78..58c27f598cf37 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -46,6 +46,7 @@
           Condition="'$(NativeAotSupported)' == 'true' and '$(RunningPublish)' == 'true'" />
 
   <Target Name="DeleteAssetsJson" Condition="'$(DotNetBuildFromSource)' == 'true'">
+    <Message Importance="high" Text="Deleting project.assets.json" />
     <Delete Files="$(ProjectAssetsFile)" />
   </Target>
 
@@ -54,8 +55,8 @@
       <Output TaskParameter="Lines" ItemName="_LinesFromFile" />
     </ReadLinesFromFile>
 
-    <Message Text="FileContents: $(ProjectAssetsFile)" />
-    <Message Text="%(_LinesFromFile.Identity)" />
+    <Message Importance="high" Text="FileContents: $(ProjectAssetsFile)" />
+    <Message Importance="high" Text="%(_LinesFromFile.Identity)" />
   </Target>
 
 </Project>

From e33ee7a338a774a56a13aa4e8dd42ac35d0b4107 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 8 Apr 2022 10:32:55 -0700
Subject: [PATCH 09/43] Try to skip restore in source build

---
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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
index 8354fd01cd47b..c95bc01888717 100644
--- 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
@@ -29,13 +29,16 @@
           DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)"
           SkipUnchangedFiles="true" />
 
+    <_TargetsToRun>Publish;PublishItemsOutputGroup</_TargetsToRun>
+    <_TargetsToRun Condition="'$(DotNetBuildFromSource) != true">DeleteAssetsJson;Restore</_TargetsToRun>
+
     <MSBuild Projects="$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2.csproj"
              Properties="RunningPublish=true
               ;RuntimeIdentifier=$(RuntimeIdentifier)
               ;CoreCLRArtifactsPath=$(CoreCLRArtifactsPath)
               ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets
               ;DotNetBuildFromSource=$(DotNetBuildFromSource)"
-             Targets="DeleteAssetsJson;Restore;Publish;PublishItemsOutputGroup">
+             Targets="$(_TargetsToRun)">
       <Output TaskParameter="TargetOutputs"
               ItemName="_RawCrossgenPublishFiles" />
     </MSBuild>

From ecf61b1fda817fd4f66abdc77cf5fef8e2be1944 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 8 Apr 2022 12:22:56 -0700
Subject: [PATCH 10/43] Typo

---
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index c95bc01888717..0dbd623c548db 100644
--- 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
@@ -30,7 +30,7 @@
           SkipUnchangedFiles="true" />
 
     <_TargetsToRun>Publish;PublishItemsOutputGroup</_TargetsToRun>
-    <_TargetsToRun Condition="'$(DotNetBuildFromSource) != true">DeleteAssetsJson;Restore</_TargetsToRun>
+    <_TargetsToRun Condition="'$(DotNetBuildFromSource)' != 'true'">DeleteAssetsJson;Restore</_TargetsToRun>
 
     <MSBuild Projects="$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2.csproj"
              Properties="RunningPublish=true

From 802acb6f373c960ef0f2c829db3504db661412fe Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 8 Apr 2022 12:42:03 -0700
Subject: [PATCH 11/43] Add PropertyGroup

---
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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
index 0dbd623c548db..dedf5b6e64233 100644
--- 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
@@ -29,8 +29,10 @@
           DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)"
           SkipUnchangedFiles="true" />
 
-    <_TargetsToRun>Publish;PublishItemsOutputGroup</_TargetsToRun>
-    <_TargetsToRun Condition="'$(DotNetBuildFromSource)' != 'true'">DeleteAssetsJson;Restore</_TargetsToRun>
+    <PropertyGroup>
+      <_TargetsToRun>Publish;PublishItemsOutputGroup</_TargetsToRun>
+      <_TargetsToRun Condition="'$(DotNetBuildFromSource)' != 'true'">DeleteAssetsJson;Restore</_TargetsToRun>
+    </PropertyGroup>
 
     <MSBuild Projects="$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2.csproj"
              Properties="RunningPublish=true

From bf5fb366921d376df83a53a9893d0c52d92ea20f Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 8 Apr 2022 16:56:55 -0700
Subject: [PATCH 12/43] Try depending on restore

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj              | 4 +++-
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                   | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 58c27f598cf37..6a5c8136104de 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -50,7 +50,9 @@
     <Delete Files="$(ProjectAssetsFile)" />
   </Target>
 
-  <Target Name="PrintAssetsJson" Condition="'$(DotNetBuildFromSource)' == 'true'" BeforeTargets="ResolvePackageAssets">
+  <Target Name="PrintAssetsJson" Condition="'$(DotNetBuildFromSource)' == 'true'" 
+    BeforeTargets="ResolvePackageAssets"
+    DependsOnTargets="Restore">
     <ReadLinesFromFile File="$(ProjectAssetsFile)">
       <Output TaskParameter="Lines" ItemName="_LinesFromFile" />
     </ReadLinesFromFile>
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
index dedf5b6e64233..2b1f4f1c01540 100644
--- 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
@@ -30,8 +30,7 @@
           SkipUnchangedFiles="true" />
 
     <PropertyGroup>
-      <_TargetsToRun>Publish;PublishItemsOutputGroup</_TargetsToRun>
-      <_TargetsToRun Condition="'$(DotNetBuildFromSource)' != 'true'">DeleteAssetsJson;Restore</_TargetsToRun>
+      <_TargetsToRun>DeleteAssetsJson;Restore;Publish;PublishItemsOutputGroup</_TargetsToRun>
     </PropertyGroup>
 
     <MSBuild Projects="$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2.csproj"

From 8d658eefba56992f83ba46a15f3d6625d287eb11 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 8 Apr 2022 20:07:54 -0700
Subject: [PATCH 13/43] Use PackageRID instead of RuntimeIdentifier

---
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 2b1f4f1c01540..679c47cc812a8 100644
--- 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
@@ -35,7 +35,7 @@
 
     <MSBuild Projects="$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2.csproj"
              Properties="RunningPublish=true
-              ;RuntimeIdentifier=$(RuntimeIdentifier)
+              ;RuntimeIdentifier=$(PackageRID)
               ;CoreCLRArtifactsPath=$(CoreCLRArtifactsPath)
               ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets
               ;DotNetBuildFromSource=$(DotNetBuildFromSource)"

From 237fe3c9644ceb8f4e1b940c2cdc89373f2db547 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Sat, 9 Apr 2022 00:37:41 -0700
Subject: [PATCH 14/43] Remove restore dependency

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 6a5c8136104de..2a49d3608d1bd 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -51,8 +51,7 @@
   </Target>
 
   <Target Name="PrintAssetsJson" Condition="'$(DotNetBuildFromSource)' == 'true'" 
-    BeforeTargets="ResolvePackageAssets"
-    DependsOnTargets="Restore">
+    BeforeTargets="ResolvePackageAssets">
     <ReadLinesFromFile File="$(ProjectAssetsFile)">
       <Output TaskParameter="Lines" ItemName="_LinesFromFile" />
     </ReadLinesFromFile>

From fbc260ae4b5e33ca6f037298530f81eac9726175 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Sat, 9 Apr 2022 12:20:02 -0700
Subject: [PATCH 15/43] Add log of RID

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 2a49d3608d1bd..7f5b4049548a9 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -48,6 +48,7 @@
   <Target Name="DeleteAssetsJson" Condition="'$(DotNetBuildFromSource)' == 'true'">
     <Message Importance="high" Text="Deleting project.assets.json" />
     <Delete Files="$(ProjectAssetsFile)" />
+    <Message Importance="high" Text="Continuing with RID $(RuntimeIdentifier)" />
   </Target>
 
   <Target Name="PrintAssetsJson" Condition="'$(DotNetBuildFromSource)' == 'true'" 

From a55404ef019857a6e153401b80f5a0cb9dc37d5c Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Sun, 10 Apr 2022 00:45:38 -0700
Subject: [PATCH 16/43] Set RuntimeIdentifier in the project file

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 7f5b4049548a9..6fcc6bdcc9d02 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -10,6 +10,7 @@
     <!-- Trimming is not currently working, but set the appropriate feature flags for NativeAOT -->
     <PublishTrimmed Condition="'$(NativeAotSupported)' == 'true'">true</PublishTrimmed>
     <RuntimeIdentifiers Condition="'$(RunningPublish)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
+    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(PackageRID)</RuntimeIdentifier>
   </PropertyGroup>
 
   <Import Project="crossgen2.props" />

From 8a8a8a52f8a1dcf07f01a98925f58214dfece36d Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Sun, 10 Apr 2022 01:04:47 -0700
Subject: [PATCH 17/43] Add print after restore

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 6fcc6bdcc9d02..2914664473f5a 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -62,4 +62,13 @@
     <Message Importance="high" Text="%(_LinesFromFile.Identity)" />
   </Target>
 
+  <Target Name="PrintAssetsJson2" Condition="'$(DotNetBuildFromSource)' == 'true'" 
+    AfterTargets="Resolve">
+    <ReadLinesFromFile File="$(ProjectAssetsFile)">
+      <Output TaskParameter="Lines" ItemName="_LinesFromFile" />
+    </ReadLinesFromFile>
+
+    <Message Importance="high" Text="FileContents: $(ProjectAssetsFile)" />
+    <Message Importance="high" Text="%(_LinesFromFile.Identity)" />
+  </Target>
 </Project>

From 7466f7fb76aea75f5ee343fd7f1ad319df92e0a4 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Sun, 10 Apr 2022 01:48:04 -0700
Subject: [PATCH 18/43] only log while running publish

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 2914664473f5a..73ecfc1561ecd 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -10,7 +10,7 @@
     <!-- Trimming is not currently working, but set the appropriate feature flags for NativeAOT -->
     <PublishTrimmed Condition="'$(NativeAotSupported)' == 'true'">true</PublishTrimmed>
     <RuntimeIdentifiers Condition="'$(RunningPublish)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
-    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(PackageRID)</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(RunningPublihs)' == 'true' and '$(DotNetBuildFromSource)' == 'true'">$(PackageRID)</RuntimeIdentifier>
   </PropertyGroup>
 
   <Import Project="crossgen2.props" />

From fd8e0549f592e21bf50c16f9d0b5809e9568732d Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Sun, 10 Apr 2022 01:48:57 -0700
Subject: [PATCH 19/43] Typo

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 73ecfc1561ecd..515223bd0e867 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -10,7 +10,7 @@
     <!-- Trimming is not currently working, but set the appropriate feature flags for NativeAOT -->
     <PublishTrimmed Condition="'$(NativeAotSupported)' == 'true'">true</PublishTrimmed>
     <RuntimeIdentifiers Condition="'$(RunningPublish)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
-    <RuntimeIdentifier Condition="'$(RunningPublihs)' == 'true' and '$(DotNetBuildFromSource)' == 'true'">$(PackageRID)</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(RunningPublish)' == 'true' and '$(DotNetBuildFromSource)' == 'true'">$(PackageRID)</RuntimeIdentifier>
   </PropertyGroup>
 
   <Import Project="crossgen2.props" />

From 8e6d6b2a596cb43e594b08892e4425c67ba1c658 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Mon, 11 Apr 2022 15:11:28 -0700
Subject: [PATCH 20/43] Escape characters

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 515223bd0e867..9ba68a2d622d6 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -59,7 +59,7 @@
     </ReadLinesFromFile>
 
     <Message Importance="high" Text="FileContents: $(ProjectAssetsFile)" />
-    <Message Importance="high" Text="%(_LinesFromFile.Identity)" />
+    <Message Importance="high" Text="$([MSBuild]::Escape('%(_LinesFromFile.Identity)'))" />
   </Target>
 
   <Target Name="PrintAssetsJson2" Condition="'$(DotNetBuildFromSource)' == 'true'" 
@@ -69,6 +69,6 @@
     </ReadLinesFromFile>
 
     <Message Importance="high" Text="FileContents: $(ProjectAssetsFile)" />
-    <Message Importance="high" Text="%(_LinesFromFile.Identity)" />
+    <Message Importance="high" Text="$([MSBuild]::Escape('%(_LinesFromFile.Identity)'))" />
   </Target>
 </Project>

From ebee79fedc1c2cd47702b5ad28f18516b7b93bfb Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Mon, 11 Apr 2022 18:41:48 -0700
Subject: [PATCH 21/43] Use cat instead of reading lines

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 9ba68a2d622d6..4612dfa74b288 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -54,12 +54,8 @@
 
   <Target Name="PrintAssetsJson" Condition="'$(DotNetBuildFromSource)' == 'true'" 
     BeforeTargets="ResolvePackageAssets">
-    <ReadLinesFromFile File="$(ProjectAssetsFile)">
-      <Output TaskParameter="Lines" ItemName="_LinesFromFile" />
-    </ReadLinesFromFile>
-
     <Message Importance="high" Text="FileContents: $(ProjectAssetsFile)" />
-    <Message Importance="high" Text="$([MSBuild]::Escape('%(_LinesFromFile.Identity)'))" />
+    <Exec Command="cat $(ProjectAssetsFile)" />
   </Target>
 
   <Target Name="PrintAssetsJson2" Condition="'$(DotNetBuildFromSource)' == 'true'" 
@@ -69,6 +65,6 @@
     </ReadLinesFromFile>
 
     <Message Importance="high" Text="FileContents: $(ProjectAssetsFile)" />
-    <Message Importance="high" Text="$([MSBuild]::Escape('%(_LinesFromFile.Identity)'))" />
+    <Exec Command="cat $(ProjectAssetsFile)" />
   </Target>
 </Project>

From cf41668bd01d3891b822bbb1fef38b87895bc2d5 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Thu, 14 Apr 2022 20:20:52 -0700
Subject: [PATCH 22/43] Try disabling assets cache

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 4612dfa74b288..84373292e63d1 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <OutputPath>$(RuntimeBinDir)crossgen2</OutputPath>
+    <DisablePackageAssetsCache Condition="'$(DotnetBuildFromSource)' == 'true'">true</DisablePackageAssetsCache>
     <!-- Can't use NativeAOT in source build yet https://github.com/dotnet/runtime/issues/66859 and we
          don't want to ship using NativeAOT on MacOS -->
     <NativeAotSupported Condition="'$(DotNetBuildFromSource)' == 'true' or '$(TargetOS)' == 'osx'">false</NativeAotSupported>

From 1471d408556865c5b388153afd0b6b18756dfc0f Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 15 Apr 2022 02:17:13 -0700
Subject: [PATCH 23/43] Adjust RIDs

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 84373292e63d1..2741605482629 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -10,8 +10,8 @@
     <NativeAotSupported Condition="'$(DotNetBuildFromSource)' == 'true' or '$(TargetOS)' == 'osx'">false</NativeAotSupported>
     <!-- Trimming is not currently working, but set the appropriate feature flags for NativeAOT -->
     <PublishTrimmed Condition="'$(NativeAotSupported)' == 'true'">true</PublishTrimmed>
-    <RuntimeIdentifiers Condition="'$(RunningPublish)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
-    <RuntimeIdentifier Condition="'$(RunningPublish)' == 'true' and '$(DotNetBuildFromSource)' == 'true'">$(PackageRID)</RuntimeIdentifier>
+    <RuntimeIdentifiers Condition="'$(RunningPublish)' != 'true' and '$(DotNetBuildFromSource)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
+    <SelfContained Condition="'$(RunningPublish)' == 'true'">true</SelfContained>
   </PropertyGroup>
 
   <Import Project="crossgen2.props" />
@@ -38,9 +38,6 @@
     <IlcFrameworkPath>$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)</IlcFrameworkPath>
     <IlcFrameworkNativePath>$(MicrosoftNetCoreAppRuntimePackNativeDir)</IlcFrameworkNativePath>
     <TrimmerSingleWarn>false</TrimmerSingleWarn>
-
-    <!-- Forced by ILLink targets; we should fix the SDK -->
-    <SelfContained Condition="'$(RunningPublish)' == 'true'">true</SelfContained>
   </PropertyGroup>
 
   <Import Project="$(R2ROverridePath)" Condition="'$(R2ROverridePath)' != ''" />

From 3f39bf6d9a16983385e2f1abc3a13c1dcd3015a6 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 15 Apr 2022 09:50:10 -0700
Subject: [PATCH 24/43] Set RID to package RID for source build

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 2741605482629..91eeb079f6636 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -10,7 +10,9 @@
     <NativeAotSupported Condition="'$(DotNetBuildFromSource)' == 'true' or '$(TargetOS)' == 'osx'">false</NativeAotSupported>
     <!-- Trimming is not currently working, but set the appropriate feature flags for NativeAOT -->
     <PublishTrimmed Condition="'$(NativeAotSupported)' == 'true'">true</PublishTrimmed>
-    <RuntimeIdentifiers Condition="'$(RunningPublish)' != 'true' and '$(DotNetBuildFromSource)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="'$(RunningPublish)' != 'true' and '$(DotNetBuildFromSource) != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
+    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == true">$(PackageRID)</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
     <SelfContained Condition="'$(RunningPublish)' == 'true'">true</SelfContained>
   </PropertyGroup>
 

From 558ea09eddef44c69637bd982913dad6aa04b009 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 15 Apr 2022 10:17:11 -0700
Subject: [PATCH 25/43] Typo

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 91eeb079f6636..e4cbf72081286 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -11,7 +11,7 @@
     <!-- Trimming is not currently working, but set the appropriate feature flags for NativeAOT -->
     <PublishTrimmed Condition="'$(NativeAotSupported)' == 'true'">true</PublishTrimmed>
     <RuntimeIdentifiers Condition="'$(RunningPublish)' != 'true' and '$(DotNetBuildFromSource) != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
-    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == true">$(PackageRID)</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(PackageRID)</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <SelfContained Condition="'$(RunningPublish)' == 'true'">true</SelfContained>
   </PropertyGroup>

From 0cbba1171312dabf0339800f597f06c85a8d3850 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 15 Apr 2022 11:47:15 -0700
Subject: [PATCH 26/43] Typo

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index e4cbf72081286..5ed6144308f92 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -10,7 +10,7 @@
     <NativeAotSupported Condition="'$(DotNetBuildFromSource)' == 'true' or '$(TargetOS)' == 'osx'">false</NativeAotSupported>
     <!-- Trimming is not currently working, but set the appropriate feature flags for NativeAOT -->
     <PublishTrimmed Condition="'$(NativeAotSupported)' == 'true'">true</PublishTrimmed>
-    <RuntimeIdentifiers Condition="'$(RunningPublish)' != 'true' and '$(DotNetBuildFromSource) != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="'$(RunningPublish)' != 'true' and '$(DotNetBuildFromSource)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
     <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(PackageRID)</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <SelfContained Condition="'$(RunningPublish)' == 'true'">true</SelfContained>

From 5e9ece46b21631348c4c1d88a7258bd2117e918d Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 15 Apr 2022 14:43:37 -0700
Subject: [PATCH 27/43] Adjust crossgen path on source build

---
 src/coreclr/crossgen-corelib.proj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj
index 4df7d1f25169b..0eda4612cb1df 100644
--- a/src/coreclr/crossgen-corelib.proj
+++ b/src/coreclr/crossgen-corelib.proj
@@ -80,7 +80,8 @@
       Text="Generating native image of System.Private.CoreLib for $(OSPlatformConfig). Logging to $(CrossGenCoreLibLog)" />
 
     <PropertyGroup>
-      <CrossGenDllCmd>$(DotNetCli) $([MSBuild]::NormalizePath('$(BinDir)', '$(CrossDir)', 'crossgen2', 'crossgen2.dll'))</CrossGenDllCmd>
+      <CrossgenRidDir Condition="'$(DotnetBuildFromSource)' == 'true'">$(PackageRID)</CrossgenRidDir>
+      <CrossGenDllCmd>$(DotNetCli) $([MSBuild]::NormalizePath('$(BinDir)', '$(CrossDir)', 'crossgen2', '$(CrossgenRidDir)', 'crossgen2.dll'))</CrossGenDllCmd>
       <CrossGenDllCmd>$(CrossGenDllCmd) -o:$(CoreLibOutputPath)</CrossGenDllCmd>
       <CrossGenDllCmd>$(CrossGenDllCmd) -r:$([MSBuild]::NormalizePath('$(BinDir)', 'IL', '*.dll'))</CrossGenDllCmd>
       <CrossGenDllCmd>$(CrossGenDllCmd) --targetarch:$(TargetArchitecture)</CrossGenDllCmd>

From e26dc43a5da7e94cdfc63f9a6e3f562dc201efda Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 15 Apr 2022 16:08:56 -0700
Subject: [PATCH 28/43] Fix crossgen2tool location

---
 src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets b/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets
index 4e3f684dedc20..8c8ce79eb54e9 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets
@@ -16,7 +16,8 @@
     <PropertyGroup>
       <CrossDir />
       <CrossDir Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)'">x64</CrossDir>
-      <Crossgen2Dll>$(CoreCLRArtifactsPath)\$(CrossDir)\crossgen2\crossgen2.dll</Crossgen2Dll>
+      <CrossgenRidDir Condition="'$(DotnetBuildFromSource)' == 'true'">$(PackageRID)\</CrossgenRidDir>
+      <Crossgen2Dll>$(CoreCLRArtifactsPath)\$(CrossDir)\crossgen2\$(CrossgenRidDir)crossgen2.dll</Crossgen2Dll>
 
       <PublishReadyToRunUseCrossgen2>true</PublishReadyToRunUseCrossgen2>
       <PublishReadyToRunCrossgen2ExtraArgs>@(PublishReadyToRunCrossgen2ExtraArgsList)</PublishReadyToRunCrossgen2ExtraArgs>

From 92d19095df89ae2bdd73931ff4a027f46ce4a8b3 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 15 Apr 2022 23:30:06 -0700
Subject: [PATCH 29/43] Removing logging

---
 .../tools/aot/crossgen2/crossgen2.csproj      | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 5ed6144308f92..1bf7691e58a0b 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -46,25 +46,4 @@
   <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.targets"
           Condition="'$(NativeAotSupported)' == 'true' and '$(RunningPublish)' == 'true'" />
 
-  <Target Name="DeleteAssetsJson" Condition="'$(DotNetBuildFromSource)' == 'true'">
-    <Message Importance="high" Text="Deleting project.assets.json" />
-    <Delete Files="$(ProjectAssetsFile)" />
-    <Message Importance="high" Text="Continuing with RID $(RuntimeIdentifier)" />
-  </Target>
-
-  <Target Name="PrintAssetsJson" Condition="'$(DotNetBuildFromSource)' == 'true'" 
-    BeforeTargets="ResolvePackageAssets">
-    <Message Importance="high" Text="FileContents: $(ProjectAssetsFile)" />
-    <Exec Command="cat $(ProjectAssetsFile)" />
-  </Target>
-
-  <Target Name="PrintAssetsJson2" Condition="'$(DotNetBuildFromSource)' == 'true'" 
-    AfterTargets="Resolve">
-    <ReadLinesFromFile File="$(ProjectAssetsFile)">
-      <Output TaskParameter="Lines" ItemName="_LinesFromFile" />
-    </ReadLinesFromFile>
-
-    <Message Importance="high" Text="FileContents: $(ProjectAssetsFile)" />
-    <Exec Command="cat $(ProjectAssetsFile)" />
-  </Target>
 </Project>

From aaffc199c4a876a6ec4550150fe27644aa778394 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Sat, 16 Apr 2022 01:13:30 -0700
Subject: [PATCH 30/43] Remove target reference

---
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 679c47cc812a8..a93a395283113 100644
--- 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
@@ -30,7 +30,7 @@
           SkipUnchangedFiles="true" />
 
     <PropertyGroup>
-      <_TargetsToRun>DeleteAssetsJson;Restore;Publish;PublishItemsOutputGroup</_TargetsToRun>
+      <_TargetsToRun>Restore;Publish;PublishItemsOutputGroup</_TargetsToRun>
     </PropertyGroup>
 
     <MSBuild Projects="$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2.csproj"

From 4dacc8f071f2a5421a9eecc0319f1702b21200d4 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Sat, 16 Apr 2022 12:55:12 -0700
Subject: [PATCH 31/43] Set PackageRID to include portable OS when building
 portable bits

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index c1d26f37c18de..f3178c7d9f291 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -182,9 +182,9 @@
     <MicrosoftNetCoreIlasmPackageRuntimeId>$(ToolsRID)</MicrosoftNetCoreIlasmPackageRuntimeId>
 
     <PackageRID>$(_packageOS)-$(TargetArchitecture)</PackageRID>
+    <PackageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)</PackageRID>
 
     <OutputRid Condition="'$(OutputRid)' == ''">$(PackageRID)</OutputRid>
-    <OutputRid Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)</OutputRid>
   </PropertyGroup>
 
   <PropertyGroup Label="CalculateTargetOSName" Condition="'$(SkipInferTargetOSName)' != 'true'">

From edc4682a2895c3647da802fc7ca1664020a14ab6 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Mon, 18 Apr 2022 15:06:51 -0700
Subject: [PATCH 32/43] Revert change to PackageRID and instead add musl check
 for _packageOS

---
 Directory.Build.props | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index f3178c7d9f291..7f633645ab82d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -153,7 +153,8 @@
     <_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux</_runtimeOS>
     <_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS)</_runtimeOS>
 
-    <_packageOS Condition="'$(CrossBuild)' == 'true'">$(_hostOS.ToLowerInvariant)</_packageOS>
+    <_packageLibc Condition="'$(_packageLibc)' == '' and $(_runtimeOS.Contains('musl'))">-musl</_packageLibc>
+    <_packageOS Condition="'$(CrossBuild)' == 'true'">$(_hostOS.ToLowerInvariant)$(_packageLibc)</_packageOS>
     <_packageOS Condition="'$(_packageOS)' == '' and '$(PortableBuild)' == 'true'">$(_portableOS)</_packageOS>
     <_packageOS Condition="'$(_packageOS)' == ''">$(_runtimeOS)</_packageOS>
   </PropertyGroup>
@@ -182,9 +183,9 @@
     <MicrosoftNetCoreIlasmPackageRuntimeId>$(ToolsRID)</MicrosoftNetCoreIlasmPackageRuntimeId>
 
     <PackageRID>$(_packageOS)-$(TargetArchitecture)</PackageRID>
-    <PackageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)</PackageRID>
 
     <OutputRid Condition="'$(OutputRid)' == ''">$(PackageRID)</OutputRid>
+    <OutputRid Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)</OutputRid>
   </PropertyGroup>
 
   <PropertyGroup Label="CalculateTargetOSName" Condition="'$(SkipInferTargetOSName)' != 'true'">

From ddf892e92212b0a3a0608ae61480d54d0d85ed4e Mon Sep 17 00:00:00 2001
From: Andy Gocke <andy@commentout.net>
Date: Mon, 18 Apr 2022 16:30:16 -0700
Subject: [PATCH 33/43] Update Directory.Build.props

Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 7f633645ab82d..20f58984f5550 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -153,7 +153,7 @@
     <_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux</_runtimeOS>
     <_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS)</_runtimeOS>
 
-    <_packageLibc Condition="'$(_packageLibc)' == '' and $(_runtimeOS.Contains('musl'))">-musl</_packageLibc>
+    <_packageLibc Condition="$(_runtimeOS.Contains('musl'))">-musl</_packageLibc>
     <_packageOS Condition="'$(CrossBuild)' == 'true'">$(_hostOS.ToLowerInvariant)$(_packageLibc)</_packageOS>
     <_packageOS Condition="'$(_packageOS)' == '' and '$(PortableBuild)' == 'true'">$(_portableOS)</_packageOS>
     <_packageOS Condition="'$(_packageOS)' == ''">$(_runtimeOS)</_packageOS>

From 995c63fc10e55ced82dd6de1e7d444356bd7b284 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Tue, 19 Apr 2022 10:17:26 -0700
Subject: [PATCH 34/43] Change to use RuntimeIdentifiers instead of
 RuntimeIdentifier, and avoid changing crossgen path

---
 src/coreclr/crossgen-corelib.proj                              | 3 +--
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj               | 2 +-
 src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj
index 0eda4612cb1df..4df7d1f25169b 100644
--- a/src/coreclr/crossgen-corelib.proj
+++ b/src/coreclr/crossgen-corelib.proj
@@ -80,8 +80,7 @@
       Text="Generating native image of System.Private.CoreLib for $(OSPlatformConfig). Logging to $(CrossGenCoreLibLog)" />
 
     <PropertyGroup>
-      <CrossgenRidDir Condition="'$(DotnetBuildFromSource)' == 'true'">$(PackageRID)</CrossgenRidDir>
-      <CrossGenDllCmd>$(DotNetCli) $([MSBuild]::NormalizePath('$(BinDir)', '$(CrossDir)', 'crossgen2', '$(CrossgenRidDir)', 'crossgen2.dll'))</CrossGenDllCmd>
+      <CrossGenDllCmd>$(DotNetCli) $([MSBuild]::NormalizePath('$(BinDir)', '$(CrossDir)', 'crossgen2', 'crossgen2.dll'))</CrossGenDllCmd>
       <CrossGenDllCmd>$(CrossGenDllCmd) -o:$(CoreLibOutputPath)</CrossGenDllCmd>
       <CrossGenDllCmd>$(CrossGenDllCmd) -r:$([MSBuild]::NormalizePath('$(BinDir)', 'IL', '*.dll'))</CrossGenDllCmd>
       <CrossGenDllCmd>$(CrossGenDllCmd) --targetarch:$(TargetArchitecture)</CrossGenDllCmd>
diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 1bf7691e58a0b..eea1256ba71cf 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -11,7 +11,7 @@
     <!-- Trimming is not currently working, but set the appropriate feature flags for NativeAOT -->
     <PublishTrimmed Condition="'$(NativeAotSupported)' == 'true'">true</PublishTrimmed>
     <RuntimeIdentifiers Condition="'$(RunningPublish)' != 'true' and '$(DotNetBuildFromSource)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers>
-    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(PackageRID)</RuntimeIdentifier>
+    <RuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' == 'true'">$(PackageRID)</RuntimeIdentifiers>
     <SelfContained>false</SelfContained>
     <SelfContained Condition="'$(RunningPublish)' == 'true'">true</SelfContained>
   </PropertyGroup>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets b/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets
index 8c8ce79eb54e9..4e3f684dedc20 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets
@@ -16,8 +16,7 @@
     <PropertyGroup>
       <CrossDir />
       <CrossDir Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)'">x64</CrossDir>
-      <CrossgenRidDir Condition="'$(DotnetBuildFromSource)' == 'true'">$(PackageRID)\</CrossgenRidDir>
-      <Crossgen2Dll>$(CoreCLRArtifactsPath)\$(CrossDir)\crossgen2\$(CrossgenRidDir)crossgen2.dll</Crossgen2Dll>
+      <Crossgen2Dll>$(CoreCLRArtifactsPath)\$(CrossDir)\crossgen2\crossgen2.dll</Crossgen2Dll>
 
       <PublishReadyToRunUseCrossgen2>true</PublishReadyToRunUseCrossgen2>
       <PublishReadyToRunCrossgen2ExtraArgs>@(PublishReadyToRunCrossgen2ExtraArgsList)</PublishReadyToRunCrossgen2ExtraArgs>

From 6caf24a0438f3f768f33ae8a32c26f8642ae2b1e Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Wed, 20 Apr 2022 11:26:42 -0700
Subject: [PATCH 35/43] Remove libs.pretest from sourcebuild set

---
 eng/Subsets.props | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index bd1cda47e06d0..b556df68ea642 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -71,7 +71,8 @@
     <DefaultLibrariesSubsets Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or
                                         '$(BuildTargetFramework)' == '' or
                                         '$(BuildAllConfigurations)' == 'true'">libs.native+</DefaultLibrariesSubsets>
-    <DefaultLibrariesSubsets>$(DefaultLibrariesSubsets)libs.sfx+libs.oob+libs.pretest</DefaultLibrariesSubsets>
+    <DefaultLibrariesSubsets>$(DefaultLibrariesSubsets)libs.sfx+libs.oob</DefaultLibrariesSubsets>
+    <DefaultLibrariesSubsets Condition="'$(DotNetBuildFromSource)' != 'true'">$(DefaultLibrariesSubsets)+libs.pretest</DefaultLibrariesSubsets>
 
     <DefaultHostSubsets>host.native+host.tools</DefaultHostSubsets>
     <DefaultHostSubsets Condition="'$(DotNetBuildFromSource)' != 'true'">$(DefaultHostSubsets)+host.pkg+host.tests</DefaultHostSubsets>

From c2ae01915797b629eeaf4c882eeb7e1f3478ef5e Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Wed, 20 Apr 2022 11:52:17 -0700
Subject: [PATCH 36/43] Move RewriteRuntimePackDir to crossgen2 project

---
 eng/liveBuilds.targets                           | 14 --------------
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index 0583f48aed5cf..77e9a90b97d30 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -223,18 +223,4 @@
   <PropertyGroup>
     <BundledRuntimeIdentifierGraphFile>$(RuntimeIdGraphDefinitionFile)</BundledRuntimeIdentifierGraphFile>
   </PropertyGroup>
-
-  <Target Name="RewriteRuntimePackDir"
-          Condition="'$(RunningPublish)' == 'true'"
-          DependsOnTargets="ResolveRuntimeFilesFromLocalBuild"
-          BeforeTargets="ResolveRuntimePackAssets">
-      <ItemGroup>
-        <!-- Remove AspNetCore runtime pack since we don't build it locally -->
-        <ResolvedRuntimePack Remove="Microsoft.AspNetCore.App.Runtime.$(RuntimeIdentifier)" />
-
-        <ResolvedRuntimePack Update="Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)">
-          <PackageDirectory>$(MicrosoftNetCoreAppRuntimePackDir)</PackageDirectory>
-        </ResolvedRuntimePack>
-      </ItemGroup>
-  </Target>
 </Project>
diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index eea1256ba71cf..57b4b132eb262 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -46,4 +46,18 @@
   <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.targets"
           Condition="'$(NativeAotSupported)' == 'true' and '$(RunningPublish)' == 'true'" />
 
+  <Target Name="RewriteRuntimePackDir"
+          Condition="'$(RunningPublish)' == 'true'"
+          DependsOnTargets="ResolveRuntimeFilesFromLocalBuild"
+          BeforeTargets="ResolveRuntimePackAssets">
+      <ItemGroup>
+        <!-- Remove AspNetCore runtime pack since we don't build it locally -->
+        <ResolvedRuntimePack Remove="Microsoft.AspNetCore.App.Runtime.$(RuntimeIdentifier)" />
+
+        <ResolvedRuntimePack Update="Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)">
+          <PackageDirectory>$(MicrosoftNetCoreAppRuntimePackDir)</PackageDirectory>
+        </ResolvedRuntimePack>
+      </ItemGroup>
+  </Target>
+
 </Project>

From cf0e37a654246abeb5affec8cbffe91ef4f13b70 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Wed, 20 Apr 2022 19:33:26 -0700
Subject: [PATCH 37/43] Use live host in source build

---
 eng/Subsets.props              | 3 +--
 src/libraries/externals.csproj | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index b556df68ea642..bd1cda47e06d0 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -71,8 +71,7 @@
     <DefaultLibrariesSubsets Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or
                                         '$(BuildTargetFramework)' == '' or
                                         '$(BuildAllConfigurations)' == 'true'">libs.native+</DefaultLibrariesSubsets>
-    <DefaultLibrariesSubsets>$(DefaultLibrariesSubsets)libs.sfx+libs.oob</DefaultLibrariesSubsets>
-    <DefaultLibrariesSubsets Condition="'$(DotNetBuildFromSource)' != 'true'">$(DefaultLibrariesSubsets)+libs.pretest</DefaultLibrariesSubsets>
+    <DefaultLibrariesSubsets>$(DefaultLibrariesSubsets)libs.sfx+libs.oob+libs.pretest</DefaultLibrariesSubsets>
 
     <DefaultHostSubsets>host.native+host.tools</DefaultHostSubsets>
     <DefaultHostSubsets Condition="'$(DotNetBuildFromSource)' != 'true'">$(DefaultHostSubsets)+host.pkg+host.tests</DefaultHostSubsets>
diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj
index d97fef376bc93..fc4a732a1adb3 100644
--- a/src/libraries/externals.csproj
+++ b/src/libraries/externals.csproj
@@ -9,7 +9,7 @@
     <BinPlaceNative>true</BinPlaceNative>
     <BinPlaceRuntime>false</BinPlaceRuntime>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <UseLiveBuiltDotNetHost Condition="'$(TargetArchitecture)' == 's390x' or '$(TargetArchitecture)' == 'armv6'">true</UseLiveBuiltDotNetHost>
+    <UseLiveBuiltDotNetHost Condition="'$(DotNetBuildFromSource)' == 'true' or '$(TargetArchitecture)' == 's390x' or '$(TargetArchitecture)' == 'armv6'">true</UseLiveBuiltDotNetHost>
   </PropertyGroup>
 
   <PropertyGroup>

From 4d09845fcbf61d7acf48b75069122ec05d56a08b Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Thu, 21 Apr 2022 15:40:10 -0700
Subject: [PATCH 38/43] Remove package assets cache disabling

---
 src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 57b4b132eb262..42f192a3f123f 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -4,7 +4,6 @@
 
   <PropertyGroup>
     <OutputPath>$(RuntimeBinDir)crossgen2</OutputPath>
-    <DisablePackageAssetsCache Condition="'$(DotnetBuildFromSource)' == 'true'">true</DisablePackageAssetsCache>
     <!-- Can't use NativeAOT in source build yet https://github.com/dotnet/runtime/issues/66859 and we
          don't want to ship using NativeAOT on MacOS -->
     <NativeAotSupported Condition="'$(DotNetBuildFromSource)' == 'true' or '$(TargetOS)' == 'osx'">false</NativeAotSupported>

From ab11405c434f1b7be5aa5a7352221f9af8903b5d Mon Sep 17 00:00:00 2001
From: Andy Gocke <andy@commentout.net>
Date: Fri, 22 Apr 2022 13:29:27 -0700
Subject: [PATCH 39/43] Update
 src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index a93a395283113..f08564fb2954f 100644
--- 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
@@ -62,7 +62,7 @@
   </Target>
 
   <Target Name="RunPublishedCrossgen" AfterTargets="PublishCrossgen"
-          Condition="'$(TargetOs)' == '$(HostOs)' and '$(TargetArchitecture)' == '$(BuildArchitecture)'">
+          Condition="'$(TargetOS)' == '$(HostOS)' and '$(TargetArchitecture)' == '$(BuildArchitecture)'">
     <!-- Run the published crossgen if we're not cross-compiling -->
     <Exec Command="@(FilesToPackage) $(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll --out $(IntermediateOutputPath)S.P.C.tmp" Condition="'%(FileName)%(Extension)' == 'crossgen2$(ExeSuffix)'"
           ConsoleToMsBuild="true">

From 850d7089705e083dcf72fe64b1c1caf19417ae40 Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Fri, 22 Apr 2022 14:10:57 -0700
Subject: [PATCH 40/43] PR comments

---
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                      | 1 -
 1 file changed, 1 deletion(-)

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
index f08564fb2954f..12b8486074efe 100644
--- 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
@@ -38,7 +38,6 @@
               ;RuntimeIdentifier=$(PackageRID)
               ;CoreCLRArtifactsPath=$(CoreCLRArtifactsPath)
               ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets
-              ;DotNetBuildFromSource=$(DotNetBuildFromSource)"
              Targets="$(_TargetsToRun)">
       <Output TaskParameter="TargetOutputs"
               ItemName="_RawCrossgenPublishFiles" />

From c824ec90f9bc8734c4bff4bfc50340c40c88d76b Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Sun, 24 Apr 2022 23:09:19 -0700
Subject: [PATCH 41/43] Typo

---
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 12b8486074efe..6cb909fee74e2 100644
--- 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
@@ -37,7 +37,7 @@
              Properties="RunningPublish=true
               ;RuntimeIdentifier=$(PackageRID)
               ;CoreCLRArtifactsPath=$(CoreCLRArtifactsPath)
-              ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets
+              ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets"
              Targets="$(_TargetsToRun)">
       <Output TaskParameter="TargetOutputs"
               ItemName="_RawCrossgenPublishFiles" />

From 0c492e72862635d5d003db26f7bb9c0d1bddc96a Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Mon, 25 Apr 2022 13:46:54 -0700
Subject: [PATCH 42/43] PR feedback

---
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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
index 6cb909fee74e2..a9a6605a0298d 100644
--- 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
@@ -63,12 +63,9 @@
   <Target Name="RunPublishedCrossgen" AfterTargets="PublishCrossgen"
           Condition="'$(TargetOS)' == '$(HostOS)' and '$(TargetArchitecture)' == '$(BuildArchitecture)'">
     <!-- Run the published crossgen if we're not cross-compiling -->
-    <Exec Command="@(FilesToPackage) $(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll --out $(IntermediateOutputPath)S.P.C.tmp" Condition="'%(FileName)%(Extension)' == 'crossgen2$(ExeSuffix)'"
-          ConsoleToMsBuild="true">
-      <Output TaskParameter="ConsoleOutput" PropertyName="CrossgenOutput" />
+    <Exec Command="@(FilesToPackage) $(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll --out $(IntermediateOutputPath)S.P.C.tmp" Condition="'%(FileName)%(Extension)' == 'crossgen2$(ExeSuffix)'">
       <Output TaskParameter="ExitCode" PropertyName="CrossgenExitCode" />
     </Exec>
-    <Error Text="Crossgen failed with code $(CrossgenExitCode), output: $(CrossgenOutput)" Condition="$(CrossgenExitCode) != 0" />
   </Target>
 
   <PropertyGroup>

From 3d16f41e52bc2e7f25bc17f54b04232c8e28e022 Mon Sep 17 00:00:00 2001
From: Andy Gocke <andy@commentout.net>
Date: Tue, 26 Apr 2022 09:55:49 -0700
Subject: [PATCH 43/43] Update
 src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 .../Microsoft.NETCore.App.Crossgen2.sfxproj        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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
index a9a6605a0298d..2e0ef08ec3469 100644
--- 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
@@ -29,16 +29,20 @@
           DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)"
           SkipUnchangedFiles="true" />
 
-    <PropertyGroup>
-      <_TargetsToRun>Restore;Publish;PublishItemsOutputGroup</_TargetsToRun>
-    </PropertyGroup>
+<MSBuild Projects="$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2.csproj"
+             Targets="Restore"
+             Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())
+              ;RunningPublish=true
+              ;RuntimeIdentifier=$(PackageRID)
+              ;CoreCLRArtifactsPath=$(CoreCLRArtifactsPath)
+              ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets" />
 
     <MSBuild Projects="$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2.csproj"
+             Targets="Publish;PublishItemsOutputGroup"
              Properties="RunningPublish=true
               ;RuntimeIdentifier=$(PackageRID)
               ;CoreCLRArtifactsPath=$(CoreCLRArtifactsPath)
-              ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets"
-             Targets="$(_TargetsToRun)">
+              ;R2ROverridePath=$(MSBuildThisFileDirectory)ReadyToRun.targets">
       <Output TaskParameter="TargetOutputs"
               ItemName="_RawCrossgenPublishFiles" />
     </MSBuild>