From 0ed3bd2513d37d3376cf75ca9d5663870cacadc8 Mon Sep 17 00:00:00 2001 From: Jan Trejbal Date: Sat, 12 Feb 2022 19:37:57 +0100 Subject: [PATCH] Drop Aviationexam. package prefix --- README.md | 4 ++-- .../Builders/MapBuilder.cs | 12 ------------ .../Model/Infrastructure/IValue.cs | 6 ------ src/Aviationexam.DockerComposeBuilder/Model/Map.cs | 10 ---------- .../Model/Network.cs | 10 ---------- .../Model/Secret.cs | 11 ----------- .../BuildArguments/BuildArgumentWithoutValue.cs | 8 -------- .../Model/Services/BuildArguments/IBuildArgument.cs | 5 ----- .../Model/Volume.cs | 10 ---------- .../DockerComposeBuilder.Examples.Complex.csproj} | 2 +- .../Program.cs | 8 ++++---- .../ComposeBuilderTests.cs | 8 ++++---- .../DockerComposeBuilder.Tests.csproj} | 2 +- ...erComposeBuilder.sln => DockerComposeBuilder.sln} | 6 +++--- ...Settings => DockerComposeBuilder.sln.DotSettings} | 0 .../Builders/Base/BaseBuilder.cs | 2 +- .../Builders/Base/BuilderBase.cs | 6 +++--- .../Builders/Builder.cs | 2 +- .../Builders/ComposeBuilder.cs | 6 +++--- .../Builders/DeployBuilder.cs | 8 ++++---- .../Builders/GenericKeyValueBuilder.cs | 4 ++-- src/DockerComposeBuilder/Builders/MapBuilder.cs | 12 ++++++++++++ .../Builders/NetworkBuilder.cs | 6 +++--- .../Builders/SecretBuilder.cs | 6 +++--- .../Builders/ServiceBuilder.cs | 12 ++++++------ .../Builders/Services/BuildArgumentBuilder.cs | 4 ++-- .../Builders/Services/BuildBuilder.cs | 6 +++--- .../Builders/SwarmServiceBuilder.cs | 4 ++-- .../Builders/VolumeBuilder.cs | 6 +++--- .../DockerComposeBuilder.csproj} | 1 + .../Emitters/FlowStringEnumConverter.cs | 2 +- .../Emitters/FlowStyleStringSequences.cs | 2 +- .../Emitters/ForceQuotedStringValuesEventEmitter.cs | 2 +- .../Emitters/QuoteSurroundingEventEmitter.cs | 2 +- .../YamlIEnumerableSkipEmptyObjectGraphVisitor.cs | 2 +- .../Emitters/YamlValueCollectionConverter.cs | 4 ++-- .../Enums/EReplicationMode.cs | 2 +- .../Enums/ERestartMode.cs | 2 +- .../Extensions/IObjectExtensions.cs | 6 +++--- .../Interfaces/IObject.cs | 2 +- .../Model/Base/ObjectBase.cs | 4 ++-- .../Model/Compose.cs | 2 +- .../Model/HealthCheck.cs | 2 +- .../Model/Infrastructure/IKeyValue.cs | 2 +- .../Model/Infrastructure/IValue.cs | 6 ++++++ .../Model/Infrastructure/IValueCollection.cs | 2 +- .../Model/Infrastructure/ValueCollection.cs | 2 +- src/DockerComposeBuilder/Model/Map.cs | 10 ++++++++++ src/DockerComposeBuilder/Model/Network.cs | 10 ++++++++++ .../Model/PlacementPreferences.cs | 4 ++-- src/DockerComposeBuilder/Model/Secret.cs | 11 +++++++++++ .../Model/Service.cs | 6 +++--- .../Model/Services/BuildArguments/BuildArgument.cs | 4 ++-- .../BuildArguments/BuildArgumentWithoutValue.cs | 8 ++++++++ .../Model/Services/BuildArguments/IBuildArgument.cs | 5 +++++ .../Model/Services/Deploy.cs | 4 ++-- .../Model/Services/Port.cs | 2 +- .../Model/Services/ServiceBuild.cs | 6 +++--- src/DockerComposeBuilder/Model/Volume.cs | 10 ++++++++++ 59 files changed, 157 insertions(+), 156 deletions(-) delete mode 100644 src/Aviationexam.DockerComposeBuilder/Builders/MapBuilder.cs delete mode 100644 src/Aviationexam.DockerComposeBuilder/Model/Infrastructure/IValue.cs delete mode 100644 src/Aviationexam.DockerComposeBuilder/Model/Map.cs delete mode 100644 src/Aviationexam.DockerComposeBuilder/Model/Network.cs delete mode 100644 src/Aviationexam.DockerComposeBuilder/Model/Secret.cs delete mode 100644 src/Aviationexam.DockerComposeBuilder/Model/Services/BuildArguments/BuildArgumentWithoutValue.cs delete mode 100644 src/Aviationexam.DockerComposeBuilder/Model/Services/BuildArguments/IBuildArgument.cs delete mode 100644 src/Aviationexam.DockerComposeBuilder/Model/Volume.cs rename src/{Aviationexam.DockerComposeBuilder.Examples.Complex/Aviationexam.DockerComposeBuilder.Examples.Complex.csproj => DockerComposeBuilder.Examples.Complex/DockerComposeBuilder.Examples.Complex.csproj} (77%) rename src/{Aviationexam.DockerComposeBuilder.Examples.Complex => DockerComposeBuilder.Examples.Complex}/Program.cs (89%) rename src/{Aviationexam.DockerComposeBuilder.Tests => DockerComposeBuilder.Tests}/ComposeBuilderTests.cs (91%) rename src/{Aviationexam.DockerComposeBuilder.Tests/Aviationexam.DockerComposeBuilder.Tests.csproj => DockerComposeBuilder.Tests/DockerComposeBuilder.Tests.csproj} (88%) rename src/{Aviationexam.DockerComposeBuilder.sln => DockerComposeBuilder.sln} (79%) rename src/{Aviationexam.DockerComposeBuilder.sln.DotSettings => DockerComposeBuilder.sln.DotSettings} (100%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Builders/Base/BaseBuilder.cs (92%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Builders/Base/BuilderBase.cs (87%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Builders/Builder.cs (96%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Builders/ComposeBuilder.cs (95%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Builders/DeployBuilder.cs (90%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Builders/GenericKeyValueBuilder.cs (91%) create mode 100644 src/DockerComposeBuilder/Builders/MapBuilder.cs rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Builders/NetworkBuilder.cs (64%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Builders/SecretBuilder.cs (71%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Builders/ServiceBuilder.cs (95%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Builders/Services/BuildArgumentBuilder.cs (51%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Builders/Services/BuildBuilder.cs (83%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Builders/SwarmServiceBuilder.cs (82%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Builders/VolumeBuilder.cs (63%) rename src/{Aviationexam.DockerComposeBuilder/Aviationexam.DockerComposeBuilder.csproj => DockerComposeBuilder/DockerComposeBuilder.csproj} (95%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Emitters/FlowStringEnumConverter.cs (95%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Emitters/FlowStyleStringSequences.cs (93%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Emitters/ForceQuotedStringValuesEventEmitter.cs (98%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Emitters/QuoteSurroundingEventEmitter.cs (94%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Emitters/YamlIEnumerableSkipEmptyObjectGraphVisitor.cs (96%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Emitters/YamlValueCollectionConverter.cs (91%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Enums/EReplicationMode.cs (80%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Enums/ERestartMode.cs (86%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Extensions/IObjectExtensions.cs (85%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Interfaces/IObject.cs (58%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Model/Base/ObjectBase.cs (94%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Model/Compose.cs (92%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Model/HealthCheck.cs (92%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Model/Infrastructure/IKeyValue.cs (51%) create mode 100644 src/DockerComposeBuilder/Model/Infrastructure/IValue.cs rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Model/Infrastructure/IValueCollection.cs (75%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Model/Infrastructure/ValueCollection.cs (75%) create mode 100644 src/DockerComposeBuilder/Model/Map.cs create mode 100644 src/DockerComposeBuilder/Model/Network.cs rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Model/PlacementPreferences.cs (70%) create mode 100644 src/DockerComposeBuilder/Model/Secret.cs rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Model/Service.cs (92%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Model/Services/BuildArguments/BuildArgument.cs (68%) create mode 100644 src/DockerComposeBuilder/Model/Services/BuildArguments/BuildArgumentWithoutValue.cs create mode 100644 src/DockerComposeBuilder/Model/Services/BuildArguments/IBuildArgument.cs rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Model/Services/Deploy.cs (88%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Model/Services/Port.cs (88%) rename src/{Aviationexam.DockerComposeBuilder => DockerComposeBuilder}/Model/Services/ServiceBuild.cs (62%) create mode 100644 src/DockerComposeBuilder/Model/Volume.cs diff --git a/README.md b/README.md index bc482d6..a84667f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Build Status](https://github.com/aviationexam/docker-compose-builder/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/aviationexam/docker-compose-builder/actions/workflows/build.yml) -[![NuGet](https://img.shields.io/nuget/v/Aviationexam.DockerComposeBuilder.svg?style=flat-square&label=nuget)](https://www.nuget.org/packages/Aviationexam.DockerComposeBuilder/) -[![MyGet](https://img.shields.io/myget/docker-compose-builder/vpre/Aviationexam.DockerComposeBuilder?label=MyGet)](https://www.myget.org/feed/docker-compose-builder/package/nuget/Aviationexam.DockerComposeBuilder) +[![NuGet](https://img.shields.io/nuget/v/DockerComposeBuilder.svg?style=flat-square&label=nuget)](https://www.nuget.org/packages/DockerComposeBuilder/) +[![MyGet](https://img.shields.io/myget/docker-compose-builder/vpre/DockerComposeBuilder?label=MyGet)](https://www.myget.org/feed/docker-compose-builder/package/nuget/DockerComposeBuilder) # DockerComposeBuilder diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/MapBuilder.cs b/src/Aviationexam.DockerComposeBuilder/Builders/MapBuilder.cs deleted file mode 100644 index 7467387..0000000 --- a/src/Aviationexam.DockerComposeBuilder/Builders/MapBuilder.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Aviationexam.DockerComposeBuilder.Builders.Base; -using Aviationexam.DockerComposeBuilder.Model; - -namespace Aviationexam.DockerComposeBuilder.Builders -{ - public class MapBuilder : BuilderBase - { - internal MapBuilder() - { - } - } -} diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Infrastructure/IValue.cs b/src/Aviationexam.DockerComposeBuilder/Model/Infrastructure/IValue.cs deleted file mode 100644 index 8db8bf1..0000000 --- a/src/Aviationexam.DockerComposeBuilder/Model/Infrastructure/IValue.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Aviationexam.DockerComposeBuilder.Model.Infrastructure; - -public interface IKey -{ - string Key { get; set; } -} diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Map.cs b/src/Aviationexam.DockerComposeBuilder/Model/Map.cs deleted file mode 100644 index f8e24a6..0000000 --- a/src/Aviationexam.DockerComposeBuilder/Model/Map.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Aviationexam.DockerComposeBuilder.Model.Base; -using System; - -namespace Aviationexam.DockerComposeBuilder.Model -{ - [Serializable] - public class Map : ObjectBase - { - } -} diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Network.cs b/src/Aviationexam.DockerComposeBuilder/Model/Network.cs deleted file mode 100644 index bff2548..0000000 --- a/src/Aviationexam.DockerComposeBuilder/Model/Network.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Aviationexam.DockerComposeBuilder.Model.Base; -using System; - -namespace Aviationexam.DockerComposeBuilder.Model -{ - [Serializable] - public class Network : ObjectBase - { - } -} diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Secret.cs b/src/Aviationexam.DockerComposeBuilder/Model/Secret.cs deleted file mode 100644 index 7e4e862..0000000 --- a/src/Aviationexam.DockerComposeBuilder/Model/Secret.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Aviationexam.DockerComposeBuilder.Model.Base; -using System; - -namespace Aviationexam.DockerComposeBuilder.Model -{ - [Serializable] - public class Secret : ObjectBase - { - - } -} diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Services/BuildArguments/BuildArgumentWithoutValue.cs b/src/Aviationexam.DockerComposeBuilder/Model/Services/BuildArguments/BuildArgumentWithoutValue.cs deleted file mode 100644 index 1d389ba..0000000 --- a/src/Aviationexam.DockerComposeBuilder/Model/Services/BuildArguments/BuildArgumentWithoutValue.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Aviationexam.DockerComposeBuilder.Model.Infrastructure; - -namespace Aviationexam.DockerComposeBuilder.Model.Services.BuildArguments; - -public class BuildArgumentWithoutValue : IKey, IBuildArgument -{ - public string Key { get; set; } = null!; -} diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Services/BuildArguments/IBuildArgument.cs b/src/Aviationexam.DockerComposeBuilder/Model/Services/BuildArguments/IBuildArgument.cs deleted file mode 100644 index 6bcb7e5..0000000 --- a/src/Aviationexam.DockerComposeBuilder/Model/Services/BuildArguments/IBuildArgument.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace Aviationexam.DockerComposeBuilder.Model.Services.BuildArguments; - -public interface IBuildArgument -{ -} diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Volume.cs b/src/Aviationexam.DockerComposeBuilder/Model/Volume.cs deleted file mode 100644 index 3ef2a60..0000000 --- a/src/Aviationexam.DockerComposeBuilder/Model/Volume.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Aviationexam.DockerComposeBuilder.Model.Base; -using System; - -namespace Aviationexam.DockerComposeBuilder.Model -{ - [Serializable] - public class Volume : ObjectBase - { - } -} diff --git a/src/Aviationexam.DockerComposeBuilder.Examples.Complex/Aviationexam.DockerComposeBuilder.Examples.Complex.csproj b/src/DockerComposeBuilder.Examples.Complex/DockerComposeBuilder.Examples.Complex.csproj similarity index 77% rename from src/Aviationexam.DockerComposeBuilder.Examples.Complex/Aviationexam.DockerComposeBuilder.Examples.Complex.csproj rename to src/DockerComposeBuilder.Examples.Complex/DockerComposeBuilder.Examples.Complex.csproj index 91ac798..7d25909 100644 --- a/src/Aviationexam.DockerComposeBuilder.Examples.Complex/Aviationexam.DockerComposeBuilder.Examples.Complex.csproj +++ b/src/DockerComposeBuilder.Examples.Complex/DockerComposeBuilder.Examples.Complex.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Aviationexam.DockerComposeBuilder.Examples.Complex/Program.cs b/src/DockerComposeBuilder.Examples.Complex/Program.cs similarity index 89% rename from src/Aviationexam.DockerComposeBuilder.Examples.Complex/Program.cs rename to src/DockerComposeBuilder.Examples.Complex/Program.cs index ae208ac..4189c1b 100644 --- a/src/Aviationexam.DockerComposeBuilder.Examples.Complex/Program.cs +++ b/src/DockerComposeBuilder.Examples.Complex/Program.cs @@ -1,7 +1,7 @@ -using Aviationexam.DockerComposeBuilder.Builders; -using Aviationexam.DockerComposeBuilder.Enums; -using Aviationexam.DockerComposeBuilder.Extensions; -using Aviationexam.DockerComposeBuilder.Model.Services; +using DockerComposeBuilder.Builders; +using DockerComposeBuilder.Enums; +using DockerComposeBuilder.Extensions; +using DockerComposeBuilder.Model.Services; using System; var dbUser = "root"; diff --git a/src/Aviationexam.DockerComposeBuilder.Tests/ComposeBuilderTests.cs b/src/DockerComposeBuilder.Tests/ComposeBuilderTests.cs similarity index 91% rename from src/Aviationexam.DockerComposeBuilder.Tests/ComposeBuilderTests.cs rename to src/DockerComposeBuilder.Tests/ComposeBuilderTests.cs index 1664e91..4315932 100644 --- a/src/Aviationexam.DockerComposeBuilder.Tests/ComposeBuilderTests.cs +++ b/src/DockerComposeBuilder.Tests/ComposeBuilderTests.cs @@ -1,10 +1,10 @@ -using Aviationexam.DockerComposeBuilder.Builders; -using Aviationexam.DockerComposeBuilder.Extensions; -using Aviationexam.DockerComposeBuilder.Model.Services.BuildArguments; +using DockerComposeBuilder.Builders; +using DockerComposeBuilder.Extensions; +using DockerComposeBuilder.Model.Services.BuildArguments; using System.Collections.Generic; using Xunit; -namespace Aviationexam.DockerComposeBuilder.Tests; +namespace DockerComposeBuilder.Tests; public class ComposeBuilderTests { diff --git a/src/Aviationexam.DockerComposeBuilder.Tests/Aviationexam.DockerComposeBuilder.Tests.csproj b/src/DockerComposeBuilder.Tests/DockerComposeBuilder.Tests.csproj similarity index 88% rename from src/Aviationexam.DockerComposeBuilder.Tests/Aviationexam.DockerComposeBuilder.Tests.csproj rename to src/DockerComposeBuilder.Tests/DockerComposeBuilder.Tests.csproj index c37d818..ada73fa 100644 --- a/src/Aviationexam.DockerComposeBuilder.Tests/Aviationexam.DockerComposeBuilder.Tests.csproj +++ b/src/DockerComposeBuilder.Tests/DockerComposeBuilder.Tests.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Aviationexam.DockerComposeBuilder.sln b/src/DockerComposeBuilder.sln similarity index 79% rename from src/Aviationexam.DockerComposeBuilder.sln rename to src/DockerComposeBuilder.sln index a86a127..83c5303 100644 --- a/src/Aviationexam.DockerComposeBuilder.sln +++ b/src/DockerComposeBuilder.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.28307.852 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aviationexam.DockerComposeBuilder.Examples.Complex", "Aviationexam.DockerComposeBuilder.Examples.Complex\Aviationexam.DockerComposeBuilder.Examples.Complex.csproj", "{84DF14CD-3329-45CF-AED3-6C386A9BB34F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DockerComposeBuilder.Examples.Complex", "DockerComposeBuilder.Examples.Complex\DockerComposeBuilder.Examples.Complex.csproj", "{84DF14CD-3329-45CF-AED3-6C386A9BB34F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aviationexam.DockerComposeBuilder", "Aviationexam.DockerComposeBuilder\Aviationexam.DockerComposeBuilder.csproj", "{D321FE6E-BC0A-49FF-9175-4D101ED0F266}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DockerComposeBuilder", "DockerComposeBuilder\DockerComposeBuilder.csproj", "{D321FE6E-BC0A-49FF-9175-4D101ED0F266}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_SolutionItems", "_SolutionItems", "{675557DF-30D8-45ED-97F1-F5210C0F4E9A}" ProjectSection(SolutionItems) = preProject @@ -24,7 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Github Workflows", "Github ..\.github\workflows\release.yml = ..\.github\workflows\release.yml EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aviationexam.DockerComposeBuilder.Tests", "Aviationexam.DockerComposeBuilder.Tests\Aviationexam.DockerComposeBuilder.Tests.csproj", "{21DA6121-85C1-42F1-9E7C-522571504727}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DockerComposeBuilder.Tests", "DockerComposeBuilder.Tests\DockerComposeBuilder.Tests.csproj", "{21DA6121-85C1-42F1-9E7C-522571504727}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Aviationexam.DockerComposeBuilder.sln.DotSettings b/src/DockerComposeBuilder.sln.DotSettings similarity index 100% rename from src/Aviationexam.DockerComposeBuilder.sln.DotSettings rename to src/DockerComposeBuilder.sln.DotSettings diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/Base/BaseBuilder.cs b/src/DockerComposeBuilder/Builders/Base/BaseBuilder.cs similarity index 92% rename from src/Aviationexam.DockerComposeBuilder/Builders/Base/BaseBuilder.cs rename to src/DockerComposeBuilder/Builders/Base/BaseBuilder.cs index 2f9d96f..4d1234a 100644 --- a/src/Aviationexam.DockerComposeBuilder/Builders/Base/BaseBuilder.cs +++ b/src/DockerComposeBuilder/Builders/Base/BaseBuilder.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Aviationexam.DockerComposeBuilder.Builders.Base +namespace DockerComposeBuilder.Builders.Base { public abstract class BaseBuilder where TObjectType : class, new() diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/Base/BuilderBase.cs b/src/DockerComposeBuilder/Builders/Base/BuilderBase.cs similarity index 87% rename from src/Aviationexam.DockerComposeBuilder/Builders/Base/BuilderBase.cs rename to src/DockerComposeBuilder/Builders/Base/BuilderBase.cs index 0b26d48..b0830e6 100644 --- a/src/Aviationexam.DockerComposeBuilder/Builders/Base/BuilderBase.cs +++ b/src/DockerComposeBuilder/Builders/Base/BuilderBase.cs @@ -1,8 +1,8 @@ -using Aviationexam.DockerComposeBuilder.Model; -using Aviationexam.DockerComposeBuilder.Model.Base; +using DockerComposeBuilder.Model; +using DockerComposeBuilder.Model.Base; using System; -namespace Aviationexam.DockerComposeBuilder.Builders.Base +namespace DockerComposeBuilder.Builders.Base { public abstract class BuilderBase where TObjectType : ObjectBase, new() diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/Builder.cs b/src/DockerComposeBuilder/Builders/Builder.cs similarity index 96% rename from src/Aviationexam.DockerComposeBuilder/Builders/Builder.cs rename to src/DockerComposeBuilder/Builders/Builder.cs index 851f936..15755bf 100644 --- a/src/Aviationexam.DockerComposeBuilder/Builders/Builder.cs +++ b/src/DockerComposeBuilder/Builders/Builder.cs @@ -1,4 +1,4 @@ -namespace Aviationexam.DockerComposeBuilder.Builders +namespace DockerComposeBuilder.Builders { public class Builder { diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/ComposeBuilder.cs b/src/DockerComposeBuilder/Builders/ComposeBuilder.cs similarity index 95% rename from src/Aviationexam.DockerComposeBuilder/Builders/ComposeBuilder.cs rename to src/DockerComposeBuilder/Builders/ComposeBuilder.cs index 5391de2..7606a54 100644 --- a/src/Aviationexam.DockerComposeBuilder/Builders/ComposeBuilder.cs +++ b/src/DockerComposeBuilder/Builders/ComposeBuilder.cs @@ -1,9 +1,9 @@ -using Aviationexam.DockerComposeBuilder.Builders.Base; -using Aviationexam.DockerComposeBuilder.Model; +using DockerComposeBuilder.Builders.Base; +using DockerComposeBuilder.Model; using System; using System.Collections.Generic; -namespace Aviationexam.DockerComposeBuilder.Builders +namespace DockerComposeBuilder.Builders { public class ComposeBuilder : BaseBuilder { diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/DeployBuilder.cs b/src/DockerComposeBuilder/Builders/DeployBuilder.cs similarity index 90% rename from src/Aviationexam.DockerComposeBuilder/Builders/DeployBuilder.cs rename to src/DockerComposeBuilder/Builders/DeployBuilder.cs index 012739c..43a4f44 100644 --- a/src/Aviationexam.DockerComposeBuilder/Builders/DeployBuilder.cs +++ b/src/DockerComposeBuilder/Builders/DeployBuilder.cs @@ -1,10 +1,10 @@ -using Aviationexam.DockerComposeBuilder.Builders.Base; -using Aviationexam.DockerComposeBuilder.Enums; -using Aviationexam.DockerComposeBuilder.Model.Services; +using DockerComposeBuilder.Builders.Base; +using DockerComposeBuilder.Enums; +using DockerComposeBuilder.Model.Services; using System; using System.Collections.Generic; -namespace Aviationexam.DockerComposeBuilder.Builders +namespace DockerComposeBuilder.Builders { public class DeployBuilder : BaseBuilder { diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/GenericKeyValueBuilder.cs b/src/DockerComposeBuilder/Builders/GenericKeyValueBuilder.cs similarity index 91% rename from src/Aviationexam.DockerComposeBuilder/Builders/GenericKeyValueBuilder.cs rename to src/DockerComposeBuilder/Builders/GenericKeyValueBuilder.cs index 365325a..761c377 100644 --- a/src/Aviationexam.DockerComposeBuilder/Builders/GenericKeyValueBuilder.cs +++ b/src/DockerComposeBuilder/Builders/GenericKeyValueBuilder.cs @@ -1,8 +1,8 @@ -using Aviationexam.DockerComposeBuilder.Model.Infrastructure; +using DockerComposeBuilder.Model.Infrastructure; using System.Collections.Generic; using System.Linq; -namespace Aviationexam.DockerComposeBuilder.Builders; +namespace DockerComposeBuilder.Builders; public abstract class GenericKeyValueBuilder where TBuilder : GenericKeyValueBuilder diff --git a/src/DockerComposeBuilder/Builders/MapBuilder.cs b/src/DockerComposeBuilder/Builders/MapBuilder.cs new file mode 100644 index 0000000..24cbd13 --- /dev/null +++ b/src/DockerComposeBuilder/Builders/MapBuilder.cs @@ -0,0 +1,12 @@ +using DockerComposeBuilder.Builders.Base; +using DockerComposeBuilder.Model; + +namespace DockerComposeBuilder.Builders +{ + public class MapBuilder : BuilderBase + { + internal MapBuilder() + { + } + } +} diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/NetworkBuilder.cs b/src/DockerComposeBuilder/Builders/NetworkBuilder.cs similarity index 64% rename from src/Aviationexam.DockerComposeBuilder/Builders/NetworkBuilder.cs rename to src/DockerComposeBuilder/Builders/NetworkBuilder.cs index 33e1974..d31fd63 100644 --- a/src/Aviationexam.DockerComposeBuilder/Builders/NetworkBuilder.cs +++ b/src/DockerComposeBuilder/Builders/NetworkBuilder.cs @@ -1,7 +1,7 @@ -using Aviationexam.DockerComposeBuilder.Builders.Base; -using Aviationexam.DockerComposeBuilder.Model; +using DockerComposeBuilder.Builders.Base; +using DockerComposeBuilder.Model; -namespace Aviationexam.DockerComposeBuilder.Builders +namespace DockerComposeBuilder.Builders { public class NetworkBuilder : BuilderBase { diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/SecretBuilder.cs b/src/DockerComposeBuilder/Builders/SecretBuilder.cs similarity index 71% rename from src/Aviationexam.DockerComposeBuilder/Builders/SecretBuilder.cs rename to src/DockerComposeBuilder/Builders/SecretBuilder.cs index 73f0274..6d7dc4c 100644 --- a/src/Aviationexam.DockerComposeBuilder/Builders/SecretBuilder.cs +++ b/src/DockerComposeBuilder/Builders/SecretBuilder.cs @@ -1,7 +1,7 @@ -using Aviationexam.DockerComposeBuilder.Builders.Base; -using Aviationexam.DockerComposeBuilder.Model; +using DockerComposeBuilder.Builders.Base; +using DockerComposeBuilder.Model; -namespace Aviationexam.DockerComposeBuilder.Builders +namespace DockerComposeBuilder.Builders { public class SecretBuilder : BuilderBase { diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/ServiceBuilder.cs b/src/DockerComposeBuilder/Builders/ServiceBuilder.cs similarity index 95% rename from src/Aviationexam.DockerComposeBuilder/Builders/ServiceBuilder.cs rename to src/DockerComposeBuilder/Builders/ServiceBuilder.cs index 2525a7d..aafea1d 100644 --- a/src/Aviationexam.DockerComposeBuilder/Builders/ServiceBuilder.cs +++ b/src/DockerComposeBuilder/Builders/ServiceBuilder.cs @@ -1,13 +1,13 @@ -using Aviationexam.DockerComposeBuilder.Builders.Base; -using Aviationexam.DockerComposeBuilder.Builders.Services; -using Aviationexam.DockerComposeBuilder.Enums; -using Aviationexam.DockerComposeBuilder.Model; -using Aviationexam.DockerComposeBuilder.Model.Services; +using DockerComposeBuilder.Builders.Base; +using DockerComposeBuilder.Builders.Services; +using DockerComposeBuilder.Enums; +using DockerComposeBuilder.Model; +using DockerComposeBuilder.Model.Services; using System; using System.Collections.Generic; using System.Linq; -namespace Aviationexam.DockerComposeBuilder.Builders +namespace DockerComposeBuilder.Builders { public class ServiceBuilder : BaseBuilder { diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/Services/BuildArgumentBuilder.cs b/src/DockerComposeBuilder/Builders/Services/BuildArgumentBuilder.cs similarity index 51% rename from src/Aviationexam.DockerComposeBuilder/Builders/Services/BuildArgumentBuilder.cs rename to src/DockerComposeBuilder/Builders/Services/BuildArgumentBuilder.cs index ed3c3c2..4495ef7 100644 --- a/src/Aviationexam.DockerComposeBuilder/Builders/Services/BuildArgumentBuilder.cs +++ b/src/DockerComposeBuilder/Builders/Services/BuildArgumentBuilder.cs @@ -1,6 +1,6 @@ -using Aviationexam.DockerComposeBuilder.Model.Services.BuildArguments; +using DockerComposeBuilder.Model.Services.BuildArguments; -namespace Aviationexam.DockerComposeBuilder.Builders.Services; +namespace DockerComposeBuilder.Builders.Services; public class BuildArgumentBuilder : GenericKeyValueBuilder { diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/Services/BuildBuilder.cs b/src/DockerComposeBuilder/Builders/Services/BuildBuilder.cs similarity index 83% rename from src/Aviationexam.DockerComposeBuilder/Builders/Services/BuildBuilder.cs rename to src/DockerComposeBuilder/Builders/Services/BuildBuilder.cs index 075614d..f9c6748 100644 --- a/src/Aviationexam.DockerComposeBuilder/Builders/Services/BuildBuilder.cs +++ b/src/DockerComposeBuilder/Builders/Services/BuildBuilder.cs @@ -1,8 +1,8 @@ -using Aviationexam.DockerComposeBuilder.Builders.Base; -using Aviationexam.DockerComposeBuilder.Model.Services; +using DockerComposeBuilder.Builders.Base; +using DockerComposeBuilder.Model.Services; using System; -namespace Aviationexam.DockerComposeBuilder.Builders.Services; +namespace DockerComposeBuilder.Builders.Services; public class BuildBuilder : BaseBuilder { diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/SwarmServiceBuilder.cs b/src/DockerComposeBuilder/Builders/SwarmServiceBuilder.cs similarity index 82% rename from src/Aviationexam.DockerComposeBuilder/Builders/SwarmServiceBuilder.cs rename to src/DockerComposeBuilder/Builders/SwarmServiceBuilder.cs index cb68445..bbd104c 100644 --- a/src/Aviationexam.DockerComposeBuilder/Builders/SwarmServiceBuilder.cs +++ b/src/DockerComposeBuilder/Builders/SwarmServiceBuilder.cs @@ -1,7 +1,7 @@ -using Aviationexam.DockerComposeBuilder.Model.Services; +using DockerComposeBuilder.Model.Services; using System; -namespace Aviationexam.DockerComposeBuilder.Builders +namespace DockerComposeBuilder.Builders { public class SwarmServiceBuilder : ServiceBuilder { diff --git a/src/Aviationexam.DockerComposeBuilder/Builders/VolumeBuilder.cs b/src/DockerComposeBuilder/Builders/VolumeBuilder.cs similarity index 63% rename from src/Aviationexam.DockerComposeBuilder/Builders/VolumeBuilder.cs rename to src/DockerComposeBuilder/Builders/VolumeBuilder.cs index c466936..d85ffd3 100644 --- a/src/Aviationexam.DockerComposeBuilder/Builders/VolumeBuilder.cs +++ b/src/DockerComposeBuilder/Builders/VolumeBuilder.cs @@ -1,7 +1,7 @@ -using Aviationexam.DockerComposeBuilder.Builders.Base; -using Aviationexam.DockerComposeBuilder.Model; +using DockerComposeBuilder.Builders.Base; +using DockerComposeBuilder.Model; -namespace Aviationexam.DockerComposeBuilder.Builders +namespace DockerComposeBuilder.Builders { public class VolumeBuilder : BuilderBase { diff --git a/src/Aviationexam.DockerComposeBuilder/Aviationexam.DockerComposeBuilder.csproj b/src/DockerComposeBuilder/DockerComposeBuilder.csproj similarity index 95% rename from src/Aviationexam.DockerComposeBuilder/Aviationexam.DockerComposeBuilder.csproj rename to src/DockerComposeBuilder/DockerComposeBuilder.csproj index 9678998..24809e7 100644 --- a/src/Aviationexam.DockerComposeBuilder/Aviationexam.DockerComposeBuilder.csproj +++ b/src/DockerComposeBuilder/DockerComposeBuilder.csproj @@ -6,6 +6,7 @@ The goal of this project is to generate docker-compose literate YAML in C# using the builder design pattern true true + DockerComposeBuilder MIT https://github.com/aviationexam/docker-compose-builder https://github.com/aviationexam/docker-compose-builder diff --git a/src/Aviationexam.DockerComposeBuilder/Emitters/FlowStringEnumConverter.cs b/src/DockerComposeBuilder/Emitters/FlowStringEnumConverter.cs similarity index 95% rename from src/Aviationexam.DockerComposeBuilder/Emitters/FlowStringEnumConverter.cs rename to src/DockerComposeBuilder/Emitters/FlowStringEnumConverter.cs index 2e38967..cdd78f8 100644 --- a/src/Aviationexam.DockerComposeBuilder/Emitters/FlowStringEnumConverter.cs +++ b/src/DockerComposeBuilder/Emitters/FlowStringEnumConverter.cs @@ -5,7 +5,7 @@ using YamlDotNet.Serialization; using YamlDotNet.Serialization.EventEmitters; -namespace Aviationexam.DockerComposeBuilder.Emitters +namespace DockerComposeBuilder.Emitters { public class FlowStringEnumConverter : ChainedEventEmitter { diff --git a/src/Aviationexam.DockerComposeBuilder/Emitters/FlowStyleStringSequences.cs b/src/DockerComposeBuilder/Emitters/FlowStyleStringSequences.cs similarity index 93% rename from src/Aviationexam.DockerComposeBuilder/Emitters/FlowStyleStringSequences.cs rename to src/DockerComposeBuilder/Emitters/FlowStyleStringSequences.cs index b3f6431..56a5fa1 100644 --- a/src/Aviationexam.DockerComposeBuilder/Emitters/FlowStyleStringSequences.cs +++ b/src/DockerComposeBuilder/Emitters/FlowStyleStringSequences.cs @@ -3,7 +3,7 @@ using YamlDotNet.Serialization; using YamlDotNet.Serialization.EventEmitters; -namespace Aviationexam.DockerComposeBuilder.Emitters +namespace DockerComposeBuilder.Emitters { public class FlowStyleStringSequences : ChainedEventEmitter { diff --git a/src/Aviationexam.DockerComposeBuilder/Emitters/ForceQuotedStringValuesEventEmitter.cs b/src/DockerComposeBuilder/Emitters/ForceQuotedStringValuesEventEmitter.cs similarity index 98% rename from src/Aviationexam.DockerComposeBuilder/Emitters/ForceQuotedStringValuesEventEmitter.cs rename to src/DockerComposeBuilder/Emitters/ForceQuotedStringValuesEventEmitter.cs index 03d188b..3a450cf 100644 --- a/src/Aviationexam.DockerComposeBuilder/Emitters/ForceQuotedStringValuesEventEmitter.cs +++ b/src/DockerComposeBuilder/Emitters/ForceQuotedStringValuesEventEmitter.cs @@ -4,7 +4,7 @@ using YamlDotNet.Serialization; using YamlDotNet.Serialization.EventEmitters; -namespace Aviationexam.DockerComposeBuilder.Emitters +namespace DockerComposeBuilder.Emitters { public class ForceQuotedStringValuesEventEmitter : ChainedEventEmitter { diff --git a/src/Aviationexam.DockerComposeBuilder/Emitters/QuoteSurroundingEventEmitter.cs b/src/DockerComposeBuilder/Emitters/QuoteSurroundingEventEmitter.cs similarity index 94% rename from src/Aviationexam.DockerComposeBuilder/Emitters/QuoteSurroundingEventEmitter.cs rename to src/DockerComposeBuilder/Emitters/QuoteSurroundingEventEmitter.cs index 9e4c023..254efc9 100644 --- a/src/Aviationexam.DockerComposeBuilder/Emitters/QuoteSurroundingEventEmitter.cs +++ b/src/DockerComposeBuilder/Emitters/QuoteSurroundingEventEmitter.cs @@ -2,7 +2,7 @@ using YamlDotNet.Serialization; using YamlDotNet.Serialization.EventEmitters; -namespace Aviationexam.DockerComposeBuilder.Emitters +namespace DockerComposeBuilder.Emitters { public class QuoteSurroundingEventEmitter : ChainedEventEmitter { diff --git a/src/Aviationexam.DockerComposeBuilder/Emitters/YamlIEnumerableSkipEmptyObjectGraphVisitor.cs b/src/DockerComposeBuilder/Emitters/YamlIEnumerableSkipEmptyObjectGraphVisitor.cs similarity index 96% rename from src/Aviationexam.DockerComposeBuilder/Emitters/YamlIEnumerableSkipEmptyObjectGraphVisitor.cs rename to src/DockerComposeBuilder/Emitters/YamlIEnumerableSkipEmptyObjectGraphVisitor.cs index a1f8d15..60d8494 100644 --- a/src/Aviationexam.DockerComposeBuilder/Emitters/YamlIEnumerableSkipEmptyObjectGraphVisitor.cs +++ b/src/DockerComposeBuilder/Emitters/YamlIEnumerableSkipEmptyObjectGraphVisitor.cs @@ -3,7 +3,7 @@ using YamlDotNet.Serialization; using YamlDotNet.Serialization.ObjectGraphVisitors; -namespace Aviationexam.DockerComposeBuilder.Emitters +namespace DockerComposeBuilder.Emitters { public sealed class YamlIEnumerableSkipEmptyObjectGraphVisitor : ChainedObjectGraphVisitor { diff --git a/src/Aviationexam.DockerComposeBuilder/Emitters/YamlValueCollectionConverter.cs b/src/DockerComposeBuilder/Emitters/YamlValueCollectionConverter.cs similarity index 91% rename from src/Aviationexam.DockerComposeBuilder/Emitters/YamlValueCollectionConverter.cs rename to src/DockerComposeBuilder/Emitters/YamlValueCollectionConverter.cs index 3977dab..ab3d31c 100644 --- a/src/Aviationexam.DockerComposeBuilder/Emitters/YamlValueCollectionConverter.cs +++ b/src/DockerComposeBuilder/Emitters/YamlValueCollectionConverter.cs @@ -1,10 +1,10 @@ -using Aviationexam.DockerComposeBuilder.Model.Infrastructure; +using DockerComposeBuilder.Model.Infrastructure; using System; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Aviationexam.DockerComposeBuilder.Emitters; +namespace DockerComposeBuilder.Emitters; public class YamlValueCollectionConverter : IYamlTypeConverter { diff --git a/src/Aviationexam.DockerComposeBuilder/Enums/EReplicationMode.cs b/src/DockerComposeBuilder/Enums/EReplicationMode.cs similarity index 80% rename from src/Aviationexam.DockerComposeBuilder/Enums/EReplicationMode.cs rename to src/DockerComposeBuilder/Enums/EReplicationMode.cs index 824c8af..4f36c38 100644 --- a/src/Aviationexam.DockerComposeBuilder/Enums/EReplicationMode.cs +++ b/src/DockerComposeBuilder/Enums/EReplicationMode.cs @@ -1,6 +1,6 @@ using System.Runtime.Serialization; -namespace Aviationexam.DockerComposeBuilder.Enums +namespace DockerComposeBuilder.Enums { public enum EReplicationMode { diff --git a/src/Aviationexam.DockerComposeBuilder/Enums/ERestartMode.cs b/src/DockerComposeBuilder/Enums/ERestartMode.cs similarity index 86% rename from src/Aviationexam.DockerComposeBuilder/Enums/ERestartMode.cs rename to src/DockerComposeBuilder/Enums/ERestartMode.cs index e70811c..87b3858 100644 --- a/src/Aviationexam.DockerComposeBuilder/Enums/ERestartMode.cs +++ b/src/DockerComposeBuilder/Enums/ERestartMode.cs @@ -1,6 +1,6 @@ using System.Runtime.Serialization; -namespace Aviationexam.DockerComposeBuilder.Enums +namespace DockerComposeBuilder.Enums { public enum ERestartMode { diff --git a/src/Aviationexam.DockerComposeBuilder/Extensions/IObjectExtensions.cs b/src/DockerComposeBuilder/Extensions/IObjectExtensions.cs similarity index 85% rename from src/Aviationexam.DockerComposeBuilder/Extensions/IObjectExtensions.cs rename to src/DockerComposeBuilder/Extensions/IObjectExtensions.cs index 3f91b96..2fc79a5 100644 --- a/src/Aviationexam.DockerComposeBuilder/Extensions/IObjectExtensions.cs +++ b/src/DockerComposeBuilder/Extensions/IObjectExtensions.cs @@ -1,9 +1,9 @@ -using Aviationexam.DockerComposeBuilder.Emitters; -using Aviationexam.DockerComposeBuilder.Model; +using DockerComposeBuilder.Emitters; +using DockerComposeBuilder.Model; using YamlDotNet.Serialization; using YamlDotNet.Serialization.NamingConventions; -namespace Aviationexam.DockerComposeBuilder.Extensions +namespace DockerComposeBuilder.Extensions { public static class ComposeExtensions { diff --git a/src/Aviationexam.DockerComposeBuilder/Interfaces/IObject.cs b/src/DockerComposeBuilder/Interfaces/IObject.cs similarity index 58% rename from src/Aviationexam.DockerComposeBuilder/Interfaces/IObject.cs rename to src/DockerComposeBuilder/Interfaces/IObject.cs index 20b2674..385072c 100644 --- a/src/Aviationexam.DockerComposeBuilder/Interfaces/IObject.cs +++ b/src/DockerComposeBuilder/Interfaces/IObject.cs @@ -1,4 +1,4 @@ -namespace Aviationexam.DockerComposeBuilder.Interfaces +namespace DockerComposeBuilder.Interfaces { public interface IObject { diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Base/ObjectBase.cs b/src/DockerComposeBuilder/Model/Base/ObjectBase.cs similarity index 94% rename from src/Aviationexam.DockerComposeBuilder/Model/Base/ObjectBase.cs rename to src/DockerComposeBuilder/Model/Base/ObjectBase.cs index 67722ec..71835cf 100644 --- a/src/Aviationexam.DockerComposeBuilder/Model/Base/ObjectBase.cs +++ b/src/DockerComposeBuilder/Model/Base/ObjectBase.cs @@ -1,9 +1,9 @@ -using Aviationexam.DockerComposeBuilder.Interfaces; +using DockerComposeBuilder.Interfaces; using System; using System.Collections.Generic; using YamlDotNet.Serialization; -namespace Aviationexam.DockerComposeBuilder.Model.Base +namespace DockerComposeBuilder.Model.Base { [Serializable] public class ObjectBase : Dictionary, IObject diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Compose.cs b/src/DockerComposeBuilder/Model/Compose.cs similarity index 92% rename from src/Aviationexam.DockerComposeBuilder/Model/Compose.cs rename to src/DockerComposeBuilder/Model/Compose.cs index cb59d46..c5dba58 100644 --- a/src/Aviationexam.DockerComposeBuilder/Model/Compose.cs +++ b/src/DockerComposeBuilder/Model/Compose.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using YamlDotNet.Serialization; -namespace Aviationexam.DockerComposeBuilder.Model +namespace DockerComposeBuilder.Model { [Serializable] public class Compose diff --git a/src/Aviationexam.DockerComposeBuilder/Model/HealthCheck.cs b/src/DockerComposeBuilder/Model/HealthCheck.cs similarity index 92% rename from src/Aviationexam.DockerComposeBuilder/Model/HealthCheck.cs rename to src/DockerComposeBuilder/Model/HealthCheck.cs index cec8f11..1d094fb 100644 --- a/src/Aviationexam.DockerComposeBuilder/Model/HealthCheck.cs +++ b/src/DockerComposeBuilder/Model/HealthCheck.cs @@ -2,7 +2,7 @@ using YamlDotNet.Core; using YamlDotNet.Serialization; -namespace Aviationexam.DockerComposeBuilder.Model +namespace DockerComposeBuilder.Model { [Serializable] public class HealthCheck diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Infrastructure/IKeyValue.cs b/src/DockerComposeBuilder/Model/Infrastructure/IKeyValue.cs similarity index 51% rename from src/Aviationexam.DockerComposeBuilder/Model/Infrastructure/IKeyValue.cs rename to src/DockerComposeBuilder/Model/Infrastructure/IKeyValue.cs index 22f7437..5d84b90 100644 --- a/src/Aviationexam.DockerComposeBuilder/Model/Infrastructure/IKeyValue.cs +++ b/src/DockerComposeBuilder/Model/Infrastructure/IKeyValue.cs @@ -1,4 +1,4 @@ -namespace Aviationexam.DockerComposeBuilder.Model.Infrastructure; +namespace DockerComposeBuilder.Model.Infrastructure; public interface IKeyValue : IKey { diff --git a/src/DockerComposeBuilder/Model/Infrastructure/IValue.cs b/src/DockerComposeBuilder/Model/Infrastructure/IValue.cs new file mode 100644 index 0000000..bb49f79 --- /dev/null +++ b/src/DockerComposeBuilder/Model/Infrastructure/IValue.cs @@ -0,0 +1,6 @@ +namespace DockerComposeBuilder.Model.Infrastructure; + +public interface IKey +{ + string Key { get; set; } +} diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Infrastructure/IValueCollection.cs b/src/DockerComposeBuilder/Model/Infrastructure/IValueCollection.cs similarity index 75% rename from src/Aviationexam.DockerComposeBuilder/Model/Infrastructure/IValueCollection.cs rename to src/DockerComposeBuilder/Model/Infrastructure/IValueCollection.cs index 82a68df..876ee02 100644 --- a/src/Aviationexam.DockerComposeBuilder/Model/Infrastructure/IValueCollection.cs +++ b/src/DockerComposeBuilder/Model/Infrastructure/IValueCollection.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; -namespace Aviationexam.DockerComposeBuilder.Model.Infrastructure; +namespace DockerComposeBuilder.Model.Infrastructure; public interface IValueCollection : IValueCollection, ICollection where T : class { diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Infrastructure/ValueCollection.cs b/src/DockerComposeBuilder/Model/Infrastructure/ValueCollection.cs similarity index 75% rename from src/Aviationexam.DockerComposeBuilder/Model/Infrastructure/ValueCollection.cs rename to src/DockerComposeBuilder/Model/Infrastructure/ValueCollection.cs index 6e1fc7c..01ad844 100644 --- a/src/Aviationexam.DockerComposeBuilder/Model/Infrastructure/ValueCollection.cs +++ b/src/DockerComposeBuilder/Model/Infrastructure/ValueCollection.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Aviationexam.DockerComposeBuilder.Model.Infrastructure; +namespace DockerComposeBuilder.Model.Infrastructure; public class ValueCollection : List, IValueCollection where T : class { diff --git a/src/DockerComposeBuilder/Model/Map.cs b/src/DockerComposeBuilder/Model/Map.cs new file mode 100644 index 0000000..8138dff --- /dev/null +++ b/src/DockerComposeBuilder/Model/Map.cs @@ -0,0 +1,10 @@ +using DockerComposeBuilder.Model.Base; +using System; + +namespace DockerComposeBuilder.Model +{ + [Serializable] + public class Map : ObjectBase + { + } +} diff --git a/src/DockerComposeBuilder/Model/Network.cs b/src/DockerComposeBuilder/Model/Network.cs new file mode 100644 index 0000000..052be6e --- /dev/null +++ b/src/DockerComposeBuilder/Model/Network.cs @@ -0,0 +1,10 @@ +using DockerComposeBuilder.Model.Base; +using System; + +namespace DockerComposeBuilder.Model +{ + [Serializable] + public class Network : ObjectBase + { + } +} diff --git a/src/Aviationexam.DockerComposeBuilder/Model/PlacementPreferences.cs b/src/DockerComposeBuilder/Model/PlacementPreferences.cs similarity index 70% rename from src/Aviationexam.DockerComposeBuilder/Model/PlacementPreferences.cs rename to src/DockerComposeBuilder/Model/PlacementPreferences.cs index d860339..b17d595 100644 --- a/src/Aviationexam.DockerComposeBuilder/Model/PlacementPreferences.cs +++ b/src/DockerComposeBuilder/Model/PlacementPreferences.cs @@ -1,7 +1,7 @@ -using Aviationexam.DockerComposeBuilder.Model.Base; +using DockerComposeBuilder.Model.Base; using System; -namespace Aviationexam.DockerComposeBuilder.Model +namespace DockerComposeBuilder.Model { [Serializable] public class PlacementPreferences : ObjectBase diff --git a/src/DockerComposeBuilder/Model/Secret.cs b/src/DockerComposeBuilder/Model/Secret.cs new file mode 100644 index 0000000..ec4a63b --- /dev/null +++ b/src/DockerComposeBuilder/Model/Secret.cs @@ -0,0 +1,11 @@ +using DockerComposeBuilder.Model.Base; +using System; + +namespace DockerComposeBuilder.Model +{ + [Serializable] + public class Secret : ObjectBase + { + + } +} diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Service.cs b/src/DockerComposeBuilder/Model/Service.cs similarity index 92% rename from src/Aviationexam.DockerComposeBuilder/Model/Service.cs rename to src/DockerComposeBuilder/Model/Service.cs index 003420d..e07afd1 100644 --- a/src/Aviationexam.DockerComposeBuilder/Model/Service.cs +++ b/src/DockerComposeBuilder/Model/Service.cs @@ -1,10 +1,10 @@ -using Aviationexam.DockerComposeBuilder.Enums; -using Aviationexam.DockerComposeBuilder.Model.Services; +using DockerComposeBuilder.Enums; +using DockerComposeBuilder.Model.Services; using System; using System.Collections.Generic; using YamlDotNet.Serialization; -namespace Aviationexam.DockerComposeBuilder.Model +namespace DockerComposeBuilder.Model { [Serializable] public class Service diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Services/BuildArguments/BuildArgument.cs b/src/DockerComposeBuilder/Model/Services/BuildArguments/BuildArgument.cs similarity index 68% rename from src/Aviationexam.DockerComposeBuilder/Model/Services/BuildArguments/BuildArgument.cs rename to src/DockerComposeBuilder/Model/Services/BuildArguments/BuildArgument.cs index 9bae71f..0d96e14 100644 --- a/src/Aviationexam.DockerComposeBuilder/Model/Services/BuildArguments/BuildArgument.cs +++ b/src/DockerComposeBuilder/Model/Services/BuildArguments/BuildArgument.cs @@ -1,6 +1,6 @@ -using Aviationexam.DockerComposeBuilder.Model.Infrastructure; +using DockerComposeBuilder.Model.Infrastructure; -namespace Aviationexam.DockerComposeBuilder.Model.Services.BuildArguments; +namespace DockerComposeBuilder.Model.Services.BuildArguments; public class BuildArgument : IKeyValue, IBuildArgument { diff --git a/src/DockerComposeBuilder/Model/Services/BuildArguments/BuildArgumentWithoutValue.cs b/src/DockerComposeBuilder/Model/Services/BuildArguments/BuildArgumentWithoutValue.cs new file mode 100644 index 0000000..6f5eb35 --- /dev/null +++ b/src/DockerComposeBuilder/Model/Services/BuildArguments/BuildArgumentWithoutValue.cs @@ -0,0 +1,8 @@ +using DockerComposeBuilder.Model.Infrastructure; + +namespace DockerComposeBuilder.Model.Services.BuildArguments; + +public class BuildArgumentWithoutValue : IKey, IBuildArgument +{ + public string Key { get; set; } = null!; +} diff --git a/src/DockerComposeBuilder/Model/Services/BuildArguments/IBuildArgument.cs b/src/DockerComposeBuilder/Model/Services/BuildArguments/IBuildArgument.cs new file mode 100644 index 0000000..45d0e50 --- /dev/null +++ b/src/DockerComposeBuilder/Model/Services/BuildArguments/IBuildArgument.cs @@ -0,0 +1,5 @@ +namespace DockerComposeBuilder.Model.Services.BuildArguments; + +public interface IBuildArgument +{ +} diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Services/Deploy.cs b/src/DockerComposeBuilder/Model/Services/Deploy.cs similarity index 88% rename from src/Aviationexam.DockerComposeBuilder/Model/Services/Deploy.cs rename to src/DockerComposeBuilder/Model/Services/Deploy.cs index 58a51b9..2270951 100644 --- a/src/Aviationexam.DockerComposeBuilder/Model/Services/Deploy.cs +++ b/src/DockerComposeBuilder/Model/Services/Deploy.cs @@ -1,9 +1,9 @@ -using Aviationexam.DockerComposeBuilder.Enums; +using DockerComposeBuilder.Enums; using System; using System.Collections.Generic; using YamlDotNet.Serialization; -namespace Aviationexam.DockerComposeBuilder.Model.Services +namespace DockerComposeBuilder.Model.Services { [Serializable] public class Deploy diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Services/Port.cs b/src/DockerComposeBuilder/Model/Services/Port.cs similarity index 88% rename from src/Aviationexam.DockerComposeBuilder/Model/Services/Port.cs rename to src/DockerComposeBuilder/Model/Services/Port.cs index 0b39ebc..98150f7 100644 --- a/src/Aviationexam.DockerComposeBuilder/Model/Services/Port.cs +++ b/src/DockerComposeBuilder/Model/Services/Port.cs @@ -1,7 +1,7 @@ using System; using YamlDotNet.Serialization; -namespace Aviationexam.DockerComposeBuilder.Model.Services +namespace DockerComposeBuilder.Model.Services { [Serializable] public class Port diff --git a/src/Aviationexam.DockerComposeBuilder/Model/Services/ServiceBuild.cs b/src/DockerComposeBuilder/Model/Services/ServiceBuild.cs similarity index 62% rename from src/Aviationexam.DockerComposeBuilder/Model/Services/ServiceBuild.cs rename to src/DockerComposeBuilder/Model/Services/ServiceBuild.cs index 5e3f3a9..ba5382d 100644 --- a/src/Aviationexam.DockerComposeBuilder/Model/Services/ServiceBuild.cs +++ b/src/DockerComposeBuilder/Model/Services/ServiceBuild.cs @@ -1,8 +1,8 @@ -using Aviationexam.DockerComposeBuilder.Model.Infrastructure; -using Aviationexam.DockerComposeBuilder.Model.Services.BuildArguments; +using DockerComposeBuilder.Model.Infrastructure; +using DockerComposeBuilder.Model.Services.BuildArguments; using YamlDotNet.Serialization; -namespace Aviationexam.DockerComposeBuilder.Model.Services; +namespace DockerComposeBuilder.Model.Services; public class ServiceBuild { diff --git a/src/DockerComposeBuilder/Model/Volume.cs b/src/DockerComposeBuilder/Model/Volume.cs new file mode 100644 index 0000000..acc51e0 --- /dev/null +++ b/src/DockerComposeBuilder/Model/Volume.cs @@ -0,0 +1,10 @@ +using DockerComposeBuilder.Model.Base; +using System; + +namespace DockerComposeBuilder.Model +{ + [Serializable] + public class Volume : ObjectBase + { + } +}