Build client with net7.0 as Core mod (#120)

* Make Client and Shared target net7.0, but also keep net6.0 on Shared for server because we can't bump Server to net7.0 yet because of websocket lib Also dialing LangVersion for Client up to C# 11
0x0ade · Feb 28, 2024 · d315bf7 · d315bf7
1 parent 6b6f31d
commit d315bf7
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 16 deletions.
diff --git a/CelesteNet.Client/CelesteNet.Client.csproj b/CelesteNet.Client/CelesteNet.Client.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <LangVersion>9</LangVersion> <!-- FIXME: Figure out why dotnet needs this! -->
-    <TargetFrameworks>net452</TargetFrameworks>
+    <LangVersion>11</LangVersion>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <AssemblyName>CelesteNet.Client</AssemblyName>
     <RootNamespace>Celeste.Mod.CelesteNet.Client</RootNamespace>
     <Nullable>disable</Nullable>

diff --git a/CelesteNet.Client/CelesteNetClientRC.cs b/CelesteNet.Client/CelesteNetClientRC.cs
@@ -42,7 +42,7 @@ public static void Initialize() {
 
         public static void Shutdown() {
             Listener?.Abort();
-            ListenerThread?.Abort();
+            //ListenerThread?.Abort();
             Listener = null;
             ListenerThread = null;
         }

diff --git a/CelesteNet.Server.ChatModule/CelesteNet.Server.ChatModule.csproj b/CelesteNet.Server.ChatModule/CelesteNet.Server.ChatModule.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <LangVersion>9</LangVersion> <!-- FIXME: Figure out why dotnet needs this! -->
-    <TargetFrameworks>net452;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <AssemblyName>CelesteNet.Server.ChatModule</AssemblyName>
     <RootNamespace>Celeste.Mod.CelesteNet.Server.Chat</RootNamespace>
   </PropertyGroup>

diff --git a/CelesteNet.Server.FrontendModule/CelesteNet.Server.FrontendModule.csproj b/CelesteNet.Server.FrontendModule/CelesteNet.Server.FrontendModule.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <LangVersion>9</LangVersion> <!-- FIXME: Figure out why dotnet needs this! -->
-    <TargetFrameworks>net452;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <AssemblyName>CelesteNet.Server.FrontendModule</AssemblyName>
     <RootNamespace>Celeste.Mod.CelesteNet.Server.Control</RootNamespace>
   </PropertyGroup>

diff --git a/CelesteNet.Server/CelesteNet.Server.csproj b/CelesteNet.Server/CelesteNet.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <AssemblyName>CelesteNet.Server</AssemblyName>
     <RootNamespace>Celeste.Mod.CelesteNet.Server</RootNamespace>
     <OutputType>Exe</OutputType>

diff --git a/CelesteNet.Shared/CelesteNet.Shared.csproj b/CelesteNet.Shared/CelesteNet.Shared.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <LangVersion>9</LangVersion> <!-- FIXME: Figure out why dotnet needs this! -->
-    <TargetFrameworks>net452;net6.0</TargetFrameworks>
+    <LangVersion>9</LangVersion>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <AssemblyName>CelesteNet.Shared</AssemblyName>
     <RootNamespace>Celeste.Mod.CelesteNet</RootNamespace>
   </PropertyGroup>

diff --git a/PublishClient.ps1 b/PublishClient.ps1
@@ -3,7 +3,7 @@ Remove-Item -Recurse -Path PubClient
 Remove-Item -Path CelesteNet.Client.zip
 New-Item -ItemType directory -Path PubClient
 Copy-Item -Path everest.pubclient.yaml -Destination PubClient/everest.yaml
-Copy-Item -Recurse -Path CelesteNet.Client/bin/Release/net452/* -Destination PubClient
+Copy-Item -Recurse -Path CelesteNet.Client/bin/Release/net7.0/CelesteNet* -Destination PubClient
 Copy-Item -Recurse -Path Dialog -Destination PubClient
 Copy-Item -Recurse -Path Graphics -Destination PubClient
 Compress-Archive -Path PubClient/* -DestinationPath CelesteNet.Client.zip
diff --git a/PublishClient.sh b/PublishClient.sh
@@ -3,7 +3,8 @@ dotnet build CelesteNet.Client -c Release
 rm -rf PubClient CelesteNet.Client.zip
 mkdir PubClient
 cp everest.pubclient.yaml PubClient/everest.yaml
-cp -r CelesteNet.Client/bin/Release/net452/* PubClient
+cp -r CelesteNet.Client/bin/Release/net7.0/CelesteNet.* PubClient
+[ -f PubClient/CelesteNet.Client.deps.json ] && rm PubClient/CelesteNet.Client.deps.json
 cp -r Dialog PubClient
 cp -r Graphics PubClient
 cd PubClient; zip -r ../CelesteNet.Client.zip *
diff --git a/everest.pubclient.yaml b/everest.pubclient.yaml
@@ -2,5 +2,5 @@
   Version: 2.2.2
   DLL: CelesteNet.Client.dll
   Dependencies:
-    - Name: Everest
-      Version: 1.3761.0
+    - Name: EverestCore
+      Version: 1.4465.0
diff --git a/everest.yaml b/everest.yaml
@@ -1,6 +1,6 @@
 - Name: CelesteNet.Client
   Version: 2.2.2
-  DLL: CelesteNet.Client/bin/Debug/net452/CelesteNet.Client.dll
+  DLL: CelesteNet.Client/bin/Debug/net7.0/CelesteNet.Client.dll
   Dependencies:
-    - Name: Everest
-      Version: 1.3761.0
+    - Name: EverestCore
+      Version: 1.4465.0