From 232775cd9299a8f799e65387adcef8f325cff8cf Mon Sep 17 00:00:00 2001
From: Patrick Stevens <3138005+Smaug123@users.noreply.github.com>
Date: Sun, 15 Dec 2024 22:38:48 +0000
Subject: [PATCH] Net9 SDK (#3)

---
 .config/dotnet-tools.json        |  2 +-
 .github/workflows/dotnetcore.yml | 13 +++++++------
 Quine/Quine.fsproj               | 25 ++++++++++++-------------
 flake.lock                       | 12 ++++++------
 flake.nix                        |  6 +++---
 nix/deps.nix                     |  4 ++--
 6 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 2dd9e88..a214227 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "fantomas": {
-      "version": "6.3.10",
+      "version": "6.3.16",
       "commands": [
         "fantomas"
       ]
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 5d79eca..63bc386 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -23,16 +23,17 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+    - name: Install Nix
+      uses: cachix/install-nix-action@v17
       with:
-        dotnet-version: 7.0.x
+        extra_nix_config: |
+          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
     - name: Restore dependencies
-      run: dotnet restore
+      run: nix develop --command dotnet restore
     - name: Build
-      run: dotnet build --no-restore --configuration ${{matrix.config}}
+      run: nix develop --command dotnet build --no-restore --configuration ${{matrix.config}}
     - name: Test
-      run: dotnet test --no-build --verbosity normal --configuration ${{matrix.config}}
+      run: nix develop --command dotnet test --no-build --verbosity normal --configuration ${{matrix.config}}
 
   check-is-quine:
     runs-on: ubuntu-latest
diff --git a/Quine/Quine.fsproj b/Quine/Quine.fsproj
index ed06986..2294d55 100644
--- a/Quine/Quine.fsproj
+++ b/Quine/Quine.fsproj
@@ -1,13 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <RootNamespace>Quine</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Program.fs" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+
+</Project>
diff --git a/flake.lock b/flake.lock
index b7878fa..2d5307b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1720768451,
-        "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
+        "lastModified": 1734119587,
+        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
+        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ee22acc..39785ac 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,8 +14,8 @@
         pkgs = import nixpkgs {inherit system;};
         projectFile = "./Quine/Quine.fsproj";
         pname = "Quine";
-        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.0.1";
         dotnetTool = toolName: toolVersion: hash:
           pkgs.stdenvNoCC.mkDerivation rec {
@@ -26,7 +26,7 @@
               pname = name;
               version = version;
               hash = hash;
-              installPhase = ''mkdir -p $out/bin && cp -r tools/net6.0/any/* $out/bin'';
+              installPhase = ''mkdir -p $out/bin && cp -r tools/*/any/* $out/bin'';
             };
             installPhase = ''
               runHook preInstall
diff --git a/nix/deps.nix b/nix/deps.nix
index f426db5..88daced 100644
--- a/nix/deps.nix
+++ b/nix/deps.nix
@@ -3,7 +3,7 @@
 {fetchNuGet}: [
   (fetchNuGet {
     pname = "fantomas";
-    version = "6.3.10";
-    hash = "sha256-2m4YevDp9CRm/Ci2hguDXd6DUMElRg3hNAne9LHntWM=";
+    version = "6.3.16";
+    hash = "sha256-4tRdYf+/Q1iedx+DDuIKVGlIWQdr6erM51VdKzZkhCs=";
   })
 ]