From b48dbba618b41e86b807e4b08225ce1ee4a5efbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Jul 2025 02:02:25 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20250717.4 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25358.3 -> To Version 10.0.0-beta.25367.4 --- eng/Version.Details.xml | 4 ++-- eng/common/tools.ps1 | 2 +- global.json | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ceabfeca32..553f4ca9a5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -36,9 +36,9 @@ - + https://github.com/dotnet/arcade - 4e526204e83e615efe8eb5743be7fbccfa4e492a + d0d479e8a393acf349e860fe728bdbcd3e44b2d7 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 40f0aa86128..996a5f9c872 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -414,7 +414,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index 1cf5dfcea7d..3142bacccb6 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-preview.6.25315.102", + "version": "10.0.100-preview.7.25322.101", "allowPrerelease": true, "paths": [ ".dotnet", @@ -9,7 +9,7 @@ "errorMessage": "The .NET SDK could not be found, please run ./eng/common/dotnet.sh." }, "tools": { - "dotnet": "10.0.100-preview.6.25315.102", + "dotnet": "10.0.100-preview.7.25322.101", "vs": { "version": "17.8", "components": [ @@ -22,7 +22,7 @@ "perl": "5.38.2.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25358.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25367.4", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } } From a85c30abfd0a014644583d4722022d52bbec2a58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Jul 2025 02:03:00 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20250717.5 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25358.3 -> To Version 10.0.0-beta.25367.5 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 553f4ca9a5d..5c069292393 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -36,9 +36,9 @@ - + https://github.com/dotnet/arcade - d0d479e8a393acf349e860fe728bdbcd3e44b2d7 + d777c20040bdc2e52b372fa98dcb84141ed692d3 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/global.json b/global.json index 3142bacccb6..ca151b6f12f 100644 --- a/global.json +++ b/global.json @@ -22,7 +22,7 @@ "perl": "5.38.2.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25367.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25367.5", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } }