From 649a712f62c9025f84ce1c40b7d8f610e0582cee Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 20:34:07 +0000
Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade
build 20230819.1 (#31525)
[release/8.0] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 2 +-
global.json | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d6f68eb4178..444e1edf90c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -56,17 +56,17 @@
-
+
https://github.com/dotnet/arcade
- 7837a0b504ed9a598daebd50f20520ccda5fe2b1
+ 385129cbc980a515ddee2fa56f6b16f3183ed9bc
-
+
https://github.com/dotnet/arcade
- 7837a0b504ed9a598daebd50f20520ccda5fe2b1
+ 385129cbc980a515ddee2fa56f6b16f3183ed9bc
-
+
https://github.com/dotnet/arcade
- 7837a0b504ed9a598daebd50f20520ccda5fe2b1
+ 385129cbc980a515ddee2fa56f6b16f3183ed9bc
diff --git a/eng/Versions.props b/eng/Versions.props
index ac8e47ae423..b14d08d2f99 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -31,7 +31,7 @@
8.0.0-rc.2.23418.14
- 8.0.0-beta.23417.3
+ 8.0.0-beta.23419.1
diff --git a/global.json b/global.json
index 3c532609fdc..3ce448dab21 100644
--- a/global.json
+++ b/global.json
@@ -13,7 +13,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23417.3",
- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23417.3"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23419.1",
+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23419.1"
}
}
From 2396bb1050742dcea00bc14d282135da14af63c9 Mon Sep 17 00:00:00 2001
From: Safia Abdalla
Date: Tue, 22 Aug 2023 17:30:58 -0700
Subject: [PATCH 2/3] [release/8.0] Update SDK
---
global.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/global.json b/global.json
index 3ce448dab21..0b8a6d88bf1 100644
--- a/global.json
+++ b/global.json
@@ -1,11 +1,11 @@
{
"sdk": {
- "version": "8.0.100-rc.1.23407.2",
+ "version": "8.0.100-rc.2.23422.11",
"allowPrerelease": true,
"rollForward": "latestMajor"
},
"tools": {
- "dotnet": "8.0.100-rc.1.23407.2",
+ "dotnet": "8.0.100-rc.2.23422.11",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
From cf9391b184ffa61593e3253e7fc364e4ffa5f316 Mon Sep 17 00:00:00 2001
From: Brice Lambson
Date: Wed, 23 Aug 2023 09:38:31 -0700
Subject: [PATCH 3/3] Remove dotnet/sdk#34003 workaround
---
Directory.Build.props | 5 -----
1 file changed, 5 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 36432f73130..4ea29042ac6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -42,11 +42,6 @@
https://docs.microsoft.com/ef/core/
-
-
-
-
-
$(WarningsNotAsErrors);CS1591;SA1636