From 035f6520466b6519fcadcb60d0de2d0743c3e066 Mon Sep 17 00:00:00 2001
From: Tobias Berger <toby@tobot.dev>
Date: Thu, 4 Apr 2024 22:10:14 +0200
Subject: [PATCH] feat: use .NET 8

---
 .vscode/settings.json          |   2 ++
 1.4/Assemblies/Template.dll    | Bin 4096 -> 4608 bytes
 Source/Startup.cs              |   4 +---
 Source/TemplateMapComponent.cs |   7 +------
 flake.nix                      |   4 ++--
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 98061ba..e9eb685 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -22,6 +22,8 @@
     "csharp.inlayHints.enableInlayHintsForImplicitVariableTypes": true,
     "csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": true,
     "csharp.inlayHints.enableInlayHintsForImplicitObjectCreation": true,
+    "csharp.suppressDotnetInstallWarning": true,
+    "csharp.suppressDotnetRestoreNotification": true,
     "dotnet.server.useOmnisharp": true,
     "omnisharp.enableLspDriver": false
 }
\ No newline at end of file
diff --git a/1.4/Assemblies/Template.dll b/1.4/Assemblies/Template.dll
index 0885e6866f8fa2382af3f8d815fe906831e4542e..a956d79ae0eb2686ab50f37fd71ec15c90d2040a 100644
GIT binary patch
delta 1281
zcmX|=Z)jUp7{;G-ZhMp7WJ#o37wsl#yVb3c^d`+;t8O;RoKtX#o3mrku1RK@uCi9P
zqDxi_MMTHKVGK6t7<GP-ean!o_`x9z!73F&1t~b^hxrGYFocPU&pEBVaDL}`p7*^c
z_uO-HGIDa$>9^ZXAK!ioE7u)#Mtsr*{Po$YoUrO04>Vut0XC?P;G=3%talb2wnjMo
z>YR8mFkw+{=V;;xs2gIS`E~?YP;2C*?-98r2sqL@VX3!de>;1c-e_a8WgSt~cJ0`D
z${wh1<>tpqT&$}KEOP!>>*B=G(Ibb(xisGO0Q)$1?J43X>X6nu_UwF;^IiJyRL+Xl
zymb0W^ei~IIPPE3k~2`0ItOe#C;pK(t{R@eFEWUY{7oD42s6JR#>h6quc7rF!&gl*
zXY@1BD=dg1a?m1cC}T)ExFol7p<|33+!d{G(89#Q1xxciQ~idwIoM|M?@iBNLRTL)
zJ%<f9Kqos)Pr@)r>T7uuLeC<EEb>;0y0&cVd@gOdV-{z)!xS~&3th@M3(c5f^Htf4
zr&zJ+LikNAI}h&-;jGn*-R$$A8!2lq*(wLgL-GLH@TDBW(-HkBGvOufU*P!&YAd!x
z`|@gWl<wH7)3upZr+0A1xO(`O9HYCqT8q$qXxt6FW7&E;OzN@)OFYE;NSlYd#J9MW
z3?Yu1o^r-KVYt(9x8X~M!=#N#avi3Ot{aXTUPA}kagjQL>$q%n<0~dTxQV<>;ty1<
z9PVLCZo|*`L=NB~))qtzK8z!V)*9aA)Q<CH7v3kM_?_&--(){p*qY}@6~iu*7s)*K
zqagA;=Ykk9dSpe9;6*WQl4+AnV+2((XOcOS%rUtnKE+|)`vW@Rc~;!wlN40c&NZFk
z`)X9|ei0~?E5+eTd1A8g`YYw}##zrM;n`b0IzBpfq%rUPK!mOj{CIBhvtI{hqnl6t
zDZT%y*PH{Ew7u#J=c8mwz;$Esm>YAWxomkj8IQa1cwaUhPiIQGQX+XUm#rk-Y$cm0
zRdShfCY?;FDc}C)Zv6$Sd0%IfSHM^ASgUUPx|JJT<k+VI{>KAh{^9<=!j>BJ&x+&f
zp1(`H(Ac;}32O#%)d=(!qde3s|69XI@|5Fn4f~j-snW=x#EudYtRFPJ6)KnY3P*yK
S3eyZ%$gn$!6rgSfKK~D6S>@pX

delta 1027
zcmX|;TS!zv7{~uJM^Aa&))jMgx7*3>;w5&iv@-3cMQa8bW>*YMx>#y=L?Snl%%X?3
zDUb>&q}LwW2#S=%@WH2|9t!NCULu0fr?Lq8&v+S_-}nE2-#2s4%v@P=#l6+-|5@HV
zh^aA#95+=K0#3ZQUAk6$aWHu_516k8J!Ps*WI4Z6*y?gR>YiBWbuG%xoJpJ>H7v@L
zKe}{kj%-tR<=P<YNtgU=&&?#-wViu9i!xt*lS?<`G7)MA?l3;ky5_>U#+Kvfxf=>+
z0s9$4wKeFb_G!JnwsI?D4}FuWv<hMr;6msqIJr0YDWfGLP%3pEuu&{NOB)XjFJnZe
z;U8OUyabrPCU%j2!}rj7%&^vE`i$NIy~8sRCD&VI3`Y@_4z9{PZnTdn2cseb4#q_u
z8M8E-O?80F94x1HFl2hZnjVkosWO}oU5%KYpy4m}=rMT+p`-9&9YR(yb!^hc`Cr=d
zI4rjCgvHcJ=wP`=MzD={luYNt2QlevcKgt3MX;NFHkKjN+DrZw2jRyPS%;{rKiiev
z&$9|t&$xQJ6VomxkI}YHTd9j(#>KOTWE0)(nVL&?-?(9%v~2ye%$$`e=;srqlQsgR
z!#n7gKCCn>G2CKUX}H_)fMKkj!A2XIi4LRVhK+_Vuo(03h}y*<Zd%Lmj+uOXL4hp7
zI1XDSm_WVUgztDL%MnH@&X5`0G0c@cWQgm-D8LVLHM_$og)PFU(A<eCQ>Y;;a0mfW
z!S@S@2BRCMbORQOPLt_0nNBodo9M$ScD_aqGQ<$hBcLwYCGw(7Jhe+jB6)UDB$lT<
z7QTV-ir9GFs_6AsH$Kf3N0b_M>Qq_kbCv5kz&nipS){5(y7GEAdf(_fof>bXI_T{c
cOVornB#>B;ri4|5*(%|Ss5R*$>aAzbe`kxUPyhe`

diff --git a/Source/Startup.cs b/Source/Startup.cs
index a124d49..6173f34 100644
--- a/Source/Startup.cs
+++ b/Source/Startup.cs
@@ -1,6 +1,4 @@
-#nullable enable
-
-using Verse;
+using Verse;
 
 // using HarmonyLib;
 
diff --git a/Source/TemplateMapComponent.cs b/Source/TemplateMapComponent.cs
index cd0e0a3..f559e08 100644
--- a/Source/TemplateMapComponent.cs
+++ b/Source/TemplateMapComponent.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
 using RimWorld;
 using Verse;
 
@@ -7,11 +5,8 @@ using Verse;
 
 namespace Template;
 
-public class TemplateMapComponent : MapComponent
+public class TemplateMapComponent(Map map) : MapComponent(map)
 {
-    public TemplateMapComponent(Map map)
-        : base(map) { }
-
     public override void FinalizeInit()
     {
         Messages.Message("Success", null, MessageTypeDefOf.PositiveEvent);
diff --git a/flake.nix b/flake.nix
index 7e64865..b5304c8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,9 +15,9 @@
         # Rust dev environment
         devShells.default = pkgs.mkShell {
           inputsFrom = [ config.treefmt.build.devShell ];
-          nativeBuildInputs = with pkgs; [ dotnet-sdk mono libxslt ];
+          nativeBuildInputs = with pkgs; [ dotnet-sdk_8 libxslt ];
           shellHook = ''
-            DOTNET_ROOT="${pkgs.dotnet-sdk}";
+            DOTNET_ROOT="${pkgs.dotnet-sdk_8}";
           '';
         };