Browse Source

properly sent content root on macos

pull/600/head
Jason Dove 5 years ago
parent
commit
14413f62a7
  1. 6
      ErsatzTV/ErsatzTV.csproj
  2. 22
      ErsatzTV/Program.cs

6
ErsatzTV/ErsatzTV.csproj

@ -10,12 +10,6 @@ @@ -10,12 +10,6 @@
<Folder Include="Resources" />
</ItemGroup>
<ItemGroup>
<Content Update="wwwroot\**" ExcludeFromSingleFile="false">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Blazored.LocalStorage" Version="4.1.5" />
<PackageReference Include="FluentValidation" Version="10.3.6" />

22
ErsatzTV/Program.cs

@ -11,23 +11,22 @@ namespace ErsatzTV @@ -11,23 +11,22 @@ namespace ErsatzTV
{
public class Program
{
private static readonly string BasePath;
static Program()
{
var executablePath = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
var executable = Path.GetFileNameWithoutExtension(executablePath);
string executablePath = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
string executable = Path.GetFileNameWithoutExtension(executablePath);
IConfigurationBuilder builder = new ConfigurationBuilder();
if ("dotnet".Equals(executable, StringComparison.InvariantCultureIgnoreCase))
{
builder = builder.SetBasePath(Path.GetDirectoryName(typeof(Program).Assembly.Location));
}
else
{
builder = builder.SetBasePath(Path.GetDirectoryName(executablePath));
}
BasePath = Path.GetDirectoryName(
"dotnet".Equals(executable, StringComparison.InvariantCultureIgnoreCase)
? typeof(Program).Assembly.Location
: executablePath);
Configuration = builder
.SetBasePath(BasePath)
.AddJsonFile("appsettings.json", false, true)
.AddJsonFile(
$"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"}.json",
@ -67,7 +66,8 @@ namespace ErsatzTV @@ -67,7 +66,8 @@ namespace ErsatzTV
.ConfigureWebHostDefaults(
webBuilder => webBuilder.UseStartup<Startup>()
.UseConfiguration(Configuration)
.UseKestrel(options => options.AddServerHeader = false))
.UseKestrel(options => options.AddServerHeader = false)
.UseContentRoot(BasePath))
.UseSerilog();
}
}

Loading…
Cancel
Save