diff --git a/NetworkResurrector.Abstractions/INotifier.cs b/NetworkResurrector.Abstractions/INotifier.cs index 04d1f9e..b484094 100644 --- a/NetworkResurrector.Abstractions/INotifier.cs +++ b/NetworkResurrector.Abstractions/INotifier.cs @@ -1,4 +1,4 @@ -namespace NetworkResurrector.Abstractions +namespace NetworkResurrector.Server.Abstractions { public interface INotifier { diff --git a/NetworkResurrector.Abstractions/IWakeOnLanService.cs b/NetworkResurrector.Abstractions/IWakeOnLanService.cs index 3901008..24f4fc7 100644 --- a/NetworkResurrector.Abstractions/IWakeOnLanService.cs +++ b/NetworkResurrector.Abstractions/IWakeOnLanService.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace NetworkResurrector.Abstractions +namespace NetworkResurrector.Server.Abstractions { public interface IWakeOnLanService { diff --git a/NetworkResurrector.Abstractions/NetworkResurrector.Abstractions.csproj b/NetworkResurrector.Abstractions/NetworkResurrector.Server.Abstractions.csproj similarity index 100% rename from NetworkResurrector.Abstractions/NetworkResurrector.Abstractions.csproj rename to NetworkResurrector.Abstractions/NetworkResurrector.Server.Abstractions.csproj diff --git a/NetworkResurrector.Api/Controllers/ResurrectorController.cs b/NetworkResurrector.Api/Controllers/ResurrectorController.cs index 1080256..e90d43c 100644 --- a/NetworkResurrector.Api/Controllers/ResurrectorController.cs +++ b/NetworkResurrector.Api/Controllers/ResurrectorController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc; using NetworkResurrector.Application.Commands; using System.Threading.Tasks; -namespace NetworkResurrector.Api.Controllers +namespace NetworkResurrector.Server.Controllers { [Authorize] [ApiController] diff --git a/NetworkResurrector.Api/Extensions/WakeOnLanExtensions.cs b/NetworkResurrector.Api/Extensions/WakeOnLanExtensions.cs index 91034eb..aab900f 100644 --- a/NetworkResurrector.Api/Extensions/WakeOnLanExtensions.cs +++ b/NetworkResurrector.Api/Extensions/WakeOnLanExtensions.cs @@ -4,7 +4,7 @@ using NetworkResurrector.WakeOnLan.Inhouse; using NetworkResurrector.WakeOnLan.Nikeee; using System; -namespace NetworkResurrector.Api.Extensions +namespace NetworkResurrector.Server.Extensions { public static class WakeOnLanExtensions { diff --git a/NetworkResurrector.Api/NetworkResurrector.Api.csproj b/NetworkResurrector.Api/NetworkResurrector.Server.csproj similarity index 97% rename from NetworkResurrector.Api/NetworkResurrector.Api.csproj rename to NetworkResurrector.Api/NetworkResurrector.Server.csproj index 97fef7e..3bb70b4 100644 --- a/NetworkResurrector.Api/NetworkResurrector.Api.csproj +++ b/NetworkResurrector.Api/NetworkResurrector.Server.csproj @@ -22,7 +22,7 @@ - + diff --git a/NetworkResurrector.Api/Program.cs b/NetworkResurrector.Api/Program.cs index 698d6b8..61f5775 100644 --- a/NetworkResurrector.Api/Program.cs +++ b/NetworkResurrector.Api/Program.cs @@ -10,7 +10,7 @@ using System.Diagnostics; using System.IO; using System.Linq; -namespace NetworkResurrector.Api +namespace NetworkResurrector.Server { public class Program { diff --git a/NetworkResurrector.Api/Properties/launchSettings.json b/NetworkResurrector.Api/Properties/launchSettings.json index a87629b..9163bc0 100644 --- a/NetworkResurrector.Api/Properties/launchSettings.json +++ b/NetworkResurrector.Api/Properties/launchSettings.json @@ -1,6 +1,6 @@ { "profiles": { - "NetworkResurrector.Api": { + "NetworkResurrector.Server": { "commandName": "Project", "applicationUrl": "http://localhost:5000", "environmentVariables": { diff --git a/NetworkResurrector.Api/Startup.cs b/NetworkResurrector.Api/Startup.cs index 341e7c1..fef14d6 100644 --- a/NetworkResurrector.Api/Startup.cs +++ b/NetworkResurrector.Api/Startup.cs @@ -8,12 +8,12 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using NDB.Extensions.Swagger; using NDB.Security.Authentication.Identity; -using NetworkResurrector.Api.Extensions; +using NetworkResurrector.Server.Extensions; using NetworkResurrector.Application; using Newtonsoft.Json; using System.Reflection; -namespace NetworkResurrector.Api +namespace NetworkResurrector.Server { public class Startup { diff --git a/NetworkResurrector.Application/CommandHandlers/WakeMachineHandler.cs b/NetworkResurrector.Application/CommandHandlers/WakeMachineHandler.cs index 829bb6a..5d78f4b 100644 --- a/NetworkResurrector.Application/CommandHandlers/WakeMachineHandler.cs +++ b/NetworkResurrector.Application/CommandHandlers/WakeMachineHandler.cs @@ -1,6 +1,6 @@ using MediatR; using Microsoft.Extensions.Logging; -using NetworkResurrector.Abstractions; +using NetworkResurrector.Server.Abstractions; using NetworkResurrector.Application.Commands; using NetworkResurrector.Application.Events; using System; diff --git a/NetworkResurrector.Application/NetworkResurrector.Application.csproj b/NetworkResurrector.Application/NetworkResurrector.Server.Application.csproj similarity index 92% rename from NetworkResurrector.Application/NetworkResurrector.Application.csproj rename to NetworkResurrector.Application/NetworkResurrector.Server.Application.csproj index 784cfbe..4f968aa 100644 --- a/NetworkResurrector.Application/NetworkResurrector.Application.csproj +++ b/NetworkResurrector.Application/NetworkResurrector.Server.Application.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/NetworkResurrector.Domain/NetworkResurrector.Domain.csproj b/NetworkResurrector.Domain/NetworkResurrector.Server.Domain.csproj similarity index 100% rename from NetworkResurrector.Domain/NetworkResurrector.Domain.csproj rename to NetworkResurrector.Domain/NetworkResurrector.Server.Domain.csproj diff --git a/NetworkResurrector.WakeOnLan.Inhouse/DependencyInjectionExtensions.cs b/NetworkResurrector.WakeOnLan.Inhouse/DependencyInjectionExtensions.cs index fa16731..eb6ce31 100644 --- a/NetworkResurrector.WakeOnLan.Inhouse/DependencyInjectionExtensions.cs +++ b/NetworkResurrector.WakeOnLan.Inhouse/DependencyInjectionExtensions.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.DependencyInjection; -using NetworkResurrector.Abstractions; +using NetworkResurrector.Server.Abstractions; namespace NetworkResurrector.WakeOnLan.Inhouse { diff --git a/NetworkResurrector.WakeOnLan.Inhouse/NetworkResurrector.WakeOnLan.Inhouse.csproj b/NetworkResurrector.WakeOnLan.Inhouse/NetworkResurrector.WakeOnLan.Inhouse.csproj index 6ce5cd3..e52cbed 100644 --- a/NetworkResurrector.WakeOnLan.Inhouse/NetworkResurrector.WakeOnLan.Inhouse.csproj +++ b/NetworkResurrector.WakeOnLan.Inhouse/NetworkResurrector.WakeOnLan.Inhouse.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -10,7 +10,7 @@ - + diff --git a/NetworkResurrector.WakeOnLan.Inhouse/WolDriver.cs b/NetworkResurrector.WakeOnLan.Inhouse/WolDriver.cs index a6fda62..8dd18a7 100644 --- a/NetworkResurrector.WakeOnLan.Inhouse/WolDriver.cs +++ b/NetworkResurrector.WakeOnLan.Inhouse/WolDriver.cs @@ -1,4 +1,4 @@ -using NetworkResurrector.Abstractions; +using NetworkResurrector.Server.Abstractions; using System.Globalization; using System.Net; using System.Text.RegularExpressions; diff --git a/NetworkResurrector.WakeOnLan.Nikeee/DependencyInjectionExtensions.cs b/NetworkResurrector.WakeOnLan.Nikeee/DependencyInjectionExtensions.cs index e40b483..a4c03b7 100644 --- a/NetworkResurrector.WakeOnLan.Nikeee/DependencyInjectionExtensions.cs +++ b/NetworkResurrector.WakeOnLan.Nikeee/DependencyInjectionExtensions.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.DependencyInjection; -using NetworkResurrector.Abstractions; +using NetworkResurrector.Server.Abstractions; namespace NetworkResurrector.WakeOnLan.Nikeee { diff --git a/NetworkResurrector.WakeOnLan.Nikeee/NetworkResurrector.WakeOnLan.Nikeee.csproj b/NetworkResurrector.WakeOnLan.Nikeee/NetworkResurrector.WakeOnLan.Nikeee.csproj index cd8f6b3..7c9bca7 100644 --- a/NetworkResurrector.WakeOnLan.Nikeee/NetworkResurrector.WakeOnLan.Nikeee.csproj +++ b/NetworkResurrector.WakeOnLan.Nikeee/NetworkResurrector.WakeOnLan.Nikeee.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -11,7 +11,7 @@ - + diff --git a/NetworkResurrector.WakeOnLan.Nikeee/WakeOnLanService.cs b/NetworkResurrector.WakeOnLan.Nikeee/WakeOnLanService.cs index f7a1772..f1259f9 100644 --- a/NetworkResurrector.WakeOnLan.Nikeee/WakeOnLanService.cs +++ b/NetworkResurrector.WakeOnLan.Nikeee/WakeOnLanService.cs @@ -1,4 +1,4 @@ -using NetworkResurrector.Abstractions; +using NetworkResurrector.Server.Abstractions; using System.Net; using System.Net.NetworkInformation; using System.Threading.Tasks; diff --git a/NetworkResurrector.sln b/NetworkResurrector.sln index 4026593..cc6d8f2 100644 --- a/NetworkResurrector.sln +++ b/NetworkResurrector.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30002.166 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api", "NetworkResurrector.Api\NetworkResurrector.Api.csproj", "{F6600491-5D79-4548-8745-59D9D337D3DB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Server", "NetworkResurrector.Api\NetworkResurrector.Server.csproj", "{F6600491-5D79-4548-8745-59D9D337D3DB}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FDDE879C-E0A3-4BF1-945F-7FEA324C8EBA}" ProjectSection(SolutionItems) = preProject @@ -17,11 +17,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ReleaseNotes.xml = ReleaseNotes.xml EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Application", "NetworkResurrector.Application\NetworkResurrector.Application.csproj", "{15D65D65-CC96-45DE-8590-AF9132889D98}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Server.Application", "NetworkResurrector.Application\NetworkResurrector.Server.Application.csproj", "{15D65D65-CC96-45DE-8590-AF9132889D98}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Domain", "NetworkResurrector.Domain\NetworkResurrector.Domain.csproj", "{EC78E88E-22DC-4FFD-881E-DEECF0D2494E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Server.Domain", "NetworkResurrector.Domain\NetworkResurrector.Server.Domain.csproj", "{EC78E88E-22DC-4FFD-881E-DEECF0D2494E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Abstractions", "NetworkResurrector.Abstractions\NetworkResurrector.Abstractions.csproj", "{B7408385-ED73-4ED3-9654-9AFF8CDFDA8D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Server.Abstractions", "NetworkResurrector.Abstractions\NetworkResurrector.Server.Abstractions.csproj", "{B7408385-ED73-4ED3-9654-9AFF8CDFDA8D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.WakeOnLan.Nikeee", "NetworkResurrector.WakeOnLan.Nikeee\NetworkResurrector.WakeOnLan.Nikeee.csproj", "{59049C2B-CEFB-456D-B3D5-D2CF5325AEEB}" EndProject @@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.WakeOnLa EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B0C5F0C1-0BF8-4651-AAFC-BE01F516D7B8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "api", "api", "{6889D39C-D8DA-4B99-AFC1-F0B6355E73C0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{6889D39C-D8DA-4B99-AFC1-F0B6355E73C0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "agent", "agent", "{43C78941-52E6-4AB8-9170-CC7C006E4784}" EndProject diff --git a/Notes.txt b/Notes.txt index babf6dd..825cf12 100644 --- a/Notes.txt +++ b/Notes.txt @@ -3,7 +3,7 @@ Publish: dotnet publish --configuration Release --runtime win7-x64 Create windows service: -sc create NetworkResurrector.Api binPath= "" +sc create NetworkResurrector.Server binPath= "" ####################################################################################################################################################### Resources: https://github.com/nikeee/wake-on-lan