From 9b2a877da5bb1564dc01b5a5d9f441cafd7136e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 May 2026 02:01:19 +0000 Subject: [PATCH 01/11] Update dependencies from https://github.com/dotnet/arcade build 20260527.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26276.8 -> To Version 11.0.0-beta.26277.3 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce6bb6c1360..d9ba785d11f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,25 @@ - + https://github.com/dotnet/arcade - 684fd431b801016186cb306af81e4b85dcf4053d + 1cc4e30dfcc1b9ea0adc4b2b0f1aadd234ed1d67 - + https://github.com/dotnet/arcade - 684fd431b801016186cb306af81e4b85dcf4053d + 1cc4e30dfcc1b9ea0adc4b2b0f1aadd234ed1d67 - + https://github.com/dotnet/arcade - 684fd431b801016186cb306af81e4b85dcf4053d + 1cc4e30dfcc1b9ea0adc4b2b0f1aadd234ed1d67 - + https://github.com/dotnet/arcade - 684fd431b801016186cb306af81e4b85dcf4053d + 1cc4e30dfcc1b9ea0adc4b2b0f1aadd234ed1d67 - + https://github.com/dotnet/arcade - 684fd431b801016186cb306af81e4b85dcf4053d + 1cc4e30dfcc1b9ea0adc4b2b0f1aadd234ed1d67 diff --git a/eng/Versions.props b/eng/Versions.props index 1137b49ff72..d8cd3459666 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,9 +22,9 @@ - 11.0.0-beta.26276.8 - 11.0.0-beta.26276.8 - 11.0.0-beta.26276.8 + 11.0.0-beta.26277.3 + 11.0.0-beta.26277.3 + 11.0.0-beta.26277.3 diff --git a/global.json b/global.json index 98926f93077..78de9de9994 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "version": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26276.8", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26276.8" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26277.3", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26277.3" } } From bbd63818f6deaf0a791653b81e114aca73d48a54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 May 2026 02:01:14 +0000 Subject: [PATCH 02/11] Update dependencies from https://github.com/dotnet/arcade build 20260529.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26276.8 -> To Version 11.0.0-beta.26279.3 --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../core-templates/steps/publish-logs.yml | 1 - eng/common/tools.ps1 | 2 ++ eng/common/tools.sh | 2 ++ global.json | 4 ++-- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9ba785d11f..0d516f44ddc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,25 @@ - + https://github.com/dotnet/arcade - 1cc4e30dfcc1b9ea0adc4b2b0f1aadd234ed1d67 + 73c171098ac0a21b73f483d3932b7643852d7a6b - + https://github.com/dotnet/arcade - 1cc4e30dfcc1b9ea0adc4b2b0f1aadd234ed1d67 + 73c171098ac0a21b73f483d3932b7643852d7a6b - + https://github.com/dotnet/arcade - 1cc4e30dfcc1b9ea0adc4b2b0f1aadd234ed1d67 + 73c171098ac0a21b73f483d3932b7643852d7a6b - + https://github.com/dotnet/arcade - 1cc4e30dfcc1b9ea0adc4b2b0f1aadd234ed1d67 + 73c171098ac0a21b73f483d3932b7643852d7a6b - + https://github.com/dotnet/arcade - 1cc4e30dfcc1b9ea0adc4b2b0f1aadd234ed1d67 + 73c171098ac0a21b73f483d3932b7643852d7a6b diff --git a/eng/Versions.props b/eng/Versions.props index d8cd3459666..57fa7ea8435 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,9 +22,9 @@ - 11.0.0-beta.26277.3 - 11.0.0-beta.26277.3 - 11.0.0-beta.26277.3 + 11.0.0-beta.26279.3 + 11.0.0-beta.26279.3 + 11.0.0-beta.26279.3 diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 648e6cfb115..2731e48cce4 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -33,7 +33,6 @@ steps: '$(publishing-dnceng-devdiv-code-r-build-re)' '$(dn-bot-all-orgs-artifact-feeds-rw)' '$(akams-client-id)' - '$(dn-bot-all-orgs-build-rw-code-rw)' '$(System.AccessToken)' ${{parameters.CustomSensitiveDataList}} continueOnError: true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 73157c2634c..2dd64758ee6 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -748,6 +748,8 @@ function Stop-Processes() { # function MSBuild() { if ($ci) { + InitializeToolset | Out-Null + $env:NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS = 20 $env:NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS = 20 Write-PipelineSetVariable -Name 'NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS' -Value '20' diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 8edf9f5a69c..2a587f1184a 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -505,6 +505,8 @@ function MSBuild { local args=( "$@" ) if [[ "$ci" == true ]]; then + InitializeToolset + export NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS=20 export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20 Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20" diff --git a/global.json b/global.json index 78de9de9994..88e042a4ccb 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "version": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26277.3", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26277.3" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26279.3", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26279.3" } } From 3149950c07ff30be6b5a4e4beffddde0e25a9b4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 31 May 2026 02:01:55 +0000 Subject: [PATCH 03/11] Update dependencies from https://github.com/dotnet/arcade build 20260529.5 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26276.8 -> To Version 11.0.0-beta.26279.5 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d516f44ddc..381215ac6ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,25 @@ - + https://github.com/dotnet/arcade - 73c171098ac0a21b73f483d3932b7643852d7a6b + 2bc908b1bdb34e2c42982eb511679bb458ddac2c - + https://github.com/dotnet/arcade - 73c171098ac0a21b73f483d3932b7643852d7a6b + 2bc908b1bdb34e2c42982eb511679bb458ddac2c - + https://github.com/dotnet/arcade - 73c171098ac0a21b73f483d3932b7643852d7a6b + 2bc908b1bdb34e2c42982eb511679bb458ddac2c - + https://github.com/dotnet/arcade - 73c171098ac0a21b73f483d3932b7643852d7a6b + 2bc908b1bdb34e2c42982eb511679bb458ddac2c - + https://github.com/dotnet/arcade - 73c171098ac0a21b73f483d3932b7643852d7a6b + 2bc908b1bdb34e2c42982eb511679bb458ddac2c diff --git a/eng/Versions.props b/eng/Versions.props index 57fa7ea8435..0da60f6fbd5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,9 +22,9 @@ - 11.0.0-beta.26279.3 - 11.0.0-beta.26279.3 - 11.0.0-beta.26279.3 + 11.0.0-beta.26279.5 + 11.0.0-beta.26279.5 + 11.0.0-beta.26279.5 diff --git a/global.json b/global.json index 88e042a4ccb..a809c644036 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "version": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26279.3", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26279.3" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26279.5", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26279.5" } } From 9b7268961141c85232524215cdaa0622a99566c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jun 2026 02:01:52 +0000 Subject: [PATCH 04/11] Update dependencies from https://github.com/dotnet/arcade build 20260601.6 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26276.8 -> To Version 11.0.0-beta.26301.6 --- eng/Version.Details.xml | 20 ++-- eng/Versions.props | 6 +- eng/common/native/install-dependencies.sh | 8 +- eng/common/tools.ps1 | 130 +++++++--------------- eng/common/tools.sh | 44 ++------ global.json | 4 +- 6 files changed, 66 insertions(+), 146 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 381215ac6ee..52a6e07bd07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,25 @@ - + https://github.com/dotnet/arcade - 2bc908b1bdb34e2c42982eb511679bb458ddac2c + 64988f042b980bf81c5d1e223ad6ddc4165e0e46 - + https://github.com/dotnet/arcade - 2bc908b1bdb34e2c42982eb511679bb458ddac2c + 64988f042b980bf81c5d1e223ad6ddc4165e0e46 - + https://github.com/dotnet/arcade - 2bc908b1bdb34e2c42982eb511679bb458ddac2c + 64988f042b980bf81c5d1e223ad6ddc4165e0e46 - + https://github.com/dotnet/arcade - 2bc908b1bdb34e2c42982eb511679bb458ddac2c + 64988f042b980bf81c5d1e223ad6ddc4165e0e46 - + https://github.com/dotnet/arcade - 2bc908b1bdb34e2c42982eb511679bb458ddac2c + 64988f042b980bf81c5d1e223ad6ddc4165e0e46 diff --git a/eng/Versions.props b/eng/Versions.props index 0da60f6fbd5..312047675a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,9 +22,9 @@ - 11.0.0-beta.26279.5 - 11.0.0-beta.26279.5 - 11.0.0-beta.26279.5 + 11.0.0-beta.26301.6 + 11.0.0-beta.26301.6 + 11.0.0-beta.26301.6 diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 4742177a768..aff839fa097 100644 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -24,16 +24,16 @@ case "$os" in apt update apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \ - libssl-dev libkrb5-dev pigz cpio ninja-build + libssl-dev libkrb5-dev pigz cpio ninja-build file localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" - $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio ninja-build + $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio ninja-build file elif [ "$ID" = "amzn" ]; then - dnf install -y cmake llvm lld lldb clang python libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio ninja-build + dnf install -y cmake llvm lld lldb clang python libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio ninja-build file elif [ "$ID" = "alpine" ]; then - apk add build-base cmake bash curl clang llvm llvm-dev lld lldb-dev krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio ninja + apk add build-base cmake bash curl clang llvm llvm-dev lld lldb-dev krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio ninja file else echo "Unsupported distro. distro: $ID" exit 1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 2dd64758ee6..77dfd5eaa21 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -162,12 +162,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 } - # Keep repo builds isolated from machine-installed SDK state and workload advertising. - # This avoids preview SDK builds picking up mismatched workloads on CI images. - $env:DOTNET_MULTILEVEL_LOOKUP = '0' - $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = '1' - $env:DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE = '1' - # Find the first path on %PATH% that contains the dotnet.exe if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) { $dotnetExecutable = GetExecutableFileName 'dotnet' @@ -230,9 +224,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { Write-PipelinePrependPath -Path $dotnetRoot Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' - Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' - Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' - Write-PipelineSetVariable -Name 'DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot } @@ -599,10 +590,9 @@ function GetDefaultMSBuildEngine() { ExitWithExitCode 1 } -function GetNuGetPackageCachePath() { +function InitializeNuGetPackageCachePath() { if ($env:NUGET_PACKAGES -eq $null) { # Use local cache on CI to ensure deterministic build. - # Avoid using the http cache as workaround for https://github.com/NuGet/Home/issues/3116 # use global cache in dev builds to avoid cost of downloading packages. # For directory normalization, see also: https://github.com/NuGet/Home/issues/7968 if ($useGlobalNuGetCache) { @@ -657,8 +647,6 @@ function InitializeToolset() { return $global:_InitializeToolset } - $nugetCache = GetNuGetPackageCachePath - $toolsetVersion = Read-ArcadeSdkVersion $toolsetToolsDir = Join-Path $ToolsetDir $toolsetVersion @@ -679,7 +667,7 @@ function InitializeToolset() { ExitWithExitCode 1 } - $downloadArgs = @("package", "download", "Microsoft.DotNet.Arcade.Sdk@$toolsetVersion", "--verbosity", "minimal", "--prerelease", "--output", "$nugetCache") + $downloadArgs = @("package", "download", "Microsoft.DotNet.Arcade.Sdk@$toolsetVersion", "--verbosity", "minimal", "--prerelease", "--output", "$nugetPackageCachePath") $nugetConfig = $env:NUGET_CONFIG if (-not $nugetConfig) { # Search for any variation of nuget.config in the RepoRoot @@ -696,7 +684,7 @@ function InitializeToolset() { } DotNet @downloadArgs - $packageDir = Join-Path $nugetCache (Join-Path 'microsoft.dotnet.arcade.sdk' $toolsetVersion) + $packageDir = Join-Path $nugetPackageCachePath (Join-Path 'microsoft.dotnet.arcade.sdk' $toolsetVersion) $packageToolsetDir = Join-Path $packageDir 'toolset' if (!(Test-Path $packageToolsetDir)) { @@ -747,60 +735,6 @@ function Stop-Processes() { # Terminates the script if the build fails. # function MSBuild() { - if ($ci) { - InitializeToolset | Out-Null - - $env:NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS = 20 - $env:NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS = 20 - Write-PipelineSetVariable -Name 'NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS' -Value '20' - Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20' - - Enable-Nuget-EnhancedRetry - } - - MSBuild-Core @args -} - -# -# Executes a dotnet command with arguments passed to the function. -# Terminates the script if the command fails. -# -function DotNet() { - $dotnetRoot = InitializeDotNetCli -install:$restore - $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - - $cmdArgs = "" - foreach ($arg in $args) { - if ($null -ne $arg -and $arg.Trim() -ne "") { - if ($arg.EndsWith('\')) { - $arg = $arg + "\" - } - $cmdArgs += " `"$arg`"" - } - } - - $env:ARCADE_BUILD_TOOL_COMMAND = "`"$dotnetPath`" $cmdArgs" - - $exitCode = Exec-Process $dotnetPath $cmdArgs - - if ($exitCode -ne 0) { - Write-Host "dotnet command failed with exit code $exitCode. Check errors above." -ForegroundColor Red - - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR) { - Write-PipelineSetResult -Result "Failed" -Message "dotnet command execution failed." - ExitWithExitCode 0 - } else { - ExitWithExitCode $exitCode - } - } -} - -# -# Executes msbuild (or 'dotnet msbuild') with arguments passed to the function. -# The arguments are automatically quoted. -# Terminates the script if the build fails. -# -function MSBuild-Core() { if ($ci) { if (!$binaryLog -and !$excludeCIBinarylog) { Write-PipelineTelemetryError -Category 'Build' -Message 'Binary log must be enabled in CI build, or explicitly opted-out from with the -excludeCIBinarylog switch.' @@ -813,16 +747,10 @@ function MSBuild-Core() { } } - Enable-Nuget-EnhancedRetry - $buildTool = InitializeBuildTool $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" - if ($ci -and $buildTool.Tool -eq 'dotnet') { - $cmdArgs += ' /p:MSBuildEnableWorkloadResolver=false' - } - # Add -mt flag for MSBuild multithreaded mode if enabled via environment variable if ($env:MSBUILD_MT_ENABLED -eq "1") { $cmdArgs += ' -mt' @@ -876,6 +804,40 @@ function MSBuild-Core() { } } +# +# Executes a dotnet command with arguments passed to the function. +# Terminates the script if the command fails. +# +function DotNet() { + $dotnetRoot = InitializeDotNetCli -install:$restore + $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') + + $cmdArgs = "" + foreach ($arg in $args) { + if ($null -ne $arg -and $arg.Trim() -ne "") { + if ($arg.EndsWith('\')) { + $arg = $arg + "\" + } + $cmdArgs += " `"$arg`"" + } + } + + $env:ARCADE_BUILD_TOOL_COMMAND = "`"$dotnetPath`" $cmdArgs" + + $exitCode = Exec-Process $dotnetPath $cmdArgs + + if ($exitCode -ne 0) { + Write-Host "dotnet command failed with exit code $exitCode. Check errors above." -ForegroundColor Red + + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR) { + Write-PipelineSetResult -Result "Failed" -Message "dotnet command execution failed." + ExitWithExitCode 0 + } else { + ExitWithExitCode $exitCode + } + } +} + function GetMSBuildBinaryLogCommandLineArgument($arguments) { foreach ($argument in $arguments) { if ($argument -ne $null) { @@ -960,19 +922,5 @@ if (!$disableConfigureToolsetImport) { } } -# -# If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic. -# -function Enable-Nuget-EnhancedRetry() { - if ($ci) { - Write-Host "Setting NUGET enhanced retry environment variables" - $env:NUGET_ENABLE_ENHANCED_HTTP_RETRY = 'true' - $env:NUGET_ENHANCED_MAX_NETWORK_TRY_COUNT = 6 - $env:NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS = 1000 - $env:NUGET_RETRY_HTTP_429 = 'true' - Write-PipelineSetVariable -Name 'NUGET_ENABLE_ENHANCED_HTTP_RETRY' -Value 'true' - Write-PipelineSetVariable -Name 'NUGET_ENHANCED_MAX_NETWORK_TRY_COUNT' -Value '6' - Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' - Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true' - } -} +# Initialize the nuget package cache vars +$nugetPackageCachePath = InitializeNuGetPackageCachePath diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 2a587f1184a..48cab70ebf4 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -116,12 +116,6 @@ function InitializeDotNetCli { export DOTNET_CLI_TELEMETRY_OPTOUT=1 fi - # Keep repo builds isolated from machine-installed SDK state and workload advertising. - # This avoids preview SDK builds picking up mismatched workloads on CI images. - export DOTNET_MULTILEVEL_LOOKUP=0 - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - export DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE=1 - # LTTNG is the logging infrastructure used by Core CLR. Need this variable set # so it doesn't output warnings to the console. export LTTNG_HOME="$HOME" @@ -167,9 +161,6 @@ function InitializeDotNetCli { Write-PipelinePrependPath -path "$dotnet_root" Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" - Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" - Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" - Write-PipelineSetVariable -name "DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE" -value "1" # return value _InitializeDotNetCli="$dotnet_root" @@ -373,7 +364,7 @@ function InitializeBuildTool { _InitializeBuildToolCommand="msbuild" } -function GetNuGetPackageCachePath { +function InitializeNuGetPackageCachePath { if [[ -z ${NUGET_PACKAGES:-} ]]; then if [[ "$use_global_nuget_cache" == true ]]; then export NUGET_PACKAGES="$HOME/.nuget/packages/" @@ -383,7 +374,7 @@ function GetNuGetPackageCachePath { fi # return value - _GetNuGetPackageCachePath=$NUGET_PACKAGES + _InitializeNuGetPackageCachePath=$NUGET_PACKAGES } function InitializeNativeTools() { @@ -405,8 +396,6 @@ function InitializeToolset { return fi - GetNuGetPackageCachePath - ReadGlobalVersion "Microsoft.DotNet.Arcade.Sdk" local toolset_version=$_ReadGlobalVersion @@ -429,7 +418,7 @@ function InitializeToolset { ExitWithExitCode 2 fi - local download_args=("package" "download" "Microsoft.DotNet.Arcade.Sdk@$toolset_version" "--verbosity" "minimal" "--prerelease" "--output" "$_GetNuGetPackageCachePath") + local download_args=("package" "download" "Microsoft.DotNet.Arcade.Sdk@$toolset_version" "--verbosity" "minimal" "--prerelease" "--output" "$_InitializeNuGetPackageCachePath") local nuget_config="${NUGET_CONFIG:-}" if [[ -z "$nuget_config" ]]; then # Search for any variation of nuget.config in the RepoRoot @@ -446,7 +435,7 @@ function InitializeToolset { fi DotNet "${download_args[@]}" - local package_dir="$_GetNuGetPackageCachePath/microsoft.dotnet.arcade.sdk/$toolset_version" + local package_dir="$_InitializeNuGetPackageCachePath/microsoft.dotnet.arcade.sdk/$toolset_version" if [[ ! -d "$package_dir/toolset" ]]; then Write-PipelineTelemetryError -category 'InitializeToolset' "Arcade SDK package does not contain a toolset folder: $package_dir" @@ -502,21 +491,6 @@ function DotNet { } function MSBuild { - local args=( "$@" ) - - if [[ "$ci" == true ]]; then - InitializeToolset - - export NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS=20 - export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20 - Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20" - Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20" - fi - - MSBuild-Core "${args[@]}" -} - -function MSBuild-Core { if [[ "$ci" == true ]]; then if [[ "$binary_log" != true && "$exclude_ci_binary_log" != true ]]; then Write-PipelineTelemetryError -category 'Build' "Binary log must be enabled in CI build, or explicitly opted-out from with the -noBinaryLog switch." @@ -569,12 +543,7 @@ function MSBuild-Core { warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=$warn_not_as_error" fi - local workload_resolver_switch="" - if [[ "$ci" == true && -n "${_InitializeBuildToolCommand:-}" ]]; then - workload_resolver_switch="/p:MSBuildEnableWorkloadResolver=false" - fi - - RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch $workload_resolver_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" + RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" } function GetDarc { @@ -665,3 +634,6 @@ fi if [[ -n "${useInstalledDotNetCli:-}" ]]; then use_installed_dotnet_cli="$useInstalledDotNetCli" fi + +# Initialize the nuget package cache vars +InitializeNuGetPackageCachePath diff --git a/global.json b/global.json index a809c644036..ce0a1da2359 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "version": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26279.5", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26279.5" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26301.6", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26301.6" } } From 33346c75910b618995691420de32808c972ce906 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 3 Jun 2026 02:01:51 +0000 Subject: [PATCH 05/11] Update dependencies from https://github.com/dotnet/arcade build 20260602.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26276.8 -> To Version 11.0.0-beta.26302.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52a6e07bd07..a64f65756fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,25 @@ - + https://github.com/dotnet/arcade - 64988f042b980bf81c5d1e223ad6ddc4165e0e46 + aa5dcbaa4fbec9c9f1ea9b3e9e4b7fc067f34d0b - + https://github.com/dotnet/arcade - 64988f042b980bf81c5d1e223ad6ddc4165e0e46 + aa5dcbaa4fbec9c9f1ea9b3e9e4b7fc067f34d0b - + https://github.com/dotnet/arcade - 64988f042b980bf81c5d1e223ad6ddc4165e0e46 + aa5dcbaa4fbec9c9f1ea9b3e9e4b7fc067f34d0b - + https://github.com/dotnet/arcade - 64988f042b980bf81c5d1e223ad6ddc4165e0e46 + aa5dcbaa4fbec9c9f1ea9b3e9e4b7fc067f34d0b - + https://github.com/dotnet/arcade - 64988f042b980bf81c5d1e223ad6ddc4165e0e46 + aa5dcbaa4fbec9c9f1ea9b3e9e4b7fc067f34d0b diff --git a/eng/Versions.props b/eng/Versions.props index 312047675a6..eff6c6da37f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,9 +22,9 @@ - 11.0.0-beta.26301.6 - 11.0.0-beta.26301.6 - 11.0.0-beta.26301.6 + 11.0.0-beta.26302.1 + 11.0.0-beta.26302.1 + 11.0.0-beta.26302.1 diff --git a/global.json b/global.json index ce0a1da2359..5210ba28770 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "version": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26301.6", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26301.6" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26302.1", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26302.1" } } From a572dbfaaeb81680f21ad3cdec4a1e1e796ed697 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Jun 2026 02:01:57 +0000 Subject: [PATCH 06/11] Update dependencies from https://github.com/dotnet/arcade build 20260603.5 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26276.8 -> To Version 11.0.0-beta.26303.5 --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../core-templates/job/helix-job-monitor.yml | 2 +- eng/common/core-templates/job/job.yml | 6 ++++++ eng/common/templates/job/job.yml | 5 ----- eng/common/tools.ps1 | 5 +++-- global.json | 4 ++-- 7 files changed, 25 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a64f65756fa..4e1470cbb20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,25 @@ - + https://github.com/dotnet/arcade - aa5dcbaa4fbec9c9f1ea9b3e9e4b7fc067f34d0b + b6ed8ef7f3251d0b67ac2428c06253d0ba328e97 - + https://github.com/dotnet/arcade - aa5dcbaa4fbec9c9f1ea9b3e9e4b7fc067f34d0b + b6ed8ef7f3251d0b67ac2428c06253d0ba328e97 - + https://github.com/dotnet/arcade - aa5dcbaa4fbec9c9f1ea9b3e9e4b7fc067f34d0b + b6ed8ef7f3251d0b67ac2428c06253d0ba328e97 - + https://github.com/dotnet/arcade - aa5dcbaa4fbec9c9f1ea9b3e9e4b7fc067f34d0b + b6ed8ef7f3251d0b67ac2428c06253d0ba328e97 - + https://github.com/dotnet/arcade - aa5dcbaa4fbec9c9f1ea9b3e9e4b7fc067f34d0b + b6ed8ef7f3251d0b67ac2428c06253d0ba328e97 diff --git a/eng/Versions.props b/eng/Versions.props index eff6c6da37f..5c44199628d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,9 +22,9 @@ - 11.0.0-beta.26302.1 - 11.0.0-beta.26302.1 - 11.0.0-beta.26302.1 + 11.0.0-beta.26303.5 + 11.0.0-beta.26303.5 + 11.0.0-beta.26303.5 diff --git a/eng/common/core-templates/job/helix-job-monitor.yml b/eng/common/core-templates/job/helix-job-monitor.yml index 767450da2fc..a8162c51166 100644 --- a/eng/common/core-templates/job/helix-job-monitor.yml +++ b/eng/common/core-templates/job/helix-job-monitor.yml @@ -170,7 +170,7 @@ jobs: toolArgs=( --helix-base-uri '${{ parameters.helixBaseUri }}' --polling-interval-seconds '${{ parameters.pollingIntervalSeconds }}' - --max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 2))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully. + --max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 5))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully. --stage-name '$(System.StageName)' ) diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 66c7988f222..cb60f529784 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -75,6 +75,12 @@ jobs: variables: - name: AllowPtrToDetectTestRunRetryFiles value: true + # Component Governance detection and CodeQL are not run in the public project + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - name: skipComponentGovernanceDetection + value: true + - name: Codeql.SkipTaskAutoInjection + value: true - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE value: '$(Build.Repository.Uri)' diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 5e261f34db4..85501406a54 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -21,11 +21,6 @@ jobs: - ${{ each step in parameters.steps }}: - ${{ step }} - # we don't run CG in public - - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" - displayName: Set skipComponentGovernanceDetection variable - artifactPublishSteps: - ${{ if ne(parameters.artifacts.publish, '') }}: - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 77dfd5eaa21..fc72fe63049 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -596,9 +596,10 @@ function InitializeNuGetPackageCachePath() { # use global cache in dev builds to avoid cost of downloading packages. # For directory normalization, see also: https://github.com/NuGet/Home/issues/7968 if ($useGlobalNuGetCache) { - $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\' + $userProfile = if (IsWindowsPlatform) { $env:UserProfile } else { $env:HOME } + $env:NUGET_PACKAGES = [IO.Path]::Combine($userProfile, '.nuget', 'packages') + [IO.Path]::DirectorySeparatorChar } else { - $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\' + $env:NUGET_PACKAGES = [IO.Path]::Combine($RepoRoot, '.packages') + [IO.Path]::DirectorySeparatorChar } } diff --git a/global.json b/global.json index 5210ba28770..725c093338e 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "version": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26302.1", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26302.1" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26303.5", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26303.5" } } From e3acc23bb7efa8d3ce10702fea84498f0033f027 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Jun 2026 02:01:52 +0000 Subject: [PATCH 07/11] Update dependencies from https://github.com/dotnet/arcade build 20260604.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26276.8 -> To Version 11.0.0-beta.26304.2 --- eng/Version.Details.xml | 20 +++++++------- eng/Versions.props | 6 ++--- .../native/LocateNativeCompiler.targets | 27 +++++++++++++++++++ global.json | 4 +-- 4 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 eng/common/native/LocateNativeCompiler.targets diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e1470cbb20..c8ba1ca0e6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,25 @@ - + https://github.com/dotnet/arcade - b6ed8ef7f3251d0b67ac2428c06253d0ba328e97 + edbe1f4ab32c715bc7e4ef80e92d7eddc99ba6c8 - + https://github.com/dotnet/arcade - b6ed8ef7f3251d0b67ac2428c06253d0ba328e97 + edbe1f4ab32c715bc7e4ef80e92d7eddc99ba6c8 - + https://github.com/dotnet/arcade - b6ed8ef7f3251d0b67ac2428c06253d0ba328e97 + edbe1f4ab32c715bc7e4ef80e92d7eddc99ba6c8 - + https://github.com/dotnet/arcade - b6ed8ef7f3251d0b67ac2428c06253d0ba328e97 + edbe1f4ab32c715bc7e4ef80e92d7eddc99ba6c8 - + https://github.com/dotnet/arcade - b6ed8ef7f3251d0b67ac2428c06253d0ba328e97 + edbe1f4ab32c715bc7e4ef80e92d7eddc99ba6c8 diff --git a/eng/Versions.props b/eng/Versions.props index 5c44199628d..bacf5c717f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,9 +22,9 @@ - 11.0.0-beta.26303.5 - 11.0.0-beta.26303.5 - 11.0.0-beta.26303.5 + 11.0.0-beta.26304.2 + 11.0.0-beta.26304.2 + 11.0.0-beta.26304.2 diff --git a/eng/common/native/LocateNativeCompiler.targets b/eng/common/native/LocateNativeCompiler.targets new file mode 100644 index 00000000000..028b33d9444 --- /dev/null +++ b/eng/common/native/LocateNativeCompiler.targets @@ -0,0 +1,27 @@ + + + + + clang + $(ROOTFS_DIR) + + + + + + + + $(_CC_LDFLAGS.SubString(0, $(_CC_LDFLAGS.IndexOf(';')))) + <_LDFLAGS>$(_CC_LDFLAGS.SubString($([MSBuild]::Add($(_CC_LDFLAGS.IndexOf(';')), 1)))) + lld + + + diff --git a/global.json b/global.json index 725c093338e..e1e7721e32c 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "version": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26303.5", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26303.5" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26304.2", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26304.2" } } From 292ffe0591115d3c3bb49b680d8262dcf65132cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 6 Jun 2026 02:01:44 +0000 Subject: [PATCH 08/11] Update dependencies from https://github.com/dotnet/arcade build 20260605.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26276.8 -> To Version 11.0.0-beta.26305.3 --- eng/Version.Details.xml | 20 ++++++++-------- eng/Versions.props | 6 ++--- .../steps/enable-internal-sources.yml | 24 +++++++++++++++++++ eng/common/templates/vmr-build-pr.yml | 2 +- global.json | 4 ++-- 5 files changed, 40 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8ba1ca0e6e..86418b5ebcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,25 @@ - + https://github.com/dotnet/arcade - edbe1f4ab32c715bc7e4ef80e92d7eddc99ba6c8 + b31c3cf8a2a203c42410451844f778d5b951c3b3 - + https://github.com/dotnet/arcade - edbe1f4ab32c715bc7e4ef80e92d7eddc99ba6c8 + b31c3cf8a2a203c42410451844f778d5b951c3b3 - + https://github.com/dotnet/arcade - edbe1f4ab32c715bc7e4ef80e92d7eddc99ba6c8 + b31c3cf8a2a203c42410451844f778d5b951c3b3 - + https://github.com/dotnet/arcade - edbe1f4ab32c715bc7e4ef80e92d7eddc99ba6c8 + b31c3cf8a2a203c42410451844f778d5b951c3b3 - + https://github.com/dotnet/arcade - edbe1f4ab32c715bc7e4ef80e92d7eddc99ba6c8 + b31c3cf8a2a203c42410451844f778d5b951c3b3 diff --git a/eng/Versions.props b/eng/Versions.props index bacf5c717f2..66d9f49d747 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,9 +22,9 @@ - 11.0.0-beta.26304.2 - 11.0.0-beta.26304.2 - 11.0.0-beta.26304.2 + 11.0.0-beta.26305.3 + 11.0.0-beta.26305.3 + 11.0.0-beta.26305.3 diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 4085512b690..51af9a01709 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -15,32 +15,56 @@ steps: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - ${{ if ne(parameters.legacyCredential, '') }}: - task: PowerShell@2 + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) displayName: Setup Internal Feeds inputs: filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token env: Token: ${{ parameters.legacyCredential }} + - task: Bash@3 + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + displayName: Setup Internal Feeds + inputs: + targetType: inline + script: | + "$(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh" "$(System.DefaultWorkingDirectory)/NuGet.config" "$Token" + env: + Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. # If running on DevDiv, NuGetAuthenticate is not really an option. It's scoped to a single feed, and we have many feeds that # may be added. Instead, we'll use the traditional approach (add cred to nuget.config), but use an account token. - ${{ else }}: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - task: PowerShell@2 + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) displayName: Setup Internal Feeds inputs: filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config + - task: Bash@3 + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + displayName: Setup Internal Feeds + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh + arguments: $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: federatedServiceConnection: ${{ parameters.nugetFederatedServiceConnection }} outputVariableName: 'dnceng-artifacts-feeds-read-access-token' - task: PowerShell@2 + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) displayName: Setup Internal Feeds inputs: filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + - task: Bash@3 + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + displayName: Setup Internal Feeds + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh + arguments: $(System.DefaultWorkingDirectory)/NuGet.config $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/templates/vmr-build-pr.yml b/eng/common/templates/vmr-build-pr.yml index 2f3694fa132..d24de935248 100644 --- a/eng/common/templates/vmr-build-pr.yml +++ b/eng/common/templates/vmr-build-pr.yml @@ -33,7 +33,7 @@ resources: - repository: vmr type: github name: dotnet/dotnet - endpoint: dotnet + endpoint: public ref: refs/heads/main # Set to whatever VMR branch the PR build should insert into stages: diff --git a/global.json b/global.json index e1e7721e32c..b01aefc8e88 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "version": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26304.2", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26304.2" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26305.3", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26305.3" } } From 156d1f3b59ed4d11208558bd035ace3ad68d4b7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 8 Jun 2026 02:01:39 +0000 Subject: [PATCH 09/11] Update dependencies from https://github.com/dotnet/arcade build 20260607.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26276.8 -> To Version 11.0.0-beta.26307.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/cross/build-rootfs.sh | 2 +- global.json | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86418b5ebcd..6f7154bed32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,25 @@ - + https://github.com/dotnet/arcade - b31c3cf8a2a203c42410451844f778d5b951c3b3 + 76ee16fe3a80a4bf55c7d31dbdef2804e555cce0 - + https://github.com/dotnet/arcade - b31c3cf8a2a203c42410451844f778d5b951c3b3 + 76ee16fe3a80a4bf55c7d31dbdef2804e555cce0 - + https://github.com/dotnet/arcade - b31c3cf8a2a203c42410451844f778d5b951c3b3 + 76ee16fe3a80a4bf55c7d31dbdef2804e555cce0 - + https://github.com/dotnet/arcade - b31c3cf8a2a203c42410451844f778d5b951c3b3 + 76ee16fe3a80a4bf55c7d31dbdef2804e555cce0 - + https://github.com/dotnet/arcade - b31c3cf8a2a203c42410451844f778d5b951c3b3 + 76ee16fe3a80a4bf55c7d31dbdef2804e555cce0 diff --git a/eng/Versions.props b/eng/Versions.props index 66d9f49d747..77d181b01a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,9 +22,9 @@ - 11.0.0-beta.26305.3 - 11.0.0-beta.26305.3 - 11.0.0-beta.26305.3 + 11.0.0-beta.26307.1 + 11.0.0-beta.26307.1 + 11.0.0-beta.26307.1 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index f06854ccc18..d6c13508668 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -626,7 +626,7 @@ elif [[ "$__CodeName" == "openbsd" ]]; then echo "Creating versionless symlinks for shared libraries..." # Find all versioned .so files and create the base .so symlink - for lib in "$__RootfsDir/usr/lib/libc++.so."* "$__RootfsDir/usr/lib/libc++abi.so."* "$__RootfsDir/usr/lib/libpthread.so."*; do + for lib in "$__RootfsDir"/usr/lib/lib*.so.*; do if [ -f "$lib" ]; then # Extract the filename (e.g., libc++.so.12.0) VERSIONED_NAME=$(basename "$lib") diff --git a/global.json b/global.json index b01aefc8e88..7fe35e65d7c 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "version": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26305.3", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26305.3" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26307.1", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26307.1" } } From 6b27897ce42a491737647fd9bd89964c4be2050f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jun 2026 02:01:14 +0000 Subject: [PATCH 10/11] Update dependencies from https://github.com/dotnet/arcade build 20260608.8 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26276.8 -> To Version 11.0.0-beta.26308.8 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/SetupNugetSources.ps1 | 5 +++++ eng/common/SetupNugetSources.sh | 5 +++++ eng/common/cross/build-rootfs.sh | 4 ++-- global.json | 4 ++-- 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f7154bed32..51d22cb3773 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,25 @@ - + https://github.com/dotnet/arcade - 76ee16fe3a80a4bf55c7d31dbdef2804e555cce0 + 697f1983c6a178fa7b2381ee7306f8c52f9c31a8 - + https://github.com/dotnet/arcade - 76ee16fe3a80a4bf55c7d31dbdef2804e555cce0 + 697f1983c6a178fa7b2381ee7306f8c52f9c31a8 - + https://github.com/dotnet/arcade - 76ee16fe3a80a4bf55c7d31dbdef2804e555cce0 + 697f1983c6a178fa7b2381ee7306f8c52f9c31a8 - + https://github.com/dotnet/arcade - 76ee16fe3a80a4bf55c7d31dbdef2804e555cce0 + 697f1983c6a178fa7b2381ee7306f8c52f9c31a8 - + https://github.com/dotnet/arcade - 76ee16fe3a80a4bf55c7d31dbdef2804e555cce0 + 697f1983c6a178fa7b2381ee7306f8c52f9c31a8 diff --git a/eng/Versions.props b/eng/Versions.props index 77d181b01a4..17e77e351c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,9 +22,9 @@ - 11.0.0-beta.26307.1 - 11.0.0-beta.26307.1 - 11.0.0-beta.26307.1 + 11.0.0-beta.26308.8 + 11.0.0-beta.26308.8 + 11.0.0-beta.26308.8 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index fc8d618014e..58002808bc8 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -32,6 +32,11 @@ $ErrorActionPreference = "Stop" Set-StrictMode -Version 2.0 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +# This script only consumes helper functions from tools.ps1 to configure NuGet feeds. +# Skip importing configure-toolset.ps1 so that repo-specific toolset setup (e.g. acquiring +# a bootstrap SDK) is not triggered as a side effect of feed configuration. +$disableConfigureToolsetImport = $true + . $PSScriptRoot\tools.ps1 # Adds or enables the package source with the given name diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index b97cc536379..67e7e0942ca 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -40,6 +40,11 @@ while [[ -h "$source" ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" +# This script only consumes helper functions from tools.sh to configure NuGet feeds. +# Skip importing configure-toolset.sh so that repo-specific toolset setup (e.g. acquiring +# a bootstrap SDK) is not triggered as a side effect of feed configuration. +disable_configure_toolset_import=1 + . "$scriptroot/tools.sh" if [ ! -f "$ConfigFile" ]; then diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index d6c13508668..b553372e48a 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -618,9 +618,9 @@ elif [[ "$__CodeName" == "openbsd" ]]; then [[ -z "$PKG_FILE" ]] && { echo "ERROR: Package $pkg not found"; exit 1; } if [[ "$__hasWget" == 1 ]]; then - wget -O- "$PKG_MIRROR/$PKG_FILE" | tar -C "$__RootfsDir" -xzpf - + wget -O- "$PKG_MIRROR/$PKG_FILE" | tar -C "$__RootfsDir/usr/local" -xzpf - else - curl -SL "$PKG_MIRROR/$PKG_FILE" | tar -C "$__RootfsDir" -xzpf - + curl -SL "$PKG_MIRROR/$PKG_FILE" | tar -C "$__RootfsDir/usr/local" -xzpf - fi done diff --git a/global.json b/global.json index 7fe35e65d7c..4aafc1ddb50 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "version": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26307.1", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26307.1" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26308.8", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26308.8" } } From 6ed9f5c6986eb0e27c9065fa755bf11df9492f1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jun 2026 02:01:25 +0000 Subject: [PATCH 11/11] Update dependencies from https://github.com/dotnet/arcade build 20260609.4 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26276.8 -> To Version 11.0.0-beta.26309.4 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/cross/build-rootfs.sh | 4 ++++ global.json | 4 ++-- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51d22cb3773..1628a268a15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,25 @@ - + https://github.com/dotnet/arcade - 697f1983c6a178fa7b2381ee7306f8c52f9c31a8 + 33a0195c151df6325ddd3904b3e7f20677769f94 - + https://github.com/dotnet/arcade - 697f1983c6a178fa7b2381ee7306f8c52f9c31a8 + 33a0195c151df6325ddd3904b3e7f20677769f94 - + https://github.com/dotnet/arcade - 697f1983c6a178fa7b2381ee7306f8c52f9c31a8 + 33a0195c151df6325ddd3904b3e7f20677769f94 - + https://github.com/dotnet/arcade - 697f1983c6a178fa7b2381ee7306f8c52f9c31a8 + 33a0195c151df6325ddd3904b3e7f20677769f94 - + https://github.com/dotnet/arcade - 697f1983c6a178fa7b2381ee7306f8c52f9c31a8 + 33a0195c151df6325ddd3904b3e7f20677769f94 diff --git a/eng/Versions.props b/eng/Versions.props index 17e77e351c5..76976e54d24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,9 +22,9 @@ - 11.0.0-beta.26308.8 - 11.0.0-beta.26308.8 - 11.0.0-beta.26308.8 + 11.0.0-beta.26309.4 + 11.0.0-beta.26309.4 + 11.0.0-beta.26309.4 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index b553372e48a..273cae651a2 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -636,6 +636,10 @@ elif [[ "$__CodeName" == "openbsd" ]]; then ln -sf "$VERSIONED_NAME" "$__RootfsDir/usr/lib/$BASE_NAME" fi done + + echo "Cleaning up unnecessary paths" + # we don't use executables and kernel in rootfs (as we use host's compiler with -sysroot) + rm -rf "$__RootfsDir/usr/share" "$__RootfsDir/usr/bin" elif [[ "$__CodeName" == "illumos" ]]; then mkdir "$__RootfsDir/tmp" pushd "$__RootfsDir/tmp" diff --git a/global.json b/global.json index 4aafc1ddb50..6bc864c8253 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "version": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26308.8", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26308.8" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26309.4", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26309.4" } }