diff --git a/eng/testing/tests.singlefile.targets b/eng/testing/tests.singlefile.targets
index 86a8b98d545f8..1149c35511ca9 100644
--- a/eng/testing/tests.singlefile.targets
+++ b/eng/testing/tests.singlefile.targets
@@ -70,7 +70,7 @@
-
+
diff --git a/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj b/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj
index d3ef3ec15cdbb..6469964c0170a 100644
--- a/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj
+++ b/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj
@@ -10,7 +10,7 @@
true
-
+
+
-
- true
- $(MSBuildThisFileDirectory)Microsoft.DotNet.ILCompiler.SingleEntry.targets
+ $(MSBuildThisFileDirectory)Microsoft.DotNet.ILCompiler.targets
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
similarity index 59%
rename from src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
rename to src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
index 0018c70f98779..d08cc8241da6a 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
@@ -1,6 +1,7 @@
+
win
osx
@@ -25,34 +26,38 @@
$(OSHostArch)
runtime.$(OSIdentifier)-$(IlcHostArch).Microsoft.DotNet.ILCompiler
-
true
+
+
RunResolvePackageDependencies
ImportRuntimeIlcPackageTarget
SetupProperties
-
-
-
- <_PackageReferenceExceptILCompiler Include="@(PackageReference)" Exclude="Microsoft.DotNet.ILCompiler" />
- <_ILCompilerPackageReference Include="@(PackageReference)" Exclude="@(_PackageReferenceExceptILCompiler)" />
-
- @(_ILCompilerPackageReference->'%(Version)')
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+ @(ResolvedILCompilerPack->'%(PackageDirectory)')
+ @(ResolvedILCompilerPack->'%(PackageDirectory)')
+ >@(ResolvedILCompilerPack->'%(PackageDirectory)')
+
-
- @(ResolvedILCompilerPack->'%(PackageDirectory)')
- @(ResolvedTargetILCompilerPack->'%(PackageDirectory)')
- @(ResolvedILCompilerPack->'%(PackageDirectory)')
+
+
+ %(PackageDefinitions.ResolvedPath)
+ %(PackageDefinitions.ResolvedPath)
diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 8696352abc03e..42f192a3f123f 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -42,7 +42,7 @@
-
-
+