From 500ac3fd27a9ede152a8afc41c4e960b7eb5f400 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 20 Nov 2025 14:04:04 -0800 Subject: [PATCH 1/2] Revert "Update dependencies from https://github.com/dotnet/arcade build 20251112.3 (#64349)" This reverts commit 7e9dd50821e43e0949355c47bb44c41538850e9c. --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../job/publish-build-assets.yml | 5 ----- .../post-build/post-build.yml | 5 ----- .../templates/job/publish-build-assets.yml | 5 ----- .../templates/post-build/post-build.yml | 5 ----- global.json | 8 ++++---- 7 files changed, 17 insertions(+), 37 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06e73680071e..4e18e4ca1af1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -376,26 +376,26 @@ https://github.com/dotnet/winforms abda8e3bfa78319363526b5a5f86863ec979940e - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 6544413e02741855b701468aa8afc6cf8ca62c72 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 6544413e02741855b701468aa8afc6cf8ca62c72 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 6544413e02741855b701468aa8afc6cf8ca62c72 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 6544413e02741855b701468aa8afc6cf8ca62c72 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 6544413e02741855b701468aa8afc6cf8ca62c72 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index a8f35ee83400..0b7a47facb4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,9 +162,9 @@ 6.2.4 6.2.4 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 + 8.0.0-beta.25515.1 + 8.0.0-beta.25515.1 + 8.0.0-beta.25515.1 8.0.0-alpha.1.25202.2 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 53109246d948..a99d79df863c 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -152,11 +152,6 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - # Darc is targeting 8.0, so make sure it's installed - - task: UseDotNet@2 - inputs: - version: 8.0.x - - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 07837055ee30..817e2d80dea1 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -271,11 +271,6 @@ stages: - task: NuGetAuthenticate@1 - # Darc is targeting 8.0, so make sure it's installed - - task: UseDotNet@2 - inputs: - version: 8.0.x - - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index b4ece772c326..1fcdcc9adc34 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -148,11 +148,6 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - # Darc is targeting 8.0, so make sure it's installed - - task: UseDotNet@2 - inputs: - version: 8.0.x - - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 96ca06882384..ea1785a8aa26 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -267,11 +267,6 @@ stages: - task: NuGetAuthenticate@1 - # Darc is targeting 8.0, so make sure it's installed - - task: UseDotNet@2 - inputs: - version: 8.0.x - - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/global.json b/global.json index 582f49bf4e40..5fda0a241eef 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "8.0.122" + "version": "8.0.121" }, "tools": { - "dotnet": "8.0.122", + "dotnet": "8.0.121", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" @@ -25,8 +25,8 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.19", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25562.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25562.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25515.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25515.1" }, "native-tools": { "jdk": "latest" From 99ce85a6b9232bd9ce7b59ab5095ff441fdfa83b Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 20 Nov 2025 14:07:37 -0800 Subject: [PATCH 2/2] Update global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 5fda0a241eef..06155192c93c 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "8.0.121" + "version": "8.0.122" }, "tools": { - "dotnet": "8.0.121", + "dotnet": "8.0.122", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"