From 35cc27ac1b0f81d5f8f86f1c0d53bf0ccbb71b43 Mon Sep 17 00:00:00 2001 From: Justin Grote Date: Thu, 4 Nov 2021 14:52:37 -0700 Subject: [PATCH 1/2] Pin development to dotnet 6.0+ --- PowerShellEditorServices.build.ps1 | 3 +-- global.json | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 global.json diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1 index e96f4d595..36db3ba93 100644 --- a/PowerShellEditorServices.build.ps1 +++ b/PowerShellEditorServices.build.ps1 @@ -106,8 +106,7 @@ task SetupDotNet -Before Clean, Build, TestServerWinPS, TestServerPS7, TestServe $dotnetExePath = if ($script:IsNix) { "$dotnetPath/dotnet" } else { "$dotnetPath/dotnet.exe" } if (!(Test-Path $dotnetExePath)) { - # TODO: Test .NET 5 with PowerShell 7.1 - Install-Dotnet -Channel '3.1','5.0','6.0' + Install-Dotnet -Channel '6.0' } # This variable is used internally by 'dotnet' to know where it's installed diff --git a/global.json b/global.json new file mode 100644 index 000000000..25490c034 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "6.0.100", + "allowPrerelease": true + } +} From b9fd2bd973108080333cc04e2d9cc3de1de015aa Mon Sep 17 00:00:00 2001 From: Justin Grote Date: Thu, 4 Nov 2021 14:52:37 -0700 Subject: [PATCH 2/2] Quick fix to require SDK 6.0 --- global.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/global.json b/global.json index 25490c034..124d3fe9b 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,7 @@ { "sdk": { - "version": "6.0.100", + "version": "6.0", + "rollForward": "latestFeature", "allowPrerelease": true } }