Skip to content

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

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 6, 2025
+61 −87
Merged

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

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
623a768
Merge main into darc-main-38cf7d43-d14d-4f2f-ba73-3428b6637bc8
dotnet-maestro[bot] Nov 6, 2025
90298f1
Update dependencies from https://github.com/dotnet/dotnet build 289655
dotnet-maestro[bot] Nov 6, 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.25553.112</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25553.112</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25553.112</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25553.112</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25553.112</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25553.112</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25553.112</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25553.112</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25553.112</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25553.112</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25553.112</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25553.112</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25553.112</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25553.112</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25553.112</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25553.112</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25553.112</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rc.1.25553.112</SystemTextJsonPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25555.103</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25555.103</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25555.103</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25555.103</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25555.103</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25555.103</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25555.103</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25555.103</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25555.103</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25555.103</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25555.103</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25555.103</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25555.103</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25555.103</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rc.1.25555.103</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="7afcc5ec7a7148c6d04096396acceaafe98f4415" BarId="289425" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="54c879632fdf0197d517d80e4b90861e2bd5d03e" BarId="289655" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25553.112">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25553.112">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25553.112">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25553.112">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25553.112">
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25553.112">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25553.112">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25553.112">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25553.112">
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25553.112">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25553.112">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25553.112">
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25553.112">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25553.112">
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25553.112">
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25553.112">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25553.112">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25553.112">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25555.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7afcc5ec7a7148c6d04096396acceaafe98f4415</Sha>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
17 changes: 2 additions & 15 deletions eng/common/SetupNugetSources.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
# disabled internal Maestro (darc-int*) feeds.
#
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
#
Expand Down Expand Up @@ -174,16 +173,4 @@ foreach ($dotnetVersion in $dotnetVersions) {
}
}

# Check for dotnet-eng and add dotnet-eng-internal if present
$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']")
if ($dotnetEngSource -ne $null) {
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
}

# Check for dotnet-tools and add dotnet-tools-internal if present
$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
if ($dotnetToolsSource -ne $null) {
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
}

$doc.Save($filename)
17 changes: 2 additions & 15 deletions eng/common/SetupNugetSources.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#!/usr/bin/env bash

# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
# disabled internal Maestro (darc-int*) feeds.
#
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
#
Expand Down Expand Up @@ -174,18 +173,6 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
fi
done

# Check for dotnet-eng and add dotnet-eng-internal if present
grep -i "<add key=\"dotnet-eng\"" $ConfigFile > /dev/null
if [ "$?" == "0" ]; then
AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix"
fi

# Check for dotnet-tools and add dotnet-tools-internal if present
grep -i "<add key=\"dotnet-tools\"" $ConfigFile > /dev/null
if [ "$?" == "0" ]; then
AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix"
fi

# I want things split line by line
PrevIFS=$IFS
IFS=$'\n'
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.25553.112",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25553.112"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25555.103",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25555.103"
}
}