From 2f075127fd942a4846dd589bcbcd0262a3564bad Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 9 Aug 2023 16:17:32 +0000
Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade
build 20230808.5 (#31436)
[release/6.0] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 8 ++++----
global.json | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 07029fbcfad..6910a586703 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -47,13 +47,13 @@
-
+
https://github.com/dotnet/arcade
- cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34
+ 98fd22588fbb0f407faa6a74cb1aa79031306151
-
+
https://github.com/dotnet/arcade
- cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34
+ 98fd22588fbb0f407faa6a74cb1aa79031306151
diff --git a/global.json b/global.json
index d3b8d803a53..b070b188891 100644
--- a/global.json
+++ b/global.json
@@ -18,7 +18,7 @@
"rollForward": "latestMajor"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23361.3"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23408.5"
}
}
From 50a6896cca24b06e154bdf652c2e7aefd0dfb7a1 Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Thu, 31 Aug 2023 12:40:01 -0700
Subject: [PATCH 2/2] Update branding to 6.0.23 (#31599)
---
eng/Versions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 3d5e068707d..31e099260bc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,6 +1,6 @@
- 6.0.22
+ 6.0.23
servicing
False
true