tudor.stanciu
/
network-resurrector
mirror of https://dev.azure.com/tstanciu94/NetworkResurrector/_git/NetworkResurrector
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Compare commits

base: tudor.stanciu:c63a48af6ef16a656fe28fa02f066bea1fc06dc6
Branches Tags
tudor.stanciu:master
..
compare: tudor.stanciu:15241429fce0987f887901430a7ad07b45e9972b
Branches Tags
tudor.stanciu:master

No commits in common. "c63a48af6ef16a656fe28fa02f066bea1fc06dc6" and "15241429fce0987f887901430a7ad07b45e9972b" have entirely different histories.
c63a48af6e ... 15241429fc

6 changed files with 23 additions and 46 deletions
Show Stats Expand all files Collapse all files

25
src/agent/NetworkResurrector.Agent/Program.cs
View File

@ -6,8 +6,6 @@ using NetworkResurrector.Agent.Extensions;
using NetworkResurrector.Agent.Extensions.Serilog;
using Serilog;
using System;
using System.Diagnostics;
using System.Linq;
namespace NetworkResurrector.Agent
{
@ -15,24 +13,7 @@ namespace NetworkResurrector.Agent
{
public static void Main(string[] 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();
}
var builder = WebApplication.CreateBuilder(args);
builder.Host.UseSerilog((_, lc) =>
{
@ -46,6 +27,10 @@ namespace NetworkResurrector.Agent
builder.Services.ConfigureServices(builder.Configuration);
var useWindowsService = builder.Configuration.GetValue<bool>("Host:UseWindowsService");
if (useWindowsService)
builder.Host.UseWindowsService();
var app = builder.Build();
app.Configure(builder.Configuration);

4
src/agent/NetworkResurrector.Agent/Properties/PublishProfiles/FolderProfile.pubxml
View File

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

3
src/agent/NetworkResurrector.Agent/appsettings.json
View File

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

26
src/server/NetworkResurrector.Server/Program.cs
View File

@ -5,8 +5,6 @@ using Microsoft.Extensions.Hosting;
using NetworkResurrector.Server.Extensions;
using Serilog;
using System;
using System.Diagnostics;
using System.Linq;
namespace NetworkResurrector.Server
{
@ -14,24 +12,7 @@ namespace NetworkResurrector.Server
{
public static void Main(string[] 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();
}
var builder = WebApplication.CreateBuilder(args);
builder.Host.UseSerilog((_, lc) =>
{
@ -43,6 +24,11 @@ namespace NetworkResurrector.Server
});
builder.Services.ConfigureServices(builder.Configuration);
var useWindowsService = builder.Configuration.GetValue<bool>("Host:UseWindowsService");
if (useWindowsService)
builder.Host.UseWindowsService();
var app = builder.Build();
app.Configure();

4
src/server/NetworkResurrector.Server/Properties/PublishProfiles/FolderProfile.pubxml
View File

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

3
src/server/NetworkResurrector.Server/appsettings.json
View File

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