Remove References to Net6 & Net7 (#1349)

* Updated test case projects to net8 * Updated some misc instance of net6 & net7 * Removed reference to net6 & 7 frameworks in paket.dependencies. Ran `dotnet paket update --keep-minor` * Updated devcontainer dotnet versions * Added `DOTNET_INSTALL_DIR' to build.yml * Renamed test directories: net6 -> net8 & net7 -> net9 * Added `DOTNET_INSTALL_DIR` to other yml files. Removed `BuildNet7` environment variable from nightly. * Update dotnet version in dockerfile
ionide · Jan 22, 2025 · ed1bcf7 · ed1bcf7
1 parent db1f44b
commit ed1bcf7
Show file tree

Hide file tree

Showing 38 changed files with 459 additions and 457 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-ARG DOTNETCORE_VERSION=7.0.400
+ARG DOTNETCORE_VERSION=8.0.405
 FROM mcr.microsoft.com/dotnet/sdk:${DOTNETCORE_VERSION}
 
 # Avoid warnings by switching to noninteractive

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,8 +5,8 @@
     "ghcr.io/devcontainers/features/github-cli:1": {},
     "ghcr.io/devcontainers/features/dotnet:2": {
       "version": "8.0",
-      "dotnetRuntimeVersions": "6.0, 7.0",
-      "aspNetCoreRuntimeVersions": "6.0, 7.0"
+      "dotnetRuntimeVersions": "8.0, 9.0",
+      "aspNetCoreRuntimeVersions": "8.0, 9.0"
     }
   },
   "customizations": {
@@ -22,4 +22,4 @@
     }
   },
   "onCreateCommand": "dotnet tool restore && dotnet restore"
-}
+}
diff --git a/.github/workflows/build-and-pack-nightly.yml b/.github/workflows/build-and-pack-nightly.yml
@@ -5,11 +5,11 @@ on:
       branches:
         - nightly
 
-env:
-  BuildNet7: true
-
 jobs:
     pack-nightly:
+      env:
+        DOTNET_INSTALL_DIR: ".dotnet"
+
       runs-on: ubuntu-latest
 
       steps:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,6 +19,7 @@ jobs:
       TEST_TIMEOUT_MINUTES: 40
       FSAC_TEST_DEFAULT_TIMEOUT : 120000 #ms, individual test timeouts
       DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1 # needed to allow .NET RCs to participate in rollforward as expected.
+      DOTNET_INSTALL_DIR: ".dotnet"
     timeout-minutes: 40 # we have a locking issue, so cap the runs at ~20m to account for varying build times, etc
     strategy:
       matrix:
@@ -60,12 +61,12 @@ jobs:
 
     # setup .NET per the repo global.json
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
 
     # setup .NET per test session
     - name: Setup .NET
       id : setup-dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{ matrix.dotnet-version }}
 
@@ -113,7 +114,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
 
     - name: Restore tools
       run: dotnet tool restore

diff --git a/.github/workflows/bump-fcs.yml b/.github/workflows/bump-fcs.yml
@@ -9,6 +9,10 @@ jobs:
   bump-fcs:
     name: bump FCS to latest nightly
     runs-on: ubuntu-latest
+
+    env:
+        DOTNET_INSTALL_DIR: ".dotnet"
+
     steps:
       - name: checkout nightly branch
         uses: actions/checkout@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,6 +7,9 @@ on:
 
 jobs:
   release:
+    env:
+      DOTNET_INSTALL_DIR: ".dotnet"
+
     runs-on: ubuntu-latest
 
     steps:

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,7 +8,7 @@
       "name": ".NET Core mode lsp (debug)",
       "type": "coreclr",
       "request": "launch",
-      "program": "${workspaceFolder}/src/FsAutoComplete/bin/Debug/net6.0/fsautocomplete.dll",
+      "program": "${workspaceFolder}/src/FsAutoComplete/bin/Debug/net8.0/fsautocomplete.dll",
       "args": ["--mode", "lsp"],
       "cwd": "${workspaceFolder}",
       "console": "internalConsole",
@@ -77,8 +77,8 @@
     {
       "id": "tfm",
       "description": "The TFM of the test to run",
-      "options": ["net6.0", "net7.0"],
-      "default": "net7.0",
+      "options": ["net8.0", "net9.0"],
+      "default": "net8.0",
       "type": "pickString"
     },
     {

diff --git a/paket.dependencies b/paket.dependencies
@@ -1,6 +1,6 @@
 version 7.2.1
 
-framework: netstandard2.0, netstandard2.1, net6.0, net7.0, net8.0, net9.0
+framework: netstandard2.0, netstandard2.1, net8.0, net9.0
 
 source https://api.nuget.org/v3/index.json
 # this is the FCS nightly feed, re-enable at your own risk!
@@ -34,7 +34,7 @@ nuget Serilog.Sinks.Async >= 1.5
 nuget Destructurama.FSharp
 nuget FSharp.UMX >= 1.1
 nuget FSharp.Formatting >= 14.0
-nuget FsToolkit.ErrorHandling.TaskResult >= 4.4 framework: netstandard2.1 ,net6.0, net7.0, net8.0, net9.0
+nuget FsToolkit.ErrorHandling.TaskResult >= 4.4 framework: netstandard2.1, net8.0, net9.0
 nuget IcedTasks >= 0.11.7
 nuget FSharpx.Async >= 1.14
 nuget CliWrap >= 3.0

diff --git a/paket.lock b/paket.lock
diff --git a/src/FsAutoComplete.Core/DotnetNewTemplate.fs b/src/FsAutoComplete.Core/DotnetNewTemplate.fs
@@ -106,7 +106,7 @@ module DotnetNewTemplate =
               ShortName = "-f"
               ParameterType =
                 TemplateParameterType.Choice
-                  [ "net6.0     - Target .net 6"; "netstandard2.0    - Target netstandard2.0" ]
+                  [ "net8.0     - Target .net 8"; "netstandard2.0    - Target netstandard2.0" ]
               ParameterDescription = "The target framework for the project."
               DefaultValue = "netstandard2.0" }
 

diff --git a/src/FsAutoComplete.Logging/FsAutoComplete.Logging.fsproj b/src/FsAutoComplete.Logging/FsAutoComplete.Logging.fsproj
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildNet7)' == 'true'">net6.0;net7.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/test/FsAutoComplete.Tests.Lsp/DependentFileCheckingTests.fs b/test/FsAutoComplete.Tests.Lsp/DependentFileCheckingTests.fs
@@ -17,11 +17,11 @@ let tests state =
   let sameProjectRoot = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "DependentFileChecking", "SameProject")
   let crossProjectRoot tfm = Path.Combine(__SOURCE_DIRECTORY__, "TestCases", "DependentFileChecking", $"CrossProject-{tfm}")
   let tfms = [
-#if NET6_0_OR_GREATER
-    "net6.0"
+#if NET8_0_OR_GREATER
+    "net8.0"
 #endif
-#if NET7_0_OR_GREATER
-    "net7.0"
+#if NET9_0_OR_GREATER
+    "net9.0"
 #endif
   ]
   let aFile, bFile = "A.fs", "B.fs"

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>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/test/FsAutoComplete.Tests.Lsp/TestCases/CloseTests/Workspace/Workspace.fsproj b/test/FsAutoComplete.Tests.Lsp/TestCases/CloseTests/Workspace/Workspace.fsproj
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="InsideProjectInsideWorkspace.fs" />
-    <Compile Include="../InsideProjectOutsideWorkspace.fs" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="InsideProjectInsideWorkspace.fs" />
+    <Compile Include="../InsideProjectOutsideWorkspace.fs" />
+  </ItemGroup>
+
+</Project>
diff --git a/...Lsp/TestCases/CodeFixTests/RenameParamToMatchSignature/RenameParamToMatchSignature.fsproj b/...Lsp/TestCases/CodeFixTests/RenameParamToMatchSignature/RenameParamToMatchSignature.fsproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="Code.fsi" />
     <Compile Include="Code.fs" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/...ecking/CrossProject-net7.0/App/App.fsproj → ...ecking/CrossProject-net8.0/App/App.fsproj b/...ecking/CrossProject-net7.0/App/App.fsproj → ...ecking/CrossProject-net8.0/App/App.fsproj
@@ -1,16 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
-
   <ItemGroup>
+    <Compile Include="..\..\..\..\DependentFileCheckingTests.fs" />
     <Compile Include="B.fs" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Library1\Library1.fsproj" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/...FileChecking/CrossProject-net6.0/App/B.fs → ...FileChecking/CrossProject-net8.0/App/B.fs b/...FileChecking/CrossProject-net6.0/App/B.fs → ...FileChecking/CrossProject-net8.0/App/B.fs
diff --git a/...hecking/CrossProject-net6.0/Library1/A.fs → ...hecking/CrossProject-net8.0/Library1/A.fs b/...hecking/CrossProject-net6.0/Library1/A.fs → ...hecking/CrossProject-net8.0/Library1/A.fs
diff --git a/...ssProject-net6.0/Library1/Library1.fsproj → ...ssProject-net8.0/Library1/Library1.fsproj b/...ssProject-net6.0/Library1/Library1.fsproj → ...ssProject-net8.0/Library1/Library1.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 

diff --git a/...ecking/CrossProject-net6.0/App/App.fsproj → ...ecking/CrossProject-net9.0/App/App.fsproj b/...ecking/CrossProject-net6.0/App/App.fsproj → ...ecking/CrossProject-net9.0/App/App.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...FileChecking/CrossProject-net7.0/App/B.fs → ...FileChecking/CrossProject-net9.0/App/B.fs b/...FileChecking/CrossProject-net7.0/App/B.fs → ...FileChecking/CrossProject-net9.0/App/B.fs
diff --git a/...hecking/CrossProject-net7.0/Library1/A.fs → ...hecking/CrossProject-net9.0/Library1/A.fs b/...hecking/CrossProject-net7.0/Library1/A.fs → ...hecking/CrossProject-net9.0/Library1/A.fs
diff --git a/...ssProject-net7.0/Library1/Library1.fsproj → ...ssProject-net9.0/Library1/Library1.fsproj b/...ssProject-net7.0/Library1/Library1.fsproj → ...ssProject-net9.0/Library1/Library1.fsproj
diff --git a/test/FsAutoComplete.Tests.Lsp/TestCases/DependentFileChecking/SameProject/SameProject.fsproj b/test/FsAutoComplete.Tests.Lsp/TestCases/DependentFileChecking/SameProject/SameProject.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 

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

diff --git a/test/FsAutoComplete.Tests.Lsp/TestCases/ExpectoTests/ExpectoTests.fsproj b/test/FsAutoComplete.Tests.Lsp/TestCases/ExpectoTests/ExpectoTests.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
 

diff --git a/test/FsAutoComplete.Tests.Lsp/TestCases/FindReferences/Solution/A/A.fsproj b/test/FsAutoComplete.Tests.Lsp/TestCases/FindReferences/Solution/A/A.fsproj
@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="MyModule1.fs" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="MyModule1.fs" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/FsAutoComplete.Tests.Lsp/TestCases/FindReferences/Solution/B/B.fsproj b/test/FsAutoComplete.Tests.Lsp/TestCases/FindReferences/Solution/B/B.fsproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="MyModule1.fs" />
-    <Compile Include="WorkingModule.fs" />
-    <Compile Include="MyModule3.fs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\A\A.fsproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="MyModule1.fs" />
+    <Compile Include="WorkingModule.fs" />
+    <Compile Include="MyModule3.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\A\A.fsproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/FsAutoComplete.Tests.Lsp/TestCases/FindReferences/Solution/C/C.fsproj b/test/FsAutoComplete.Tests.Lsp/TestCases/FindReferences/Solution/C/C.fsproj
@@ -1,15 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="MyModule1.fs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\B\B.fsproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="MyModule1.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\B\B.fsproj" />
+  </ItemGroup>
+
+</Project>
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>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/...ts.Lsp/TestCases/FullNameExternalAutocompleteTest/FullNameExternalAutocompleteTest.fsproj b/...ts.Lsp/TestCases/FullNameExternalAutocompleteTest/FullNameExternalAutocompleteTest.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,9 @@ on: @@
     jobs:
       release:
+        env:
+          DOTNET_INSTALL_DIR: ".dotnet"
         runs-on: ubuntu-latest
         steps:
@@ Expand Down @@