From 7eb337c4c60d115487dd573fb2b7c235739ae45d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 14 Oct 2021 19:44:48 +0000
Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade
build 20211005.12 (#26358)
[release/3.1] Update dependencies from dotnet/arcade
---
NuGet.config | 4 ----
eng/Version.Details.xml | 4 ++--
global.json | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 6611dfcd037..138e99ee50c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,11 +4,8 @@
-
-
-
@@ -23,7 +20,6 @@
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0d92a8cf955..fe95baea17f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -321,9 +321,9 @@
-
+
https://github.com/dotnet/arcade
- 98e2fbaad9f2f7bbe091bb0b9dd37d03206becc9
+ 62ba17e4a1901b89bfbc7de7b47cef9150cfb413
https://github.com/dotnet/roslyn
diff --git a/global.json b/global.json
index 225e2eb5a95..7760c77b27a 100644
--- a/global.json
+++ b/global.json
@@ -12,6 +12,6 @@
"version": "3.1.120"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21427.4"
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21505.12"
}
}
From 893af6e6ab222ba67b47dbd3539935ec36c74b20 Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Tue, 2 Nov 2021 13:34:29 -0700
Subject: [PATCH 2/2] Update branding for 3.1.22 (#26512)
---
eng/Versions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 848594139b4..2137de6ba36 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,6 +1,6 @@
- 3.1.21
+ 3.1.22
servicing
False
true