Merge pull request #401 from nvisionative/develop

Merged `develop` into `main` for `2.5.0` release

Author: david-poindexter

nvQuickSite/Controllers/PackageController.cs

@@ -103,6 +103,15 @@ public static IEnumerable<Package> GetPackageList()
                 }
             }
 
+            // Remove RCs if they already have a non-RC version.
+            packages.RemoveAll(p =>
+                p.did == "dnn-platform-rc" &&
+                packages.Any(p2 =>
+                    p2.version.Major == p.version.Major &&
+                    p2.version.Minor == p2.version.Minor &&
+                    p2.version.Build == p2.version.Build &&
+                    p2.did != "dnn-platform-rc"));
+
             SaveLocalPackagesFile(packages);
             Log.Logger.Information("Saved local packages file");
             Log.Logger.Debug("Saved packages to local packages file: {@packages}", packages);
@@ -201,15 +210,26 @@ private static IEnumerable<Package> GetGitHubPackages()
 
                         ghPackage.version = new System.Version(release.TagName.TrimStart('v').Split('-')[0]);
 
-                        if (index == 0 &&
-                            release.Name.IndexOf("rc", StringComparison.OrdinalIgnoreCase) >= 0 &&
+                        if (release.Name.IndexOf("rc", StringComparison.OrdinalIgnoreCase) >= 0 &&
                             Properties.Settings.Default.ShowReleaseCandidates &&
                             installPackage != null)
                         {
                             ghPackage.did = "dnn-platform-rc";
-                            ghPackage.name = "DNN Platform Release Candidate " + release.TagName.Split('-')[1].ToUpperInvariant().Substring(2);
+                            ghPackage.name = "DNN Platform Release Candidate";
                             ghPackage.url = installPackage.BrowserDownloadUrl;
                             ghPackage.upgradeurl = upgradePackage.BrowserDownloadUrl;
+
+                            var preReleaseTag = release.TagName.TrimStart('v').Split('-')[1];
+                            var rcSuffix = preReleaseTag.Replace("rc", string.Empty);
+                            if (int.TryParse(rcSuffix, out int preReleaseNumber))
+                            {
+                                ghPackage.version = new System.Version(
+                                    ghPackage.version.Major,
+                                    ghPackage.version.Minor,
+                                    ghPackage.version.Build,
+                                    preReleaseNumber);
+                            }
+
                             packages.Add(ghPackage);
                         }
                         else if (!release.Name.ToUpperInvariant().Contains("RC") &&

nvQuickSite/Extensions/VersionExtensions.cs

@@ -0,0 +1,26 @@
+namespace nvQuickSite.Extensions
+{
+    using System;
+
+    /// <summary>
+    /// Extension methods for <see cref="Version"/> objects.
+    /// </summary>
+    public static class VersionExtensions
+    {
+        /// <summary>
+        /// Converts  a DotNet Version into a semantic version string.
+        /// </summary>
+        /// <param name="version">The version to convert.</param>
+        /// <returns>9.13.8 or 10.0.0-rc1 for example.</returns>
+        public static string ToSemanticString(this Version version)
+        {
+            var baseVersion = version.ToString(3);
+            if (version.Revision > 0)
+            {
+                return $"{baseVersion}-rc{version.Revision}";
+            }
+
+            return baseVersion;
+        }
+    }
+}

nvQuickSite/Models/Package.cs

@@ -1,28 +1,31 @@
-// Copyright (c) 2016-2020 nvisionative, Inc.
-//
-// This file is part of nvQuickSite.
-//
-// nvQuickSite is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// nvQuickSite is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with nvQuickSite.  If not, see <http://www.gnu.org/licenses/>.
-
+// Copyright (c) 2016-2020 nvisionative, Inc.
+//
+// This file is part of nvQuickSite.
+//
+// nvQuickSite is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// nvQuickSite is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with nvQuickSite.  If not, see <http://www.gnu.org/licenses/>.
+
 namespace nvQuickSite.Models
 {
+    using System.Diagnostics;
+
     using Newtonsoft.Json;
-    using Newtonsoft.Json.Converters;
-
+    using Newtonsoft.Json.Converters;
+
     /// <summary>
     /// Represents one package.
     /// </summary>
+    [DebuggerDisplay("{did} {version}")]
     public class Package
     {
         /// <summary>

nvQuickSite/Properties/AssemblyInfo.cs

@@ -49,6 +49,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0")]
-[assembly: AssemblyFileVersion("2.4.0")]
+[assembly: AssemblyVersion("2.5.0")]
+[assembly: AssemblyFileVersion("2.5.0")]
 [assembly: NeutralResourcesLanguage("en")]