Skip to content

Make NativeAOT tests buildable again. #35558

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
cincuranet merged 2 commits into from
Feb 3, 2025
Merged

Make NativeAOT tests buildable again. #35558

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25c8fdb
Make NativeAOT tests buildable again.
cincuranet Jan 15, 2025
a08c6c4
Feedback.
cincuranet Feb 3, 2025
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
2 changes: 2 additions & 0 deletions eng/testing/linker/project.csproj.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<OutputType>Exe</OutputType>
<RuntimeIdentifier>{RuntimeIdentifier}</RuntimeIdentifier>
<PublishAot>{PublishAot}</PublishAot>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
<NoWarn>$(NoWarn);NU1903;NU1904</NoWarn>
<_ExtraTrimmerArgs>{ExtraTrimmerArgs} $(_ExtraTrimmerArgs)</_ExtraTrimmerArgs>
{AdditionalProperties}
</PropertyGroup>
Expand Down
18 changes: 15 additions & 3 deletions eng/testing/linker/trimmingTests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,24 @@
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'@(PackageReference)' != ''">
<_packageReferences Include="@(PackageReference)" Exclude="Microsoft.DotNet.ILCompiler;Microsoft.NET.ILLink.Tasks" />
<ItemGroup>
<PackageReferenceWithRealVersionCross Include="@(PackageReference)">
<Identity2>%(PackageVersion.Identity)</Identity2>
<RealVersion>%(PackageVersion.Version)</RealVersion>
</PackageReferenceWithRealVersionCross>
</ItemGroup>
<ItemGroup>
<PackageReferenceWithRealVersion Include="@(PackageReferenceWithRealVersionCross)" KeepMetadata="Version;PrivateAssets" Condition="'%(PackageReferenceWithRealVersionCross.Identity)' == '%(PackageReferenceWithRealVersionCross.Identity2)'">
<Version>%(PackageReferenceWithRealVersionCross.RealVersion)</Version>
</PackageReferenceWithRealVersion>
</ItemGroup>

<ItemGroup Condition="'@(PackageReferenceWithRealVersion)' != ''">
<_packageReferences Include="@(PackageReferenceWithRealVersion)" Exclude="Microsoft.DotNet.ILCompiler;Microsoft.NET.ILLink.Tasks" />
</ItemGroup>

<ItemGroup Condition="'@(_packageReferences)' != ''">
<_additionalPackageReference Include="&lt;PackageReference Include=&quot;%(_packageReferences.Identity)&quot; Version=&quot;%(_packageReferences.Version)&quot; &gt; &#xA; &lt;PrivateAssets&gt;%(_packageReferences.PrivateAssets)&lt;/PrivateAssets&gt;&#xA; &lt;/PackageReference&gt;" />
<_additionalPackageReference Include="&lt;PackageReference Include=&quot;%(_packageReferences.Identity)&quot; Version=&quot;%(_packageReferences.Version)&quot;&gt;&#xA; &lt;PrivateAssets&gt;%(_packageReferences.PrivateAssets)&lt;/PrivateAssets&gt;&#xA; &lt;/PackageReference&gt;" />
</ItemGroup>

<PropertyGroup>
Expand Down
Loading