Compare commits

..
2 Commits
Author SHA1 Message Date
Jason DoveandGitHub 663a62431b properly fix startup paths (#576) 2022-01-17 16:31:22 -06:00
Jason Dove 1d4acc284d Update changelog for release v0.3.7-alpha [no ci] 2022-01-17 15:23:39 -06:00
2 changed files with 31 additions and 11 deletions
+5 -2
View File
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased] ## [Unreleased]
## [0.3.7-alpha] - 2022-01-17
### Fixed ### Fixed
- Fix local folder scanners to properly detect removed/re-added folders with unchanged contents - Fix local folder scanners to properly detect removed/re-added folders with unchanged contents
- Fix double-click startup on mac - Fix double-click startup on mac
@@ -909,8 +911,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Initial release to facilitate testing outside of Docker. - Initial release to facilitate testing outside of Docker.
[Unreleased]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.6-alpha...HEAD [Unreleased]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.7-alpha...HEAD
[0.3.5-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.5-alpha...v0.3.6-alpha [0.3.7-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.6-alpha...v0.3.7-alpha
[0.3.6-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.5-alpha...v0.3.6-alpha
[0.3.5-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.4-alpha...v0.3.5-alpha [0.3.5-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.4-alpha...v0.3.5-alpha
[0.3.4-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.3-alpha...v0.3.4-alpha [0.3.4-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.3-alpha...v0.3.4-alpha
[0.3.3-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.2-alpha...v0.3.3-alpha [0.3.3-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.2-alpha...v0.3.3-alpha
+26 -9
View File
@@ -1,6 +1,5 @@
using System; using System;
using System.IO; using System.IO;
using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using ErsatzTV.Core; using ErsatzTV.Core;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
@@ -12,14 +11,32 @@ namespace ErsatzTV
{ {
public class Program public class Program
{ {
private static IConfiguration Configuration { get; } = new ConfigurationBuilder() static Program()
.SetBasePath(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)) {
.AddJsonFile("appsettings.json", false, true) var executablePath = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
.AddJsonFile( var executable = Path.GetFileNameWithoutExtension(executablePath);
$"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"}.json",
true) IConfigurationBuilder builder = new ConfigurationBuilder();
.AddEnvironmentVariables()
.Build(); if ("dotnet".Equals(executable, StringComparison.InvariantCultureIgnoreCase))
{
builder = builder.SetBasePath(Path.GetDirectoryName(typeof(Program).Assembly.Location));
}
else
{
builder = builder.SetBasePath(Path.GetDirectoryName(executablePath));
}
Configuration = builder
.AddJsonFile("appsettings.json", false, true)
.AddJsonFile(
$"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"}.json",
true)
.AddEnvironmentVariables()
.Build();
}
private static IConfiguration Configuration { get; }
public static async Task<int> Main(string[] args) public static async Task<int> Main(string[] args)
{ {