#714 Improved AoT support

Author: danielpalme

src/Readme.txt

@@ -69,6 +69,7 @@ CHANGELOG
 
 5.4.4.0
 
+    * New: #714 Improved AoT support
     * New: #721 Added support for comma-separated arguments in addition to semicolon
 
 5.4.3.0

src/ReportGenerator.Core/Generator.cs

@@ -136,7 +136,7 @@ public bool GenerateReport(
                 // Set log level before validation is performed
                 LoggerFactory.VerbosityLevel = reportConfiguration.VerbosityLevel;
 
-                Logger.Debug($"{Resources.Executable}: {typeof(Program).Assembly.Location}");
+                Logger.Debug($"{Resources.Executable}: {AppContext.BaseDirectory}");
                 Logger.Debug($"{Resources.WorkingDirectory}: {Directory.GetCurrentDirectory()}");
 
                 if (!new ReportConfigurationValidator(reportBuilderFactory).Validate(reportConfiguration))
@@ -358,7 +358,7 @@ private IConfigurationRoot GetConfiguration()
             try
             {
                 var builder = new ConfigurationBuilder()
-                    .SetBasePath(new FileInfo(this.GetType().Assembly.Location).DirectoryName)
+                    .SetBasePath(AppContext.BaseDirectory)
                     .AddJsonFile("appsettings.json")
                     .AddCommandLine(args);
 
@@ -368,7 +368,7 @@ private IConfigurationRoot GetConfiguration()
             {
                 // This can happen when excuted within MSBuild (dotnet msbuild): JSON configuration gets ignored
                 var builder = new ConfigurationBuilder()
-                    .SetBasePath(new FileInfo(this.GetType().Assembly.Location).DirectoryName)
+                    .SetBasePath(AppContext.BaseDirectory)
                     .AddCommandLine(args);
 
                 return builder.Build();

src/ReportGenerator.Core/Plugin/ReflectionPluginLoader.cs

@@ -127,8 +127,7 @@ private IAssemblyLoader CreateAssemblyLoader()
 
             if (framework != null && framework.StartsWith(".NETCoreApp"))
             {
-                var directory = new FileInfo(typeof(ReflectionPluginLoader).Assembly.Location).Directory.FullName;
-                string path = Path.Combine(directory, "ReportGenerator.DotnetCorePluginLoader.dll");
+                string path = Path.Combine(AppContext.BaseDirectory, "ReportGenerator.DotnetCorePluginLoader.dll");
 
                 if (!File.Exists(path))
                 {