diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-08-26 16:38:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-26 16:38:30 -0400 |
| commit | 9305573e9672ef655a3febd5ba5ed0905dd767f0 (patch) | |
| tree | 336e7d9bb1830f06abf85128916aec56fdf7a9fb | |
| parent | 76daf165355ab3fea8f37570c1cf37de4cf9b3ab (diff) | |
| parent | ae331babed85ad55eb67641fb17f9829f2a3a8bc (diff) | |
Merge pull request #2106 from MediaBrowser/dev
fix version comparison
| -rw-r--r-- | MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs b/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs index 5212b8ac3..ec00fb33d 100644 --- a/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs +++ b/MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs @@ -66,13 +66,10 @@ namespace MediaBrowser.Server.Startup.Common.Migrations if (releases.Count >= 1) { var release = releases[0]; - Version version; - if (Version.TryParse(release.tag_name, out version)) + var version = ParseVersion(release.tag_name); + if (version != null && currentVersion > version) { - if (currentVersion > version) - { - newUpdateLevel = PackageVersionClass.Beta; - } + newUpdateLevel = PackageVersionClass.Beta; } } @@ -80,13 +77,10 @@ namespace MediaBrowser.Server.Startup.Common.Migrations if (releases.Count >= 2) { var release = releases[1]; - Version version; - if (Version.TryParse(release.tag_name, out version)) + var version = ParseVersion(release.tag_name); + if (version != null && currentVersion > version) { - if (currentVersion > version) - { - newUpdateLevel = PackageVersionClass.Dev; - } + newUpdateLevel = PackageVersionClass.Dev; } } @@ -96,5 +90,19 @@ namespace MediaBrowser.Server.Startup.Common.Migrations _config.SaveConfiguration(); } } + + private Version ParseVersion(string versionString) + { + var parts = versionString.Split('.'); + if (parts.Length == 3) + { + versionString += ".0"; + } + + Version version; + Version.TryParse(versionString, out version); + + return version; + } } } |