1.0 Beta 8 (hotfix 1): Fix crash during background update check

- Fix potential bug preventing automatically updating from a beta/RC to a full release
Sparronator9999 · Jan 17, 2025 · 6518d37 · 6518d37
1 parent 73d2350
commit 6518d37
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 13 deletions.
diff --git a/YAMDCC.Common/CommonConfig.cs b/YAMDCC.Common/CommonConfig.cs
@@ -74,7 +74,7 @@ public class CommonConfig
     /// to pre-releases, otherwise <see langword="false"/>.
     /// </summary>
     [XmlElement]
-    public bool PreRelease { get; set; } = true;
+    public bool PreRelease { get; set; }
 
     public static string GetLastConf()
     {

diff --git a/YAMDCC.Common/Utils.cs b/YAMDCC.Common/Utils.cs
@@ -113,9 +113,10 @@ public static Version GetVersion(string verString)
         // expected version format: X.Y.Z-SUFFIX[.W]+REVISION,
         switch (suffix)
         {
-            // releases: X.Y.Z
+            // releases: X.Y.Z.250
+            // (ensures that beta/RC versions get updated to releases)
             case "release":
-                verString = verString.Remove(verString.IndexOf('-'));
+                verString = $"{verString.Remove(verString.IndexOf('-'))}.250";
                 break;
             // dev versions: X.Y.Z.255
             // (ensures that dev versions don't get updated)

diff --git a/YAMDCC.Common/YAMDCC.Common.csproj b/YAMDCC.Common/YAMDCC.Common.csproj
@@ -13,7 +13,7 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC common code library</Title>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>beta.8</VersionSuffix>
+        <VersionSuffix>beta.8-hotfix.1</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Config/YAMDCC.Config.csproj b/YAMDCC.Config/YAMDCC.Config.csproj
@@ -13,7 +13,7 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC config library</Title>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>beta.8</VersionSuffix>
+        <VersionSuffix>beta.8-hotfix.1</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj b/YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj
@@ -21,7 +21,7 @@
         <Title>YAMDCC configuration utility</Title>
         <UseWindowsForms>true</UseWindowsForms>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>beta.8</VersionSuffix>
+        <VersionSuffix>beta.8-hotfix.1</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.ECAccess/YAMDCC.ECAccess.csproj b/YAMDCC.ECAccess/YAMDCC.ECAccess.csproj
@@ -14,7 +14,7 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC EC access library</Title>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>beta.8</VersionSuffix>
+        <VersionSuffix>beta.8-hotfix.1</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.ECInspector/YAMDCC.ECInspector.csproj b/YAMDCC.ECInspector/YAMDCC.ECInspector.csproj
@@ -19,7 +19,7 @@
         <Title>YAMDCC EC inspector</Title>
         <UseWindowsForms>true</UseWindowsForms>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>beta.8</VersionSuffix>
+        <VersionSuffix>beta.8-hotfix.1</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Logs/YAMDCC.Logs.csproj b/YAMDCC.Logs/YAMDCC.Logs.csproj
@@ -13,7 +13,7 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC logging library</Title>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>beta.8</VersionSuffix>
+        <VersionSuffix>beta.8-hotfix.1</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Service/YAMDCC.Service.csproj b/YAMDCC.Service/YAMDCC.Service.csproj
@@ -16,7 +16,7 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC helper service</Title>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>beta.8</VersionSuffix>
+        <VersionSuffix>beta.8-hotfix.1</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Updater/Program.cs b/YAMDCC.Updater/Program.cs
@@ -147,7 +147,19 @@ private static bool BGUpdate(bool autoUpdate)
     {
         try
         {
-            Release release = Updater.GetLatestReleaseAsync(CommonConfig.GetPreRelease()).GetAwaiter().GetResult();
+            bool preRelease = CommonConfig.GetPreRelease();
+            Release release = Updater.GetLatestReleaseAsync(preRelease).GetAwaiter().GetResult();
+
+            if (release is null && !preRelease)
+            {
+                // there's no non-prerelease version yet, try to get latest pre-release
+                release = Updater.GetLatestReleaseAsync(true).GetAwaiter().GetResult();
+                if (release is null)
+                {
+                    Utils.ShowError("Failed to get latest YAMDCC release info!");
+                    return false;
+                }
+            }
 
             if (Utils.GetCurrentVersion() < Utils.GetVersion(release.TagName.Remove(0, 1)))
             {

diff --git a/YAMDCC.Updater/UpdateForm.cs b/YAMDCC.Updater/UpdateForm.cs
@@ -189,7 +189,7 @@ private void tsiAutoUpdate_Click(object sender, EventArgs e)
 
     private void tsiPreRelease_Click(object sender, EventArgs e)
     {
-        if (SetAdminSetting("setprerelease", tsiPreRelease.Checked))
+        if (SetAdminSetting("setprerelease", !tsiPreRelease.Checked))
         {
             tsiPreRelease.Checked = !tsiPreRelease.Checked;
             if (btnUpdate.Tag is null)
@@ -212,6 +212,11 @@ private async void CheckUpdate()
         try
         {
             Release = await Updater.GetLatestReleaseAsync(tsiPreRelease.Checked);
+            if (Release is null && !tsiPreRelease.Checked)
+            {
+                // there's no non-prerelease version yet, try to get latest pre-release
+                Release = await Updater.GetLatestReleaseAsync(true);
+            }
         }
         catch (HttpRequestException ex)
         {

diff --git a/YAMDCC.Updater/YAMDCC.Updater.csproj b/YAMDCC.Updater/YAMDCC.Updater.csproj
@@ -18,7 +18,7 @@
         <Title>YAMDCC configuration utility</Title>
         <UseWindowsForms>true</UseWindowsForms>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>beta.8</VersionSuffix>
+        <VersionSuffix>beta.8-hotfix.1</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>