Skip to content

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

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

Open
dotnet-maestro wants to merge 4 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
383d2df
Update dependencies from build 311575
dotnet-maestro[bot] Apr 24, 2026
7155025
Update dependencies from build 311807
dotnet-maestro[bot] Apr 25, 2026
09a9861
Revert Microsoft.Extensions.ServiceDiscovery and ServiceDiscovery.Yar…
Copilot Apr 25, 2026
a46b4d9
Merge branch 'main' into darc-main-add31982-129f-4022-a49d-c5de6e62aeac
wtgodbe Apr 25, 2026
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
186 changes: 93 additions & 93 deletions eng/Version.Details.props
View file
Open in desktop

Large diffs are not rendered by default.

370 changes: 185 additions & 185 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@
<MicrosoftPlaywrightXunitV3Version>1.58.0</MicrosoftPlaywrightXunitV3Version>
<!-- Components.Testing dependencies -->
<YarpReverseProxyVersion>2.3.0</YarpReverseProxyVersion>
<MicrosoftExtensionsServiceDiscoveryYarpVersion>$(MicrosoftExtensionsServiceDiscoveryVersion)</MicrosoftExtensionsServiceDiscoveryYarpVersion>
<MicrosoftDataSqlClientVersion>7.0.0</MicrosoftDataSqlClientVersion>
<MicrosoftDataSqlClientExtensionsAzureVersion>1.0.0</MicrosoftDataSqlClientExtensionsAzureVersion>
<MicrosoftOpenApiVersion>3.3.1</MicrosoftOpenApiVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/post-build/post-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ stages:
displayName: Validate
inputs:
filePath: eng\common\sdk-task.ps1
arguments: -task SigningValidation -restore
arguments: -task SigningValidation -restore -msbuildEngine dotnet
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
/p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt'
${{ parameters.signingValidationAdditionalParameters }}
Expand Down
20 changes: 17 additions & 3 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,11 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
if ((-not $globalJsonHasRuntimes) -and (-not [string]::IsNullOrEmpty($env:DOTNET_INSTALL_DIR)) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) {
$dotnetRoot = $env:DOTNET_INSTALL_DIR
} else {
$dotnetRoot = Join-Path $RepoRoot '.dotnet'
if (-not [string]::IsNullOrEmpty($env:DOTNET_GLOBAL_INSTALL_DIR)) {
$dotnetRoot = $env:DOTNET_GLOBAL_INSTALL_DIR
} else {
$dotnetRoot = Join-Path $RepoRoot '.dotnet'
}

if (-not (Test-Path(Join-Path $dotnetRoot "sdk\$dotnetSdkVersion"))) {
if ($install) {
Expand Down Expand Up @@ -677,9 +681,19 @@ function InitializeToolset() {
}

$downloadArgs = @("package", "download", "Microsoft.DotNet.Arcade.Sdk@$toolsetVersion", "--verbosity", "minimal", "--prerelease", "--output", "$nugetCache")
if ($env:NUGET_CONFIG) {
$nugetConfig = $env:NUGET_CONFIG
if (-not $nugetConfig) {
# Search for any variation of nuget.config in the RepoRoot
$configFile = Get-ChildItem -Path $RepoRoot -File | Where-Object { $_.Name -ieq "nuget.config" } | Select-Object -First 1

if ($configFile) {
$nugetConfig = $configFile.FullName
}
}

if ($nugetConfig) {
$downloadArgs += "--configfile"
$downloadArgs += $env:NUGET_CONFIG
$downloadArgs += $nugetConfig
}
DotNet @downloadArgs

Expand Down
21 changes: 18 additions & 3 deletions eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,11 @@ function InitializeDotNetCli {
if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
dotnet_root="$DOTNET_INSTALL_DIR"
else
dotnet_root="${repo_root}.dotnet"
if [[ -n "${DOTNET_GLOBAL_INSTALL_DIR:-}" ]]; then
dotnet_root="$DOTNET_GLOBAL_INSTALL_DIR"
else
dotnet_root="${repo_root}.dotnet"
fi

export DOTNET_INSTALL_DIR="$dotnet_root"

Expand Down Expand Up @@ -427,8 +431,19 @@ function InitializeToolset {
fi

local download_args=("package" "download" "Microsoft.DotNet.Arcade.Sdk@$toolset_version" "--verbosity" "minimal" "--prerelease" "--output" "$_GetNuGetPackageCachePath")
if [[ -n "${NUGET_CONFIG:-}" ]]; then
download_args+=("--configfile" "$NUGET_CONFIG")
local nuget_config="${NUGET_CONFIG:-}"
if [[ -z "$nuget_config" ]]; then
# Search for any variation of nuget.config in the RepoRoot
local found_config
found_config=$(find "$repo_root" -maxdepth 1 -type f -iname "nuget.config" -print -quit)

if [[ -n "$found_config" ]]; then
nuget_config="$found_config"
fi
fi

if [[ -n "$nuget_config" ]]; then
download_args+=("--configfile" "$nuget_config")
fi
DotNet "${download_args[@]}"

Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"jdk": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26215.121",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26215.121",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26215.121",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26224.104",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26224.104",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26224.104",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.WixToolset.Sdk": "6.0.3-dotnet.4"
Expand Down
2 changes: 0 additions & 2 deletions src/Components/Testing/src/Microsoft.AspNetCore.Components.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" />
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<Reference Include="Microsoft.Extensions.Hosting" />
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading