Skip to content

[main] Source code updates from dotnet/dotnet #36425

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
dotnet-maestro merged 3 commits into from
Jul 25, 2025
Merged

[main] Source code updates from dotnet/dotnet #36425

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
874bcb1
Update dependencies from https://github.com/dotnet/dotnet build 276450
dotnet-maestro[bot] Jul 24, 2025
716c5fe
Merge main into darc-main-5595a78c-9bc2-4727-817f-c8af0194ce5b
dotnet-maestro[bot] Jul 25, 2025
13f590a
Update dependencies from https://github.com/dotnet/dotnet build 276628
dotnet-maestro[bot] Jul 25, 2025
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
74 changes: 37 additions & 37 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="96ac952a7886b565e83acc4c9cef656954ed0686" BarId="276277" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="87e4c823cc62a13a3e8afbddc78bf718971f376c" BarId="276628" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25372.103">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.7.25372.103">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25372.103">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25372.103">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25372.103">
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25372.103">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.7.25372.103">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.7.25372.103">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25372.103">
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25372.103">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25372.103">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25372.103">
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25372.103">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.7.25372.103">
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.7.25372.103">
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.7.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25372.103">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25372.103">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25372.103">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25374.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
<Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@
<UsingToolXliff>False</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/runtime">
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25372.103</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25372.103</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25372.103</MicrosoftNETCorePlatformsVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25372.103</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-preview.7.25372.103</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-preview.7.25372.103</SystemFormatsAsn1Version>
<SystemRuntimeCachingVersion>10.0.0-preview.7.25372.103</SystemRuntimeCachingVersion>
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.7.25374.102</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25374.102</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25374.102</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.7.25374.102</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25374.102</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25374.102</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.7.25374.102</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.7.25374.102</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25374.102</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25374.102</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25374.102</MicrosoftNETCorePlatformsVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25374.102</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-preview.7.25374.102</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-preview.7.25374.102</SystemFormatsAsn1Version>
<SystemRuntimeCachingVersion>10.0.0-preview.7.25374.102</SystemRuntimeCachingVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25372.103</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25374.102</MicrosoftDotNetBuildTasksTemplatingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>
Expand Down
2 changes: 2 additions & 0 deletions eng/common/core-templates/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ parameters:
artifacts: ''
enableMicrobuild: false
enableMicrobuildForMacAndLinux: false
microbuildUseESRP: true
enablePublishBuildArtifacts: false
enablePublishBuildAssets: false
enablePublishTestResults: false
Expand Down Expand Up @@ -128,6 +129,7 @@ jobs:
parameters:
enableMicrobuild: ${{ parameters.enableMicrobuild }}
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
continueOnError: ${{ parameters.continueOnError }}

- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
Expand Down
40 changes: 33 additions & 7 deletions eng/common/core-templates/steps/install-microbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,16 @@ parameters:
# Enable install tasks for MicroBuild on Mac and Linux
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
enableMicrobuildForMacAndLinux: false
# Determines whether the ESRP service connection information should be passed to the signing plugin.
# This overlaps with _SignType to some degree. We only need the service connection for real signing.
# It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place.
# Doing so will cause the service connection to be authorized for the pipeline, which isn't allowed and won't work for non-prod.
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
microbuildUseESRP: true
# Location of the MicroBuild output folder
microBuildOutputFolder: '$(Build.SourcesDirectory)'

continueOnError: false

steps:
Expand All @@ -21,19 +29,37 @@ steps:
workingDirectory: ${{ parameters.microBuildOutputFolder }}
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))

- script: |
REM Check if ESRP is disabled while SignType is real
if /I "${{ parameters.microbuildUseESRP }}"=="false" if /I "$(_SignType)"=="real" (
echo Error: ESRP must be enabled when SignType is real.
exit /b 1
)
displayName: 'Validate ESRP usage (Windows)'
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'))
- script: |
# Check if ESRP is disabled while SignType is real
if [ "${{ parameters.microbuildUseESRP }}" = "false" ] && [ "$(_SignType)" = "real" ]; then
echo "Error: ESRP must be enabled when SignType is real."
exit 1
fi
displayName: 'Validate ESRP usage (Non-Windows)'
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))

- task: MicroBuildSigningPlugin@4
displayName: Install MicroBuild plugin
inputs:
signType: $(_SignType)
zipSources: false
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
useEsrpCli: true
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
${{ else }}:
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
${{ if eq(parameters.microbuildUseESRP, true) }}:
${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
useEsrpCli: true
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
${{ else }}:
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25372.103",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25372.103"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25374.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25374.102"
}
}