Skip to content

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

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
merged 2 commits into from
Nov 4, 2025
+62 −58
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7f2db5
Merge main into darc-main-db341cab-e205-47c0-88c5-ebceb35ec25c
dotnet-maestro[bot] Nov 4, 2025
7ce61ae
Update dependencies from https://github.com/dotnet/dotnet build 289373
dotnet-maestro[bot] Nov 4, 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
36 changes: 18 additions & 18 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25531.101</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25531.101</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25531.101</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25531.101</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25531.101</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25531.101</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25531.101</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25531.101</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rc.1.25531.101</SystemTextJsonPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25553.108</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25553.108</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25553.108</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25553.108</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25553.108</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25553.108</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25553.108</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25553.108</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25553.108</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25553.108</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25553.108</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25553.108</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25553.108</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25553.108</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25553.108</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25553.108</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25553.108</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rc.1.25553.108</SystemTextJsonPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
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="6ad4d0db4a7569ab9944901096381c5eff133709" BarId="289141" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2" BarId="289373" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25531.101">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25531.101">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25531.101">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25531.101">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25531.101">
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25531.101">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25531.101">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25531.101">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25531.101">
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25531.101">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25531.101">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25531.101">
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25531.101">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25531.101">
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25531.101">
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25531.101">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25531.101">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25531.101">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25553.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 2 additions & 0 deletions eng/common/core-templates/steps/publish-logs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ steps:
arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs'
-BinlogToolVersion ${{parameters.BinlogToolVersion}}
-TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
-runtimeSourceFeed https://ci.dot.net/internal
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
'$(publishing-dnceng-devdiv-code-r-build-re)'
'$(MaestroAccessToken)'
'$(dn-bot-all-orgs-artifact-feeds-rw)'
Expand Down
4 changes: 3 additions & 1 deletion eng/common/post-build/redact-logs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ param(
# File with strings to redact - separated by newlines.
# For comments start the line with '# ' - such lines are ignored
[Parameter(Mandatory=$false)][string] $TokensFilePath,
[Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact
[Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact,
[Parameter(Mandatory=$false)][string] $runtimeSourceFeed,
[Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey
)

try {
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": "11.0.0-beta.25531.101",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25531.101"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25553.108",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25553.108"
}
}