NetworkResurrector.Server fix

master
Tudor Stanciu 2023-01-29 04:28:34 +02:00
parent 15241429fc
commit 06c76f5745
3 changed files with 23 additions and 12 deletions

View File

@ -5,6 +5,8 @@ using Microsoft.Extensions.Hosting;
using NetworkResurrector.Server.Extensions; using NetworkResurrector.Server.Extensions;
using Serilog; using Serilog;
using System; using System;
using System.Diagnostics;
using System.Linq;
namespace NetworkResurrector.Server namespace NetworkResurrector.Server
{ {
@ -12,7 +14,24 @@ namespace NetworkResurrector.Server
{ {
public static void Main(string[] args) public static void Main(string[] args)
{ {
var builder = WebApplication.CreateBuilder(args); var isConsole = Debugger.IsAttached || args.Contains("--console");
WebApplicationBuilder builder;
if (isConsole)
{
builder = WebApplication.CreateBuilder(args);
}
else
{
var webApplicationOptions = new WebApplicationOptions()
{
ContentRootPath = AppContext.BaseDirectory,
Args = args,
ApplicationName = Process.GetCurrentProcess().ProcessName
};
builder = WebApplication.CreateBuilder(webApplicationOptions);
builder.Host.UseWindowsService();
}
builder.Host.UseSerilog((_, lc) => builder.Host.UseSerilog((_, lc) =>
{ {
@ -24,11 +43,6 @@ namespace NetworkResurrector.Server
}); });
builder.Services.ConfigureServices(builder.Configuration); builder.Services.ConfigureServices(builder.Configuration);
var useWindowsService = builder.Configuration.GetValue<bool>("Host:UseWindowsService");
if (useWindowsService)
builder.Host.UseWindowsService();
var app = builder.Build(); var app = builder.Build();
app.Configure(); app.Configure();

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
https://go.microsoft.com/fwlink/?LinkID=208121. https://go.microsoft.com/fwlink/?LinkID=208121.
--> -->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project>
<PropertyGroup> <PropertyGroup>
<DeleteExistingFiles>false</DeleteExistingFiles> <DeleteExistingFiles>false</DeleteExistingFiles>
<ExcludeApp_Data>false</ExcludeApp_Data> <ExcludeApp_Data>false</ExcludeApp_Data>
@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform> <LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider> <PublishProvider>FileSystem</PublishProvider>
<PublishUrl>bin\Release\net5.0\publish\</PublishUrl> <PublishUrl>bin\Release\net6.0\publish\</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod> <WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish /> <SiteUrlToLaunchAfterPublish />
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>

View File

@ -3,9 +3,6 @@
"ConnectionStrings": { "ConnectionStrings": {
"DatabaseConnection": "Server=#########;Database=#########;User Id=#########;Password=#########;MultipleActiveResultSets=true" "DatabaseConnection": "Server=#########;Database=#########;User Id=#########;Password=#########;MultipleActiveResultSets=true"
}, },
"Host": {
"UseWindowsService": false
},
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Information", "Default": "Information",