From e75e0e8babc9a7e2d98186009bb32c4ffb0913ba Mon Sep 17 00:00:00 2001
From: Luke <rt.luke.s@gmail.com>
Date: Sat, 27 Nov 2021 17:57:19 +1000
Subject: [PATCH] Switch to .net6

---
 TShockAPI/TShockAPI.csproj | 8 ++++----
 TerrariaServerAPI          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index d8a6748c..b30e69cf 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -31,10 +31,10 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
+  <PropertyGroup Condition=" '$(ConfigurationName)' == 'Default' ">
     <StartAction>Program</StartAction>
-    <StartProgram>$(SolutionDir)\TShockAPI\bin\Debug\net5.0\TerrariaServerAPI.dll</StartProgram>
-    <StartWorkingDirectory>$(SolutionDir)\TShockAPI\bin\Debug\net5.0\</StartWorkingDirectory>
+    <StartProgram>$(SolutionDir)\TShockAPI\bin\Debug\net6.0\TerrariaServerAPI.dll</StartProgram>
+    <StartWorkingDirectory>$(SolutionDir)\TShockAPI\bin\Debug\net6.0\</StartWorkingDirectory>
     <ExternalConsole>true</ExternalConsole>
   </PropertyGroup>
   <ItemGroup>
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index 87a3760c..1e651bc3 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit 87a3760c6c3e0b48d0efdff1e5bac18543d198f2
+Subproject commit 1e651bc3193a42016aa5cc12f64f8c3bd5d897af