update .net core startup

This commit is contained in:
Luke Pulverenti
2016-11-13 16:04:21 -05:00
parent 3c55747cd6
commit 0e9cd51f9c
38 changed files with 355 additions and 325 deletions

View File

@@ -8,7 +8,7 @@ namespace Emby.Server
{
public class ApplicationPathHelper
{
public static string GetProgramDataPath(string applicationPath)
public static string GetProgramDataPath(string appDirectory)
{
var useDebugPath = false;
@@ -27,14 +27,7 @@ namespace Emby.Server
// If it's a relative path, e.g. "..\"
if (!Path.IsPathRooted(programDataPath))
{
var path = Path.GetDirectoryName(applicationPath);
if (string.IsNullOrEmpty(path))
{
throw new Exception("Unable to determine running assembly location");
}
programDataPath = Path.Combine(path, programDataPath);
programDataPath = Path.Combine(appDirectory, programDataPath);
programDataPath = Path.GetFullPath(programDataPath);
}