Skip to content

[release/11.0.1xx-preview1] Merge branch 'net11.0' into 'release/11.0.1xx-preview1' #24561

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
rolfbjarne merged 3 commits into from
Jan 27, 2026
Merged

[release/11.0.1xx-preview1] Merge branch 'net11.0' into 'release/11.0.1xx-preview1' #24561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cc5cb9
[net11.0] We've branched preview 1, so going to preview 2 now.
rolfbjarne Jan 26, 2026
e052d66
[net11.0] Update dependencies from dotnet/dotnet (#24508)
dotnet-maestro[bot] Jan 26, 2026
8329b74
[release/11.0.1xx-preview1] Merge remote-tracking branch 'origin/net…
rolfbjarne Jan 27, 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
9 changes: 9 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,14 @@
<!-- Fix transient dependency issue found by component governance 4.7.0 -> 4.7.1 brought by Microsoft.Build.Tasks.Core package -->
<SystemSecurityCryptographyXmlPackageVersion>8.0.0</SystemSecurityCryptographyXmlPackageVersion>
</PropertyGroup>

<PropertyGroup>
<!-- workarounds for https://github.com/dotnet/runtime/issues/123503 -->
<!-- https://github.com/dotnet/macios/issues/24558 -->
<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
<EnableAotAnalyzer>false</EnableAotAnalyzer>
<NoWarn>$(NoWarn);AD0001</NoWarn>
</PropertyGroup>

<Import Project="Build.props" Condition="Exists('Build.props')" />
</Project>
2 changes: 1 addition & 1 deletion Make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ NUGET_RELEASE_BRANCH=release/11.0.1xx
##
## Note that the prerelease identifier should be as short as possible, because otherwise
## the resulting package name can become too long for MSIs.
NUGET_HARDCODED_PRERELEASE_IDENTIFIER=net11.0-p1
NUGET_HARDCODED_PRERELEASE_IDENTIFIER=net11-p1
NUGET_HARDCODED_PRERELEASE_BRANCH=release/11.0.1xx-preview1

# compute the alphanumeric version of branch names
Expand Down
4 changes: 4 additions & 0 deletions dotnet/targets/Xamarin.Shared.Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,12 @@

<!-- Set the default RuntimeIdentifier when publishing -->
<PropertyGroup Condition="'$(PublishRuntimeIdentifier)' == ''">
<!--
<PublishRuntimeIdentifier Condition="'$(_PlatformName)' == 'iOS'">ios-arm64</PublishRuntimeIdentifier>
<PublishRuntimeIdentifier Condition="'$(_PlatformName)' == 'tvOS'">tvos-arm64</PublishRuntimeIdentifier>
-->
<!-- Disable the default PublishRuntimeIdentifier behavior: https://github.com/dotnet/sdk/pull/52566 -->
<UseDefaultPublishRuntimeIdentifier>false</UseDefaultPublishRuntimeIdentifier>
</PropertyGroup>

<!-- Now that we know the runtime identifier, we can determine if we're building for a simulator -->
Expand Down
2 changes: 2 additions & 0 deletions dotnet/targets/Xamarin.Shared.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@
ResolveReferences;
_DetectSdkLocations;
_GenerateBundleName;
_CompileEntitlements;
</_RunRidSpecificBuildDependsOn>
</PropertyGroup>

Expand Down Expand Up @@ -394,6 +395,7 @@
_ProcessedColladaAssetsPath=$(_ProcessedColladaAssetsPath);
_ProcessedTextureAtlasesPath=$(_ProcessedTextureAtlasesPath);
_ProcessedCoreMLModelsPath=$(_ProcessedCoreMLModelsPath);
_CompiledEntitlements=$(_CompiledEntitlements);
_CompiledEntitlementsPath=$(_CompiledEntitlementsPath);
</_RidSpecificProperties>
</PropertyGroup>
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26062.101</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26062.101</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.26062.101</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26062.101</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-alpha.1.26062.101</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-alpha.1.26062.101</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-alpha.1.26062.101</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-alpha.1.26062.101</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.26062.101</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.26062.101</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26073.123</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26073.123</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26073.123</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26073.123</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.1.26073.123</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-preview.1.26073.123</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-preview.1.26073.123</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.1.26073.123</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.1.26073.123</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.1.26073.123</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet100_262PackageVersion>26.2.10196</MicrosoftiOSSdknet100_262PackageVersion>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-alpha.1.26062.101">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.1.26073.123">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>9b1fccbc24a292cdfb153dfac7fec2744a13b62f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-alpha.1.26062.101">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.1.26073.123">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>9b1fccbc24a292cdfb153dfac7fec2744a13b62f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-alpha.1.26062.101">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.1.26073.123">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>9b1fccbc24a292cdfb153dfac7fec2744a13b62f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-alpha.1.26062.101">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.1.26073.123">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>9b1fccbc24a292cdfb153dfac7fec2744a13b62f</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.26062.101">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.1.26073.123">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>9b1fccbc24a292cdfb153dfac7fec2744a13b62f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.26062.101">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26073.123">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>9b1fccbc24a292cdfb153dfac7fec2744a13b62f</Sha>
</Dependency>
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
Expand Down Expand Up @@ -61,25 +61,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26062.101">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26073.123">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>9b1fccbc24a292cdfb153dfac7fec2744a13b62f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26062.101">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26073.123">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>9b1fccbc24a292cdfb153dfac7fec2744a13b62f</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.26062.101">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.1.26073.123">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>9b1fccbc24a292cdfb153dfac7fec2744a13b62f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25516.4">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>88399512021dfa8b5f45d91f84c8ce6f0959b127</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26062.101">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26073.123">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>9b1fccbc24a292cdfb153dfac7fec2744a13b62f</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/publish-build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
steps:
- ${{ if eq(parameters.is1ESPipeline, '') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
demands: ImageOverride -equals build.ubuntu.2204.amd64
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
image: 1es-azurelinux-3
image: Azure-Linux-3-Amd64
os: linux
${{ else }}:
pool:
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/post-build/post-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,11 @@ stages:
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2019.amd64
demands: ImageOverride -equals windows.vs2022.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/variables/pool-providers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
# demands: ImageOverride -equals windows.vs2019.amd64
# demands: ImageOverride -equals windows.vs2022.amd64
variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- template: /eng/common/templates-official/variables/pool-providers.yml
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "11.0.100-alpha.1.26062.101",
"version": "11.0.100-preview.1.26073.123",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "11.0.100-alpha.1.26062.101"
"dotnet": "11.0.100-preview.1.26073.123"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26062.101"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26073.123"
}
}
7 changes: 6 additions & 1 deletion tests/dotnet/UnitTests/BuildCodeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ static IEnumerable<TestCaseData> MonoComponentsSource {
"libSystem.Native.a",
"libSystem.Net.Security.Native.a",
"libSystem.Security.Cryptography.Native.Apple.a",
"libzstd.a",
});
yield return new TestCaseData (ApplePlatform.iOS, "iossimulator-arm64", new string [] {
"libmono-component-debugger.dylib",
Expand Down Expand Up @@ -55,6 +56,7 @@ static IEnumerable<TestCaseData> MonoComponentsSource {
"libSystem.Native.a",
"libSystem.Net.Security.Native.a",
"libSystem.Security.Cryptography.Native.Apple.a",
"libzstd.a",
});
yield return new TestCaseData (ApplePlatform.TVOS, "tvossimulator-arm64", new string [] {
"libmono-component-debugger.dylib",
Expand Down Expand Up @@ -84,6 +86,7 @@ static IEnumerable<TestCaseData> MonoComponentsSource {
"libSystem.IO.Compression.Native.a",
"libSystem.Native.a",
"libSystem.Security.Cryptography.Native.Apple.a",
"libzstd.a",
});
yield return new TestCaseData (ApplePlatform.MacOSX, "osx-arm64", new string [] {
"libclrgc.dylib",
Expand Down Expand Up @@ -133,7 +136,9 @@ public void MonoComponents (ApplePlatform platform, string runtimeIdentifiers, s

// NUnit's rendering of assertions failures if the arrays are different is rather lacking.
if (expectedLibraries.Length != libs.Length) {
Assert.Fail ($"Expected {expectedLibraries.Length} components, got {libs.Length} components.\nExpected:\n\t{string.Join ("\n\t", expectedLibraries)}\nActual:\n\t{string.Join ("\n\t", libs)}");
var newLibraries = libs.Except (expectedLibraries).OrderBy (v => v).ToArray ();
var missingLibraries = expectedLibraries.Except (libs).OrderBy (v => v).ToArray ();
Assert.Fail ($"Expected {expectedLibraries.Length} components, got {libs.Length} components.\nExpected:\n\t{string.Join ("\n\t", expectedLibraries)}\nActual:\n\t{string.Join ("\n\t", libs)}\nMissing ({missingLibraries.Length}):{string.Join ("", missingLibraries.Select (v => "\n\t" + v))}\nExtra libraries ({newLibraries.Length}):{string.Join ("", newLibraries.Select (v => "\n\t" + v))}");
} else {
for (var i = 0; i < expectedLibraries.Length; i++) {
if (expectedLibraries [i] == libs [i])
Expand Down
1 change: 1 addition & 0 deletions tests/dotnet/UnitTests/ProjectTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2534,6 +2534,7 @@ public void PublishAotDuringBuild (ApplePlatform platform, string runtimeIdentif
[TestCase (ApplePlatform.iOS, "ios-arm64")]
[TestCase (ApplePlatform.iOS, "iossimulator-arm64")]
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64")]
[Ignore ("https://github.com/dotnet/macios/issues/24558")]
public void BuildMyNativeAotAppWithTrimAnalysisWarning (ApplePlatform platform, string runtimeIdentifiers)
{
var project = "MyNativeAotAppWithTrimAnalysisWarning";
Expand Down
Loading
Loading