Skip to content

[main] Update dependencies from dotnet/dotnet #10873

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
jonathanpeppers merged 7 commits into from
Mar 5, 2026
Merged

[main] Update dependencies from dotnet/dotnet #10873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3672114
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Mar 2, 2026
8f19b7c
Merge branch 'main' into darc-main-2b39dd91-77e1-464a-b705-d70468416845
jonathanpeppers Mar 2, 2026
ffaa9d6
[NativeAOT] fix missing RuntimeIdentifier metadata on linked assemblies
jonathanpeppers Mar 2, 2026
d5aefea
Fix duplicate assembly key error (XAAMP7004) in NativeAOT builds
jonathanpeppers Mar 2, 2026
e302308
Merge branch 'main' into darc-main-2b39dd91-77e1-464a-b705-d70468416845
jonathanpeppers Mar 4, 2026
11f7fa3
Fix NativeAOT duplicate assembly crash in outer build
jonathanpeppers Mar 4, 2026
3a2678c
Remove redundant Remove+Add dedup in _AndroidComputeIlcCompileInputs
jonathanpeppers Mar 5, 2026
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
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.3.26124.102">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.3.26151.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.3.26124.102">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.3.26151.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.3.26124.102">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.3.26151.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26124.102">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26151.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-11.0.100-preview.3" Version="11.0.100-preview.3.26124.102">
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.3" Version="11.0.0-preview.3.26151.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.3" Version="11.0.100-preview.3.26124.102">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.3" Version="11.0.100-preview.3.26151.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
</Dependency>
<!-- Previous .NET version -->
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-9.0.100" Version="9.0.12">
Expand All @@ -36,13 +36,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26124.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26151.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.3.26124.102">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.3.26151.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9</Sha>
<Sha>a66d14e1fcfc6474837f9c951759d049c380bc59</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
16 changes: 8 additions & 8 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.3.26124.102</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.3.26151.104</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.3.26124.102</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.3.26124.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.3.26151.104</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.3.26151.104</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<!-- Last version built for net10.0, needed for CI steps that only have the .NET 10 SDK installed (e.g., BAR manifest publishing) -->
<MicrosoftDotNetBuildTasksFeedPackageVersionNet10>11.0.0-beta.26060.102</MicrosoftDotNetBuildTasksFeedPackageVersionNet10>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26124.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview3PackageVersion>11.0.100-preview.3.26124.102</MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview3PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>11.0.100-preview.3.26124.102</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26151.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>11.0.0-preview.3.26151.104</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>11.0.100-preview.3.26151.104</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.3.26124.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26124.102</MicrosoftDotNetCecilPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.3.26151.104</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26151.104</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
<SystemReflectionMetadataPackageVersion>11.0.0-preview.1.26104.118</SystemReflectionMetadataPackageVersion>
<!-- Previous .NET Android version -->
Expand Down
10 changes: 10 additions & 0 deletions ...uild.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ _ResolveAssemblies MSBuild target.
RuntimeIdentifier="$(RuntimeIdentifier)"
/>
</ItemGroup>
<!-- In .NET 11+, multiple targets (ILLink, NativeAOT runtime, Android) may independently
add the same assembly to ResolvedFileToPublish. Deduplicate before returning to the
outer build, which does not use Distinct() since items from different RIDs must be kept. -->
<RemoveDuplicates Condition=" '$(_AndroidRuntime)' == 'NativeAOT' " Inputs="@(ResolvedFileToPublish)">
<Output TaskParameter="Filtered" ItemName="_DeduplicatedResolvedFileToPublish" />
</RemoveDuplicates>
<ItemGroup Condition=" '$(_AndroidRuntime)' == 'NativeAOT' ">
<ResolvedFileToPublish Remove="@(ResolvedFileToPublish)" />
<ResolvedFileToPublish Include="@(_DeduplicatedResolvedFileToPublish)" />
</ItemGroup>
<AndroidWarning
Code="XA1024"
ResourceName="XA1024"
Expand Down
9 changes: 9 additions & 0 deletions ...Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.NativeAOT.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,15 @@ This file contains the NativeAOT-specific MSBuild logic for .NET for Android.
</_PrivateEnvironmentNativeObjectFile>

<_PrivateAndroidNaotResolvedAssemblyFiles Include="@(ResolvedFileToPublish->Distinct())" Condition=" '%(ResolvedFileToPublish.Extension)' == '.dll' " />
<!-- In .NET 11+, the SDK's ILLink target populates ResolvedFileToPublish with linked assemblies
(via _LinkedResolvedFileToPublish) WITHOUT RuntimeIdentifier metadata. _AndroidComputeIlcCompileInputs
adds the same items WITH RuntimeIdentifier, but ->Distinct() keeps the first occurrence (without metadata).
Stamp RuntimeIdentifier on any items that lack it, since we're in the inner build with a single RID. -->
<_PrivateAndroidNaotResolvedAssemblyFiles
Update="@(_PrivateAndroidNaotResolvedAssemblyFiles)"
Condition=" '%(_PrivateAndroidNaotResolvedAssemblyFiles.RuntimeIdentifier)' == '' "
RuntimeIdentifier="$(RuntimeIdentifier)"
/>
</ItemGroup>
</Target>

Expand Down
Loading