Skip to content

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

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
Oct 16, 2025
+61 −62
Merged

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

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
72d985d
Merge main into darc-main-7055c68b-d7d7-4452-9412-0c00b31f5a5c
dotnet-maestro[bot] Oct 16, 2025
502db4e
Update dependencies from https://github.com/dotnet/dotnet build 287240
dotnet-maestro[bot] Oct 16, 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
3 changes: 0 additions & 3 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-862de94" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-862de94f/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-e1f1988" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e1f19886/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -26,7 +24,6 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-e1f1988" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
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.25514.106</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25514.106</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25514.106</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25514.106</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25514.106</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25514.106</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25514.106</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25514.106</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25514.106</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25514.106</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25514.106</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25514.106</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25514.106</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25514.106</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25514.106</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25514.106</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25514.106</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rc.1.25514.106</SystemTextJsonPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25515.101</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25515.101</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25515.101</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25515.101</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25515.101</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25515.101</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25515.101</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25515.101</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25515.101</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25515.101</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25515.101</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25515.101</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25515.101</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25515.101</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25515.101</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25515.101</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25515.101</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rc.1.25515.101</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="2d4079aa0b0ae84217540e6df5dcc15e8a64c07d" BarId="287091" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="6422c4b30a1b96ec5ba148759fab13dde95f5e89" BarId="287240" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25514.106">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25514.106">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25514.106">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25514.106">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25514.106">
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25514.106">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25514.106">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25514.106">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25514.106">
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25514.106">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25514.106">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25514.106">
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25514.106">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25514.106">
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25514.106">
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25514.106">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25514.106">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25514.106">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25515.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2d4079aa0b0ae84217540e6df5dcc15e8a64c07d</Sha>
<Sha>6422c4b30a1b96ec5ba148759fab13dde95f5e89</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 4 additions & 2 deletions eng/common/SetupNugetSources.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@ EnableInternalPackageSource() {
grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
if [ "$?" == "0" ]; then
echo "Enabling internal source '$PackageSourceName'."
# Remove the disabled entry (including any surrounding comments or whitespace on the same line)
sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"
# Remove the disabled entry
local OldDisableValue="<add key=\"$PackageSourceName\" value=\"true\" />"
local NewDisableValue="<!-- Reenabled for build : $PackageSourceName -->"
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile"

# Add the source name to PackageSources for credential handling
PackageSources+=("$PackageSourceName")
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.25514.106",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25514.106"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25515.101",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25515.101"
}
}