Merge pull request #2798 from Flow-Launcher/prerelease

Semantic Version

Author: Jack251970

Flow.Launcher.Core/Flow.Launcher.Core.csproj

@@ -57,6 +57,7 @@
     <PackageReference Include="FSharp.Core" Version="9.0.201" />
     <PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.0" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
+    <PackageReference Include="SemanticVersioning" Version="3.0.0" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
     <PackageReference Include="StreamJsonRpc" Version="2.21.10" />
   </ItemGroup>

Flow.Launcher.Core/Updater.cs

@@ -49,8 +49,9 @@ public async Task UpdateAppAsync(bool silentUpdate = true)
                 // UpdateApp CheckForUpdate will return value only if the app is squirrel installed
                 var newUpdateInfo = await updateManager.CheckForUpdate().NonNull().ConfigureAwait(false);
 
-                var newReleaseVersion = Version.Parse(newUpdateInfo.FutureReleaseEntry.Version.ToString());
-                var currentVersion = Version.Parse(Constant.Version);
+                var newReleaseVersion =
+                    SemanticVersioning.Version.Parse(newUpdateInfo.FutureReleaseEntry.Version.ToString());
+                var currentVersion = SemanticVersioning.Version.Parse(Constant.Version);
 
                 _api.LogInfo(ClassName, $"Future Release <{Formatted(newUpdateInfo.FutureReleaseEntry)}>");
 
@@ -71,10 +72,13 @@ public async Task UpdateAppAsync(bool silentUpdate = true)
 
                 if (DataLocation.PortableDataLocationInUse())
                 {
-                    var targetDestination = updateManager.RootAppDirectory + $"\\app-{newReleaseVersion}\\{DataLocation.PortableFolderName}";
+                    var targetDestination = updateManager.RootAppDirectory +
+                                            $"\\app-{newReleaseVersion}\\{DataLocation.PortableFolderName}";
                     FilesFolders.CopyAll(DataLocation.PortableDataPath, targetDestination, (s) => _api.ShowMsgBox(s));
-                    if (!FilesFolders.VerifyBothFolderFilesEqual(DataLocation.PortableDataPath, targetDestination, (s) => _api.ShowMsgBox(s)))
-                        _api.ShowMsgBox(string.Format(_api.GetTranslation("update_flowlauncher_fail_moving_portable_user_profile_data"),
+                    if (!FilesFolders.VerifyBothFolderFilesEqual(DataLocation.PortableDataPath, targetDestination,
+                            (s) => _api.ShowMsgBox(s)))
+                        _api.ShowMsgBox(string.Format(
+                            _api.GetTranslation("update_flowlauncher_fail_moving_portable_user_profile_data"),
                             DataLocation.PortableDataPath,
                             targetDestination));
                 }
@@ -87,22 +91,25 @@ public async Task UpdateAppAsync(bool silentUpdate = true)
 
                 _api.LogInfo(ClassName, $"Update success:{newVersionTips}");
 
-                if (_api.ShowMsgBox(newVersionTips, _api.GetTranslation("update_flowlauncher_new_update"), MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+                if (_api.ShowMsgBox(newVersionTips, _api.GetTranslation("update_flowlauncher_new_update"),
+                        MessageBoxButton.YesNo) == MessageBoxResult.Yes)
                 {
                     UpdateManager.RestartApp(Constant.ApplicationFileName);
                 }
             }
             catch (Exception e)
             {
-                if (e is HttpRequestException or WebException or SocketException || e.InnerException is TimeoutException)
+                if (e is HttpRequestException or WebException or SocketException ||
+                    e.InnerException is TimeoutException)
                 {
-                    _api.LogException(ClassName, $"Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);
+                    _api.LogException(ClassName,
+                        $"Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);
                 }
                 else
                 {
                     _api.LogException(ClassName, $"Error Occurred", e);
                 }
-                
+
                 if (!silentUpdate)
                     _api.ShowMsg(_api.GetTranslation("update_flowlauncher_fail"),
                         _api.GetTranslation("update_flowlauncher_check_connection"));
@@ -116,14 +123,11 @@ public async Task UpdateAppAsync(bool silentUpdate = true)
         [UsedImplicitly]
         private class GithubRelease
         {
-            [JsonPropertyName("prerelease")]
-            public bool Prerelease { get; [UsedImplicitly] set; }
+            [JsonPropertyName("prerelease")] public bool Prerelease { get; [UsedImplicitly] set; }
 
-            [JsonPropertyName("published_at")]
-            public DateTime PublishedAt { get; [UsedImplicitly] set; }
+            [JsonPropertyName("published_at")] public DateTime PublishedAt { get; [UsedImplicitly] set; }
 
-            [JsonPropertyName("html_url")]
-            public string HtmlUrl { get; [UsedImplicitly] set; }
+            [JsonPropertyName("html_url")] public string HtmlUrl { get; [UsedImplicitly] set; }
         }
 
         // https://github.com/Squirrel/Squirrel.Windows/blob/master/src/Squirrel/UpdateManager.Factory.cs
@@ -138,10 +142,7 @@ private static async Task<UpdateManager> GitHubUpdateManagerAsync(string reposit
             var latest = releases.Where(r => !r.Prerelease).OrderByDescending(r => r.PublishedAt).First();
             var latestUrl = latest.HtmlUrl.Replace("/tag/", "/download/");
 
-            var client = new WebClient
-            {
-                Proxy = Http.WebProxy
-            };
+            var client = new WebClient { Proxy = Http.WebProxy };
             var downloader = new FileDownloader(client);
 
             var manager = new UpdateManager(latestUrl, urlDownloader: downloader);
@@ -158,10 +159,7 @@ private string NewVersionTips(string version)
 
         private static string Formatted<T>(T t)
         {
-            var formatted = JsonSerializer.Serialize(t, new JsonSerializerOptions
-            {
-                WriteIndented = true
-            });
+            var formatted = JsonSerializer.Serialize(t, new JsonSerializerOptions { WriteIndented = true });
 
             return formatted;
         }