From 86cca2ae73e1fdc65446f2df8e3a74a913adc6b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Jul 2025 02:04:52 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/dotnet build 275814 Updated Dependencies: Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.Configuration, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Text.Json, System.Text.Encodings.Web, System.Formats.Asn1, System.Runtime.Caching (Version 10.0.0-preview.7.25367.101 -> 10.0.0-preview.7.25368.102) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25367.101 -> 10.0.0-beta.25368.102) --- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++--------- eng/common/tools.ps1 | 2 +- global.json | 4 +-- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4822f24617..967a341c893 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 46deba7a696a2f4e00270a11c84a5aff2648dd39 diff --git a/eng/Versions.props b/eng/Versions.props index 0a871f3b7c4..3dbbde5d678 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,24 +16,24 @@ False - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.102 - 10.0.0-beta.25367.101 + 10.0.0-beta.25368.102 17.14.8 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 cb99e3d51a4..8a6b64d8e65 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25367.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25367.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25368.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25368.102" } } From cee56dd61d69bc474fa15ad3a142b7bf02cdd0a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 20 Jul 2025 02:04:23 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/dotnet build 275898 Updated Dependencies: Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.Configuration, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Text.Json, System.Text.Encodings.Web, System.Formats.Asn1, System.Runtime.Caching (Version 10.0.0-preview.7.25368.102 -> 10.0.0-preview.7.25368.105) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25368.102 -> 10.0.0-beta.25368.105) --- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++--------- global.json | 4 +-- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 967a341c893..9b41743e15e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 46deba7a696a2f4e00270a11c84a5aff2648dd39 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 diff --git a/eng/Versions.props b/eng/Versions.props index 3dbbde5d678..8716d33c428 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,24 +16,24 @@ False - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 - 10.0.0-preview.7.25368.102 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 - 10.0.0-beta.25368.102 + 10.0.0-beta.25368.105 17.14.8 diff --git a/global.json b/global.json index 8a6b64d8e65..111b070336e 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25368.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25368.102" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25368.105", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25368.105" } }