diff --git a/eng/testing/tests.singlefile.targets b/eng/testing/tests.singlefile.targets index 6a50cbbfbf55a8..1a992b1b7e10d3 100644 --- a/eng/testing/tests.singlefile.targets +++ b/eng/testing/tests.singlefile.targets @@ -30,6 +30,12 @@ false true + + true + <_IlcReferencedAsPackage>false + $(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets + true @@ -42,8 +48,6 @@ $(DefineConstants);TEST_READY_TO_RUN_COMPILED - - diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets index cf313984696b5f..62cb2d8f7aadc4 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets @@ -42,7 +42,7 @@ RunResolvePackageDependencies - ImportRuntimeIlcPackageTarget + ImportRuntimeIlcPackageTarget SetupProperties @@ -62,7 +62,7 @@ - + diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets index 1776c7bf1d4ed5..255dd63ef53ed9 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets @@ -14,13 +14,21 @@ - @@ -60,6 +68,10 @@ + + + - + <_NETCoreAppFrameworkReference Include="@(ResolvedFrameworkReference)" Condition="'%(ResolvedFrameworkReference.RuntimePackName)' == 'Microsoft.NETCore.App.Runtime.NativeAOT.$(RuntimeIdentifier)'" /> @@ -156,7 +156,7 @@ The .NET Foundation licenses this file to you under the MIT license. - + diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index df43d981422b54..b6dce9ef455492 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -143,6 +143,7 @@ false false false + false false true Test diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets index bd7093beb18339..c9a5138af52d8a 100644 --- a/src/tests/Directory.Build.targets +++ b/src/tests/Directory.Build.targets @@ -544,6 +544,12 @@ false + + true + <_IlcReferencedAsPackage>false + $(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets + $(CoreCLRCrossILCompilerDir) $(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll $(CoreCLRAotSdkDir) @@ -575,7 +581,6 @@ -