Skip to content
Merged
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions dotnet/targets/Microsoft.Sdk.R2R.targets
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
Condition="'%(_ResolvedAssembliesToPublish.NuGetPackageId)' != ''" />
<_UserAssemblies Include="@(_ResolvedAssembliesToPublish)" Exclude="@(_NonUserAssemblies)" />
<PublishReadyToRunExclude Include="@(_UserAssemblies -> '%(Filename)%(Extension)')" />
<PublishReadyToRunCompositeRoots Condition="$(RuntimeIdentifier.EndsWith('-arm64'))" Include="System.Private.CoreLib.dll" KeepDuplicates="false" />
Comment thread
rolfbjarne marked this conversation as resolved.
</ItemGroup>

<!-- Hash the R2R input assemblies so we can detect when the set actually changes -->
Expand Down Expand Up @@ -119,6 +120,14 @@
Condition="Exists('%(_ReadyToRunCompileList.OutputR2RImage)')" />
</Target>

<Target Name="_DedupUnrootedReadyToRunPublish"
Condition="@(PublishReadyToRunCompositeRoots->Count()) != 0"
Comment thread
rolfbjarne marked this conversation as resolved.
AfterTargets="_PrepareForReadyToRunCompilation">
<ItemGroup>
<ResolvedFileToPublish Remove="@(_ReadyToRunCompositeUnrootedBuildInput)" />
</ItemGroup>
</Target>

<!--
The following section creates either a .dylib or a .framework for each
ReadyToRun output (which is an object file that must be linked into a dynamic library).
Expand Down
Loading