Skip to content

Have NativeAOT test execution project include SDK #62927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichalStrehovsky merged 2 commits into from
Dec 18, 2021
Merged

Have NativeAOT test execution project include SDK #62927

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
555a38c
Have NativeAOT test execution project include SDK
MichalStrehovsky Dec 16, 2021
59f992a
Update CLRTest.NativeAot.targets
MichalStrehovsky Dec 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/tests/Common/CLRTest.NativeAot.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,22 +139,26 @@ if defined RunNativeAot (
Outputs="$(OutputPath)\nativebuild.proj"
BeforeTargets="Build">
<PropertyGroup>
<_RootEntryAssemblyLine Condition="$(CLRTestFullTrimming) != 'true'">&lt;TrimmerDefaultAction&gt;copyused&lt;/TrimmerDefaultAction&gt;</_RootEntryAssemblyLine>
<_RootEntryAssemblyLine Condition="$(CLRTestFullTrimming) == 'true'">&lt;TrimmerDefaultAction&gt;link&lt;/TrimmerDefaultAction&gt;</_RootEntryAssemblyLine>

<_NativeAotBuildProjectFile>
<![CDATA[
<Project DefaultTargets="LinkNative" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="LinkNative">

<PropertyGroup>
<TargetName>$(MSBuildProjectName)</TargetName>
<TargetExt>.dll</TargetExt>
<TargetFramework>$(TargetFramework)</TargetFramework>
<OutputType>Exe</OutputType>
<OutputPath>%24(MSBuildProjectDirectory)\</OutputPath>
<IntermediateOutputPath>%24(MSBuildProjectDirectory)\</IntermediateOutputPath>
<TargetArchitecture>$(TargetArchitecture)</TargetArchitecture>
<Optimize>$(Optimize)</Optimize>
<DebugSymbols>true</DebugSymbols>
<NETCoreSdkVersion>$(NETCoreSdkVersion)</NETCoreSdkVersion>
<SkipResolvePackageAssets>true</SkipResolvePackageAssets>
<SelfContained>true</SelfContained>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
$(_RootEntryAssemblyLine)
</PropertyGroup>

Expand All @@ -169,9 +173,9 @@ if defined RunNativeAot (
</ItemGroup>

<!-- We don't do anything in the Compile step since the test is already compiled to IL - the AOT compiler hooks up after this -->
<Target Name="Compile" />
<Target Name="CoreCompile" />

<Target Name="PrepareForILLink" />
<Target Name="CreateManifestResourceNames" />

<Import Project="%24(IlcPath)\build\Microsoft.NETCore.Native.targets" />

Expand Down