Merge pull request #327 from nvisionative/develop

Merge `develop` into `master` for 2.1.1 release

nvQuickSite/Controllers/PackageController.cs

@@ -184,7 +184,7 @@ private static IEnumerable<Package> GetGitHubPackages()
 
                         var ghPackage = new Package();
 
-                        ghPackage.version = TrimTagName(release);
+                        ghPackage.version = new System.Version(release.TagName.TrimStart('v').Split('-')[0]);
 
                         if (index == 0 &&
                             release.Name.IndexOf("rc", StringComparison.OrdinalIgnoreCase) >= 0 &&
@@ -200,8 +200,8 @@ private static IEnumerable<Package> GetGitHubPackages()
                         else if (!release.Name.ToUpperInvariant().Contains("RC") &&
                             installPackage != null)
                         {
-                            ghPackage.did = "dnn-platform-" + ghPackage.version.Substring(0, 1);
-                            ghPackage.name = "DNN Platform " + ghPackage.version.Substring(0, 1);
+                            ghPackage.did = "dnn-platform-" + ghPackage.version.Major.ToString();
+                            ghPackage.name = "DNN Platform " + ghPackage.version.Major.ToString();
                             ghPackage.url = installPackage.BrowserDownloadUrl;
                             ghPackage.upgradeurl = upgradePackage.BrowserDownloadUrl;
                             packages.Add(ghPackage);
@@ -221,17 +221,5 @@ private static IEnumerable<Package> GetGitHubPackages()
                 return packages;
             }
         }
-
-        private static string TrimTagName(Release release)
-        {
-            if (release.TagName != null && release.TagName[0] == 'v')
-            {
-                return release.TagName.Remove(0, 1);
-            }
-            else
-            {
-                return release.TagName;
-            }
-        }
     }
 }