aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/ApplicationHost.cs
diff options
context:
space:
mode:
authorBond_009 <bond.009@outlook.com>2019-01-01 16:27:11 +0100
committerVasily <JustAMan@users.noreply.github.com>2019-01-02 02:30:59 +0300
commit75efe9cf0a15b6871726a4c2e8802e2af88cf1d1 (patch)
treebba4635541b86bf87fd8e2bd7825fbc44a02f0d6 /Emby.Server.Implementations/ApplicationHost.cs
parente094c45abb44ece2bf685087ca6326cb00c468a8 (diff)
Rename and rework entry point
Diffstat (limited to 'Emby.Server.Implementations/ApplicationHost.cs')
-rw-r--r--Emby.Server.Implementations/ApplicationHost.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index a4a24dda0a..060898684e 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -416,7 +416,6 @@ namespace Emby.Server.Implementations
ConfigurationManager = GetConfigurationManager();
- // Initialize this early in case the -v command line option is used
Logger = LoggerFactory.CreateLogger("App");
StartupOptions = options;
@@ -467,7 +466,7 @@ namespace Emby.Server.Implementations
{
get
{
- return _version ?? (_version = GetType().GetTypeInfo().Assembly.GetName().Version);
+ return _version ?? (_version = typeof(ApplicationHost).Assembly.GetName().Version);
}
}
@@ -1772,7 +1771,7 @@ namespace Emby.Server.Implementations
return list.ToList();
}
- protected abstract List<Assembly> GetAssembliesWithPartsInternal();
+ protected abstract IEnumerable<Assembly> GetAssembliesWithPartsInternal();
/// <summary>
/// Gets the plugin assemblies.