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

Merged PR 22: projects rename 

- begin
- rename
- rename
- server subfolder
- rename
- api subfolder
- Dockerfile fix
master
Tudor Stanciu 2021-04-05 23:45:42 +00:00
parent b7e1f2237a 0fb6e0f7c6
commit d314680c9f
70 changed files with 154 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
NetworkResurrector.Agent/Dockerfile
View File

@ -1,34 +0,0 @@
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base
WORKDIR /app
EXPOSE 80
FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
WORKDIR /src
COPY dependencies.props .
COPY Directory.Build.props .
COPY NuGet.config .
COPY ["NetworkResurrector.Agent/NetworkResurrector.Agent.csproj", "NetworkResurrector.Agent/"]
COPY ["NetworkResurrector.Agent.Application/NetworkResurrector.Agent.Application.csproj", "NetworkResurrector.Agent.Application/"]
COPY ["NetworkResurrector.Agent.Domain/NetworkResurrector.Agent.Domain.csproj", "NetworkResurrector.Agent.Domain/"]
COPY ["NetworkResurrector.Agent.Domain.Data/NetworkResurrector.Agent.Domain.Data.csproj", "NetworkResurrector.Agent.Domain.Data/"]
RUN dotnet restore "NetworkResurrector.Agent/NetworkResurrector.Agent.csproj"
COPY . .
WORKDIR "/src/NetworkResurrector.Agent"
RUN dotnet build "NetworkResurrector.Agent.csproj" -c Release -o /app/build
FROM build AS publish
RUN dotnet publish "NetworkResurrector.Agent.csproj" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENV urls="http://*:80"
ENV ConnectionStrings__DatabaseConnection="***REMOVED***"
#Workaround to lower the TLS level in container for old sql server version
RUN sed -i 's/TLSv1.2/TLSv1.0/g' /etc/ssl/openssl.cnf
ENTRYPOINT ["dotnet", "NetworkResurrector.Agent.dll", "--console"]

6
NetworkResurrector.Domain/Services/IParamProvider.cs
View File

@ -1,6 +0,0 @@
namespace NetworkResurrector.Domain.Services
{
public interface IParamProvider
{
}
}

24
NetworkResurrector.sln
View File

@ -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", "src\server\NetworkResurrector.Server\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,29 +17,29 @@ 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", "src\server\NetworkResurrector.Server.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", "src\server\NetworkResurrector.Server.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", "src\server\NetworkResurrector.Server.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}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.WakeOnLan.Nikeee", "src\server\NetworkResurrector.WakeOnLan.Nikeee\NetworkResurrector.WakeOnLan.Nikeee.csproj", "{59049C2B-CEFB-456D-B3D5-D2CF5325AEEB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.WakeOnLan.Inhouse", "NetworkResurrector.WakeOnLan.Inhouse\NetworkResurrector.WakeOnLan.Inhouse.csproj", "{8A593A37-7ECA-4EDD-A0A7-86CA88ECC1BD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.WakeOnLan.Inhouse", "src\server\NetworkResurrector.WakeOnLan.Inhouse\NetworkResurrector.WakeOnLan.Inhouse.csproj", "{8A593A37-7ECA-4EDD-A0A7-86CA88ECC1BD}"
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}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "api", "api", "{43C78941-52E6-4AB8-9170-CC7C006E4784}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Agent", "NetworkResurrector.Agent\NetworkResurrector.Agent.csproj", "{E10CEE53-8167-446F-BFF3-B80725BB6C90}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api", "src\api\NetworkResurrector.Api\NetworkResurrector.Api.csproj", "{E10CEE53-8167-446F-BFF3-B80725BB6C90}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Agent.Application", "NetworkResurrector.Agent.Application\NetworkResurrector.Agent.Application.csproj", "{EE31B126-12EC-46B3-8FB4-AD5BCF14C029}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api.Application", "src\api\NetworkResurrector.Api.Application\NetworkResurrector.Api.Application.csproj", "{EE31B126-12EC-46B3-8FB4-AD5BCF14C029}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Agent.Domain", "NetworkResurrector.Agent.Domain\NetworkResurrector.Agent.Domain.csproj", "{885D5625-028A-4B35-8C89-7EF718BC6E34}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api.Domain", "src\api\NetworkResurrector.Api.Domain\NetworkResurrector.Api.Domain.csproj", "{885D5625-028A-4B35-8C89-7EF718BC6E34}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Agent.Domain.Data", "NetworkResurrector.Agent.Domain.Data\NetworkResurrector.Agent.Domain.Data.csproj", "{509767A7-D11C-4143-8D45-01E62DFC2C74}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api.Domain.Data", "src\api\NetworkResurrector.Api.Domain.Data\NetworkResurrector.Api.Domain.Data.csproj", "{509767A7-D11C-4143-8D45-01E62DFC2C74}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

4
Notes.txt
View File

@ -3,7 +3,7 @@ Publish:
dotnet publish --configuration Release --runtime win7-x64
Create windows service:
sc create NetworkResurrector.Api binPath= "<path_to_the_service_executable>"
sc create NetworkResurrector.Server binPath= "<path_to_the_service_executable>"
#######################################################################################################################################################
Resources: https://github.com/nikeee/wake-on-lan
@ -21,7 +21,7 @@ Agent:
Create image:
--from solution folder:
docker image build -t "network-resurrector-agent:1.0.0" -f "NetworkResurrector.Agent/Dockerfile" .
docker image build -t "network-resurrector-agent:1.0.0" -f "NetworkResurrector.Api/Dockerfile" .
Run image:
docker run -p 5053:80 -it network-resurrector-agent:1.0.0

2
NetworkResurrector.Agent.Application/DependencyInjectionExtensions.cs → src/api/NetworkResurrector.Api.Application/DependencyInjectionExtensions.cs
View File

@ -1,6 +1,6 @@
using Microsoft.Extensions.DependencyInjection;
namespace NetworkResurrector.Agent.Application
namespace NetworkResurrector.Api.Application
{
public static class DependencyInjectionExtensions
{

6
NetworkResurrector.Agent.Application/Mappings/MappingProfile.cs → src/api/NetworkResurrector.Api.Application/Mappings/MappingProfile.cs
View File

@ -1,8 +1,8 @@
using AutoMapper;
using NetworkResurrector.Agent.Application.Queries;
using NetworkResurrector.Agent.Domain.Entities;
using NetworkResurrector.Api.Application.Queries;
using NetworkResurrector.Api.Domain.Entities;
namespace NetworkResurrector.Agent.Application.Mappings
namespace NetworkResurrector.Api.Application.Mappings
{
public class MappingProfile : Profile
{

4
NetworkResurrector.Agent.Application/NetworkResurrector.Agent.Application.csproj → src/api/NetworkResurrector.Api.Application/NetworkResurrector.Api.Application.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
@ -14,6 +14,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NetworkResurrector.Agent.Domain\NetworkResurrector.Agent.Domain.csproj" />
<ProjectReference Include="..\NetworkResurrector.Api.Domain\NetworkResurrector.Api.Domain.csproj" />
</ItemGroup>
</Project>

4
NetworkResurrector.Agent.Application/Queries/GetMachines.cs → src/api/NetworkResurrector.Api.Application/Queries/GetMachines.cs
View File

@ -1,11 +1,11 @@
using AutoMapper;
using MediatR;
using NDB.Application.DataContracts;
using NetworkResurrector.Agent.Domain.Repositories;
using NetworkResurrector.Api.Domain.Repositories;
using System.Threading;
using System.Threading.Tasks;
namespace NetworkResurrector.Agent.Application.Queries
namespace NetworkResurrector.Api.Application.Queries
{
public class GetMachines
{

6
NetworkResurrector.Agent.Domain.Data/DbContexts/AgentDbContext.cs → src/api/NetworkResurrector.Api.Domain.Data/DbContexts/AgentDbContext.cs
View File

@ -1,8 +1,8 @@
using Microsoft.EntityFrameworkCore;
using NetworkResurrector.Agent.Domain.Data.EntityTypeConfiguration;
using NetworkResurrector.Agent.Domain.Entities;
using NetworkResurrector.Api.Domain.Data.EntityTypeConfiguration;
using NetworkResurrector.Api.Domain.Entities;
namespace NetworkResurrector.Agent.Domain.Data.DbContexts
namespace NetworkResurrector.Api.Domain.Data.DbContexts
{
public class AgentDbContext : DbContext
{

8
NetworkResurrector.Agent.Domain.Data/DependencyInjectionExtensions.cs → src/api/NetworkResurrector.Api.Domain.Data/DependencyInjectionExtensions.cs
View File

@ -1,11 +1,11 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using NetworkResurrector.Agent.Domain.Data.DbContexts;
using NetworkResurrector.Agent.Domain.Data.Repositories;
using NetworkResurrector.Agent.Domain.Repositories;
using NetworkResurrector.Api.Domain.Data.DbContexts;
using NetworkResurrector.Api.Domain.Data.Repositories;
using NetworkResurrector.Api.Domain.Repositories;
namespace NetworkResurrector.Agent.Domain.Data
namespace NetworkResurrector.Api.Domain.Data
{
public static class DependencyInjectionExtensions
{

4
NetworkResurrector.Agent.Domain.Data/EntityTypeConfiguration/MachineConfiguration.cs → src/api/NetworkResurrector.Api.Domain.Data/EntityTypeConfiguration/MachineConfiguration.cs
View File

@ -1,8 +1,8 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using NetworkResurrector.Agent.Domain.Entities;
using NetworkResurrector.Api.Domain.Entities;
namespace NetworkResurrector.Agent.Domain.Data.EntityTypeConfiguration
namespace NetworkResurrector.Api.Domain.Data.EntityTypeConfiguration
{
class MachineConfiguration : IEntityTypeConfiguration<Machine>
{

2
NetworkResurrector.Agent.Domain.Data/NetworkResurrector.Agent.Domain.Data.csproj → src/api/NetworkResurrector.Api.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj
View File

@ -9,7 +9,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NetworkResurrector.Agent.Domain\NetworkResurrector.Agent.Domain.csproj" />
<ProjectReference Include="..\NetworkResurrector.Api.Domain\NetworkResurrector.Api.Domain.csproj" />
</ItemGroup>
</Project>

8
NetworkResurrector.Agent.Domain.Data/Repositories/AgentRepository.cs → src/api/NetworkResurrector.Api.Domain.Data/Repositories/AgentRepository.cs
View File

@ -1,10 +1,10 @@
using Microsoft.EntityFrameworkCore;
using NetworkResurrector.Agent.Domain.Data.DbContexts;
using NetworkResurrector.Agent.Domain.Entities;
using NetworkResurrector.Agent.Domain.Repositories;
using NetworkResurrector.Api.Domain.Data.DbContexts;
using NetworkResurrector.Api.Domain.Entities;
using NetworkResurrector.Api.Domain.Repositories;
using System.Threading.Tasks;
namespace NetworkResurrector.Agent.Domain.Data.Repositories
namespace NetworkResurrector.Api.Domain.Data.Repositories
{
class AgentRepository : IAgentRepository
{

0
NetworkResurrector.Agent.Domain.Data/Scripts/001.Machine table.sql → src/api/NetworkResurrector.Api.Domain.Data/Scripts/001.Machine table.sql
View File

2
NetworkResurrector.Agent.Domain/Entities/Machine.cs → src/api/NetworkResurrector.Api.Domain/Entities/Machine.cs
View File

@ -1,4 +1,4 @@
namespace NetworkResurrector.Agent.Domain.Entities
namespace NetworkResurrector.Api.Domain.Entities
{
public class Machine
{

0
NetworkResurrector.Abstractions/NetworkResurrector.Abstractions.csproj → src/api/NetworkResurrector.Api.Domain/NetworkResurrector.Api.Domain.csproj
View File

4
NetworkResurrector.Agent.Domain/Repositories/IAgentRepository.cs → src/api/NetworkResurrector.Api.Domain/Repositories/IAgentRepository.cs
View File

@ -1,7 +1,7 @@
using NetworkResurrector.Agent.Domain.Entities;
using NetworkResurrector.Api.Domain.Entities;
using System.Threading.Tasks;
namespace NetworkResurrector.Agent.Domain.Repositories
namespace NetworkResurrector.Api.Domain.Repositories
{
public interface IAgentRepository
{

4
NetworkResurrector.Agent/Controllers/ResurrectorAgentController.cs → src/api/NetworkResurrector.Api/Controllers/ResurrectorAgentController.cs
View File

@ -1,9 +1,9 @@
using MediatR;
using Microsoft.AspNetCore.Mvc;
using NetworkResurrector.Agent.Application.Queries;
using NetworkResurrector.Api.Application.Queries;
using System.Threading.Tasks;
namespace NetworkResurrector.Agent.Controllers
namespace NetworkResurrector.Api.Controllers
{
[ApiController]
[Route("resurrector-agent")]

34
src/api/NetworkResurrector.Api/Dockerfile Normal file
View File

@ -0,0 +1,34 @@
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base
WORKDIR /app
EXPOSE 80
FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
WORKDIR /src
COPY dependencies.props .
COPY Directory.Build.props .
COPY NuGet.config .
COPY ["src/api/NetworkResurrector.Api/NetworkResurrector.Api.csproj", "NetworkResurrector.Api/"]
COPY ["src/api/NetworkResurrector.Api.Application/NetworkResurrector.Api.Application.csproj", "NetworkResurrector.Api.Application/"]
COPY ["src/api/NetworkResurrector.Api.Domain/NetworkResurrector.Api.Domain.csproj", "NetworkResurrector.Api.Domain/"]
COPY ["src/api/NetworkResurrector.Api.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj", "NetworkResurrector.Api.Domain.Data/"]
RUN dotnet restore "NetworkResurrector.Api/NetworkResurrector.Api.csproj"
COPY . .
WORKDIR "/src/NetworkResurrector.Api"
RUN dotnet build "NetworkResurrector.Api.csproj" -c Release -o /app/build
FROM build AS publish
RUN dotnet publish "NetworkResurrector.Api.csproj" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENV urls="http://*:80"
ENV ConnectionStrings__DatabaseConnection="***REMOVED***"
#Workaround to lower the TLS level in container for old sql server version
RUN sed -i 's/TLSv1.2/TLSv1.0/g' /etc/ssl/openssl.cnf
ENTRYPOINT ["dotnet", "NetworkResurrector.Api.dll", "--console"]

6
NetworkResurrector.Api/NetworkResurrector.Api.csproj → src/api/NetworkResurrector.Api/NetworkResurrector.Api.csproj
View File

@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
<ItemGroup>
@ -22,9 +23,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NetworkResurrector.Application\NetworkResurrector.Application.csproj" />
<ProjectReference Include="..\NetworkResurrector.WakeOnLan.Inhouse\NetworkResurrector.WakeOnLan.Inhouse.csproj" />
<ProjectReference Include="..\NetworkResurrector.WakeOnLan.Nikeee\NetworkResurrector.WakeOnLan.Nikeee.csproj" />
<ProjectReference Include="..\NetworkResurrector.Api.Application\NetworkResurrector.Api.Application.csproj" />
<ProjectReference Include="..\NetworkResurrector.Api.Domain.Data\NetworkResurrector.Api.Domain.Data.csproj" />
</ItemGroup>
</Project>

2
NetworkResurrector.Agent/Program.cs → src/api/NetworkResurrector.Api/Program.cs
View File

@ -10,7 +10,7 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
namespace NetworkResurrector.Agent
namespace NetworkResurrector.Api
{
public class Program
{

0
NetworkResurrector.Api/Properties/launchSettings.json → src/api/NetworkResurrector.Api/Properties/launchSettings.json
View File

6
NetworkResurrector.Agent/Startup.cs → src/api/NetworkResurrector.Api/Startup.cs
View File

@ -8,12 +8,12 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using NDB.Extensions.Swagger;
using NDB.Security.Authentication.Identity;
using NetworkResurrector.Agent.Application;
using NetworkResurrector.Agent.Domain.Data;
using NetworkResurrector.Api.Application;
using NetworkResurrector.Api.Domain.Data;
using Newtonsoft.Json;
using System.Reflection;
namespace NetworkResurrector.Agent
namespace NetworkResurrector.Api
{
public class Startup
{

0
NetworkResurrector.Agent/appsettings.Development.json → src/api/NetworkResurrector.Api/appsettings.Development.json
View File

0
NetworkResurrector.Agent/appsettings.json → src/api/NetworkResurrector.Api/appsettings.json
View File

2
NetworkResurrector.Abstractions/INotifier.cs → src/server/NetworkResurrector.Server.Abstractions/INotifier.cs
View File

@ -1,4 +1,4 @@
namespace NetworkResurrector.Abstractions
namespace NetworkResurrector.Server.Abstractions
{
public interface INotifier
{

2
NetworkResurrector.Abstractions/IWakeOnLanService.cs → src/server/NetworkResurrector.Server.Abstractions/IWakeOnLanService.cs
View File

@ -1,6 +1,6 @@
using System.Threading.Tasks;
namespace NetworkResurrector.Abstractions
namespace NetworkResurrector.Server.Abstractions
{
public interface IWakeOnLanService
{

0
NetworkResurrector.Agent.Domain/NetworkResurrector.Agent.Domain.csproj → src/server/NetworkResurrector.Server.Abstractions/NetworkResurrector.Server.Abstractions.csproj
View File

8
NetworkResurrector.Application/CommandHandlers/PingMachineHandler.cs → src/server/NetworkResurrector.Server.Application/CommandHandlers/PingMachineHandler.cs
View File

@ -1,13 +1,13 @@
using MediatR;
using Microsoft.Extensions.Logging;
using NetworkResurrector.Application.Commands;
using NetworkResurrector.Application.Events;
using NetworkResurrector.Application.Services;
using NetworkResurrector.Server.Application.Commands;
using NetworkResurrector.Server.Application.Events;
using NetworkResurrector.Server.Application.Services;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace NetworkResurrector.Application.CommandHandlers
namespace NetworkResurrector.Server.Application.CommandHandlers
{
public class PingMachineHandler : IRequestHandler<PingMachine, MachinePinged>
{

8
NetworkResurrector.Application/CommandHandlers/ShutdownMachineHandler.cs → src/server/NetworkResurrector.Server.Application/CommandHandlers/ShutdownMachineHandler.cs
View File

@ -1,13 +1,13 @@
using MediatR;
using Microsoft.Extensions.Logging;
using NetworkResurrector.Application.Commands;
using NetworkResurrector.Application.Events;
using NetworkResurrector.Application.Services;
using NetworkResurrector.Server.Application.Commands;
using NetworkResurrector.Server.Application.Events;
using NetworkResurrector.Server.Application.Services;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace NetworkResurrector.Application.CommandHandlers
namespace NetworkResurrector.Server.Application.CommandHandlers
{
public class ShutdownMachineHandler : IRequestHandler<ShutdownMachine, MachineShutdown>
{

8
NetworkResurrector.Application/CommandHandlers/WakeMachineHandler.cs → src/server/NetworkResurrector.Server.Application/CommandHandlers/WakeMachineHandler.cs
View File

@ -1,13 +1,13 @@
using MediatR;
using Microsoft.Extensions.Logging;
using NetworkResurrector.Abstractions;
using NetworkResurrector.Application.Commands;
using NetworkResurrector.Application.Events;
using NetworkResurrector.Server.Abstractions;
using NetworkResurrector.Server.Application.Commands;
using NetworkResurrector.Server.Application.Events;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace NetworkResurrector.Application.CommandHandlers
namespace NetworkResurrector.Server.Application.CommandHandlers
{
public class WakeMachineHandler : IRequestHandler<WakeMachine, MachineWaked>
{

4
NetworkResurrector.Application/Commands/PingMachine.cs → src/server/NetworkResurrector.Server.Application/Commands/PingMachine.cs
View File

@ -1,8 +1,8 @@
using NDB.Application.DataContracts;
using NetworkResurrector.Application.Events;
using NetworkResurrector.Server.Application.Events;
using System;
namespace NetworkResurrector.Application.Commands
namespace NetworkResurrector.Server.Application.Commands
{
public class PingMachine : Command<MachinePinged>
{

4
NetworkResurrector.Application/Commands/ShutdownMachine.cs → src/server/NetworkResurrector.Server.Application/Commands/ShutdownMachine.cs
View File

@ -1,8 +1,8 @@
using NDB.Application.DataContracts;
using NetworkResurrector.Application.Events;
using NetworkResurrector.Server.Application.Events;
using System;
namespace NetworkResurrector.Application.Commands
namespace NetworkResurrector.Server.Application.Commands
{
public class ShutdownMachine : Command<MachineShutdown>
{

4
NetworkResurrector.Application/Commands/WakeMachine.cs → src/server/NetworkResurrector.Server.Application/Commands/WakeMachine.cs
View File

@ -1,8 +1,8 @@
using NDB.Application.DataContracts;
using NetworkResurrector.Application.Events;
using NetworkResurrector.Server.Application.Events;
using System;
namespace NetworkResurrector.Application.Commands
namespace NetworkResurrector.Server.Application.Commands
{
public class WakeMachine : Command<MachineWaked>
{

8
NetworkResurrector.Application/DependencyInjectionExtensions.cs → src/server/NetworkResurrector.Server.Application/DependencyInjectionExtensions.cs
View File

@ -1,9 +1,9 @@
using Microsoft.Extensions.DependencyInjection;
using NetworkResurrector.Application.Services;
using NetworkResurrector.Application.Stores;
using NetworkResurrector.Domain.Services;
using NetworkResurrector.Server.Application.Services;
using NetworkResurrector.Server.Application.Stores;
using NetworkResurrector.Server.Domain.Services;
namespace NetworkResurrector.Application
namespace NetworkResurrector.Server.Application
{
public static class DependencyInjectionExtensions
{

2
NetworkResurrector.Application/Events/MachinePinged.cs → src/server/NetworkResurrector.Server.Application/Events/MachinePinged.cs
View File

@ -1,4 +1,4 @@
namespace NetworkResurrector.Application.Events
namespace NetworkResurrector.Server.Application.Events
{
public class MachinePinged
{

2
NetworkResurrector.Application/Events/MachineShutdown.cs → src/server/NetworkResurrector.Server.Application/Events/MachineShutdown.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
namespace NetworkResurrector.Application.Events
namespace NetworkResurrector.Server.Application.Events
{
public class MachineShutdown
{

2
NetworkResurrector.Application/Events/MachineWaked.cs → src/server/NetworkResurrector.Server.Application/Events/MachineWaked.cs
View File

@ -1,4 +1,4 @@
namespace NetworkResurrector.Application.Events
namespace NetworkResurrector.Server.Application.Events
{
public class MachineWaked
{

2
NetworkResurrector.Application/Mappings/MappingProfile.cs → src/server/NetworkResurrector.Server.Application/Mappings/MappingProfile.cs
View File

@ -1,6 +1,6 @@
using AutoMapper;
namespace NetworkResurrector.Application.Mappings
namespace NetworkResurrector.Server.Application.Mappings
{
public class MappingProfile : Profile
{

4
NetworkResurrector.Application/NetworkResurrector.Application.csproj → src/server/NetworkResurrector.Server.Application/NetworkResurrector.Server.Application.csproj
View File

@ -16,8 +16,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NetworkResurrector.Abstractions\NetworkResurrector.Abstractions.csproj" />
<ProjectReference Include="..\NetworkResurrector.Domain\NetworkResurrector.Domain.csproj" />
<ProjectReference Include="..\NetworkResurrector.Server.Abstractions\NetworkResurrector.Server.Abstractions.csproj" />
<ProjectReference Include="..\NetworkResurrector.Server.Domain\NetworkResurrector.Server.Domain.csproj" />
</ItemGroup>
</Project>

2
NetworkResurrector.Application/Queries/GetServiceVersion.cs → src/server/NetworkResurrector.Server.Application/Queries/GetServiceVersion.cs
View File

@ -1,4 +1,4 @@
namespace NetworkResurrector.Application.Queries
namespace NetworkResurrector.Server.Application.Queries
{
class GetServiceVersion
{

2
NetworkResurrector.Application/Services/IPingService.cs → src/server/NetworkResurrector.Server.Application/Services/IPingService.cs
View File

@ -1,6 +1,6 @@
using System.Threading.Tasks;
namespace NetworkResurrector.Application.Services
namespace NetworkResurrector.Server.Application.Services
{
public interface IPingService
{

2
NetworkResurrector.Application/Services/IShutdownService.cs → src/server/NetworkResurrector.Server.Application/Services/IShutdownService.cs
View File

@ -1,4 +1,4 @@
namespace NetworkResurrector.Application.Services
namespace NetworkResurrector.Server.Application.Services
{
public interface IShutdownService
{

2
NetworkResurrector.Application/Services/IValidationService.cs → src/server/NetworkResurrector.Server.Application/Services/IValidationService.cs
View File

@ -1,4 +1,4 @@
namespace NetworkResurrector.Application.Services
namespace NetworkResurrector.Server.Application.Services
{
public interface IValidationService
{

4
NetworkResurrector.Application/Services/ParamProvider.cs → src/server/NetworkResurrector.Server.Application/Services/ParamProvider.cs
View File

@ -1,7 +1,7 @@
using Microsoft.Extensions.Configuration;
using NetworkResurrector.Domain.Services;
using NetworkResurrector.Server.Domain.Services;
namespace NetworkResurrector.Application.Services
namespace NetworkResurrector.Server.Application.Services
{
public class ParamProvider : IParamProvider
{

2
NetworkResurrector.Application/Services/PingService.cs → src/server/NetworkResurrector.Server.Application/Services/PingService.cs
View File

@ -2,7 +2,7 @@
using System.Text;
using System.Threading.Tasks;
namespace NetworkResurrector.Application.Services
namespace NetworkResurrector.Server.Application.Services
{
public class PingService : IPingService
{

2
NetworkResurrector.Application/Services/ShutdownService.cs → src/server/NetworkResurrector.Server.Application/Services/ShutdownService.cs
View File

@ -3,7 +3,7 @@ using System.Diagnostics;
using System.Linq;
using System.Management;
namespace NetworkResurrector.Application.Services
namespace NetworkResurrector.Server.Application.Services
{
public class ShutdownService : IShutdownService
{

2
NetworkResurrector.Application/Services/ValidationService.cs → src/server/NetworkResurrector.Server.Application/Services/ValidationService.cs
View File

@ -2,7 +2,7 @@
using System;
using System.Net;
namespace NetworkResurrector.Application.Services
namespace NetworkResurrector.Server.Application.Services
{
public class ValidationService : IValidationService
{

4
NetworkResurrector.Application/Stores/ISecurityStore.cs → src/server/NetworkResurrector.Server.Application/Stores/ISecurityStore.cs
View File

@ -1,6 +1,6 @@
using NetworkResurrector.Domain.Models;
using NetworkResurrector.Server.Domain.Models;
namespace NetworkResurrector.Application.Stores
namespace NetworkResurrector.Server.Application.Stores
{
public interface ISecurityStore
{

4
NetworkResurrector.Application/Stores/SecurityStore.cs → src/server/NetworkResurrector.Server.Application/Stores/SecurityStore.cs
View File

@ -1,8 +1,8 @@
using NetworkResurrector.Domain.Models;
using NetworkResurrector.Server.Domain.Models;
using System.Collections.Generic;
using System.Linq;
namespace NetworkResurrector.Application.Stores
namespace NetworkResurrector.Server.Application.Stores
{
public class SecurityStore : ISecurityStore
{

2
NetworkResurrector.Domain/Models/SecurityToken.cs → src/server/NetworkResurrector.Server.Domain/Models/SecurityToken.cs
View File

@ -1,6 +1,6 @@
using System;
namespace NetworkResurrector.Domain.Models
namespace NetworkResurrector.Server.Domain.Models
{
public class SecurityToken
{

2
NetworkResurrector.Domain/Models/Settings/Credentials.cs → src/server/NetworkResurrector.Server.Domain/Models/Settings/Credentials.cs
View File

@ -1,4 +1,4 @@
namespace NetworkResurrector.Domain.Models.Settings
namespace NetworkResurrector.Server.Domain.Models.Settings
{
public class Credentials
{

2
NetworkResurrector.Domain/Models/TokenValidation.cs → src/server/NetworkResurrector.Server.Domain/Models/TokenValidation.cs
View File

@ -1,4 +1,4 @@
namespace NetworkResurrector.Domain.Models
namespace NetworkResurrector.Server.Domain.Models
{
public class TokenValidation
{

0
NetworkResurrector.Domain/NetworkResurrector.Domain.csproj → src/server/NetworkResurrector.Server.Domain/NetworkResurrector.Server.Domain.csproj
View File

6
src/server/NetworkResurrector.Server.Domain/Services/IParamProvider.cs Normal file
View File

@ -0,0 +1,6 @@
namespace NetworkResurrector.Server.Domain.Services
{
public interface IParamProvider
{
}
}

4
NetworkResurrector.Api/Controllers/ResurrectorController.cs → src/server/NetworkResurrector.Server/Controllers/ResurrectorController.cs
View File

@ -1,10 +1,10 @@
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using NetworkResurrector.Application.Commands;
using NetworkResurrector.Server.Application.Commands;
using System.Threading.Tasks;
namespace NetworkResurrector.Api.Controllers
namespace NetworkResurrector.Server.Controllers
{
[Authorize]
[ApiController]

2
NetworkResurrector.Api/Extensions/WakeOnLanExtensions.cs → src/server/NetworkResurrector.Server/Extensions/WakeOnLanExtensions.cs
View File

@ -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
{

6
NetworkResurrector.Agent/NetworkResurrector.Agent.csproj → src/server/NetworkResurrector.Server/NetworkResurrector.Server.csproj
View File

@ -2,7 +2,6 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
<ItemGroup>
@ -23,8 +22,9 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NetworkResurrector.Agent.Application\NetworkResurrector.Agent.Application.csproj" />
<ProjectReference Include="..\NetworkResurrector.Agent.Domain.Data\NetworkResurrector.Agent.Domain.Data.csproj" />
<ProjectReference Include="..\NetworkResurrector.Server.Application\NetworkResurrector.Server.Application.csproj" />
<ProjectReference Include="..\NetworkResurrector.WakeOnLan.Inhouse\NetworkResurrector.WakeOnLan.Inhouse.csproj" />
<ProjectReference Include="..\NetworkResurrector.WakeOnLan.Nikeee\NetworkResurrector.WakeOnLan.Nikeee.csproj" />
</ItemGroup>
</Project>

2
NetworkResurrector.Api/Program.cs → src/server/NetworkResurrector.Server/Program.cs
View File

@ -10,7 +10,7 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
namespace NetworkResurrector.Api
namespace NetworkResurrector.Server
{
public class Program
{

2
NetworkResurrector.Agent/Properties/launchSettings.json → src/server/NetworkResurrector.Server/Properties/launchSettings.json
View File

@ -1,6 +1,6 @@
{
"profiles": {
"NetworkResurrector.Agent": {
"NetworkResurrector.Server": {
"commandName": "Project",
"applicationUrl": "http://localhost:5000",
"environmentVariables": {

6
NetworkResurrector.Api/Startup.cs → src/server/NetworkResurrector.Server/Startup.cs
View File

@ -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.Application;
using NetworkResurrector.Server.Extensions;
using NetworkResurrector.Server.Application;
using Newtonsoft.Json;
using System.Reflection;
namespace NetworkResurrector.Api
namespace NetworkResurrector.Server
{
public class Startup
{

0
NetworkResurrector.Api/appsettings.Development.json → src/server/NetworkResurrector.Server/appsettings.Development.json
View File

0
NetworkResurrector.Api/appsettings.json → src/server/NetworkResurrector.Server/appsettings.json
View File

2
NetworkResurrector.WakeOnLan.Inhouse/DependencyInjectionExtensions.cs → src/server/NetworkResurrector.WakeOnLan.Inhouse/DependencyInjectionExtensions.cs
View File

@ -1,5 +1,5 @@
using Microsoft.Extensions.DependencyInjection;
using NetworkResurrector.Abstractions;
using NetworkResurrector.Server.Abstractions;
namespace NetworkResurrector.WakeOnLan.Inhouse
{

6
NetworkResurrector.WakeOnLan.Inhouse/NetworkResurrector.WakeOnLan.Inhouse.csproj → src/server/NetworkResurrector.WakeOnLan.Inhouse/NetworkResurrector.WakeOnLan.Inhouse.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
@ -8,9 +8,9 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsPackageVersion)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NetworkResurrector.Abstractions\NetworkResurrector.Abstractions.csproj" />
<ProjectReference Include="..\NetworkResurrector.Server.Abstractions\NetworkResurrector.Server.Abstractions.csproj" />
</ItemGroup>
</Project>

0
NetworkResurrector.WakeOnLan.Inhouse/WolClient.cs → src/server/NetworkResurrector.WakeOnLan.Inhouse/WolClient.cs
View File

2
NetworkResurrector.WakeOnLan.Inhouse/WolDriver.cs → src/server/NetworkResurrector.WakeOnLan.Inhouse/WolDriver.cs
View File

@ -1,4 +1,4 @@
using NetworkResurrector.Abstractions;
using NetworkResurrector.Server.Abstractions;
using System.Globalization;
using System.Net;
using System.Text.RegularExpressions;

2
NetworkResurrector.WakeOnLan.Nikeee/DependencyInjectionExtensions.cs → src/server/NetworkResurrector.WakeOnLan.Nikeee/DependencyInjectionExtensions.cs
View File

@ -1,5 +1,5 @@
using Microsoft.Extensions.DependencyInjection;
using NetworkResurrector.Abstractions;
using NetworkResurrector.Server.Abstractions;
namespace NetworkResurrector.WakeOnLan.Nikeee
{

4
NetworkResurrector.WakeOnLan.Nikeee/NetworkResurrector.WakeOnLan.Nikeee.csproj → src/server/NetworkResurrector.WakeOnLan.Nikeee/NetworkResurrector.WakeOnLan.Nikeee.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
@ -11,7 +11,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NetworkResurrector.Abstractions\NetworkResurrector.Abstractions.csproj" />
<ProjectReference Include="..\NetworkResurrector.Server.Abstractions\NetworkResurrector.Server.Abstractions.csproj" />
</ItemGroup>
</Project>

2
NetworkResurrector.WakeOnLan.Nikeee/WakeOnLanService.cs → src/server/NetworkResurrector.WakeOnLan.Nikeee/WakeOnLanService.cs
View File

@ -1,4 +1,4 @@
using NetworkResurrector.Abstractions;
using NetworkResurrector.Server.Abstractions;
using System.Net;
using System.Net.NetworkInformation;
using System.Threading.Tasks;