[WIP] Update to .NET6 (#903)

Co-authored-by: Chet Husk <[email protected]>
ionide · Mar 19, 2022 · 334d316 · 334d316
1 parent 2182f6a
commit 334d316
Show file tree

Hide file tree

Showing 16 changed files with 131 additions and 132 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build_debug_netcore",
-      "program": "${workspaceFolder}/src/FsAutoComplete/bin/Debug/net5.0/fsautocomplete.dll",
+      "program": "${workspaceFolder}/src/FsAutoComplete/bin/Debug/net6.0/fsautocomplete.dll",
       "args": [
         "--mode",
         "lsp"
@@ -24,7 +24,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build_lsp_tests",
-      "program": "${workspaceFolder}/test/FsAutoComplete.Tests.Lsp/bin/Debug/net5.0/FsAutoComplete.Tests.Lsp.dll",
+      "program": "${workspaceFolder}/test/FsAutoComplete.Tests.Lsp/bin/Debug/net6.0/FsAutoComplete.Tests.Lsp.dll",
       "cwd": "${workspaceFolder}",
       "console": "integratedTerminal",
       "stopAtEntry": false,

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -6,7 +6,7 @@
         {
             "taskName": "build_debug_netcore",
             "type": "shell",
-            "command": "dotnet build src/FsAutoComplete -f net5.0",
+            "command": "dotnet build src/FsAutoComplete -f net6.0",
             "group": {
                 "kind": "build",
                 "isDefault": true

diff --git a/build.fsx b/build.fsx
@@ -73,7 +73,7 @@ Target.create "LocalRelease" (fun _ ->
     DotNet.publish (fun p ->
        { p with
            OutputPath = Some (__SOURCE_DIRECTORY__ </> "bin/release_netcore")
-           Framework = Some "net5.0"
+           Framework = Some "net6.0"
            Configuration = DotNet.BuildConfiguration.fromString configuration }) "src/FsAutoComplete"
 
     Directory.ensure "bin/release_as_tool"

diff --git a/paket.dependencies b/paket.dependencies
@@ -1,6 +1,6 @@
 version 6.2.1
 
-framework: netstandard2.0, net5.0
+framework: netstandard2.0, 6.0
 
 source https://api.nuget.org/v3/index.json
 # this is the FCS nightly feed, re-enable at your own risk!

diff --git a/paket.lock b/paket.lock
diff --git a/src/FsAutoComplete.BackgroundServices/FsAutoComplete.BackgroundServices.fsproj b/src/FsAutoComplete.BackgroundServices/FsAutoComplete.BackgroundServices.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>fsautocomplete.backgroundservices</AssemblyName>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>

diff --git a/src/FsAutoComplete.Core/DotnetNewTemplate.fs b/src/FsAutoComplete.Core/DotnetNewTemplate.fs
@@ -88,7 +88,7 @@ module DotnetNewTemplate =
         Options =
         [ { ParameterName = "--framework";
             ShortName = "-f";
-            ParameterType = TemplateParameterType.Choice ["net5.0     - Target .net 5";"netstandard2.0    - Target netstandard2.0"];
+            ParameterType = TemplateParameterType.Choice ["net6.0     - Target .net 6";"netstandard2.0    - Target netstandard2.0"];
             ParameterDescription = "The target framework for the project.";
             DefaultValue = "netstandard2.0" };
 

diff --git a/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj b/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/FsAutoComplete/FsAutoComplete.fsproj b/src/FsAutoComplete/FsAutoComplete.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>fsautocomplete</AssemblyName>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
@@ -57,9 +57,9 @@
   <Target Name="CopyBackgroundServiceJsonToOutputDir"
           AfterTargets="ComputeFilesToPublish">
     <ItemGroup>
-      <ResolvedFileToPublish Include="$(MSBuildProjectDirectory)/../FsAutoComplete.BackgroundServices\bin\$(Configuration)\net5.0\fsautocomplete.backgroundservices.deps.json"
+      <ResolvedFileToPublish Include="$(MSBuildProjectDirectory)/../FsAutoComplete.BackgroundServices\bin\$(Configuration)\net6.0\fsautocomplete.backgroundservices.deps.json"
                              RelativePath="fsautocomplete.backgroundservices.deps.json" />
-      <ResolvedFileToPublish Include="$(MSBuildProjectDirectory)/../FsAutoComplete.BackgroundServices\bin\$(Configuration)\net5.0\fsautocomplete.backgroundservices.runtimeconfig.json"
+      <ResolvedFileToPublish Include="$(MSBuildProjectDirectory)/../FsAutoComplete.BackgroundServices\bin\$(Configuration)\net6.0\fsautocomplete.backgroundservices.runtimeconfig.json"
                              RelativePath="fsautocomplete.backgroundservices.runtimeconfig.json" />
     </ItemGroup>
   </Target>

diff --git a/test/FsAutoComplete.Tests.Lsp/FsAutoComplete.Tests.Lsp.fsproj b/test/FsAutoComplete.Tests.Lsp/FsAutoComplete.Tests.Lsp.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateProgramFile>false</GenerateProgramFile>
     <RollForward>LatestMajor</RollForward>
   </PropertyGroup>

diff --git a/test/FsAutoComplete.Tests.Lsp/TestCases/AutocompleteTest/AutocompleteTest.fsproj b/test/FsAutoComplete.Tests.Lsp/TestCases/AutocompleteTest/AutocompleteTest.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/test/FsAutoComplete.Tests.Lsp/TestCases/DocumentSymbolTest/DocumentSymbolTest.fsproj b/test/FsAutoComplete.Tests.Lsp/TestCases/DocumentSymbolTest/DocumentSymbolTest.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/test/FsAutoComplete.Tests.Lsp/TestCases/FsdnTest/BasicTest.fsproj b/test/FsAutoComplete.Tests.Lsp/TestCases/FsdnTest/BasicTest.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/test/FsAutoComplete.Tests.Lsp/TestCases/RenameTest/RenameTest.fsproj b/test/FsAutoComplete.Tests.Lsp/TestCases/RenameTest/RenameTest.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/FsAutoComplete.Tests.Lsp/decode.fsx b/test/FsAutoComplete.Tests.Lsp/decode.fsx
@@ -1,5 +1,5 @@
-#r "../../src/FsAutoComplete/bin/Debug/net5.0/fsautocomplete.dll"
-#r "../../src/FsAutoComplete/bin/Debug/net5.0/LanguageServerProtocol.dll"
+#r "../../src/FsAutoComplete/bin/Debug/net6.0/fsautocomplete.dll"
+#r "../../src/FsAutoComplete/bin/Debug/net6.0/LanguageServerProtocol.dll"
 
 open FsAutoComplete
 open FsAutoComplete.LspHelpers

diff --git a/test/OptionAnalyzer/OptionAnalyzer.fsproj b/test/OptionAnalyzer/OptionAnalyzer.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../../src/FsAutoComplete.Logging/FsAutoComplete.Logging.fsproj">