From b9d18e1a162176963bdf8c2fb2fcf4a55b61b638 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Thu, 4 Aug 2022 16:29:36 -0700
Subject: [PATCH 01/25] Clean up AOT publish process

---
 .../Microsoft.DotNet.ILCompiler.targets       | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
index d08cc8241da6a..5f19f52f223c5 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
@@ -1,5 +1,12 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <PropertyGroup>
+
+    <!-- Set the publishAot property to true if not set-->
+    <PublishAot Condition="'$(PublishAot)' == ''">true</PublishAot>
+  </PropertyGroup>
+
+
   <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
 
     <!-- Define the name of the runtime specific compiler package to import -->
@@ -26,7 +33,6 @@
 
     <IlcHostArch Condition="'$(IlcHostArch)' == ''">$(OSHostArch)</IlcHostArch>
     <IlcHostPackageName>runtime.$(OSIdentifier)-$(IlcHostArch).Microsoft.DotNet.ILCompiler</IlcHostPackageName>
-    <IlcCalledViaPackage>true</IlcCalledViaPackage>
 
   </PropertyGroup>
 
@@ -39,29 +45,34 @@
 
   </PropertyGroup>
 
-  <!-- Locate the runtime package according to the current target runtime -->
-  <Target Name="ImportRuntimeIlcPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' AND $(IlcCalledViaPackage) == 'true'" DependsOnTargets="$(ImportRuntimeIlcPackageTargetDependsOn)" BeforeTargets="Publish">
-    <!-- This targets file is imported by the SDK when the AotRuntimePackageLoadedViaSDK property is set. SDK resolves runtime package paths differently-->
-    <Error Condition="'@(ResolvedILCompilerPack)' == '' AND '$(AotRuntimePackageLoadedViaSDK)' == 'true'" Text="The ResolvedILCompilerPack ItemGroup is required for target ImportRuntimeIlcPackageTarget" />
-    <!-- NativeAOT runtime pack assemblies need to be defined to avoid the default CoreCLR implementations being set as compiler inputs -->
-    <Error Condition="'@(PackageDefinitions)' == '' AND '$(AotRuntimePackageLoadedViaSDK)' != 'true'" Text="The PackageDefinitions ItemGroup is required for target ImportRuntimeIlcPackageTarget" />
+  <!-- Target ProcessFrameworkReferences sets the details to download the runtime package but requires setting the version to the explicit package if one exists -->
+  <Target Name="SetILCompilerVersionForPackageReference" Condition="'$(AotRuntimePackageLoadedViaSDK)' != 'true' and '$(PublishAot)' == 'true'" BeforeTargets="ProcessFrameworkReferences">
+    <ItemGroup>
+      <OldKnownIlPack Include="@(KnownILCompilerPack)"/>
+      <ILCompilerRefernece Include="@(PackageReference)" Condition="'%(Identity)'=='Microsoft.DotNet.ILCompiler'"/>
+    </ItemGroup>
+    <ItemGroup>
+        <KnownILCompilerPack Remove="@(OldKnownIlPack)" />
+        <KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
+              TargetFramework="@(OldKnownIlPack->'%(TargetFramework)')"
+              ILCompilerPackNamePattern="@(OldKnownIlPack->'%(ILCompilerPackNamePattern)')"
+              ILCompilerPackVersion="@(ILCompilerRefernece->'%(Version)')"
+              ILCompilerRuntimeIdentifiers="@(OldKnownIlPack->'%(ILCompilerRuntimeIdentifiers)')"/>
+    </ItemGroup>
+  </Target>
 
+  <!-- Locate the runtime package according to the current target runtime -->
+  <Target Name="ImportRuntimeIlcPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' and '$(PublishAot)' == 'true'" DependsOnTargets="$(ImportRuntimeIlcPackageTargetDependsOn)" BeforeTargets="Publish">
+    <Error Condition="'@(ResolvedILCompilerPack)' == ''" Text="The ResolvedILCompilerPack ItemGroup is required for target ImportRuntimeIlcPackageTarget" />
 
-    <!-- This targets file is imported by the SDK when the AotRuntimePackageLoadedViaSDK property is set. Use the SDK runtime package resolve property to set  down stream properties -->
-    <PropertyGroup Condition="'$(AotRuntimePackageLoadedViaSDK)' == 'true'">
+    <PropertyGroup>
       <RuntimePackagePath>@(ResolvedILCompilerPack->'%(PackageDirectory)')</RuntimePackagePath>
       <IlcHostPackagePath>@(ResolvedILCompilerPack->'%(PackageDirectory)')</IlcHostPackagePath>
       <IlcPath>>@(ResolvedILCompilerPack->'%(PackageDirectory)')</IlcPath>
     </PropertyGroup>
 
-    <!-- Use the non-SDK runtime package resolve property to set down stream properties if there is an explicit reference in the project -->
-    <PropertyGroup Condition="'$(AotRuntimePackageLoadedViaSDK)' != 'true'">
-      <RuntimePackagePath Condition="'%(PackageDefinitions.Name)' == '$(RuntimeIlcPackageName)'">%(PackageDefinitions.ResolvedPath)</RuntimePackagePath>
-      <IlcHostPackagePath Condition="'%(PackageDefinitions.Name)' == '$(IlcHostPackageName)'">%(PackageDefinitions.ResolvedPath)</IlcHostPackagePath>
-    </PropertyGroup>
-
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets" Condition="'$(PublishAot)' == 'true'"/>
 
 </Project>

From 62a302a2bdc76426e6ea9e533dbf29ffb7a830e6 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Fri, 5 Aug 2022 05:46:39 -0700
Subject: [PATCH 02/25] Update
 src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets

Co-authored-by: Sven Boemer <sbomer@gmail.com>
---
 .../BuildIntegration/Microsoft.DotNet.ILCompiler.targets        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
index 5f19f52f223c5..7d501e1ae8451 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
@@ -49,7 +49,7 @@
   <Target Name="SetILCompilerVersionForPackageReference" Condition="'$(AotRuntimePackageLoadedViaSDK)' != 'true' and '$(PublishAot)' == 'true'" BeforeTargets="ProcessFrameworkReferences">
     <ItemGroup>
       <OldKnownIlPack Include="@(KnownILCompilerPack)"/>
-      <ILCompilerRefernece Include="@(PackageReference)" Condition="'%(Identity)'=='Microsoft.DotNet.ILCompiler'"/>
+      <ILCompilerReference Include="@(PackageReference)" Condition="'%(Identity)'=='Microsoft.DotNet.ILCompiler'"/>
     </ItemGroup>
     <ItemGroup>
         <KnownILCompilerPack Remove="@(OldKnownIlPack)" />

From b5f37f01f061d6b2f207fd6f6da1b3b7a0390078 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Fri, 5 Aug 2022 05:46:51 -0700
Subject: [PATCH 03/25] Update
 src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets

Co-authored-by: Sven Boemer <sbomer@gmail.com>
---
 .../BuildIntegration/Microsoft.DotNet.ILCompiler.targets        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
index 7d501e1ae8451..0d7572fd2bb2d 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
@@ -56,7 +56,7 @@
         <KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
               TargetFramework="@(OldKnownIlPack->'%(TargetFramework)')"
               ILCompilerPackNamePattern="@(OldKnownIlPack->'%(ILCompilerPackNamePattern)')"
-              ILCompilerPackVersion="@(ILCompilerRefernece->'%(Version)')"
+              ILCompilerPackVersion="@(ILCompilerReference->'%(Version)')"
               ILCompilerRuntimeIdentifiers="@(OldKnownIlPack->'%(ILCompilerRuntimeIdentifiers)')"/>
     </ItemGroup>
   </Target>

From e992c9bb86f6fbc9abb4bed4c5cce6cede733d93 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Sun, 7 Aug 2022 10:41:12 -0700
Subject: [PATCH 04/25] FB and working around running native aot tests

---
 eng/testing/tests.singlefile.targets          |  2 +-
 .../BuildFrameworkNativeObjects.proj          |  2 +-
 ...oft.DotNet.ILCompiler.SingleEntry.targets} | 27 +++++++++----------
 .../Microsoft.DotNet.ILCompiler.props         |  3 +--
 4 files changed, 15 insertions(+), 19 deletions(-)
 rename src/coreclr/nativeaot/BuildIntegration/{Microsoft.DotNet.ILCompiler.targets => Microsoft.DotNet.ILCompiler.SingleEntry.targets} (80%)

diff --git a/eng/testing/tests.singlefile.targets b/eng/testing/tests.singlefile.targets
index 1cfa4ba1cdeca..e4a246d6ef1c0 100644
--- a/eng/testing/tests.singlefile.targets
+++ b/eng/testing/tests.singlefile.targets
@@ -34,7 +34,7 @@
     <SelfContained>true</SelfContained>
   </PropertyGroup>
 
-  <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.targets" Condition="'$(TestNativeAot)' == 'true'" />
+  <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets" Condition="'$(TestNativeAot)' == 'true'" />
 
   <ItemGroup Condition="'$(TestNativeAot)' == 'true'">
     <RdXmlFile Include="$(MSBuildThisFileDirectory)default.rd.xml" />
diff --git a/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj b/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj
index 6469964c0170a..d3ef3ec15cdbb 100644
--- a/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj
+++ b/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj
@@ -10,7 +10,7 @@
     <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.DotNet.ILCompiler.targets" Condition="'$(IlcCalledViaPackage)' == 'true'" />
+  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.DotNet.ILCompiler.SingleEntry.targets" Condition="'$(IlcCalledViaPackage)' == 'true'" />
   <Import Project="Microsoft.NETCore.Native.targets" Condition="'$(IlcCalledViaPackage)' == ''" />
 
   <Target Name="BuildAllFrameworkLibraries"
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
similarity index 80%
rename from src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
rename to src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
index 0d7572fd2bb2d..bacb081a0c321 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
@@ -1,14 +1,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-
     <!-- Set the publishAot property to true if not set-->
     <PublishAot Condition="'$(PublishAot)' == ''">true</PublishAot>
   </PropertyGroup>
 
-
   <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
-
     <!-- Define the name of the runtime specific compiler package to import -->
     <OSIdentifier Condition="$(RuntimeIdentifier.StartsWith('win'))">win</OSIdentifier>
     <OSIdentifier Condition="$(RuntimeIdentifier.StartsWith('osx'))">osx</OSIdentifier>
@@ -33,36 +30,36 @@
 
     <IlcHostArch Condition="'$(IlcHostArch)' == ''">$(OSHostArch)</IlcHostArch>
     <IlcHostPackageName>runtime.$(OSIdentifier)-$(IlcHostArch).Microsoft.DotNet.ILCompiler</IlcHostPackageName>
-
+    
+    <IlcCalledViaPackage>true</IlcCalledViaPackage>
   </PropertyGroup>
 
   <PropertyGroup>
-
     <!-- If the NativeAOT toolchain is being consumed via package, runtime-specific properties must be set before compilation can proceed -->
     <ImportRuntimeIlcPackageTargetDependsOn>RunResolvePackageDependencies</ImportRuntimeIlcPackageTargetDependsOn>
     <IlcSetupPropertiesDependsOn>ImportRuntimeIlcPackageTarget</IlcSetupPropertiesDependsOn>
     <IlcDynamicBuildPropertyDependencies>SetupProperties</IlcDynamicBuildPropertyDependencies>
-
   </PropertyGroup>
 
   <!-- Target ProcessFrameworkReferences sets the details to download the runtime package but requires setting the version to the explicit package if one exists -->
   <Target Name="SetILCompilerVersionForPackageReference" Condition="'$(AotRuntimePackageLoadedViaSDK)' != 'true' and '$(PublishAot)' == 'true'" BeforeTargets="ProcessFrameworkReferences">
     <ItemGroup>
-      <OldKnownIlPack Include="@(KnownILCompilerPack)"/>
-      <ILCompilerReference Include="@(PackageReference)" Condition="'%(Identity)'=='Microsoft.DotNet.ILCompiler'"/>
+      <OldKnownILCompilerPack  Include="@(KnownILCompilerPack)"/>
+      <ILCompilerRefernece Include="@(PackageReference)" Condition="'%(Identity)'=='Microsoft.DotNet.ILCompiler'"/>
     </ItemGroup>
     <ItemGroup>
-        <KnownILCompilerPack Remove="@(OldKnownIlPack)" />
+        <KnownILCompilerPack Remove="@(OldKnownILCompilerPack )" Condition="@(ILCompilerReference->'%(Version)')!=''"/>
         <KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
-              TargetFramework="@(OldKnownIlPack->'%(TargetFramework)')"
-              ILCompilerPackNamePattern="@(OldKnownIlPack->'%(ILCompilerPackNamePattern)')"
-              ILCompilerPackVersion="@(ILCompilerReference->'%(Version)')"
-              ILCompilerRuntimeIdentifiers="@(OldKnownIlPack->'%(ILCompilerRuntimeIdentifiers)')"/>
+              TargetFramework="@(OldKnownILCompilerPack ->'%(TargetFramework)')"
+              ILCompilerPackNamePattern="@(OldKnownILCompilerPack ->'%(ILCompilerPackNamePattern)')"
+              ILCompilerPackVersion="@(ILCompilerRefernece->'%(Version)')"
+              ILCompilerRuntimeIdentifiers="@(OldKnownILCompilerPack ->'%(ILCompilerRuntimeIdentifiers)')"
+              Condition="@(ILCompilerReference->'%(Version)')!=''"/>
     </ItemGroup>
   </Target>
 
   <!-- Locate the runtime package according to the current target runtime -->
-  <Target Name="ImportRuntimeIlcPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' and '$(PublishAot)' == 'true'" DependsOnTargets="$(ImportRuntimeIlcPackageTargetDependsOn)" BeforeTargets="Publish">
+  <Target Name="ImportRuntimeIlcPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' and '$(PublishAot)' == 'true' and $(IlcCalledViaPackage) == 'true'" DependsOnTargets="$(ImportRuntimeIlcPackageTargetDependsOn)" BeforeTargets="Publish">
     <Error Condition="'@(ResolvedILCompilerPack)' == ''" Text="The ResolvedILCompilerPack ItemGroup is required for target ImportRuntimeIlcPackageTarget" />
 
     <PropertyGroup>
@@ -73,6 +70,6 @@
 
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets" Condition="'$(PublishAot)' == 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets" Condition="'$(TestNativeAot)' != 'true'"/>
 
 </Project>
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props
index e883245ee0f7c..c2f2f45bce605 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props
@@ -10,10 +10,9 @@ Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
 <Project>
-
   <PropertyGroup>
     <!-- N.B. The ILCompilerTargetsPath is used as a sentinel to indicate a version of this file has already been imported. It will also be the path
          used to import the targets later in the SDK. -->
-    <ILCompilerTargetsPath>$(MSBuildThisFileDirectory)Microsoft.DotNet.ILCompiler.targets</ILCompilerTargetsPath>
+    <ILCompilerTargetsPath>$(MSBuildThisFileDirectory)Microsoft.DotNet.ILCompiler.SingleEntry.targets</ILCompilerTargetsPath>
   </PropertyGroup>
 </Project>

From dcf710cbefb0c059edd1c21ba10c53456db8f267 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Mon, 8 Aug 2022 03:58:53 -0700
Subject: [PATCH 05/25] update crossgen2 reference

---
 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 42f192a3f123f..8696352abc03e 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -42,7 +42,7 @@
   </PropertyGroup>
 
   <Import Project="$(R2ROverridePath)" Condition="'$(R2ROverridePath)' != ''" />
-  <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.targets"
+  <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets"
           Condition="'$(NativeAotSupported)' == 'true' and '$(RunningPublish)' == 'true'" />
 
   <Target Name="RewriteRuntimePackDir"

From da529fd83e19304234ef467e02dceb90da0320e2 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Mon, 8 Aug 2022 13:20:25 -0700
Subject: [PATCH 06/25] moving package version change out of a target as per FB

---
 ...soft.DotNet.ILCompiler.SingleEntry.targets | 26 ++++---------------
 .../Microsoft.DotNet.ILCompiler.props         |  2 ++
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
index bacb081a0c321..1bf95747a4ff1 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
@@ -1,10 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <PropertyGroup>
-    <!-- Set the publishAot property to true if not set-->
-    <PublishAot Condition="'$(PublishAot)' == ''">true</PublishAot>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
     <!-- Define the name of the runtime specific compiler package to import -->
     <OSIdentifier Condition="$(RuntimeIdentifier.StartsWith('win'))">win</OSIdentifier>
@@ -41,22 +36,11 @@
     <IlcDynamicBuildPropertyDependencies>SetupProperties</IlcDynamicBuildPropertyDependencies>
   </PropertyGroup>
 
-  <!-- Target ProcessFrameworkReferences sets the details to download the runtime package but requires setting the version to the explicit package if one exists -->
-  <Target Name="SetILCompilerVersionForPackageReference" Condition="'$(AotRuntimePackageLoadedViaSDK)' != 'true' and '$(PublishAot)' == 'true'" BeforeTargets="ProcessFrameworkReferences">
-    <ItemGroup>
-      <OldKnownILCompilerPack  Include="@(KnownILCompilerPack)"/>
-      <ILCompilerRefernece Include="@(PackageReference)" Condition="'%(Identity)'=='Microsoft.DotNet.ILCompiler'"/>
-    </ItemGroup>
-    <ItemGroup>
-        <KnownILCompilerPack Remove="@(OldKnownILCompilerPack )" Condition="@(ILCompilerReference->'%(Version)')!=''"/>
-        <KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
-              TargetFramework="@(OldKnownILCompilerPack ->'%(TargetFramework)')"
-              ILCompilerPackNamePattern="@(OldKnownILCompilerPack ->'%(ILCompilerPackNamePattern)')"
-              ILCompilerPackVersion="@(ILCompilerRefernece->'%(Version)')"
-              ILCompilerRuntimeIdentifiers="@(OldKnownILCompilerPack ->'%(ILCompilerRuntimeIdentifiers)')"
-              Condition="@(ILCompilerReference->'%(Version)')!=''"/>
-    </ItemGroup>
-  </Target>
+  <ItemGroup>
+    <KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler" Condition="@(PackageReference->'%(Identity)')=='Microsoft.DotNet.ILCompiler'">
+        <ILCompilerPackVersion> @(PackageReference->'%(Version)')</ILCompilerPackVersion>
+    </KnownILCompilerPack>
+  </ItemGroup>
 
   <!-- Locate the runtime package according to the current target runtime -->
   <Target Name="ImportRuntimeIlcPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' and '$(PublishAot)' == 'true' and $(IlcCalledViaPackage) == 'true'" DependsOnTargets="$(ImportRuntimeIlcPackageTargetDependsOn)" BeforeTargets="Publish">
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props
index c2f2f45bce605..da6b72b12d7ce 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props
@@ -11,6 +11,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 -->
 <Project>
   <PropertyGroup>
+    <!-- Set the publishAot property to true if not set-->
+    <PublishAot Condition="'$(PublishAot)' == ''">true</PublishAot>
     <!-- N.B. The ILCompilerTargetsPath is used as a sentinel to indicate a version of this file has already been imported. It will also be the path
          used to import the targets later in the SDK. -->
     <ILCompilerTargetsPath>$(MSBuildThisFileDirectory)Microsoft.DotNet.ILCompiler.SingleEntry.targets</ILCompilerTargetsPath>

From 3cb58e64a55b2de64cc8b485372b99929d8f95c2 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Tue, 9 Aug 2022 10:46:18 -0700
Subject: [PATCH 07/25] Fix nativeaot test take 2

---
 .../Microsoft.DotNet.ILCompiler.SingleEntry.targets            | 3 ++-
 .../BuildIntegration/Microsoft.NETCore.Native.targets          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
index 1bf95747a4ff1..1e3d21b1b4629 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
@@ -37,6 +37,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <!-- If called via package instead of the SDK, Update the runtime package version to match the build package-->
     <KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler" Condition="@(PackageReference->'%(Identity)')=='Microsoft.DotNet.ILCompiler'">
         <ILCompilerPackVersion> @(PackageReference->'%(Version)')</ILCompilerPackVersion>
     </KnownILCompilerPack>
@@ -54,6 +55,6 @@
 
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets" Condition="'$(TestNativeAot)' != 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets"/>
 
 </Project>
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
index f39805cc9eddf..4282d9ce0f1fe 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -247,7 +247,7 @@ The .NET Foundation licenses this file to you under the MIT license.
       <IlcArg Include="@(_IlcConditionallyRootedAssemblies->'--conditionalroot:%(Identity)')" />
       <IlcArg Include="@(_IlcTrimmedAssemblies->'--trim:%(Identity)')" />
       <IlcArg Include="@(_IlcNoSingleWarnAssemblies->'--nosinglewarnassembly:%(Filename)')" />
-      <IlcArg Condition="'$(TrimmerDefaultAction)' == 'copyused' or '$(TrimmerDefaultAction)' == 'copy' or '$(TrimMode)' == 'partial'" Include="--defaultrooting" />
+      <IlcArg Condition="'$(TrimmerDefaultAction)' == 'copyused' or '$(TrimmerDefaultAction)' == 'copy' or '$(TrimMode)' == 'partial' or ('$(TestNativeAot)' == 'true' and '$(TrimMode)' == 'full')" Include="--defaultrooting" />
       <IlcArg Include="--resilient" />
 
       <IlcArg Condition="$(IlcDisableReflection) == 'true'" Include="--feature:System.Reflection.IsReflectionExecutionAvailable=false" />

From 5696f2d1f7ec2f7cdcfda2d212147c2912695f57 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Tue, 9 Aug 2022 17:04:08 -0700
Subject: [PATCH 08/25] disabling a failing test

---
 src/libraries/tests.proj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 2d46d69750c30..d0e20435b05d9 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -420,6 +420,8 @@
   <ItemGroup Condition="'$(TestNativeAot)' == 'true' and '$(RunDisabledNativeAotTests)' != 'true'">
     <!-- https://github.com/dotnet/runtime/issues/72908 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.MetadataLoadContext\tests\System.Reflection.MetadataLoadContext.Tests.csproj" />
+    <!-- Temp working around an issue that does not locally repro with PR https://github.com/dotnet/runtime/pull/73416 -->
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.Metadata\tests\System.Reflection.Metadata.Tests.csproj" />
 
     <!-- Test needs to copy .so file: https://github.com/dotnet/runtime/issues/72987 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.Ports\tests\System.IO.Ports.Tests.csproj"

From 941d55862bc73b6bbc54ab91e409a32d4a35ae5e Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Thu, 4 Aug 2022 16:29:36 -0700
Subject: [PATCH 09/25] Clean up AOT publish process

---
 .../Microsoft.DotNet.ILCompiler.targets       | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
index d08cc8241da6a..5f19f52f223c5 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
@@ -1,5 +1,12 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <PropertyGroup>
+
+    <!-- Set the publishAot property to true if not set-->
+    <PublishAot Condition="'$(PublishAot)' == ''">true</PublishAot>
+  </PropertyGroup>
+
+
   <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
 
     <!-- Define the name of the runtime specific compiler package to import -->
@@ -26,7 +33,6 @@
 
     <IlcHostArch Condition="'$(IlcHostArch)' == ''">$(OSHostArch)</IlcHostArch>
     <IlcHostPackageName>runtime.$(OSIdentifier)-$(IlcHostArch).Microsoft.DotNet.ILCompiler</IlcHostPackageName>
-    <IlcCalledViaPackage>true</IlcCalledViaPackage>
 
   </PropertyGroup>
 
@@ -39,29 +45,34 @@
 
   </PropertyGroup>
 
-  <!-- Locate the runtime package according to the current target runtime -->
-  <Target Name="ImportRuntimeIlcPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' AND $(IlcCalledViaPackage) == 'true'" DependsOnTargets="$(ImportRuntimeIlcPackageTargetDependsOn)" BeforeTargets="Publish">
-    <!-- This targets file is imported by the SDK when the AotRuntimePackageLoadedViaSDK property is set. SDK resolves runtime package paths differently-->
-    <Error Condition="'@(ResolvedILCompilerPack)' == '' AND '$(AotRuntimePackageLoadedViaSDK)' == 'true'" Text="The ResolvedILCompilerPack ItemGroup is required for target ImportRuntimeIlcPackageTarget" />
-    <!-- NativeAOT runtime pack assemblies need to be defined to avoid the default CoreCLR implementations being set as compiler inputs -->
-    <Error Condition="'@(PackageDefinitions)' == '' AND '$(AotRuntimePackageLoadedViaSDK)' != 'true'" Text="The PackageDefinitions ItemGroup is required for target ImportRuntimeIlcPackageTarget" />
+  <!-- Target ProcessFrameworkReferences sets the details to download the runtime package but requires setting the version to the explicit package if one exists -->
+  <Target Name="SetILCompilerVersionForPackageReference" Condition="'$(AotRuntimePackageLoadedViaSDK)' != 'true' and '$(PublishAot)' == 'true'" BeforeTargets="ProcessFrameworkReferences">
+    <ItemGroup>
+      <OldKnownIlPack Include="@(KnownILCompilerPack)"/>
+      <ILCompilerRefernece Include="@(PackageReference)" Condition="'%(Identity)'=='Microsoft.DotNet.ILCompiler'"/>
+    </ItemGroup>
+    <ItemGroup>
+        <KnownILCompilerPack Remove="@(OldKnownIlPack)" />
+        <KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
+              TargetFramework="@(OldKnownIlPack->'%(TargetFramework)')"
+              ILCompilerPackNamePattern="@(OldKnownIlPack->'%(ILCompilerPackNamePattern)')"
+              ILCompilerPackVersion="@(ILCompilerRefernece->'%(Version)')"
+              ILCompilerRuntimeIdentifiers="@(OldKnownIlPack->'%(ILCompilerRuntimeIdentifiers)')"/>
+    </ItemGroup>
+  </Target>
 
+  <!-- Locate the runtime package according to the current target runtime -->
+  <Target Name="ImportRuntimeIlcPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' and '$(PublishAot)' == 'true'" DependsOnTargets="$(ImportRuntimeIlcPackageTargetDependsOn)" BeforeTargets="Publish">
+    <Error Condition="'@(ResolvedILCompilerPack)' == ''" Text="The ResolvedILCompilerPack ItemGroup is required for target ImportRuntimeIlcPackageTarget" />
 
-    <!-- This targets file is imported by the SDK when the AotRuntimePackageLoadedViaSDK property is set. Use the SDK runtime package resolve property to set  down stream properties -->
-    <PropertyGroup Condition="'$(AotRuntimePackageLoadedViaSDK)' == 'true'">
+    <PropertyGroup>
       <RuntimePackagePath>@(ResolvedILCompilerPack->'%(PackageDirectory)')</RuntimePackagePath>
       <IlcHostPackagePath>@(ResolvedILCompilerPack->'%(PackageDirectory)')</IlcHostPackagePath>
       <IlcPath>>@(ResolvedILCompilerPack->'%(PackageDirectory)')</IlcPath>
     </PropertyGroup>
 
-    <!-- Use the non-SDK runtime package resolve property to set down stream properties if there is an explicit reference in the project -->
-    <PropertyGroup Condition="'$(AotRuntimePackageLoadedViaSDK)' != 'true'">
-      <RuntimePackagePath Condition="'%(PackageDefinitions.Name)' == '$(RuntimeIlcPackageName)'">%(PackageDefinitions.ResolvedPath)</RuntimePackagePath>
-      <IlcHostPackagePath Condition="'%(PackageDefinitions.Name)' == '$(IlcHostPackageName)'">%(PackageDefinitions.ResolvedPath)</IlcHostPackagePath>
-    </PropertyGroup>
-
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets" Condition="'$(PublishAot)' == 'true'"/>
 
 </Project>

From 363fd28acd05c5d81681f55ab4367a4e6bc8a33e Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Fri, 5 Aug 2022 05:46:39 -0700
Subject: [PATCH 10/25] Update
 src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets

Co-authored-by: Sven Boemer <sbomer@gmail.com>
---
 .../BuildIntegration/Microsoft.DotNet.ILCompiler.targets        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
index 5f19f52f223c5..7d501e1ae8451 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
@@ -49,7 +49,7 @@
   <Target Name="SetILCompilerVersionForPackageReference" Condition="'$(AotRuntimePackageLoadedViaSDK)' != 'true' and '$(PublishAot)' == 'true'" BeforeTargets="ProcessFrameworkReferences">
     <ItemGroup>
       <OldKnownIlPack Include="@(KnownILCompilerPack)"/>
-      <ILCompilerRefernece Include="@(PackageReference)" Condition="'%(Identity)'=='Microsoft.DotNet.ILCompiler'"/>
+      <ILCompilerReference Include="@(PackageReference)" Condition="'%(Identity)'=='Microsoft.DotNet.ILCompiler'"/>
     </ItemGroup>
     <ItemGroup>
         <KnownILCompilerPack Remove="@(OldKnownIlPack)" />

From 48b0f744f62c11eaadf15ea6b7b535e29063bcec Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Fri, 5 Aug 2022 05:46:51 -0700
Subject: [PATCH 11/25] Update
 src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets

Co-authored-by: Sven Boemer <sbomer@gmail.com>
---
 .../BuildIntegration/Microsoft.DotNet.ILCompiler.targets        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
index 7d501e1ae8451..0d7572fd2bb2d 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
@@ -56,7 +56,7 @@
         <KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
               TargetFramework="@(OldKnownIlPack->'%(TargetFramework)')"
               ILCompilerPackNamePattern="@(OldKnownIlPack->'%(ILCompilerPackNamePattern)')"
-              ILCompilerPackVersion="@(ILCompilerRefernece->'%(Version)')"
+              ILCompilerPackVersion="@(ILCompilerReference->'%(Version)')"
               ILCompilerRuntimeIdentifiers="@(OldKnownIlPack->'%(ILCompilerRuntimeIdentifiers)')"/>
     </ItemGroup>
   </Target>

From c1fb84ebbed836e5fcf0feb6e06be234b9d6e7c1 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Sun, 7 Aug 2022 10:41:12 -0700
Subject: [PATCH 12/25] FB and working around running native aot tests

---
 eng/testing/tests.singlefile.targets          |  2 +-
 .../BuildFrameworkNativeObjects.proj          |  2 +-
 ...oft.DotNet.ILCompiler.SingleEntry.targets} | 27 +++++++++----------
 .../Microsoft.DotNet.ILCompiler.props         |  3 +--
 4 files changed, 15 insertions(+), 19 deletions(-)
 rename src/coreclr/nativeaot/BuildIntegration/{Microsoft.DotNet.ILCompiler.targets => Microsoft.DotNet.ILCompiler.SingleEntry.targets} (80%)

diff --git a/eng/testing/tests.singlefile.targets b/eng/testing/tests.singlefile.targets
index 1cfa4ba1cdeca..e4a246d6ef1c0 100644
--- a/eng/testing/tests.singlefile.targets
+++ b/eng/testing/tests.singlefile.targets
@@ -34,7 +34,7 @@
     <SelfContained>true</SelfContained>
   </PropertyGroup>
 
-  <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.targets" Condition="'$(TestNativeAot)' == 'true'" />
+  <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets" Condition="'$(TestNativeAot)' == 'true'" />
 
   <ItemGroup Condition="'$(TestNativeAot)' == 'true'">
     <RdXmlFile Include="$(MSBuildThisFileDirectory)default.rd.xml" />
diff --git a/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj b/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj
index 6469964c0170a..d3ef3ec15cdbb 100644
--- a/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj
+++ b/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj
@@ -10,7 +10,7 @@
     <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.DotNet.ILCompiler.targets" Condition="'$(IlcCalledViaPackage)' == 'true'" />
+  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.DotNet.ILCompiler.SingleEntry.targets" Condition="'$(IlcCalledViaPackage)' == 'true'" />
   <Import Project="Microsoft.NETCore.Native.targets" Condition="'$(IlcCalledViaPackage)' == ''" />
 
   <Target Name="BuildAllFrameworkLibraries"
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
similarity index 80%
rename from src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
rename to src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
index 0d7572fd2bb2d..bacb081a0c321 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
@@ -1,14 +1,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-
     <!-- Set the publishAot property to true if not set-->
     <PublishAot Condition="'$(PublishAot)' == ''">true</PublishAot>
   </PropertyGroup>
 
-
   <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
-
     <!-- Define the name of the runtime specific compiler package to import -->
     <OSIdentifier Condition="$(RuntimeIdentifier.StartsWith('win'))">win</OSIdentifier>
     <OSIdentifier Condition="$(RuntimeIdentifier.StartsWith('osx'))">osx</OSIdentifier>
@@ -33,36 +30,36 @@
 
     <IlcHostArch Condition="'$(IlcHostArch)' == ''">$(OSHostArch)</IlcHostArch>
     <IlcHostPackageName>runtime.$(OSIdentifier)-$(IlcHostArch).Microsoft.DotNet.ILCompiler</IlcHostPackageName>
-
+    
+    <IlcCalledViaPackage>true</IlcCalledViaPackage>
   </PropertyGroup>
 
   <PropertyGroup>
-
     <!-- If the NativeAOT toolchain is being consumed via package, runtime-specific properties must be set before compilation can proceed -->
     <ImportRuntimeIlcPackageTargetDependsOn>RunResolvePackageDependencies</ImportRuntimeIlcPackageTargetDependsOn>
     <IlcSetupPropertiesDependsOn>ImportRuntimeIlcPackageTarget</IlcSetupPropertiesDependsOn>
     <IlcDynamicBuildPropertyDependencies>SetupProperties</IlcDynamicBuildPropertyDependencies>
-
   </PropertyGroup>
 
   <!-- Target ProcessFrameworkReferences sets the details to download the runtime package but requires setting the version to the explicit package if one exists -->
   <Target Name="SetILCompilerVersionForPackageReference" Condition="'$(AotRuntimePackageLoadedViaSDK)' != 'true' and '$(PublishAot)' == 'true'" BeforeTargets="ProcessFrameworkReferences">
     <ItemGroup>
-      <OldKnownIlPack Include="@(KnownILCompilerPack)"/>
-      <ILCompilerReference Include="@(PackageReference)" Condition="'%(Identity)'=='Microsoft.DotNet.ILCompiler'"/>
+      <OldKnownILCompilerPack  Include="@(KnownILCompilerPack)"/>
+      <ILCompilerRefernece Include="@(PackageReference)" Condition="'%(Identity)'=='Microsoft.DotNet.ILCompiler'"/>
     </ItemGroup>
     <ItemGroup>
-        <KnownILCompilerPack Remove="@(OldKnownIlPack)" />
+        <KnownILCompilerPack Remove="@(OldKnownILCompilerPack )" Condition="@(ILCompilerReference->'%(Version)')!=''"/>
         <KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
-              TargetFramework="@(OldKnownIlPack->'%(TargetFramework)')"
-              ILCompilerPackNamePattern="@(OldKnownIlPack->'%(ILCompilerPackNamePattern)')"
-              ILCompilerPackVersion="@(ILCompilerReference->'%(Version)')"
-              ILCompilerRuntimeIdentifiers="@(OldKnownIlPack->'%(ILCompilerRuntimeIdentifiers)')"/>
+              TargetFramework="@(OldKnownILCompilerPack ->'%(TargetFramework)')"
+              ILCompilerPackNamePattern="@(OldKnownILCompilerPack ->'%(ILCompilerPackNamePattern)')"
+              ILCompilerPackVersion="@(ILCompilerRefernece->'%(Version)')"
+              ILCompilerRuntimeIdentifiers="@(OldKnownILCompilerPack ->'%(ILCompilerRuntimeIdentifiers)')"
+              Condition="@(ILCompilerReference->'%(Version)')!=''"/>
     </ItemGroup>
   </Target>
 
   <!-- Locate the runtime package according to the current target runtime -->
-  <Target Name="ImportRuntimeIlcPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' and '$(PublishAot)' == 'true'" DependsOnTargets="$(ImportRuntimeIlcPackageTargetDependsOn)" BeforeTargets="Publish">
+  <Target Name="ImportRuntimeIlcPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' and '$(PublishAot)' == 'true' and $(IlcCalledViaPackage) == 'true'" DependsOnTargets="$(ImportRuntimeIlcPackageTargetDependsOn)" BeforeTargets="Publish">
     <Error Condition="'@(ResolvedILCompilerPack)' == ''" Text="The ResolvedILCompilerPack ItemGroup is required for target ImportRuntimeIlcPackageTarget" />
 
     <PropertyGroup>
@@ -73,6 +70,6 @@
 
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets" Condition="'$(PublishAot)' == 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets" Condition="'$(TestNativeAot)' != 'true'"/>
 
 </Project>
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props
index e883245ee0f7c..c2f2f45bce605 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props
@@ -10,10 +10,9 @@ Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
 <Project>
-
   <PropertyGroup>
     <!-- N.B. The ILCompilerTargetsPath is used as a sentinel to indicate a version of this file has already been imported. It will also be the path
          used to import the targets later in the SDK. -->
-    <ILCompilerTargetsPath>$(MSBuildThisFileDirectory)Microsoft.DotNet.ILCompiler.targets</ILCompilerTargetsPath>
+    <ILCompilerTargetsPath>$(MSBuildThisFileDirectory)Microsoft.DotNet.ILCompiler.SingleEntry.targets</ILCompilerTargetsPath>
   </PropertyGroup>
 </Project>

From eb13dc8f133b9b4fe6a47a4958b45b58b98cfb5f Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Mon, 8 Aug 2022 03:58:53 -0700
Subject: [PATCH 13/25] update crossgen2 reference

---
 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 42f192a3f123f..8696352abc03e 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -42,7 +42,7 @@
   </PropertyGroup>
 
   <Import Project="$(R2ROverridePath)" Condition="'$(R2ROverridePath)' != ''" />
-  <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.targets"
+  <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets"
           Condition="'$(NativeAotSupported)' == 'true' and '$(RunningPublish)' == 'true'" />
 
   <Target Name="RewriteRuntimePackDir"

From 294c4633be8567ec9958817f3bf90b2c4613ffd0 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Mon, 8 Aug 2022 13:20:25 -0700
Subject: [PATCH 14/25] moving package version change out of a target as per FB

---
 ...soft.DotNet.ILCompiler.SingleEntry.targets | 26 ++++---------------
 .../Microsoft.DotNet.ILCompiler.props         |  2 ++
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
index bacb081a0c321..1bf95747a4ff1 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
@@ -1,10 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <PropertyGroup>
-    <!-- Set the publishAot property to true if not set-->
-    <PublishAot Condition="'$(PublishAot)' == ''">true</PublishAot>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
     <!-- Define the name of the runtime specific compiler package to import -->
     <OSIdentifier Condition="$(RuntimeIdentifier.StartsWith('win'))">win</OSIdentifier>
@@ -41,22 +36,11 @@
     <IlcDynamicBuildPropertyDependencies>SetupProperties</IlcDynamicBuildPropertyDependencies>
   </PropertyGroup>
 
-  <!-- Target ProcessFrameworkReferences sets the details to download the runtime package but requires setting the version to the explicit package if one exists -->
-  <Target Name="SetILCompilerVersionForPackageReference" Condition="'$(AotRuntimePackageLoadedViaSDK)' != 'true' and '$(PublishAot)' == 'true'" BeforeTargets="ProcessFrameworkReferences">
-    <ItemGroup>
-      <OldKnownILCompilerPack  Include="@(KnownILCompilerPack)"/>
-      <ILCompilerRefernece Include="@(PackageReference)" Condition="'%(Identity)'=='Microsoft.DotNet.ILCompiler'"/>
-    </ItemGroup>
-    <ItemGroup>
-        <KnownILCompilerPack Remove="@(OldKnownILCompilerPack )" Condition="@(ILCompilerReference->'%(Version)')!=''"/>
-        <KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
-              TargetFramework="@(OldKnownILCompilerPack ->'%(TargetFramework)')"
-              ILCompilerPackNamePattern="@(OldKnownILCompilerPack ->'%(ILCompilerPackNamePattern)')"
-              ILCompilerPackVersion="@(ILCompilerRefernece->'%(Version)')"
-              ILCompilerRuntimeIdentifiers="@(OldKnownILCompilerPack ->'%(ILCompilerRuntimeIdentifiers)')"
-              Condition="@(ILCompilerReference->'%(Version)')!=''"/>
-    </ItemGroup>
-  </Target>
+  <ItemGroup>
+    <KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler" Condition="@(PackageReference->'%(Identity)')=='Microsoft.DotNet.ILCompiler'">
+        <ILCompilerPackVersion> @(PackageReference->'%(Version)')</ILCompilerPackVersion>
+    </KnownILCompilerPack>
+  </ItemGroup>
 
   <!-- Locate the runtime package according to the current target runtime -->
   <Target Name="ImportRuntimeIlcPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' and '$(PublishAot)' == 'true' and $(IlcCalledViaPackage) == 'true'" DependsOnTargets="$(ImportRuntimeIlcPackageTargetDependsOn)" BeforeTargets="Publish">
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props
index c2f2f45bce605..da6b72b12d7ce 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props
@@ -11,6 +11,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 -->
 <Project>
   <PropertyGroup>
+    <!-- Set the publishAot property to true if not set-->
+    <PublishAot Condition="'$(PublishAot)' == ''">true</PublishAot>
     <!-- N.B. The ILCompilerTargetsPath is used as a sentinel to indicate a version of this file has already been imported. It will also be the path
          used to import the targets later in the SDK. -->
     <ILCompilerTargetsPath>$(MSBuildThisFileDirectory)Microsoft.DotNet.ILCompiler.SingleEntry.targets</ILCompilerTargetsPath>

From 2a07fcca1a5e2e177a2f2a4781c81f0c5d92ce04 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Tue, 9 Aug 2022 10:46:18 -0700
Subject: [PATCH 15/25] Fix nativeaot test take 2

---
 .../Microsoft.DotNet.ILCompiler.SingleEntry.targets            | 3 ++-
 .../BuildIntegration/Microsoft.NETCore.Native.targets          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
index 1bf95747a4ff1..1e3d21b1b4629 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
@@ -37,6 +37,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <!-- If called via package instead of the SDK, Update the runtime package version to match the build package-->
     <KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler" Condition="@(PackageReference->'%(Identity)')=='Microsoft.DotNet.ILCompiler'">
         <ILCompilerPackVersion> @(PackageReference->'%(Version)')</ILCompilerPackVersion>
     </KnownILCompilerPack>
@@ -54,6 +55,6 @@
 
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets" Condition="'$(TestNativeAot)' != 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets"/>
 
 </Project>
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
index 5ded3960f2795..f72d8df511d0c 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -245,7 +245,7 @@ The .NET Foundation licenses this file to you under the MIT license.
       <IlcArg Include="@(_IlcConditionallyRootedAssemblies->'--conditionalroot:%(Identity)')" />
       <IlcArg Include="@(_IlcTrimmedAssemblies->'--trim:%(Identity)')" />
       <IlcArg Include="@(_IlcNoSingleWarnAssemblies->'--nosinglewarnassembly:%(Filename)')" />
-      <IlcArg Condition="'$(TrimmerDefaultAction)' == 'copyused' or '$(TrimmerDefaultAction)' == 'copy' or '$(TrimMode)' == 'partial'" Include="--defaultrooting" />
+      <IlcArg Condition="'$(TrimmerDefaultAction)' == 'copyused' or '$(TrimmerDefaultAction)' == 'copy' or '$(TrimMode)' == 'partial' or ('$(TestNativeAot)' == 'true' and '$(TrimMode)' == 'full')" Include="--defaultrooting" />
       <IlcArg Include="--resilient" />
 
       <IlcArg Condition="$(IlcDisableReflection) == 'true'" Include="--feature:System.Reflection.IsReflectionExecutionAvailable=false" />

From 8038c58321a3015a0cd47f6b9e2e1f64de4403f3 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Tue, 9 Aug 2022 17:04:08 -0700
Subject: [PATCH 16/25] disabling a failing test

---
 src/libraries/tests.proj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index d1a1ffe538402..4c46de7b03068 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -419,6 +419,8 @@
 
     <!-- https://github.com/dotnet/runtime/issues/72908 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.MetadataLoadContext\tests\System.Reflection.MetadataLoadContext.Tests.csproj" />
+    <!-- Temp working around an issue that does not locally repro with PR https://github.com/dotnet/runtime/pull/73416 -->
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.Metadata\tests\System.Reflection.Metadata.Tests.csproj" />
 
     <!-- Test needs to copy .so file: https://github.com/dotnet/runtime/issues/72987 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.Ports\tests\System.IO.Ports.Tests.csproj"

From 45c21cb49a0900854a88a92b2fab4fd97cf5cd6a Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Wed, 10 Aug 2022 12:00:14 -0700
Subject: [PATCH 17/25] Remove TrimMode workaround

---
 .../nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
index f72d8df511d0c..5ded3960f2795 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -245,7 +245,7 @@ The .NET Foundation licenses this file to you under the MIT license.
       <IlcArg Include="@(_IlcConditionallyRootedAssemblies->'--conditionalroot:%(Identity)')" />
       <IlcArg Include="@(_IlcTrimmedAssemblies->'--trim:%(Identity)')" />
       <IlcArg Include="@(_IlcNoSingleWarnAssemblies->'--nosinglewarnassembly:%(Filename)')" />
-      <IlcArg Condition="'$(TrimmerDefaultAction)' == 'copyused' or '$(TrimmerDefaultAction)' == 'copy' or '$(TrimMode)' == 'partial' or ('$(TestNativeAot)' == 'true' and '$(TrimMode)' == 'full')" Include="--defaultrooting" />
+      <IlcArg Condition="'$(TrimmerDefaultAction)' == 'copyused' or '$(TrimmerDefaultAction)' == 'copy' or '$(TrimMode)' == 'partial'" Include="--defaultrooting" />
       <IlcArg Include="--resilient" />
 
       <IlcArg Condition="$(IlcDisableReflection) == 'true'" Include="--feature:System.Reflection.IsReflectionExecutionAvailable=false" />

From 590741636de5d55f7b65a472daa09f01335fa3a8 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Thu, 11 Aug 2022 10:57:21 -0700
Subject: [PATCH 18/25] work around a test issue

---
 src/libraries/tests.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 4c46de7b03068..e32f24d1c97f8 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -421,6 +421,7 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.MetadataLoadContext\tests\System.Reflection.MetadataLoadContext.Tests.csproj" />
     <!-- Temp working around an issue that does not locally repro with PR https://github.com/dotnet/runtime/pull/73416 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.Metadata\tests\System.Reflection.Metadata.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Resources.ResourceManager\tests\System.Resources.ResourceManager.Tests.csproj" />
 
     <!-- Test needs to copy .so file: https://github.com/dotnet/runtime/issues/72987 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.Ports\tests\System.IO.Ports.Tests.csproj"

From b12795b6dca949af4a30bf69afb4a83ffa2c5a9a Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Thu, 11 Aug 2022 14:47:31 -0700
Subject: [PATCH 19/25] Update
 src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets

Co-authored-by: Sven Boemer <sbomer@gmail.com>
---
 .../Microsoft.DotNet.ILCompiler.SingleEntry.targets             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
index 1e3d21b1b4629..e9381c6f13da2 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
@@ -37,7 +37,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- If called via package instead of the SDK, Update the runtime package version to match the build package-->
+    <!-- If called via package instead of the SDK, update the runtime package version to match the build package -->
     <KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler" Condition="@(PackageReference->'%(Identity)')=='Microsoft.DotNet.ILCompiler'">
         <ILCompilerPackVersion> @(PackageReference->'%(Version)')</ILCompilerPackVersion>
     </KnownILCompilerPack>

From 80cedc4bc18b85ee70d48e4df1919e3b70611f1d Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Thu, 11 Aug 2022 14:47:40 -0700
Subject: [PATCH 20/25] Update
 src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets

Co-authored-by: Sven Boemer <sbomer@gmail.com>
---
 .../Microsoft.DotNet.ILCompiler.SingleEntry.targets             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
index e9381c6f13da2..933f60491db76 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
@@ -55,6 +55,6 @@
 
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets"/>
+  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets" />
 
 </Project>

From 80faf9474e1fca5fa8d18eff36671e7c2d1bb014 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Fri, 12 Aug 2022 11:36:39 -0700
Subject: [PATCH 21/25] update the version check for package

---
 .../Microsoft.DotNet.ILCompiler.SingleEntry.targets         | 6 ++++--
 src/libraries/tests.proj                                    | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
index 933f60491db76..cd51cc9511f99 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
@@ -38,8 +38,10 @@
 
   <ItemGroup>
     <!-- If called via package instead of the SDK, update the runtime package version to match the build package -->
-    <KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler" Condition="@(PackageReference->'%(Identity)')=='Microsoft.DotNet.ILCompiler'">
-        <ILCompilerPackVersion> @(PackageReference->'%(Version)')</ILCompilerPackVersion>
+    <_PackageReferenceExceptILCompiler Include="@(PackageReference)" Exclude="Microsoft.DotNet.ILCompiler" />
+    <_ILCompilerPackageReference Include="@(PackageReference)" Exclude="@(_PackageReferenceExceptILCompiler)" />
+    <KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler" Condition="@(_ILCompilerPackageReference->'%(Identity)')=='Microsoft.DotNet.ILCompiler'">
+        <ILCompilerPackVersion>@(_ILCompilerPackageReference->'%(Version)')</ILCompilerPackVersion>
     </KnownILCompilerPack>
   </ItemGroup>
 
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index e32f24d1c97f8..886a771ed483a 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -422,6 +422,8 @@
     <!-- Temp working around an issue that does not locally repro with PR https://github.com/dotnet/runtime/pull/73416 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.Metadata\tests\System.Reflection.Metadata.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Resources.ResourceManager\tests\System.Resources.ResourceManager.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.Csp\tests\System.Security.Cryptography.Csp.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Transactions.Local\tests\System.Transactions.Local.Tests.csproj" />
 
     <!-- Test needs to copy .so file: https://github.com/dotnet/runtime/issues/72987 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.Ports\tests\System.IO.Ports.Tests.csproj"
@@ -511,6 +513,7 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Composition.TypedParts\tests\System.Composition.TypedParts.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Configuration.ConfigurationManager\tests\System.Configuration.ConfigurationManager.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Data.Common\tests\System.Data.Common.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.TraceSource\tests\System.Diagnostics.TraceSource.Config.Tests\System.Diagnostics.TraceSource.Config.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Data.DataSetExtensions\tests\System.Data.DataSetExtensions.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.DiagnosticSource\tests\TestWithConfigSwitches\System.Diagnostics.DiagnosticSource.Switches.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.StackTrace\tests\System.Diagnostics.StackTrace.Tests.csproj" />

From 141c61fdb14f88975a45f0b290be6fb35b58c6fc Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Sun, 14 Aug 2022 07:00:38 -0700
Subject: [PATCH 22/25] Cross target support, requires changes from SDK

---
 .../Microsoft.DotNet.ILCompiler.SingleEntry.targets        | 6 +++---
 .../BuildIntegration/Microsoft.NETCore.Native.targets      | 2 +-
 src/libraries/tests.proj                                   | 7 +------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
index cd51cc9511f99..f67b7bb7292cc 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
@@ -50,9 +50,9 @@
     <Error Condition="'@(ResolvedILCompilerPack)' == ''" Text="The ResolvedILCompilerPack ItemGroup is required for target ImportRuntimeIlcPackageTarget" />
 
     <PropertyGroup>
-      <RuntimePackagePath>@(ResolvedILCompilerPack->'%(PackageDirectory)')</RuntimePackagePath>
-      <IlcHostPackagePath>@(ResolvedILCompilerPack->'%(PackageDirectory)')</IlcHostPackagePath>
-      <IlcPath>>@(ResolvedILCompilerPack->'%(PackageDirectory)')</IlcPath>
+      <IlcHostPackagePath Condition="'@(ResolvedILCompilerPack)' == '$(IlcHostPackageName)'">@(ResolvedILCompilerPack->'%(PackageDirectory)')</IlcHostPackagePath>
+      <RuntimePackagePath Condition="'@(ResolvedILCompilerPack2)' == '$(RuntimeIlcPackageName)'">@(ResolvedILCompilerPack2->'%(PackageDirectory)')</RuntimePackagePath>
+      <RuntimePackagePath Condition="'@(ResolvedILCompilerPack2)' != '$(RuntimeIlcPackageName)'">@(ResolvedILCompilerPack->'%(PackageDirectory)')</RuntimePackagePath>
     </PropertyGroup>
 
   </Target>
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
index f72d8df511d0c..5ded3960f2795 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -245,7 +245,7 @@ The .NET Foundation licenses this file to you under the MIT license.
       <IlcArg Include="@(_IlcConditionallyRootedAssemblies->'--conditionalroot:%(Identity)')" />
       <IlcArg Include="@(_IlcTrimmedAssemblies->'--trim:%(Identity)')" />
       <IlcArg Include="@(_IlcNoSingleWarnAssemblies->'--nosinglewarnassembly:%(Filename)')" />
-      <IlcArg Condition="'$(TrimmerDefaultAction)' == 'copyused' or '$(TrimmerDefaultAction)' == 'copy' or '$(TrimMode)' == 'partial' or ('$(TestNativeAot)' == 'true' and '$(TrimMode)' == 'full')" Include="--defaultrooting" />
+      <IlcArg Condition="'$(TrimmerDefaultAction)' == 'copyused' or '$(TrimmerDefaultAction)' == 'copy' or '$(TrimMode)' == 'partial'" Include="--defaultrooting" />
       <IlcArg Include="--resilient" />
 
       <IlcArg Condition="$(IlcDisableReflection) == 'true'" Include="--feature:System.Reflection.IsReflectionExecutionAvailable=false" />
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 886a771ed483a..8a6705fab817b 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -419,12 +419,7 @@
 
     <!-- https://github.com/dotnet/runtime/issues/72908 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.MetadataLoadContext\tests\System.Reflection.MetadataLoadContext.Tests.csproj" />
-    <!-- Temp working around an issue that does not locally repro with PR https://github.com/dotnet/runtime/pull/73416 -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.Metadata\tests\System.Reflection.Metadata.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Resources.ResourceManager\tests\System.Resources.ResourceManager.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.Csp\tests\System.Security.Cryptography.Csp.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Transactions.Local\tests\System.Transactions.Local.Tests.csproj" />
-
+    
     <!-- Test needs to copy .so file: https://github.com/dotnet/runtime/issues/72987 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.Ports\tests\System.IO.Ports.Tests.csproj"
                       Condition="'$(TargetOS)' != 'windows'" />

From de74e2bab3cd7ff528172e500e7422513bce8ae9 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Mon, 15 Aug 2022 07:50:44 -0700
Subject: [PATCH 23/25] Change ResolvedTargetILCompilerPack to match SDK
 changes

---
 .../Microsoft.DotNet.ILCompiler.SingleEntry.targets           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
index f67b7bb7292cc..b7dd29c14191d 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
@@ -51,8 +51,8 @@
 
     <PropertyGroup>
       <IlcHostPackagePath Condition="'@(ResolvedILCompilerPack)' == '$(IlcHostPackageName)'">@(ResolvedILCompilerPack->'%(PackageDirectory)')</IlcHostPackagePath>
-      <RuntimePackagePath Condition="'@(ResolvedILCompilerPack2)' == '$(RuntimeIlcPackageName)'">@(ResolvedILCompilerPack2->'%(PackageDirectory)')</RuntimePackagePath>
-      <RuntimePackagePath Condition="'@(ResolvedILCompilerPack2)' != '$(RuntimeIlcPackageName)'">@(ResolvedILCompilerPack->'%(PackageDirectory)')</RuntimePackagePath>
+      <RuntimePackagePath Condition="'@(ResolvedTargetILCompilerPack)' == '$(RuntimeIlcPackageName)'">@(ResolvedTargetILCompilerPack->'%(PackageDirectory)')</RuntimePackagePath>
+      <RuntimePackagePath Condition="'@(ResolvedTargetILCompilerPack)' != '$(RuntimeIlcPackageName)'">@(ResolvedILCompilerPack->'%(PackageDirectory)')</RuntimePackagePath>
     </PropertyGroup>
 
   </Target>

From 62ce9bde1d3b65eda7c35bf68118218c7b6fe863 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Mon, 15 Aug 2022 11:20:45 -0700
Subject: [PATCH 24/25] FB

---
 .../Microsoft.DotNet.ILCompiler.SingleEntry.targets             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
index b7dd29c14191d..0018c70f98779 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
@@ -52,7 +52,7 @@
     <PropertyGroup>
       <IlcHostPackagePath Condition="'@(ResolvedILCompilerPack)' == '$(IlcHostPackageName)'">@(ResolvedILCompilerPack->'%(PackageDirectory)')</IlcHostPackagePath>
       <RuntimePackagePath Condition="'@(ResolvedTargetILCompilerPack)' == '$(RuntimeIlcPackageName)'">@(ResolvedTargetILCompilerPack->'%(PackageDirectory)')</RuntimePackagePath>
-      <RuntimePackagePath Condition="'@(ResolvedTargetILCompilerPack)' != '$(RuntimeIlcPackageName)'">@(ResolvedILCompilerPack->'%(PackageDirectory)')</RuntimePackagePath>
+      <RuntimePackagePath Condition="'@(ResolvedTargetILCompilerPack)' == ''">@(ResolvedILCompilerPack->'%(PackageDirectory)')</RuntimePackagePath>
     </PropertyGroup>
 
   </Target>

From ff574f8a03dbf7ecbe30cdbad782422a88ba0e98 Mon Sep 17 00:00:00 2001
From: Lakshan Fernando <lakshanf@hotmail.com>
Date: Mon, 15 Aug 2022 12:08:07 -0700
Subject: [PATCH 25/25] Trigger Build to fix interop break