From 757036acf386852a3d52fea10843a4b9787a5367 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 17:35:48 +0000
Subject: [PATCH] [release/8.0] Update dependencies from dotnet/arcade (#11661)
[release/8.0] Update dependencies from dotnet/arcade
---
NuGet.config | 8 +++++++
eng/Version.Details.xml | 24 +++++++++----------
eng/Versions.props | 6 ++---
.../job/publish-build-assets.yml | 9 ++++---
.../templates/job/publish-build-assets.yml | 9 ++++---
global.json | 6 ++---
6 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index e394b90174f..8cae17fb651 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,6 +5,10 @@
+
+
+
+
@@ -23,6 +27,10 @@
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7dfad278199..b39493eac0a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -179,29 +179,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-
+
https://github.com/dotnet/arcade
- 3fe41d9e97519a4e9b48293906dbf58714ea9a0d
+ c9efa535175049eb9cba06cae1f8c3d5dbe768a9
-
+
https://github.com/dotnet/arcade
- 3fe41d9e97519a4e9b48293906dbf58714ea9a0d
+ c9efa535175049eb9cba06cae1f8c3d5dbe768a9
-
+
https://github.com/dotnet/arcade
- 3fe41d9e97519a4e9b48293906dbf58714ea9a0d
+ c9efa535175049eb9cba06cae1f8c3d5dbe768a9
-
+
https://github.com/dotnet/arcade
- 3fe41d9e97519a4e9b48293906dbf58714ea9a0d
+ c9efa535175049eb9cba06cae1f8c3d5dbe768a9
-
+
https://github.com/dotnet/arcade
- 3fe41d9e97519a4e9b48293906dbf58714ea9a0d
+ c9efa535175049eb9cba06cae1f8c3d5dbe768a9
-
+
https://github.com/dotnet/arcade
- 3fe41d9e97519a4e9b48293906dbf58714ea9a0d
+ c9efa535175049eb9cba06cae1f8c3d5dbe768a9
diff --git a/eng/Versions.props b/eng/Versions.props
index 93d5b814b14..b5e9247fe9a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,9 +56,9 @@
- 8.0.0-beta.24324.7
- 8.0.0-beta.24324.7
- 8.0.0-beta.24324.7
+ 8.0.0-beta.24360.5
+ 8.0.0-beta.24360.5
+ 8.0.0-beta.24360.5
17.4.0-preview-20220707-01
diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml
index d01739c1285..ba3e7df8158 100644
--- a/eng/common/templates-official/job/publish-build-assets.yml
+++ b/eng/common/templates-official/job/publish-build-assets.yml
@@ -140,11 +140,14 @@ jobs:
BARBuildId: ${{ parameters.BARBuildId }}
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- - task: PowerShell@2
+ - task: AzureCLI@2
displayName: Publish Using Darc
inputs:
- filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
- arguments: -BuildId $(BARBuildId)
+ azureSubscription: "Darc: Maestro Production"
+ scriptType: ps
+ scriptLocation: scriptPath
+ scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+ arguments: -BuildId $(BARBuildId)
-PublishingInfraVersion 3
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
-WaitPublishingFinish true
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index 9fd69fa7c9b..57a41f0a3e1 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -136,11 +136,14 @@ jobs:
BARBuildId: ${{ parameters.BARBuildId }}
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- - task: PowerShell@2
+ - task: AzureCLI@2
displayName: Publish Using Darc
inputs:
- filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
- arguments: -BuildId $(BARBuildId)
+ azureSubscription: "Darc: Maestro Production"
+ scriptType: ps
+ scriptLocation: scriptPath
+ scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+ arguments: -BuildId $(BARBuildId)
-PublishingInfraVersion 3
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
-WaitPublishingFinish true
diff --git a/global.json b/global.json
index 4bbeec879b4..0cbda22b004 100644
--- a/global.json
+++ b/global.json
@@ -14,9 +14,9 @@
"version": "8.0.101"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24324.7",
- "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24324.7",
- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24324.7",
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24360.5",
+ "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24360.5",
+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24360.5",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "8.0.7-servicing.24313.11"
},