From 4136f7fe945a1ba946c76a63006279605224a9e3 Mon Sep 17 00:00:00 2001
From: Patrick Stevens <3138005+Smaug123@users.noreply.github.com>
Date: Sun, 15 Dec 2024 22:13:30 +0000
Subject: [PATCH] Update to net9 SDK (#302)

---
 ConsumePlugin/ConsumePlugin.fsproj            |  4 +--
 ...Ware.Myriad.Plugins.Attributes.Test.fsproj |  2 +-
 .../WoofWare.Myriad.Plugins.Test.fsproj       |  2 +-
 flake.lock                                    |  6 ++--
 flake.nix                                     | 20 ++++++-----
 global.json                                   | 12 +++----
 nix/deps.nix                                  | 34 +++++++++++++++++--
 7 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/ConsumePlugin/ConsumePlugin.fsproj b/ConsumePlugin/ConsumePlugin.fsproj
index d509e3b..7d053e9 100644
--- a/ConsumePlugin/ConsumePlugin.fsproj
+++ b/ConsumePlugin/ConsumePlugin.fsproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <OtherFlags>--reflectionfree $(OtherFlags)</OtherFlags>
   </PropertyGroup>
diff --git a/WoofWare.Myriad.Plugins.Attributes/Test/WoofWare.Myriad.Plugins.Attributes.Test.fsproj b/WoofWare.Myriad.Plugins.Attributes/Test/WoofWare.Myriad.Plugins.Attributes.Test.fsproj
index 49ead26..4a5d1a1 100644
--- a/WoofWare.Myriad.Plugins.Attributes/Test/WoofWare.Myriad.Plugins.Attributes.Test.fsproj
+++ b/WoofWare.Myriad.Plugins.Attributes/Test/WoofWare.Myriad.Plugins.Attributes.Test.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFramework>net8.0</TargetFramework>
+      <TargetFramework>net9.0</TargetFramework>
 
       <IsPackable>false</IsPackable>
       <IsTestProject>true</IsTestProject>
diff --git a/WoofWare.Myriad.Plugins.Test/WoofWare.Myriad.Plugins.Test.fsproj b/WoofWare.Myriad.Plugins.Test/WoofWare.Myriad.Plugins.Test.fsproj
index af76a06..360e053 100644
--- a/WoofWare.Myriad.Plugins.Test/WoofWare.Myriad.Plugins.Test.fsproj
+++ b/WoofWare.Myriad.Plugins.Test/WoofWare.Myriad.Plugins.Test.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <!--
diff --git a/flake.lock b/flake.lock
index dce783f..60b7030 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733935885,
-        "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=",
+        "lastModified": 1734126203,
+        "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5a48e3c2e435e95103d56590188cfed7b70e108c",
+        "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 6d26593..56472e6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,8 +14,8 @@
     flake-utils.lib.eachDefaultSystem (system: let
       pkgs = nixpkgs.legacyPackages.${system};
       pname = "WoofWare.Myriad.Plugins";
-      dotnet-sdk = pkgs.dotnet-sdk_8;
-      dotnet-runtime = pkgs.dotnetCorePackages.runtime_8_0;
+      dotnet-sdk = pkgs.dotnetCorePackages.sdk_9_0;
+      dotnet-runtime = pkgs.dotnetCorePackages.runtime_9_0;
       version = "0.1";
       dotnetTool = dllOverride: toolName: toolVersion: hash:
         pkgs.stdenvNoCC.mkDerivation rec {
@@ -33,13 +33,15 @@
               if isNull dllOverride
               then name
               else dllOverride;
-          in ''
-            runHook preInstall
-            mkdir -p "$out/lib"
-            cp -r ./bin/* "$out/lib"
-            makeWrapper "${dotnet-runtime}/bin/dotnet" "$out/bin/${name}" --add-flags "$out/lib/${dll}.dll"
-            runHook postInstall
-          '';
+          in
+            # fsharp-analyzers requires the .NET SDK at runtime, so we use that instead of dotnet-runtime.
+            ''
+              runHook preInstall
+              mkdir -p "$out/lib"
+              cp -r ./bin/* "$out/lib"
+              makeWrapper "${dotnet-sdk}/bin/dotnet" "$out/bin/${name}" --set DOTNET_HOST_PATH "${dotnet-sdk}/bin/dotnet" --add-flags "$out/lib/${dll}.dll"
+              runHook postInstall
+            '';
         };
     in {
       packages = {
diff --git a/global.json b/global.json
index fb5108f..f657889 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
-{
-  "sdk": {
-    "version": "8.0.100",
-    "rollForward": "latestMajor"
-  }
-}
+{
+  "sdk": {
+    "version": "9.0.100",
+    "rollForward": "latestMajor"
+  }
+}
diff --git a/nix/deps.nix b/nix/deps.nix
index 812941e..f04a2da 100644
--- a/nix/deps.nix
+++ b/nix/deps.nix
@@ -31,11 +31,26 @@
     version = "0.28.0";
     hash = "sha256-BqGk9MzHHA3oRPNfWuANcM1YELsdhzWI+kLF4mUDUx8=";
   })
+  (fetchNuGet {
+    pname = "FSharp.Core";
+    version = "4.2.3";
+    hash = "sha256-yMGMrMUY+4Lwnh9JIbD2/3FBGIFcSK7leGURWaSQsLQ=";
+  })
   (fetchNuGet {
     pname = "FSharp.Core";
     version = "4.3.4";
     hash = "sha256-styyo+6mJy+yxE0NZG/b1hxkAjPOnJfMgd9zWzCJ5uk=";
   })
+  (fetchNuGet {
+    pname = "FSharp.Core";
+    version = "4.5.0";
+    hash = "sha256-7+B+8rsm/dMKvNBty8z5qB+kOxMwUzExy0F04xM88sk=";
+  })
+  (fetchNuGet {
+    pname = "FSharp.Core";
+    version = "5.0.2";
+    hash = "sha256-YOoosLEiszPsOOaNAkWhFGU04JJKDOFVoA/ggrZMN10=";
+  })
   (fetchNuGet {
     pname = "FSharp.Core";
     version = "6.0.1";
@@ -43,8 +58,8 @@
   })
   (fetchNuGet {
     pname = "FSharp.Core";
-    version = "8.0.403";
-    hash = "sha256-3XSQp7JUOU5T6gvSQXNfBF4t4gaX4J4xushH+cfM9mE=";
+    version = "9.0.100";
+    hash = "sha256-V1q3CjbRvWZqxpi6cXD/R0F7pyXGGtH83M5Z/ITDrp8=";
   })
   (fetchNuGet {
     pname = "FsUnit";
@@ -146,6 +161,11 @@
     version = "2.0.0";
     hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=";
   })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.Targets";
+    version = "1.1.0";
+    hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=";
+  })
   (fetchNuGet {
     pname = "Microsoft.NETCore.Targets";
     version = "1.1.3";
@@ -221,6 +241,11 @@
     version = "6.12.1";
     hash = "sha256-f/ejCuzCAwKs4N4Ec6yf2RovrhBT0nj0hRDP+03/Iy4=";
   })
+  (fetchNuGet {
+    pname = "NUnit";
+    version = "4.0.1";
+    hash = "sha256-jd1CD5nHVXkpvBNpVDJcJyfTggCHLyDBySVSvtrA8Uk=";
+  })
   (fetchNuGet {
     pname = "NUnit";
     version = "4.2.2";
@@ -256,6 +281,11 @@
     version = "7.0.0";
     hash = "sha256-9Wk8cHSkjKtqkN6xW7KnXoQVtF/VNbKeBq79WqDesMs=";
   })
+  (fetchNuGet {
+    pname = "System.Formats.Asn1";
+    version = "6.0.0";
+    hash = "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8=";
+  })
   (fetchNuGet {
     pname = "System.Formats.Asn1";
     version = "8.0.1";