From 6552948719e5a79c2d831cf17dc8d40432043796 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Nov 2025 02:03:37 +0000 Subject: [PATCH 1/2] Backflow from https://github.com/dotnet/dotnet / f4701e0 build 290631 [[ commit created by automation ]] --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index faf2531306e..fce8c20b774 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,7 @@ 10 0 1 - rtm + servicing $(MajorVersion).$(MinorVersion).$(PatchVersion) - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 5ceddefda23..37789c36b87 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 10.0.0-beta.25555.106 - 10.0.0-beta.25555.106 - 10.0.0-beta.25555.106 - 10.0.0-beta.25555.106 - 10.0.1-servicing.25555.106 + 10.0.0-beta.25562.108 + 10.0.0-beta.25562.108 + 10.0.0-beta.25562.108 + 10.0.0-beta.25562.108 + 10.0.1-servicing.25562.108 10.0.1 - 10.0.1-servicing.25555.106 - 10.0.1-servicing.25555.106 + 10.0.1-servicing.25562.108 + 10.0.1-servicing.25562.108 8.0.0-beta.23409.2 8.0.0-beta.23409.2 10.0.1 @@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props 10.0.1 10.0.1 10.0.1 - 10.0.1-servicing.25555.106 + 10.0.1-servicing.25562.108 10.0.1 10.0.1 10.0.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 442119f5472..fd6c9d18e11 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -28,51 +28,51 @@ https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 37dff559fc1..e7daa6d2faf 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -180,6 +180,11 @@ jobs: PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} + # 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/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index f6f87fe5c67..55361908c2e 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -307,6 +307,11 @@ 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 2cb053155eb..dd5d7927e1e 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25555.106", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25555.106", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25562.108", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25562.108", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": {