From 5eeaf465b1519be6695072447bc40191d86f96da Mon Sep 17 00:00:00 2001
From: "Matthew Parker [SSW]" <61717342+MattParkerDev@users.noreply.github.com>
Date: Sun, 14 Apr 2024 20:02:37 +1000
Subject: [PATCH] get rid of excess projects because of nuget
https://github.com/NuGet/Home/issues/3891
---
Parker.ModularPipelines.sln | 30 +------------------
...Parker.ModularPipelines.Application.csproj | 17 -----------
.../Parker.ModularPipelines.Common.csproj | 9 ------
.../1Setup/InstallDotnetWasmToolsModule.cs | 2 +-
.../Modules/1Setup/InstallSwaCliModule.cs | 2 +-
.../Parker.ModularPipelines.Console.csproj | 2 +-
.../Parker.ModularPipelines.Domain.csproj | 13 --------
.../Parker.ModularPipelines.Host.csproj | 22 --------------
...ker.ModularPipelines.Infrastructure.csproj | 20 -------------
.../Attributes/DependsOnExpAttribute.cs | 0
.../Application}/DependencyInjection.cs | 0
.../Domain}/Entities/IModule.cs | 0
.../Domain}/Entities/ModuleContainer.cs | 0
.../Domain}/Enums/CompletionType.cs | 0
.../Host}/DependencyInjection.cs | 6 ++--
.../Host}/Helpers/GitHelper.cs | 0
.../Host}/Helpers/PipelineCliHelper.cs | 0
.../Host}/Helpers/PipelineContext.cs | 0
.../Host}/Helpers/PipelineFileHelper.cs | 1 -
.../InternalHelpers/DeploymentTimeProvider.cs | 0
.../Host}/PipelineApplication.cs | 0
.../Host}/Services/ConsoleRenderer.cs | 0
.../Services/ExampleAnsiProgressService.cs | 0
.../Host}/Services/ModuleContainerProvider.cs | 0
.../Host}/Services/OrchestratorService.cs | 0
.../Infrastructure}/DependencyInjection.cs | 0
.../Parker.ModularPipelines.csproj | 17 +++++++++++
27 files changed, 24 insertions(+), 117 deletions(-)
delete mode 100644 src/Parker.ModularPipelines.Application/Parker.ModularPipelines.Application.csproj
delete mode 100644 src/Parker.ModularPipelines.Common/Parker.ModularPipelines.Common.csproj
delete mode 100644 src/Parker.ModularPipelines.Domain/Parker.ModularPipelines.Domain.csproj
delete mode 100644 src/Parker.ModularPipelines.Host/Parker.ModularPipelines.Host.csproj
delete mode 100644 src/Parker.ModularPipelines.Infrastructure/Parker.ModularPipelines.Infrastructure.csproj
rename src/{Parker.ModularPipelines.Application => Parker.ModularPipelines/Application}/Attributes/DependsOnExpAttribute.cs (100%)
rename src/{Parker.ModularPipelines.Application => Parker.ModularPipelines/Application}/DependencyInjection.cs (100%)
rename src/{Parker.ModularPipelines.Domain => Parker.ModularPipelines/Domain}/Entities/IModule.cs (100%)
rename src/{Parker.ModularPipelines.Domain => Parker.ModularPipelines/Domain}/Entities/ModuleContainer.cs (100%)
rename src/{Parker.ModularPipelines.Domain => Parker.ModularPipelines/Domain}/Enums/CompletionType.cs (100%)
rename src/{Parker.ModularPipelines.Host => Parker.ModularPipelines/Host}/DependencyInjection.cs (93%)
rename src/{Parker.ModularPipelines.Host => Parker.ModularPipelines/Host}/Helpers/GitHelper.cs (100%)
rename src/{Parker.ModularPipelines.Host => Parker.ModularPipelines/Host}/Helpers/PipelineCliHelper.cs (100%)
rename src/{Parker.ModularPipelines.Host => Parker.ModularPipelines/Host}/Helpers/PipelineContext.cs (100%)
rename src/{Parker.ModularPipelines.Host => Parker.ModularPipelines/Host}/Helpers/PipelineFileHelper.cs (97%)
rename src/{Parker.ModularPipelines.Host => Parker.ModularPipelines/Host}/InternalHelpers/DeploymentTimeProvider.cs (100%)
rename src/{Parker.ModularPipelines.Host => Parker.ModularPipelines/Host}/PipelineApplication.cs (100%)
rename src/{Parker.ModularPipelines.Host => Parker.ModularPipelines/Host}/Services/ConsoleRenderer.cs (100%)
rename src/{Parker.ModularPipelines.Host => Parker.ModularPipelines/Host}/Services/ExampleAnsiProgressService.cs (100%)
rename src/{Parker.ModularPipelines.Host => Parker.ModularPipelines/Host}/Services/ModuleContainerProvider.cs (100%)
rename src/{Parker.ModularPipelines.Host => Parker.ModularPipelines/Host}/Services/OrchestratorService.cs (100%)
rename src/{Parker.ModularPipelines.Infrastructure => Parker.ModularPipelines/Infrastructure}/DependencyInjection.cs (100%)
create mode 100644 src/Parker.ModularPipelines/Parker.ModularPipelines.csproj
diff --git a/Parker.ModularPipelines.sln b/Parker.ModularPipelines.sln
index 15cd0b6..d6a8b2a 100644
--- a/Parker.ModularPipelines.sln
+++ b/Parker.ModularPipelines.sln
@@ -7,15 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5F3E03F6-838
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parker.ModularPipelines.Console", "src\Parker.ModularPipelines.Console\Parker.ModularPipelines.Console.csproj", "{23339A9C-1746-46DB-9D3A-2FFE930FE8C7}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parker.ModularPipelines.Application", "src\Parker.ModularPipelines.Application\Parker.ModularPipelines.Application.csproj", "{2DFDC50D-D793-4EC7-9E92-9EA9D07931F5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parker.ModularPipelines.Domain", "src\Parker.ModularPipelines.Domain\Parker.ModularPipelines.Domain.csproj", "{21F78D00-49BB-47E6-AB48-9885B08CA5CA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parker.ModularPipelines.Infrastructure", "src\Parker.ModularPipelines.Infrastructure\Parker.ModularPipelines.Infrastructure.csproj", "{1491BEEF-B342-44EF-8E42-7056AF13BE7F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parker.ModularPipelines.Common", "src\Parker.ModularPipelines.Common\Parker.ModularPipelines.Common.csproj", "{422D038D-6351-44AB-90F7-2196AB6F76D0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parker.ModularPipelines.Host", "src\Parker.ModularPipelines.Host\Parker.ModularPipelines.Host.csproj", "{04D03AC9-55D6-4647-8FED-091B9C9343D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parker.ModularPipelines", "src\Parker.ModularPipelines\Parker.ModularPipelines.csproj", "{04D03AC9-55D6-4647-8FED-091B9C9343D5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{97428686-0D95-47B9-8CC0-62A25E26AC51}"
ProjectSection(SolutionItems) = preProject
@@ -38,22 +30,6 @@ Global
{23339A9C-1746-46DB-9D3A-2FFE930FE8C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23339A9C-1746-46DB-9D3A-2FFE930FE8C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23339A9C-1746-46DB-9D3A-2FFE930FE8C7}.Release|Any CPU.Build.0 = Release|Any CPU
- {2DFDC50D-D793-4EC7-9E92-9EA9D07931F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2DFDC50D-D793-4EC7-9E92-9EA9D07931F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2DFDC50D-D793-4EC7-9E92-9EA9D07931F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2DFDC50D-D793-4EC7-9E92-9EA9D07931F5}.Release|Any CPU.Build.0 = Release|Any CPU
- {21F78D00-49BB-47E6-AB48-9885B08CA5CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {21F78D00-49BB-47E6-AB48-9885B08CA5CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {21F78D00-49BB-47E6-AB48-9885B08CA5CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {21F78D00-49BB-47E6-AB48-9885B08CA5CA}.Release|Any CPU.Build.0 = Release|Any CPU
- {1491BEEF-B342-44EF-8E42-7056AF13BE7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1491BEEF-B342-44EF-8E42-7056AF13BE7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1491BEEF-B342-44EF-8E42-7056AF13BE7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1491BEEF-B342-44EF-8E42-7056AF13BE7F}.Release|Any CPU.Build.0 = Release|Any CPU
- {422D038D-6351-44AB-90F7-2196AB6F76D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {422D038D-6351-44AB-90F7-2196AB6F76D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {422D038D-6351-44AB-90F7-2196AB6F76D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {422D038D-6351-44AB-90F7-2196AB6F76D0}.Release|Any CPU.Build.0 = Release|Any CPU
{04D03AC9-55D6-4647-8FED-091B9C9343D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{04D03AC9-55D6-4647-8FED-091B9C9343D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{04D03AC9-55D6-4647-8FED-091B9C9343D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,10 +37,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{23339A9C-1746-46DB-9D3A-2FFE930FE8C7} = {5F3E03F6-838F-433E-B8ED-38AC5AFDCD85}
- {2DFDC50D-D793-4EC7-9E92-9EA9D07931F5} = {5F3E03F6-838F-433E-B8ED-38AC5AFDCD85}
- {21F78D00-49BB-47E6-AB48-9885B08CA5CA} = {5F3E03F6-838F-433E-B8ED-38AC5AFDCD85}
- {1491BEEF-B342-44EF-8E42-7056AF13BE7F} = {5F3E03F6-838F-433E-B8ED-38AC5AFDCD85}
- {422D038D-6351-44AB-90F7-2196AB6F76D0} = {5F3E03F6-838F-433E-B8ED-38AC5AFDCD85}
{04D03AC9-55D6-4647-8FED-091B9C9343D5} = {5F3E03F6-838F-433E-B8ED-38AC5AFDCD85}
EndGlobalSection
EndGlobal
diff --git a/src/Parker.ModularPipelines.Application/Parker.ModularPipelines.Application.csproj b/src/Parker.ModularPipelines.Application/Parker.ModularPipelines.Application.csproj
deleted file mode 100644
index 332a025..0000000
--- a/src/Parker.ModularPipelines.Application/Parker.ModularPipelines.Application.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- net8.0
- enable
- enable
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Parker.ModularPipelines.Common/Parker.ModularPipelines.Common.csproj b/src/Parker.ModularPipelines.Common/Parker.ModularPipelines.Common.csproj
deleted file mode 100644
index 20ebbe3..0000000
--- a/src/Parker.ModularPipelines.Common/Parker.ModularPipelines.Common.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- net8.0
- enable
- enable
-
-
-
diff --git a/src/Parker.ModularPipelines.Console/Modules/1Setup/InstallDotnetWasmToolsModule.cs b/src/Parker.ModularPipelines.Console/Modules/1Setup/InstallDotnetWasmToolsModule.cs
index 9194488..158573d 100644
--- a/src/Parker.ModularPipelines.Console/Modules/1Setup/InstallDotnetWasmToolsModule.cs
+++ b/src/Parker.ModularPipelines.Console/Modules/1Setup/InstallDotnetWasmToolsModule.cs
@@ -1,6 +1,6 @@
using CliWrap;
-using Parker.ModularPipelines.Host.Helpers;
using Parker.ModularPipelines.Domain.Entities;
+using Parker.ModularPipelines.Host.Helpers;
// ReSharper disable once CheckNamespace
namespace Deploy.Modules.Setup;
diff --git a/src/Parker.ModularPipelines.Console/Modules/1Setup/InstallSwaCliModule.cs b/src/Parker.ModularPipelines.Console/Modules/1Setup/InstallSwaCliModule.cs
index 616f301..1351a46 100644
--- a/src/Parker.ModularPipelines.Console/Modules/1Setup/InstallSwaCliModule.cs
+++ b/src/Parker.ModularPipelines.Console/Modules/1Setup/InstallSwaCliModule.cs
@@ -1,6 +1,6 @@
using CliWrap;
-using Parker.ModularPipelines.Host.Helpers;
using Parker.ModularPipelines.Domain.Entities;
+using Parker.ModularPipelines.Host.Helpers;
// ReSharper disable once CheckNamespace
namespace Deploy.Modules.Setup;
diff --git a/src/Parker.ModularPipelines.Console/Parker.ModularPipelines.Console.csproj b/src/Parker.ModularPipelines.Console/Parker.ModularPipelines.Console.csproj
index 7ff0f71..39977f5 100644
--- a/src/Parker.ModularPipelines.Console/Parker.ModularPipelines.Console.csproj
+++ b/src/Parker.ModularPipelines.Console/Parker.ModularPipelines.Console.csproj
@@ -9,6 +9,6 @@
-
+
diff --git a/src/Parker.ModularPipelines.Domain/Parker.ModularPipelines.Domain.csproj b/src/Parker.ModularPipelines.Domain/Parker.ModularPipelines.Domain.csproj
deleted file mode 100644
index 516471e..0000000
--- a/src/Parker.ModularPipelines.Domain/Parker.ModularPipelines.Domain.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- net8.0
- enable
- enable
-
-
-
-
-
-
-
diff --git a/src/Parker.ModularPipelines.Host/Parker.ModularPipelines.Host.csproj b/src/Parker.ModularPipelines.Host/Parker.ModularPipelines.Host.csproj
deleted file mode 100644
index addb881..0000000
--- a/src/Parker.ModularPipelines.Host/Parker.ModularPipelines.Host.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- net8.0
- enable
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Parker.ModularPipelines.Infrastructure/Parker.ModularPipelines.Infrastructure.csproj b/src/Parker.ModularPipelines.Infrastructure/Parker.ModularPipelines.Infrastructure.csproj
deleted file mode 100644
index 3d08b40..0000000
--- a/src/Parker.ModularPipelines.Infrastructure/Parker.ModularPipelines.Infrastructure.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- net8.0
- enable
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Parker.ModularPipelines.Application/Attributes/DependsOnExpAttribute.cs b/src/Parker.ModularPipelines/Application/Attributes/DependsOnExpAttribute.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Application/Attributes/DependsOnExpAttribute.cs
rename to src/Parker.ModularPipelines/Application/Attributes/DependsOnExpAttribute.cs
diff --git a/src/Parker.ModularPipelines.Application/DependencyInjection.cs b/src/Parker.ModularPipelines/Application/DependencyInjection.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Application/DependencyInjection.cs
rename to src/Parker.ModularPipelines/Application/DependencyInjection.cs
diff --git a/src/Parker.ModularPipelines.Domain/Entities/IModule.cs b/src/Parker.ModularPipelines/Domain/Entities/IModule.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Domain/Entities/IModule.cs
rename to src/Parker.ModularPipelines/Domain/Entities/IModule.cs
diff --git a/src/Parker.ModularPipelines.Domain/Entities/ModuleContainer.cs b/src/Parker.ModularPipelines/Domain/Entities/ModuleContainer.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Domain/Entities/ModuleContainer.cs
rename to src/Parker.ModularPipelines/Domain/Entities/ModuleContainer.cs
diff --git a/src/Parker.ModularPipelines.Domain/Enums/CompletionType.cs b/src/Parker.ModularPipelines/Domain/Enums/CompletionType.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Domain/Enums/CompletionType.cs
rename to src/Parker.ModularPipelines/Domain/Enums/CompletionType.cs
diff --git a/src/Parker.ModularPipelines.Host/DependencyInjection.cs b/src/Parker.ModularPipelines/Host/DependencyInjection.cs
similarity index 93%
rename from src/Parker.ModularPipelines.Host/DependencyInjection.cs
rename to src/Parker.ModularPipelines/Host/DependencyInjection.cs
index e94683b..17f451a 100644
--- a/src/Parker.ModularPipelines.Host/DependencyInjection.cs
+++ b/src/Parker.ModularPipelines/Host/DependencyInjection.cs
@@ -1,7 +1,7 @@
-using Parker.ModularPipelines.Application;
-using Parker.ModularPipelines.Domain.Entities;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
+using Parker.ModularPipelines.Application;
+using Parker.ModularPipelines.Domain.Entities;
using Parker.ModularPipelines.Host.Helpers;
using Parker.ModularPipelines.Host.Services;
using Parker.ModularPipelines.Infrastructure;
diff --git a/src/Parker.ModularPipelines.Host/Helpers/GitHelper.cs b/src/Parker.ModularPipelines/Host/Helpers/GitHelper.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Host/Helpers/GitHelper.cs
rename to src/Parker.ModularPipelines/Host/Helpers/GitHelper.cs
diff --git a/src/Parker.ModularPipelines.Host/Helpers/PipelineCliHelper.cs b/src/Parker.ModularPipelines/Host/Helpers/PipelineCliHelper.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Host/Helpers/PipelineCliHelper.cs
rename to src/Parker.ModularPipelines/Host/Helpers/PipelineCliHelper.cs
diff --git a/src/Parker.ModularPipelines.Host/Helpers/PipelineContext.cs b/src/Parker.ModularPipelines/Host/Helpers/PipelineContext.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Host/Helpers/PipelineContext.cs
rename to src/Parker.ModularPipelines/Host/Helpers/PipelineContext.cs
diff --git a/src/Parker.ModularPipelines.Host/Helpers/PipelineFileHelper.cs b/src/Parker.ModularPipelines/Host/Helpers/PipelineFileHelper.cs
similarity index 97%
rename from src/Parker.ModularPipelines.Host/Helpers/PipelineFileHelper.cs
rename to src/Parker.ModularPipelines/Host/Helpers/PipelineFileHelper.cs
index a746ce8..420bcbf 100644
--- a/src/Parker.ModularPipelines.Host/Helpers/PipelineFileHelper.cs
+++ b/src/Parker.ModularPipelines/Host/Helpers/PipelineFileHelper.cs
@@ -1,6 +1,5 @@
using System.IO.Compression;
using System.Text.Json;
-using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
namespace Parker.ModularPipelines.Host.Helpers;
diff --git a/src/Parker.ModularPipelines.Host/InternalHelpers/DeploymentTimeProvider.cs b/src/Parker.ModularPipelines/Host/InternalHelpers/DeploymentTimeProvider.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Host/InternalHelpers/DeploymentTimeProvider.cs
rename to src/Parker.ModularPipelines/Host/InternalHelpers/DeploymentTimeProvider.cs
diff --git a/src/Parker.ModularPipelines.Host/PipelineApplication.cs b/src/Parker.ModularPipelines/Host/PipelineApplication.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Host/PipelineApplication.cs
rename to src/Parker.ModularPipelines/Host/PipelineApplication.cs
diff --git a/src/Parker.ModularPipelines.Host/Services/ConsoleRenderer.cs b/src/Parker.ModularPipelines/Host/Services/ConsoleRenderer.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Host/Services/ConsoleRenderer.cs
rename to src/Parker.ModularPipelines/Host/Services/ConsoleRenderer.cs
diff --git a/src/Parker.ModularPipelines.Host/Services/ExampleAnsiProgressService.cs b/src/Parker.ModularPipelines/Host/Services/ExampleAnsiProgressService.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Host/Services/ExampleAnsiProgressService.cs
rename to src/Parker.ModularPipelines/Host/Services/ExampleAnsiProgressService.cs
diff --git a/src/Parker.ModularPipelines.Host/Services/ModuleContainerProvider.cs b/src/Parker.ModularPipelines/Host/Services/ModuleContainerProvider.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Host/Services/ModuleContainerProvider.cs
rename to src/Parker.ModularPipelines/Host/Services/ModuleContainerProvider.cs
diff --git a/src/Parker.ModularPipelines.Host/Services/OrchestratorService.cs b/src/Parker.ModularPipelines/Host/Services/OrchestratorService.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Host/Services/OrchestratorService.cs
rename to src/Parker.ModularPipelines/Host/Services/OrchestratorService.cs
diff --git a/src/Parker.ModularPipelines.Infrastructure/DependencyInjection.cs b/src/Parker.ModularPipelines/Infrastructure/DependencyInjection.cs
similarity index 100%
rename from src/Parker.ModularPipelines.Infrastructure/DependencyInjection.cs
rename to src/Parker.ModularPipelines/Infrastructure/DependencyInjection.cs
diff --git a/src/Parker.ModularPipelines/Parker.ModularPipelines.csproj b/src/Parker.ModularPipelines/Parker.ModularPipelines.csproj
new file mode 100644
index 0000000..e7a388e
--- /dev/null
+++ b/src/Parker.ModularPipelines/Parker.ModularPipelines.csproj
@@ -0,0 +1,17 @@
+
+
+
+ net8.0
+ enable
+ enable
+ MattParkerDev
+ true
+
+
+
+
+
+
+
+
+