From ad10bb16b57c8efd4fdf13cc4ef9b629639fcb3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Apr 2026 05:02:59 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20260411.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.26204.1 -> To Version 11.0.0-beta.26211.1 --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- eng/common/tools.ps1 | 8 ++++++-- eng/common/tools.sh | 8 ++++++-- global.json | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index df44899c6b..28a9b5c80e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.26204.1 + 11.0.0-beta.26211.1 18.6.1 18.6.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 505ab393a4..813b23bdc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,9 +76,9 @@ - + https://github.com/dotnet/arcade - 1f7eece09d5c6fc2a1319d04f6ae4b7d18455e2d + a08169b890573cfd7f949ea9062c86a4db1aab1b https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index b678799176..e28db6c7c8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -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) { @@ -773,7 +777,7 @@ function MSBuild-Core() { $cmdArgs += ' /p:TreatWarningsAsErrors=false' } - if ($warnNotAsError) { + if ($warnAsError -and $warnNotAsError) { $cmdArgs += " /warnnotaserror:$warnNotAsError /p:AdditionalWarningsNotAsErrors=$warnNotAsError" } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index a6e0ed594f..1e37fd95b2 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -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" @@ -534,7 +538,7 @@ function MSBuild-Core { fi local warnnotaserror_switch="" - if [[ -n "$warn_not_as_error" ]]; then + if [[ -n "$warn_not_as_error" && "$warn_as_error" == true ]]; then warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=$warn_not_as_error" fi diff --git a/global.json b/global.json index a1fdd405af..ab623d776c 100644 --- a/global.json +++ b/global.json @@ -22,7 +22,7 @@ "xcopy-msbuild": "18.0.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26204.1", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26211.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } } From 57de5e4b7056623049056b24bc0c4a5eb3b50a06 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Mon, 13 Apr 2026 12:15:51 +0200 Subject: [PATCH 2/2] Fix NU1605: update MicrosoftTestPlatformVersion to 18.0.1 The new arcade SDK (11.0.0-beta.26211.1) changed Tests.props to check IsTestingPlatformApplication instead of UseMicrosoftTestingPlatformRunner, causing Microsoft.NET.Test.Sdk 18.0.1 to be added to test projects. This conflicted with the repo-pinned Microsoft.TestPlatform.ObjectModel 17.14.1, producing NU1605 package downgrade errors on all CI legs. Update MicrosoftTestPlatformVersion to 18.0.1 to match arcade's default. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/Versions.props | 2 +- tests/EndToEndBuildTests/Directory.Build.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5ef7109a3b..a6a34de7ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 5.0.0-preview.7.20364.11 5.0.0-preview.7.20364.11 - 17.14.1 + 18.0.1 2.0.2 13.0.3 3.2.2 diff --git a/tests/EndToEndBuildTests/Directory.Build.props b/tests/EndToEndBuildTests/Directory.Build.props index f97db4e168..66d1e05ada 100644 --- a/tests/EndToEndBuildTests/Directory.Build.props +++ b/tests/EndToEndBuildTests/Directory.Build.props @@ -8,7 +8,7 @@ 3.2.2 2.0.2 8.0.0 - 17.14.1 + 18.0.1