From 6065856c97f58cef82e22b1d51c167bcf4d5e37b Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 15 Jun 2024 17:25:20 +0200 Subject: [PATCH 1/2] Make sure the main branch is using .NET 8 SDK The main branch needs to use the .NET 8 SDK because we are building the .NET 7 TFMs as well. The .NET 9 SDK does not support .NET 7 TFMs anymore. --- global.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/global.json b/global.json index 2b3c65d222ba..3fc9f1ad923b 100644 --- a/global.json +++ b/global.json @@ -6,5 +6,9 @@ "MSBuild.Sdk.Extras": "3.0.44", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5" + }, + "sdk": { + "version": "8.0.100", + "rollForward": "latestMinor" } } From f62d92027c31e0bcb4555e7b9c9e6da1232bfb0c Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 17 Jun 2024 17:49:37 +0800 Subject: [PATCH 2/2] no previews! --- global.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/global.json b/global.json index 3fc9f1ad923b..d05a39062b91 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,6 @@ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5" }, "sdk": { - "version": "8.0.100", - "rollForward": "latestMinor" + "allowPrerelease": false } }