Bugfix

- Fixed background self-update checker uses wrong URL.

Author: Leayal

LauncherCore/Classes/BackgroundSelfUpdateChecker.cs

@@ -6,6 +6,7 @@
 using System.Text.Json;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Collections.Frozen;
 
 namespace Leayal.PSO2Launcher.Core.Classes
 {
@@ -36,9 +37,9 @@ public TimeSpan TickTime
             }
         }
 
-        private readonly IReadOnlyDictionary<string, string> files;
+        private readonly FrozenDictionary<string, string> files;
 
-        public BackgroundSelfUpdateChecker(in CancellationToken cancellationToken, HttpClient client, Dictionary<string, string> filelist)
+        public BackgroundSelfUpdateChecker(in CancellationToken cancellationToken, HttpClient client, FrozenDictionary<string, string> filelist)
         {
             this.appExit = cancellationToken;
             this.files = filelist;
@@ -89,7 +90,7 @@ private async ValueTask TimerTicked()
 
         private async Task<IReadOnlyDictionary<string, string>> GetFileList()
         {
-            var data = await this.webclient.GetStringAsync("https://leayal.github.io/PSO2-Launcher-CSharp/publish/v6/update.json").ConfigureAwait(false);
+            var data = await this.webclient.GetStringAsync(Updater.SharedCode.LauncherUpdateManifest).ConfigureAwait(false);
             var dictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
             using (var document = JsonDocument.Parse(data))

LauncherCore/GameLauncher.cs

@@ -1,5 +1,4 @@
 using Leayal.SharedInterfaces;
-using Microsoft.Win32.SafeHandles;
 using Leayal.SharedInterfaces.Communication;
 using System;
 using System.Threading;

LauncherCore/LauncherCore.csproj

@@ -31,6 +31,9 @@
     <None Remove="Resources\_bgimg_dark.png" />
     <None Remove="Resources\_bgimg_light.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Updater\SharedCode.cs" Link="SharedCode.cs" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\empty_d4455ebc2bef618f29106da7692ebc1a" />
     <EmbeddedResource Include="Resources\ico-item-AlphaReactor.png" />

LauncherCore/StaticResources.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Security.Principal;
 
 namespace Leayal.PSO2Launcher.Core
 {

LauncherCore/Windows/MainMenuWindow.xaml.cs

@@ -25,6 +25,7 @@
 using Leayal.Shared;
 using System.Windows.Input;
 using System.Runtime.CompilerServices;
+using System.Collections.Frozen;
 
 namespace Leayal.PSO2Launcher.Core.Windows
 {
@@ -253,8 +254,8 @@ static void AddToDictionary(Dictionary<string, string> d, string p, int o)
                 AddToDictionary(dictionary, Path.Combine(binDir, "native-x86"), removelen);
             }
 
-            dictionary.TrimExcess();
-            var selfupdatecheck = new BackgroundSelfUpdateChecker(this.cancelAllOperation.Token, this.webclient, dictionary);
+            // dictionary.TrimExcess();
+            var selfupdatecheck = new BackgroundSelfUpdateChecker(this.cancelAllOperation.Token, this.webclient, dictionary.Count == 0 ? FrozenDictionary<string, string>.Empty : dictionary.ToFrozenDictionary(StringComparer.OrdinalIgnoreCase));
             selfupdatecheck.UpdateFound += this.OnSelfUpdateFound;
             return selfupdatecheck;
         }

Updater/BootstrapUpdater.cs

@@ -224,7 +224,7 @@ public Task<BootstrapUpdater_CheckForUpdates> CheckForUpdatesAsync(string rootDi
 #if DEBUG
                     jsonData = File.ReadAllText(Path.Combine(rootDirectory, @"..\docs\publish\v8\update.json"));
 #else
-                    jsonData = await this.wc.GetStringAsync("https://leayal.github.io/PSO2-Launcher-CSharp/publish/v8/update.json");
+                    jsonData = await this.wc.GetStringAsync(SharedCode.LauncherUpdateManifest);
 #endif
                 }
                 catch

Updater/SharedCode.cs

@@ -0,0 +1,9 @@
+// Duplicate this file via LINK property in project file instead of importing Updater.dll assembly into LauncherCore (avoid loading Assembly).
+
+namespace Leayal.PSO2Launcher.Updater
+{
+    static class SharedCode
+    {
+        public const string LauncherUpdateManifest = "https://leayal.github.io/PSO2-Launcher-CSharp/publish/v8/update.json";
+    }
+}