Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7713608
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 15, 2026
8600c39
Re-generate global.json for PR #24508: [net11.0] Update dependencies …
Jan 15, 2026
5f48acb
[tests] Update SizeTestApp's expected sizes.
rolfbjarne Jan 15, 2026
ee15359
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 16, 2026
7d71d4e
Re-generate global.json for PR #24508: [net11.0] Update dependencies …
Jan 16, 2026
e78d3a0
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 17, 2026
92390ba
Re-generate global.json for PR #24508: [net11.0] Update dependencies …
Jan 17, 2026
a962663
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 18, 2026
f2bc33a
Re-generate global.json for PR #24508: [net11.0] Update dependencies …
Jan 18, 2026
4cfb14f
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 20, 2026
3878b7a
Re-generate global.json for PR #24508: [net11.0] Update dependencies …
Jan 20, 2026
40443d3
[tests] Update expected app sizes.
rolfbjarne Jan 20, 2026
6174f11
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-1a88d…
rolfbjarne Jan 20, 2026
935c31f
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 21, 2026
2090852
Re-generate global.json for PR #24508: [net11.0] Update dependencies …
Jan 21, 2026
55d1f2e
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 22, 2026
283c07a
Re-generate global.json for PR #24508: [net11.0] Update dependencies …
Jan 22, 2026
b7394f3
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-1a88d…
rolfbjarne Jan 22, 2026
6aa6c0d
[dotnet] Implement partial temporary workaround for incorrect Publish…
rolfbjarne Jan 22, 2026
92bc799
Add workaround for https://github.com/dotnet/runtime/issues/123503.
rolfbjarne Jan 22, 2026
54b12cd
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 24, 2026
b78a158
Re-generate global.json for PR #24508: [net11.0] Update dependencies …
Jan 24, 2026
b8629f9
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 25, 2026
9d755b0
Re-generate global.json for PR #24508: [net11.0] Update dependencies …
Jan 25, 2026
c878bdd
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 26, 2026
54e270a
Re-generate global.json for PR #24508: [net11.0] Update dependencies …
Jan 26, 2026
2f0a330
[tests] Updated expected values.
rolfbjarne Jan 26, 2026
87e1aa6
More workarounds.
rolfbjarne Jan 26, 2026
a40dc2a
Fix an issue where compiled entitlements aren't properly included in …
rolfbjarne Jan 26, 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
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>
4 changes: 4 additions & 0 deletions dotnet/targets/Xamarin.Shared.Sdk.props
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
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
22 changes: 11 additions & 11 deletions eng/Version.Details.props
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.10192</MicrosoftiOSSdknet100_262PackageVersion>
Expand All @@ -26,7 +26,7 @@ This file should be imported by eng/Versions.props
<MicrosofttvOSSdknet100_260PackageVersion>26.0.11017</MicrosofttvOSSdknet100_260PackageVersion>
<MicrosofttvOSSdknet100_262PackageVersion>26.2.10192</MicrosofttvOSSdknet100_262PackageVersion>
<!-- dotnet/xharness dependencies -->
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>11.0.0-prerelease.26064.3</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.25516.4</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
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
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
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
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
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
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
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
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