Skip to content

[main] Update dependencies from dotnet/dotnet #11317

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

Open
dotnet-maestro wants to merge 7 commits into
base: main
Choose a base branch
from
Open

[main] Update dependencies from dotnet/dotnet #11317

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
99e24dd
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 11, 2026
2a4a5eb
Merge branch 'main' into darc-main-2af8e2c5-c30f-4cb4-9f61-c045ed71df20
jonathanpeppers May 11, 2026
d3ec64a
Add System.Private.CoreLib linker descriptor
simonrozsival May 12, 2026
762302b
Limit corelib descriptor to non-Mono runtimes
simonrozsival May 12, 2026
b99b746
Limit corelib descriptor to CoreCLR
simonrozsival May 12, 2026
d8a404f
Disable flaky SharedPreferences test
simonrozsival May 13, 2026
d3cc659
Revert "Disable flaky SharedPreferences test"
simonrozsival May 13, 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
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.5.26251.112">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.5.26258.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3c45e4f3e8b0e9069e8b740c7cfa610075c8ca34</Sha>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.5.26251.112">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.5.26258.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3c45e4f3e8b0e9069e8b740c7cfa610075c8ca34</Sha>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26251.112">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26258.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3c45e4f3e8b0e9069e8b740c7cfa610075c8ca34</Sha>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26251.112">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26258.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3c45e4f3e8b0e9069e8b740c7cfa610075c8ca34</Sha>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-11.0.100-preview.4" Version="11.0.100-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand All @@ -36,13 +36,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26251.112">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26258.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3c45e4f3e8b0e9069e8b740c7cfa610075c8ca34</Sha>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.5.26251.112">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.5.26258.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3c45e4f3e8b0e9069e8b740c7cfa610075c8ca34</Sha>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
</Dependency>
<Dependency Name="MSTest" Version="4.3.0-preview.26257.2">
<Uri>https://github.com/microsoft/testfx</Uri>
Expand Down
12 changes: 6 additions & 6 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.5.26251.112</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.5.26258.110</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.5.26251.112</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.5.26251.112</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.5.26258.110</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.5.26258.110</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.26251.112</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26258.110</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview4PackageVersion>11.0.100-preview.4.26215.121</MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview4PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion>11.0.100-preview.4.26215.121</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion>
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview4PackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.5.26251.112</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26251.112</MicrosoftDotNetCecilPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.5.26258.110</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26258.110</MicrosoftDotNetCecilPackageVersion>
<MSTestPackageVersion>4.3.0-preview.26257.2</MSTestPackageVersion>
<SystemIOHashingPackageVersion>10.0.7</SystemIOHashingPackageVersion>
<SystemReflectionMetadataPackageVersion>11.0.0-preview.1.26104.118</SystemReflectionMetadataPackageVersion>
Expand Down
11 changes: 11 additions & 0 deletions ...amarin.Android.Build.Tasks/Microsoft.Android.Sdk/PreserveLists/System.Private.CoreLib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<linker>
<assembly fullname="System.Private.CoreLib">
<!-- Work around dotnet/runtime#128027 until System.Private.CoreLib ships these descriptor roots. -->
<type fullname="System.StubHelpers.IArrayMarshaler`2" preserve="all" />
<type fullname="System.StubHelpers.IArrayElementMarshaler`2" preserve="all" />
<type fullname="System.StubHelpers.DateMarshaler" preserve="all" />
<type fullname="System.StubHelpers.StructureMarshaler`1" preserve="all" />
<type fullname="System.StubHelpers.BlittableArrayMarshaler`1" preserve="all" />
</assembly>
</linker>
5 changes: 4 additions & 1 deletion ...id.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.LlvmIr.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,10 @@
AfterStep="CleanStep"
Type="Microsoft.Android.Sdk.ILLink.TypeMappingStep"
/>
<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)..\PreserveLists\*.xml" />
<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)..\PreserveLists\*.xml"
Exclude="$(MSBuildThisFileDirectory)..\PreserveLists\System.Private.CoreLib.xml" />
<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)..\PreserveLists\System.Private.CoreLib.xml"
Condition=" '$(_AndroidRuntime)' == 'CoreCLR' " />
<TrimmerRootDescriptor Include="@(LinkDescription)" />
<TrimmerRootAssembly Include="Microsoft.Android.Runtime.NativeAOT" Condition=" '$(_AndroidRuntime)' == 'NativeAOT' " RootMode="All" />
</ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions ...Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
<!-- Preserve the native→managed entry point (called via create_delegate from host.cc) -->
<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)../PreserveLists/Trimmable.CoreCLR.xml"
Condition=" '$(_AndroidRuntime)' == 'CoreCLR' " />
<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)../PreserveLists/System.Private.CoreLib.xml"
Condition=" '$(_AndroidRuntime)' == 'CoreCLR' " />
</ItemGroup>

<Target Name="_ValidateTrimmableTypeMapRuntime"
Expand Down
12 changes: 8 additions & 4 deletions ...marin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,15 @@ public void Build_WithTrimmableTypeMap_AssemblyStoreMappingsStayInRange ()
}

[Test]
public void TrimmableTypeMap_PreserveList_IsPackagedInSdk ()
public void TrimmableTypeMap_PreserveLists_ArePackagedInSdk ()
{
var path = Path.Combine (TestEnvironment.DotNetPreviewAndroidSdkDirectory, "PreserveLists", "Trimmable.CoreCLR.xml");

FileAssert.Exists (path, $"{path} should exist in the SDK pack.");
foreach (var file in new [] {
"Trimmable.CoreCLR.xml",
"System.Private.CoreLib.xml",
}) {
var path = Path.Combine (TestEnvironment.DotNetPreviewAndroidSdkDirectory, "PreserveLists", file);
FileAssert.Exists (path, $"{path} should exist in the SDK pack.");
}
}

[Test]
Expand Down