diff --git a/NuGet.config b/NuGet.config index f0ccf5d37a1..b1922c34161 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -25,7 +24,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c43631ca5b..f5207799f86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 9eaf7b289d5003a94ee23658f057a6c06ddcd570 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 9eaf7b289d5003a94ee23658f057a6c06ddcd570 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 9eaf7b289d5003a94ee23658f057a6c06ddcd570 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 9eaf7b289d5003a94ee23658f057a6c06ddcd570 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 9eaf7b289d5003a94ee23658f057a6c06ddcd570 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 9eaf7b289d5003a94ee23658f057a6c06ddcd570 diff --git a/eng/Versions.props b/eng/Versions.props index 6a615fa185e..99db611cbaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,9 +57,9 @@ - 9.0.0-beta.25515.2 - 9.0.0-beta.25515.2 - 9.0.0-beta.25515.2 + 9.0.0-beta.25555.4 + 9.0.0-beta.25555.4 + 9.0.0-beta.25555.4 17.4.0-preview-20220707-01 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index a58c8a418e8..6b5ff28cc70 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -145,6 +145,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 2ee8bbfff54..221d1ac6de1 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -305,6 +305,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 02e2c264fff..c47d58580f8 100644 --- a/global.json +++ b/global.json @@ -14,9 +14,9 @@ "version": "9.0.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25515.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25515.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25515.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25555.4", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25555.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25555.4", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "9.0.10" },