diff --git a/PlexRequests.Core.Tests/StatusCheckerTests.cs b/PlexRequests.Core.Tests/StatusCheckerTests.cs index aaacaf78a..e45b4dcab 100644 --- a/PlexRequests.Core.Tests/StatusCheckerTests.cs +++ b/PlexRequests.Core.Tests/StatusCheckerTests.cs @@ -24,6 +24,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + +using System; using NUnit.Framework; namespace PlexRequests.Core.Tests diff --git a/PlexRequests.Core/StatusChecker.cs b/PlexRequests.Core/StatusChecker.cs index e4c939206..1512082f0 100644 --- a/PlexRequests.Core/StatusChecker.cs +++ b/PlexRequests.Core/StatusChecker.cs @@ -63,10 +63,10 @@ namespace PlexRequests.Core var latestRelease = GetLatestRelease(); - var latestVersionArray = latestRelease.Result.Name.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); + var latestVersionArray = latestRelease.Result.Name.Split(new[] { 'v' }, StringSplitOptions.RemoveEmptyEntries); var latestVersion = latestVersionArray.Length > 1 ? latestVersionArray[1] : string.Empty; - if (!latestVersion.Equals(AssemblyHelper.GetReleaseVersion(), StringComparison.InvariantCultureIgnoreCase)) + if (!latestVersion.Equals(AssemblyHelper.GetProductVersion(), StringComparison.InvariantCultureIgnoreCase)) { model.UpdateAvailable = true; model.UpdateUri = latestRelease.Result.HtmlUrl; diff --git a/PlexRequests.Helpers.Tests/AssemblyHelperTests.cs b/PlexRequests.Helpers.Tests/AssemblyHelperTests.cs index 689bfd039..b55443e61 100644 --- a/PlexRequests.Helpers.Tests/AssemblyHelperTests.cs +++ b/PlexRequests.Helpers.Tests/AssemblyHelperTests.cs @@ -34,9 +34,8 @@ namespace PlexRequests.Helpers.Tests [Test] public void GetReleaseVersionTest() { - var result = AssemblyHelper.GetReleaseVersion(); - Assert.That(result, Contains.Substring("v")); - Assert.That(result, Is.Not.EqualTo("1.0.0.0")); + var result = AssemblyHelper.GetProductVersion(); + Assert.That(result, Is.Not.Null); } } } \ No newline at end of file diff --git a/PlexRequests.Helpers/AssemblyHelper.cs b/PlexRequests.Helpers/AssemblyHelper.cs index c1a03d2b7..6c450bda8 100644 --- a/PlexRequests.Helpers/AssemblyHelper.cs +++ b/PlexRequests.Helpers/AssemblyHelper.cs @@ -38,11 +38,11 @@ namespace PlexRequests.Helpers return fvi.FileVersion; } - public static string GetReleaseVersion() + public static string GetProductVersion() { var assembly = Assembly.GetExecutingAssembly(); var fvi = FileVersionInfo.GetVersionInfo(assembly.Location); - var retVersion = "v" + fvi.FileVersion.Substring(0, fvi.FileVersion.Length - 2); + var retVersion = fvi.ProductVersion; return retVersion; } } diff --git a/PlexRequests.UI/Views/Admin/Status.cshtml b/PlexRequests.UI/Views/Admin/Status.cshtml index 1cb621f3c..057c16e44 100644 --- a/PlexRequests.UI/Views/Admin/Status.cshtml +++ b/PlexRequests.UI/Views/Admin/Status.cshtml @@ -6,11 +6,21 @@
- + + +
+ +
+ + @if (Model.UpdateAvailable) + { + + } + else + { + + } -
- -
diff --git a/PlexRequests.UI/Views/Admin/_Sidebar.cshtml b/PlexRequests.UI/Views/Admin/_Sidebar.cshtml index 7733857e8..b2e3da3c2 100644 --- a/PlexRequests.UI/Views/Admin/_Sidebar.cshtml +++ b/PlexRequests.UI/Views/Admin/_Sidebar.cshtml @@ -57,7 +57,7 @@ @if (Context.Request.Path == "/admin/status") { - Status/a> + Status } else { diff --git a/appveyor.yml b/appveyor.yml index d786aadd9..90f12b286 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,10 @@ -version: 1.2.{build} +version: 1.2.0 configuration: Release assembly_info: patch: true file: '**\AssemblyInfo.*' assembly_version: '1.2.0' - assembly_file_version: '{version}' + assembly_file_version: '1.2.{build}' assembly_informational_version: '1.2.0' before_build: - cmd: appveyor-retry nuget restore