From 8a5198e6a395ed03fb471e62687fceecdf947abf Mon Sep 17 00:00:00 2001 From: Andrew Rabert Date: Sat, 19 Jan 2019 21:34:47 -0500 Subject: [PATCH] Remove ApplicationVersion --- Emby.Server.Implementations/ApplicationHost.cs | 9 +-------- MediaBrowser.Api/PackageService.cs | 6 +++--- MediaBrowser.Common/IApplicationHost.cs | 6 ------ 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index f0e2eec202..4da50d7074 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -429,14 +429,7 @@ namespace Emby.Server.Implementations _validAddressResults.Clear(); } - private Version _applicationVersion; - /// - /// Gets the current application server version - /// - /// The application server version. - public Version ApplicationVersion => _applicationVersion ?? (_applicationVersion = typeof(ApplicationHost).Assembly.GetName().Version); - - public string ApplicationSemanticVersion => ApplicationVersion.ToString(3); + public string ApplicationSemanticVersion => typeof(ApplicationHost).Assembly.GetName().Version.ToString(3); /// /// Gets the current application server version diff --git a/MediaBrowser.Api/PackageService.cs b/MediaBrowser.Api/PackageService.cs index c202f0f6b8..16819ee37f 100644 --- a/MediaBrowser.Api/PackageService.cs +++ b/MediaBrowser.Api/PackageService.cs @@ -139,7 +139,7 @@ namespace MediaBrowser.Api /// System.Object. public object Get(GetPackage request) { - var packages = _installationManager.GetAvailablePackages(CancellationToken.None, applicationVersion: _appHost.ApplicationVersion).Result; + var packages = _installationManager.GetAvailablePackages(CancellationToken.None, applicationVersion: typeof(PackageService).Assembly.GetName().Version).Result; var result = packages.FirstOrDefault(p => string.Equals(p.guid, request.AssemblyGuid ?? "none", StringComparison.OrdinalIgnoreCase)) ?? packages.FirstOrDefault(p => p.name.Equals(request.Name, StringComparison.OrdinalIgnoreCase)); @@ -154,7 +154,7 @@ namespace MediaBrowser.Api /// System.Object. public async Task Get(GetPackages request) { - IEnumerable packages = await _installationManager.GetAvailablePackages(CancellationToken.None, false, request.PackageType, _appHost.ApplicationVersion).ConfigureAwait(false); + IEnumerable packages = await _installationManager.GetAvailablePackages(CancellationToken.None, false, request.PackageType, typeof(PackageService).Assembly.GetName().Version).ConfigureAwait(false); if (!string.IsNullOrEmpty(request.TargetSystems)) { @@ -189,7 +189,7 @@ namespace MediaBrowser.Api public async Task Post(InstallPackage request) { var package = string.IsNullOrEmpty(request.Version) ? - await _installationManager.GetLatestCompatibleVersion(request.Name, request.AssemblyGuid, _appHost.ApplicationVersion, request.UpdateClass).ConfigureAwait(false) : + await _installationManager.GetLatestCompatibleVersion(request.Name, request.AssemblyGuid, typeof(PackageService).Assembly.GetName().Version, request.UpdateClass).ConfigureAwait(false) : await _installationManager.GetPackage(request.Name, request.AssemblyGuid, request.UpdateClass, Version.Parse(request.Version)).ConfigureAwait(false); if (package == null) diff --git a/MediaBrowser.Common/IApplicationHost.cs b/MediaBrowser.Common/IApplicationHost.cs index 94dd251cf2..06437c6a9c 100644 --- a/MediaBrowser.Common/IApplicationHost.cs +++ b/MediaBrowser.Common/IApplicationHost.cs @@ -65,12 +65,6 @@ namespace MediaBrowser.Common /// void Restart(); - /// - /// Gets the application version. - /// - /// The application version. - Version ApplicationVersion { get; } - /// /// Gets the application semantic version. ///