aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBond_009 <bond.009@outlook.com>2019-01-01 23:19:00 +0100
committerVasily <JustAMan@users.noreply.github.com>2019-01-02 02:30:59 +0300
commit9ccc259c99b11469cd93cb3e15ad2f69f54f0b46 (patch)
tree49c60219e1575c9d7748da292616f508cc5e3bf9
parent95a5dd881076f6649f4b5dc5a1897df98dc3c008 (diff)
Fix errors and assembly name
-rw-r--r--Jellyfin.Server/Jellyfin.Server.csproj1
-rw-r--r--Jellyfin.Server/Program.cs2
2 files changed, 2 insertions, 1 deletions
diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index 09491d6a5..fa603a086 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
+ <AssemblyName>jellyfin</AssemblyName>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index aef22e020..73c7a0c7c 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -134,7 +134,7 @@ namespace Jellyfin.Server
Environment.SetEnvironmentVariable("JELLYFIN_LOG_DIR", logDir);
}
- string appPath = Assembly.GetEntryAssembly().Location;
+ string appPath = AppContext.BaseDirectory;
return new ServerApplicationPaths(programDataPath, appPath, appPath, logDir);
}