From 726f6de5849fb2abcb0d391348dd0228e8649227 Mon Sep 17 00:00:00 2001
From: Jimmy Byrd <jimmy.byrd@motivity.net>
Date: Sat, 16 Nov 2024 15:21:33 -0500
Subject: [PATCH] Bump TFM to net8 and net9

---
 .github/workflows/ci.yml                                    | 5 +++++
 .github/workflows/release.yml                               | 6 ++++++
 Directory.Packages.props                                    | 3 ++-
 global.json                                                 | 2 +-
 samples/OptionAnalyzer.Test/OptionAnalyzer.Test.fsproj      | 2 +-
 samples/OptionAnalyzer/OptionAnalyzer.fsproj                | 2 +-
 src/FSharp.Analyzers.Cli/FSharp.Analyzers.Cli.fsproj        | 2 +-
 .../FSharp.Analyzers.SDK.Testing.fsproj                     | 2 +-
 src/FSharp.Analyzers.SDK/FSharp.Analyzers.SDK.fsproj        | 4 ++--
 9 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2bd086c..912ec1d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,6 +23,11 @@ jobs:
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
+        with:  
+          global-json-file: 'global.json'
+          dotnet-version: |
+            8.x
+            9.x
 
       - name: Build
         run: dotnet fsi build.fsx
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c6637a1..14865e4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,6 +20,12 @@ jobs:
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
+        with:  
+          global-json-file: 'global.json'
+          dotnet-version: |
+            8.x
+            9.x
+
 
       - name: Run Release Build
         run: dotnet fsi build.fsx -p ReleaseBuild
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 1d84a5c..0a6ee19 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <MsBuildPackageVersion>17.2.0</MsBuildPackageVersion>
+    <NuGetAuditMode>direct</NuGetAuditMode>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="CliWrap" Version="3.6.4" />
@@ -11,7 +12,7 @@
     <PackageVersion Include="McMaster.NETCore.Plugins" Version="1.4.0" />
     <PackageVersion Include="Argu" Version="6.1.1" />
     <PackageVersion Include="Glob" Version="1.1.9" />
-    <PackageVersion Include="Ionide.ProjInfo.ProjectSystem" Version="0.65.0" />
+    <PackageVersion Include="Ionide.ProjInfo.ProjectSystem" Version="0.67.0" />
     <PackageVersion Include="Microsoft.Build" Version="$(MsBuildPackageVersion)" ExcludeAssets="runtime" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="$(MsBuildPackageVersion)" ExcludeAssets="runtime" />
     <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MsBuildPackageVersion)" ExcludeAssets="runtime" />
diff --git a/global.json b/global.json
index 39c53b8..2bc13e8 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.200",
+    "version": "9.0.100",
     "rollForward": "latestMinor"
   }
 }
diff --git a/samples/OptionAnalyzer.Test/OptionAnalyzer.Test.fsproj b/samples/OptionAnalyzer.Test/OptionAnalyzer.Test.fsproj
index d9d4147..aa5302e 100644
--- a/samples/OptionAnalyzer.Test/OptionAnalyzer.Test.fsproj
+++ b/samples/OptionAnalyzer.Test/OptionAnalyzer.Test.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RollForward>LatestMajor</RollForward>
 
         <IsPackable>false</IsPackable>
diff --git a/samples/OptionAnalyzer/OptionAnalyzer.fsproj b/samples/OptionAnalyzer/OptionAnalyzer.fsproj
index dde246d..4e29e74 100644
--- a/samples/OptionAnalyzer/OptionAnalyzer.fsproj
+++ b/samples/OptionAnalyzer/OptionAnalyzer.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/FSharp.Analyzers.Cli/FSharp.Analyzers.Cli.fsproj b/src/FSharp.Analyzers.Cli/FSharp.Analyzers.Cli.fsproj
index 9fd4150..07958de 100644
--- a/src/FSharp.Analyzers.Cli/FSharp.Analyzers.Cli.fsproj
+++ b/src/FSharp.Analyzers.Cli/FSharp.Analyzers.Cli.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RollForward>LatestMajor</RollForward>
     <OutputType>Exe</OutputType>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
diff --git a/src/FSharp.Analyzers.SDK.Testing/FSharp.Analyzers.SDK.Testing.fsproj b/src/FSharp.Analyzers.SDK.Testing/FSharp.Analyzers.SDK.Testing.fsproj
index e86d313..b2173c0 100644
--- a/src/FSharp.Analyzers.SDK.Testing/FSharp.Analyzers.SDK.Testing.fsproj
+++ b/src/FSharp.Analyzers.SDK.Testing/FSharp.Analyzers.SDK.Testing.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFrameworks>net8.0; net9.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <IsPackable>true</IsPackable>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/FSharp.Analyzers.SDK/FSharp.Analyzers.SDK.fsproj b/src/FSharp.Analyzers.SDK/FSharp.Analyzers.SDK.fsproj
index 0c2f432..c03f91c 100644
--- a/src/FSharp.Analyzers.SDK/FSharp.Analyzers.SDK.fsproj
+++ b/src/FSharp.Analyzers.SDK/FSharp.Analyzers.SDK.fsproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <IsPackable>true</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>