phares3757/oi-metrology
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added UseFileServer

Browse Source 
Removed webApplicationOptions
Added extra Route
This commit is contained in:
Mike Phares 2022-08-10 10:38:30 -07:00
parent 831dd58078
commit 61692f2c48
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Archive/Controllers/PagesController.cs
View File

@ -31,10 +31,12 @@ public class PagesController : Controller
[HttpGet] [HttpGet]
[Route("/AwaitingDispo")] [Route("/AwaitingDispo")]
[Route("Metrology/AwaitingDispo")]
public IActionResult AwaitingDispo() => View(); public IActionResult AwaitingDispo() => View();
[HttpGet] [HttpGet]
[Route("/RunInfo")] [Route("/RunInfo")]
[Route("Metrology/RunInfo")]
public IActionResult RunInfo([FromQuery] int tooltypeid = 1, [FromQuery] int headerid = 0) public IActionResult RunInfo([FromQuery] int tooltypeid = 1, [FromQuery] int headerid = 0)
{ {
RunInfo m = new() RunInfo m = new()
@ -52,6 +54,7 @@ public class PagesController : Controller
[HttpGet] [HttpGet]
[Route("/RunHeaders")] [Route("/RunHeaders")]
[Route("Metrology/RunHeaders")]
public IActionResult RunHeaders() => View(); public IActionResult RunHeaders() => View();
[HttpGet] [HttpGet]

5
Archive/Program.cs
View File

@ -47,8 +47,8 @@ public class Program
public static int Main(string[] args) public static int Main(string[] args)
{ {
LoggerConfiguration loggerConfiguration = new(); LoggerConfiguration loggerConfiguration = new();
(string assemblyName, WebApplicationOptions webApplicationOptions) = Get(args); (string assemblyName, WebApplicationOptions _) = Get(args);
WebApplicationBuilder webApplicationBuilder = WebApplication.CreateBuilder(webApplicationOptions); WebApplicationBuilder webApplicationBuilder = WebApplication.CreateBuilder();
_ = webApplicationBuilder.Configuration.AddUserSecrets<Program>(); _ = webApplicationBuilder.Configuration.AddUserSecrets<Program>();
AppSettings appSettings = Models.Stateless.AppSettings.Get(webApplicationBuilder.Configuration); AppSettings appSettings = Models.Stateless.AppSettings.Get(webApplicationBuilder.Configuration);
if (string.IsNullOrEmpty(appSettings.WorkingDirectoryName)) if (string.IsNullOrEmpty(appSettings.WorkingDirectoryName))
@ -107,6 +107,7 @@ public class Program
_ = webApplication.Lifetime.ApplicationStopped.Register(Log.CloseAndFlush); _ = webApplication.Lifetime.ApplicationStopped.Register(Log.CloseAndFlush);
_ = ApplicationBuilderSerilogClientExtensions.UseSerilogIngestion(webApplication); _ = ApplicationBuilderSerilogClientExtensions.UseSerilogIngestion(webApplication);
_ = SerilogApplicationBuilderExtensions.UseSerilogRequestLogging(webApplication); _ = SerilogApplicationBuilderExtensions.UseSerilogRequestLogging(webApplication);
_ = webApplication.UseFileServer(enableDirectoryBrowsing: true);
_ = webApplication.UseStaticFiles(); _ = webApplication.UseStaticFiles();
_ = webApplication.UseSession(); _ = webApplication.UseSession();
_ = webApplication.UseHttpsRedirection(); _ = webApplication.UseHttpsRedirection();

5
Viewer/Program.cs
View File

@ -47,8 +47,8 @@ public class Program
public static int Main(string[] args) public static int Main(string[] args)
{ {
LoggerConfiguration loggerConfiguration = new(); LoggerConfiguration loggerConfiguration = new();
(string assemblyName, WebApplicationOptions webApplicationOptions) = Get(args); (string assemblyName, WebApplicationOptions _) = Get(args);
WebApplicationBuilder webApplicationBuilder = WebApplication.CreateBuilder(webApplicationOptions); WebApplicationBuilder webApplicationBuilder = WebApplication.CreateBuilder();
_ = webApplicationBuilder.Configuration.AddUserSecrets<Program>(); _ = webApplicationBuilder.Configuration.AddUserSecrets<Program>();
AppSettings appSettings = Models.Stateless.AppSettings.Get(webApplicationBuilder.Configuration); AppSettings appSettings = Models.Stateless.AppSettings.Get(webApplicationBuilder.Configuration);
if (string.IsNullOrEmpty(appSettings.WorkingDirectoryName)) if (string.IsNullOrEmpty(appSettings.WorkingDirectoryName))
@ -107,6 +107,7 @@ public class Program
_ = webApplication.Lifetime.ApplicationStopped.Register(Log.CloseAndFlush); _ = webApplication.Lifetime.ApplicationStopped.Register(Log.CloseAndFlush);
_ = ApplicationBuilderSerilogClientExtensions.UseSerilogIngestion(webApplication); _ = ApplicationBuilderSerilogClientExtensions.UseSerilogIngestion(webApplication);
_ = SerilogApplicationBuilderExtensions.UseSerilogRequestLogging(webApplication); _ = SerilogApplicationBuilderExtensions.UseSerilogRequestLogging(webApplication);
_ = webApplication.UseFileServer(enableDirectoryBrowsing: true);
_ = webApplication.UseStaticFiles(); _ = webApplication.UseStaticFiles();
_ = webApplication.UseSession(); _ = webApplication.UseSession();
_ = webApplication.UseHttpsRedirection(); _ = webApplication.UseHttpsRedirection();