Use ILCompilerTargetsPath instead of AfterMicrosoftNETSdkTargets for ILC import

Replace the AfterMicrosoftNETSdkTargets hook with the SDK's ILCompilerTargetsPath
extension point to import ILC targets in the correct order (before ILLink),
fixing the DynamicCodeSupport property evaluation error. Gate
IlcSetupPropertiesDependsOn on _IlcReferencedAsPackage to skip NuGet package
resolution when using live ILC targets.

Author: sbomer

eng/testing/tests.singlefile.targets

@@ -30,11 +30,11 @@
     <TrimmerSingleWarn>false</TrimmerSingleWarn>
     <StackTraceLineNumberSupport>true</StackTraceLineNumberSupport>
 
-    <!-- NativeAOT always enables trimming. Set this early so liveILLink.targets
-         computes _RequiresLiveILLink=true and loads ILLink targets that define
-         _PrepareTrimConfiguration. Previously set by the directly-imported
-         Microsoft.NETCore.Native.targets, now deferred via AfterMicrosoftNETSdkTargets. -->
-    <PublishTrimmed>true</PublishTrimmed>
+    <!-- Use the SDK's ILCompilerTargetsPath hook to import ILC targets in the correct order
+         (before ILLink), matching how the shipping SDK imports them. -->
+    <PublishAot>true</PublishAot>
+    <_IlcReferencedAsPackage>false</_IlcReferencedAsPackage>
+    <ILCompilerTargetsPath>$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets</ILCompilerTargetsPath>
 
     <!-- Forced by ILLink targets -->
     <SelfContained>true</SelfContained>
@@ -48,14 +48,6 @@
     <DefineConstants>$(DefineConstants);TEST_READY_TO_RUN_COMPILED</DefineConstants>
   </PropertyGroup>
 
-  <!-- Import ILC targets after the SDK targets so that the NativeCompile target redefinition
-       in Microsoft.NETCore.Native.Publish.targets comes AFTER the SDK's empty placeholder
-       in Microsoft.NET.Publish.targets (MSBuild last-definition-wins). This mirrors how
-       ILLink targets are imported via $(ILLinkTargetsPath) at the end of Microsoft.NET.Sdk.targets. -->
-  <PropertyGroup Condition="'$(TestNativeAot)' == 'true'">
-    <AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets</AfterMicrosoftNETSdkTargets>
-  </PropertyGroup>
-
   <ItemGroup Condition="'$(TestNativeAot)' == 'true'">
     <RdXmlFile Include="$(MSBuildThisFileDirectory)default.rd.xml" />
     <TrimmerRootAssembly Include="TestUtilities" Condition="'$(SkipTestUtilitiesReference)' != 'true'" />

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets

@@ -42,7 +42,7 @@
   <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>
+    <IlcSetupPropertiesDependsOn Condition="'$(_IlcReferencedAsPackage)' != 'false'">ImportRuntimeIlcPackageTarget</IlcSetupPropertiesDependsOn>
     <IlcDynamicBuildPropertyDependencies>SetupProperties</IlcDynamicBuildPropertyDependencies>
   </PropertyGroup>
 

src/tests/Directory.Build.targets

@@ -544,11 +544,11 @@
 
     <IlcTreatWarningsAsErrors>false</IlcTreatWarningsAsErrors>
 
-    <!-- NativeAOT always enables trimming. Set this early so liveILLink.targets (imported below)
-         computes _RequiresLiveILLink=true and loads the ILLink targets that define
-         _PrepareTrimConfiguration. Previously this was set by Microsoft.NETCore.Native.targets
-         during direct import, but now that import is deferred via AfterMicrosoftNETSdkTargets. -->
-    <PublishTrimmed>true</PublishTrimmed>
+    <!-- Use the SDK's ILCompilerTargetsPath hook to import ILC targets in the correct order
+         (before ILLink), matching how the shipping SDK imports them. -->
+    <PublishAot>true</PublishAot>
+    <_IlcReferencedAsPackage>false</_IlcReferencedAsPackage>
+    <ILCompilerTargetsPath>$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets</ILCompilerTargetsPath>
 
     <IlcToolsPath>$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
     <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
@@ -581,12 +581,6 @@
 
   <Import Project="$(RepositoryEngineeringDir)nativeSanitizers.targets" Condition="'$(TestBuildMode)' == 'nativeaot'" />
 
-  <!-- Import ILC targets after the SDK targets so that the NativeCompile target redefinition
-       in Microsoft.NETCore.Native.Publish.targets comes AFTER the SDK's empty placeholder
-       in Microsoft.NET.Publish.targets (MSBuild last-definition-wins). -->
-  <PropertyGroup Condition="'$(TestBuildMode)' == 'nativeaot'">
-    <AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets</AfterMicrosoftNETSdkTargets>
-  </PropertyGroup>
   <Import Project="$(RepoRoot)eng/liveILLink.targets" />
 
   <ItemGroup Condition="'$(TestBuildMode)' == 'nativeaot'">