Skip to content

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

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 3 commits into from
Oct 20, 2025
+61 −61
Merged

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

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
bff18e8
Backflow from https://github.com/dotnet/dotnet / 8762bd9 build 287677
dotnet-maestro[bot] Oct 18, 2025
424674b
Merge main into darc-main-15d9b901-bf76-42c9-bba2-ceffffd7c4d3
dotnet-maestro[bot] Oct 18, 2025
a7f76bb
Update dependencies from https://github.com/dotnet/dotnet build 287677
dotnet-maestro[bot] Oct 18, 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
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<PackageVersion Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />

<!-- build dependencies-->
<PackageVersion Include="Microsoft.Build.Locator" Version="1.9.1" />
<PackageVersion Include="Microsoft.Build.Locator" Version="1.10.2" />
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
Expand Down
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.25515.110</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25515.110</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25515.110</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25515.110</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25515.110</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25515.110</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25515.110</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25515.110</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25515.110</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25515.110</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25515.110</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25515.110</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25515.110</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25515.110</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25515.110</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25515.110</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25515.110</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rc.1.25515.110</SystemTextJsonPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25517.107</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25517.107</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25517.107</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25517.107</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25517.107</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25517.107</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25517.107</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25517.107</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25517.107</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25517.107</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25517.107</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25517.107</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25517.107</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25517.107</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25517.107</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25517.107</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25517.107</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rc.1.25517.107</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="be28ec777bf12db631725399c442448d52093087" BarId="287454" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="8762bd921df96f28a567acfb83797c445c7bc06b" BarId="287677" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25515.110">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25515.110">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25515.110">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25515.110">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25515.110">
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25515.110">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25515.110">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25515.110">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25515.110">
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25515.110">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25515.110">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25515.110">
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25515.110">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25515.110">
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25515.110">
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25515.110">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25515.110">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25515.110">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25517.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
<Sha>8762bd921df96f28a567acfb83797c445c7bc06b</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</PropertyGroup>
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(IsServicingBuild)' != 'true'">
<!-- For MSBuild and Roslyn packages use the previous stable version until the current stable build is released. -->
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.14.8</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildTasksCoreVersion>17.14.8</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildFrameworkVersion>17.14.28</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.14.28</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildTasksCoreVersion>17.14.28</MicrosoftBuildTasksCoreVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.14.0</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.14.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>4.14.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
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.25515.110",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25515.110"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25517.107",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25517.107"
}
}