Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0e44a5d
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Mar 25, 2026
d1f843b
Re-generate global.json for PR #25013: [net11.0] Update dependencies …
Mar 25, 2026
96716f3
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Mar 27, 2026
54ee13d
Re-generate global.json for PR #25013: [net11.0] Update dependencies …
Mar 27, 2026
a9dd8db
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Mar 28, 2026
6c31652
Re-generate global.json for PR #25013: [net11.0] Update dependencies …
Mar 28, 2026
d128a95
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Mar 29, 2026
934f74b
Re-generate global.json for PR #25013: [net11.0] Update dependencies …
Mar 29, 2026
09a9f0c
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Mar 30, 2026
a9f5cc8
Re-generate global.json for PR #25013: [net11.0] Update dependencies …
Mar 30, 2026
a2f62ff
[dotnet] Temporarily disable new R2R features that aren't quite compl…
rolfbjarne Mar 30, 2026
86f2113
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Mar 31, 2026
cc6888a
Re-generate global.json for PR #25013: [net11.0] Update dependencies …
Mar 31, 2026
900cea1
[tests] Update sizes.
rolfbjarne Apr 1, 2026
e44a595
[runtime] Add a temporary workaround for runtime regression.
rolfbjarne Apr 1, 2026
4308130
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Apr 2, 2026
2b250ae
Re-generate global.json for PR #25013: [net11.0] Update dependencies …
Apr 2, 2026
7211f02
[tests] Update expected sizes.
rolfbjarne Apr 2, 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
4 changes: 4 additions & 0 deletions dotnet/targets/Xamarin.Shared.Sdk.props
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@
<PublishReadyToRunComposite Condition="'$(PublishReadyToRunComposite)' == '' And '$(PublishReadyToRun)' == 'true'">true</PublishReadyToRunComposite>
<PublishReadyToRunContainerFormat Condition="'$(PublishReadyToRunContainerFormat)' == '' And '$(PublishReadyToRun)' == 'true'">macho</PublishReadyToRunContainerFormat>
<PublishReadyToRunCreateSharedLibrary>false</PublishReadyToRunCreateSharedLibrary>

<!-- We have to set the following two variables until https://github.com/dotnet/runtime/pull/124604 flows to us -->
<PublishReadyToRunStripDebugInfo>false</PublishReadyToRunStripDebugInfo>
<PublishReadyToRunStripInliningInfo>false</PublishReadyToRunStripInliningInfo>
</PropertyGroup>

<ItemGroup Condition="'$(UseMonoRuntime)' == 'false' And '$(_PlatformName)' != 'macOS' And '$(PublishReadyToRun)' != 'true'">
Expand Down
20 changes: 10 additions & 10 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.26172.108</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26172.108</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26172.108</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26172.108</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.3.26172.108</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-preview.3.26172.108</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-preview.3.26172.108</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.3.26172.108</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.3.26172.108</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.3.26172.108</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26201.113</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26201.113</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26201.113</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26201.113</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.4.26201.113</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-preview.4.26201.113</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-preview.4.26201.113</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.4.26201.113</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.4.26201.113</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.4.26201.113</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet-macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet100_262PackageVersion>26.2.10226</MicrosoftiOSSdknet100_262PackageVersion>
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-preview.3.26172.108">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.4.26201.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>491bbab262d2f8179cf5f5651bc0689d9c12739a</Sha>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.3.26172.108">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.4.26201.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>491bbab262d2f8179cf5f5651bc0689d9c12739a</Sha>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.3.26172.108">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.4.26201.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>491bbab262d2f8179cf5f5651bc0689d9c12739a</Sha>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.3.26172.108">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.4.26201.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>491bbab262d2f8179cf5f5651bc0689d9c12739a</Sha>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</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-preview.3.26172.108">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.4.26201.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>491bbab262d2f8179cf5f5651bc0689d9c12739a</Sha>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26172.108">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26201.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>491bbab262d2f8179cf5f5651bc0689d9c12739a</Sha>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</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.26172.108">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26201.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>491bbab262d2f8179cf5f5651bc0689d9c12739a</Sha>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26172.108">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26201.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>491bbab262d2f8179cf5f5651bc0689d9c12739a</Sha>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.3.26172.108">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.4.26201.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>491bbab262d2f8179cf5f5651bc0689d9c12739a</Sha>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</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.26172.108">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26201.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>491bbab262d2f8179cf5f5651bc0689d9c12739a</Sha>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/job/onelocbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ jobs:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
image: windows.vs2026.amd64
os: windows

steps:
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ jobs:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2022.amd64
image: windows.vs2026.amd64
os: windows
steps:
- ${{ if eq(parameters.is1ESPipeline, '') }}:
Expand Down
2 changes: 2 additions & 0 deletions eng/common/core-templates/job/source-index-stage1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
variables:
- name: BinlogPath
value: ${{ parameters.binlogPath }}
- name: skipComponentGovernanceDetection
value: true
- template: /eng/common/core-templates/variables/pool-providers.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
Expand Down
16 changes: 8 additions & 8 deletions eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ stages:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
Expand Down Expand Up @@ -154,14 +154,14 @@ stages:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
image: windows.vs2026.amd64
os: windows
${{ else }}:
name: $(DncEngInternalBuildPool)
Expand Down Expand Up @@ -215,14 +215,14 @@ stages:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
image: windows.vs2026.amd64
os: windows
${{ else }}:
name: $(DncEngInternalBuildPool)
Expand Down Expand Up @@ -276,18 +276,18 @@ stages:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2022.amd64
image: windows.vs2026.amd64
os: windows
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2022.amd64
demands: ImageOverride -equals windows.vs2026.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/stages/renovate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ parameters:
type: object
default:
name: NetCore1ESPool-Internal
image: 1es-windows-2022
image: windows.vs2026.amd64
os: windows

resources:
Expand Down
7 changes: 3 additions & 4 deletions eng/common/templates-official/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,10 @@ jobs:
sbomEnabled: false # we don't need SBOM for logs

- ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
- output: buildArtifacts
- output: pipelineArtifact
displayName: Publish Logs
PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
publishLocation: Container
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
continueOnError: true
condition: always()
sbomEnabled: false # we don't need SBOM for logs
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/variables/pool-providers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
# image: 1es-windows-2022
# image: windows.vs2026.amd64

variables:
# Coalesce the target and source branches so we know when a PR targets a release branch
Expand Down
6 changes: 3 additions & 3 deletions eng/common/templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,16 @@ jobs:
sbomEnabled: false # we don't need SBOM for logs

- ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
parameters:
is1ESPipeline: false
args:
displayName: Publish Logs
pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
publishLocation: Container
targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
continueOnError: true
condition: always()
sbomEnabled: false

- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
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.vs2022.amd64
# demands: ImageOverride -equals windows.vs2026.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-preview.3.26172.108",
"version": "11.0.100-preview.4.26201.113",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "11.0.100-preview.3.26172.108"
"dotnet": "11.0.100-preview.4.26201.113"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26172.108"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26201.113"
}
}
2 changes: 2 additions & 0 deletions runtime/shared.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ struct Block_literal {

struct Xamarin_block_descriptor * xamarin_get_block_descriptor ();

// Workaround for https://github.com/dotnet/runtime/issues/126299
int32_t SystemNative_IsATty (intptr_t fd);

#ifdef __cplusplus
} /* extern "C" */
Expand Down
8 changes: 8 additions & 0 deletions runtime/shared.m
Original file line number Diff line number Diff line change
Expand Up @@ -193,3 +193,11 @@ -(id) initWithFunc: (init_cocoa_func *) func
{
return &xamarin_block_descriptor;
}

#if (TARGET_OS_MACCATALYST || TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_SIMULATOR)
// Workaround for https://github.com/dotnet/runtime/issues/126299
int32_t SystemNative_IsATty (intptr_t fd)
{
return 0;
}
#endif
Loading
Loading