WIP on dotnet update support

ClassiCube · Jul 4, 2024 · 60df0ea · 60df0ea
1 parent 3c2d98c
commit 60df0ea
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/CLI/Program.cs b/CLI/Program.cs
@@ -31,8 +31,9 @@ public static class Program {
             // If MCGalaxy_.dll is missing, a FileNotFoundException will get thrown for MCGalaxy dll
             try {
                 EnableCLIMode();
-            } catch (FileNotFoundException) {
-                Console.WriteLine("Cannot start server as MCGalaxy_.dll is missing from " + Environment.CurrentDirectory);
+            } catch (FileNotFoundException ex) {
+                Console.WriteLine("Cannot start server as {0} is missing from {1}",
+                                  GetFilename(ex.FileName), Environment.CurrentDirectory);
                 Console.WriteLine("Download from " + Updater.UploadsURL);
                 Console.WriteLine("Press any key to exit...");
                 Console.ReadKey(true);
@@ -43,6 +44,14 @@ public static class Program {
             StartCLI();
         }
 
+        static string GetFilename(string rawName) {
+            try {
+                return new AssemblyName(rawName).Name + ".dll";
+            } catch {
+                return rawName;
+            }
+        }
+
         static void SetCurrentDirectory() {
 #if !MCG_STANDALONE
             string path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);

diff --git a/MCGalaxy/Server/Maintenance/Updater.cs b/MCGalaxy/Server/Maintenance/Updater.cs
@@ -33,7 +33,11 @@ public static class Updater
         const string changelogURL      = BaseURL + "Changelog.txt";
 
         const string CDN_URL  = "https://cdn.classicube.net/client/mcg/{0}/";
-#if NET_20
+#if NET8_0
+        const string CDN_BASE = CDN_URL + "net80/";
+#elif NET6_0
+        const string CDN_BASE = CDN_URL + "net60/";
+#elif NET_20
         const string CDN_BASE = CDN_URL + "net20/";
 #else
         const string CDN_BASE = CDN_URL + "net40/";
@@ -90,11 +94,13 @@ public static class Updater
                 }
 
                 string mode = release ? "release" : "latest";
-                Logger.Log(LogType.SystemActivity, "Downloading {0} update files", mode);
-
+                Logger.Log(LogType.SystemActivity, "Downloading {0} update files", mode);               
                 WebClient client = HttpUtil.CreateWebClient();
+
                 client.DownloadFile(DLL_URL.Replace("{0}", mode), "MCGalaxy_.update");
-#if !MCG_STANDALONE
+#if MCG_DOTNET
+                client.DownloadFile(CLI_URL.Replace("{0}", mode), "MCGalaxyCLI.update");
+#elif !MCG_STANDALONE
                 client.DownloadFile(GUI_URL.Replace("{0}", mode), "MCGalaxy.update");
                 client.DownloadFile(CLI_URL.Replace("{0}", mode), "MCGalaxyCLI.update");
 #endif