[main] Update dependencies from dotnet/dotnet#10873
Open
dotnet-maestro[bot] wants to merge 7 commits intomainfrom
Open
[main] Update dependencies from dotnet/dotnet#10873dotnet-maestro[bot] wants to merge 7 commits intomainfrom
dotnet-maestro[bot] wants to merge 7 commits intomainfrom
Conversation
…301.4 On relative base path root Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.3 From Version 11.0.100-preview.3.26124.102 -> To Version 11.0.0-preview.3.26151.104 Microsoft.DotNet.Build.Tasks.Feed From Version 11.0.0-beta.26124.102 -> To Version 11.0.0-beta.26151.104 Microsoft.DotNet.Cecil From Version 0.11.5-preview.26124.102 -> To Version 0.11.5-preview.26151.104 Microsoft.NET.ILLink , Microsoft.NETCore.App.Ref From Version 11.0.0-preview.3.26124.102 -> To Version 11.0.0-preview.3.26151.104 Microsoft.NET.Sdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.3 , Microsoft.TemplateEngine.Authoring.Tasks From Version 11.0.100-preview.3.26124.102 -> To Version 11.0.100-preview.3.26151.104
dotnet-maestro
bot
requested review from
grendello,
jonathanpeppers and
simonrozsival
as code owners
In .NET 11, the SDK's ILLink target now populates ResolvedFileToPublish with linked assemblies (via _LinkedResolvedFileToPublish) WITHOUT RuntimeIdentifier metadata. Our _AndroidComputeIlcCompileInputs target adds the same items WITH RuntimeIdentifier, but the ->Distinct() call in _PrepareNativeAotAndroidAppInputs keeps the first occurrence — the one from ILLink without the metadata. The _ComputeFilesToPublishForRuntimeIdentifiers fixup (which stamps RuntimeIdentifier on items that lack it) cannot help here because it runs in its target body, after all DependsOnTargets complete — but the error occurs inside the NativeCompile dependency chain, before the fixup runs. Fix: add an Update operation on _PrivateAndroidNaotResolvedAssemblyFiles that stamps RuntimeIdentifier on any items missing it, matching the pattern already used in _ComputeFilesToPublishForRuntimeIdentifiers. Fixes: XAGNALLAS7009
jonathanpeppers
added
the
copilot
In .NET 11, the SDK's ILLink target now populates ResolvedFileToPublish with linked assemblies via _LinkedResolvedFileToPublish. Our _AndroidComputeIlcCompileInputs target then adds the same assemblies again, creating duplicates. These duplicates flow to the outer build's ProcessAssemblies task (which doesn't deduplicate), then to GetPerArchAssemblies which throws a duplicate key exception for the same assembly name within an architecture. Fix by removing any ILLink-added items from ResolvedFileToPublish before re-adding them with explicit RuntimeIdentifier metadata. This is backwards compatible - on older SDKs the Remove is a no-op.
In .NET 11+, dotnet/runtime PR #111514 changed NativeAOT's ComputeLinkedFilesToPublish to run AfterTargets (instead of BeforeTargets) on ComputeResolvedFilesToPublishList and added _ComputeAssembliesToPostprocessOnPublish which does a Remove+Add cycle on ResolvedFileToPublish to stamp PostprocessAssembly metadata. Combined with ILLink's and Android's own Remove+Add cycles, this leaves duplicate .dll items in ResolvedFileToPublish within the inner build. When the outer build collects items from both RIDs, duplicates within the same RID cause GetPerArchAssemblies to throw: error XAAMP7004: An item with the same key has already been added. Key: Java.Interop Fix by adding a RemoveDuplicates step in _ComputeFilesToPublishForRuntimeIdentifiers (the inner build's return point to the outer build), gated to NativeAOT only. This catches duplicates regardless of which upstream target created them. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The RemoveDuplicates step in _ComputeFilesToPublishForRuntimeIdentifiers already catches all duplicates in ResolvedFileToPublish, and lines 44-48 of that same target already stamp RuntimeIdentifier on items that lack it. The Remove before Include here is no longer needed. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request updates the following dependencies
From https://github.com/dotnet/dotnet