Skip to content
This repository has been archived by the owner on Jun 15, 2022. It is now read-only.

Move specific containers into dedicated modules #78

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Move specific containers into dedicated modules #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions TestContainers.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestContainers", "src\TestC
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestContainers.Tests", "test\TestContainers.Tests\TestContainers.Tests.csproj", "{9C954639-D343-4E02-A5C8-B3A466CE2F70}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Module.RabbitMQ", "src\Testcontainers.Module.RabbitMQ\Testcontainers.Module.RabbitMQ.csproj", "{6EA32AF6-695E-4D3A-AEEC-EF59F725858E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Module.MySql", "src\Testcontainers.Module.MySql\Testcontainers.Module.MySql.csproj", "{9D9EFF95-25EB-4FD1-BED2-86ACCA1C69D2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Module.PostgreSQL", "src\Testcontainers.Module.PostgreSQL\Testcontainers.Module.PostgreSQL.csproj", "{6C7B99EB-4B4E-444D-A5B7-426D33B99222}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Module.Redis", "src\Testcontainers.Module.Redis\Testcontainers.Module.Redis.csproj", "{156CC687-F598-4F4F-BBF8-5F3A7D02F6E4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -24,13 +32,33 @@ Global
{9C954639-D343-4E02-A5C8-B3A466CE2F70}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9C954639-D343-4E02-A5C8-B3A466CE2F70}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9C954639-D343-4E02-A5C8-B3A466CE2F70}.Release|Any CPU.Build.0 = Release|Any CPU
{6EA32AF6-695E-4D3A-AEEC-EF59F725858E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6EA32AF6-695E-4D3A-AEEC-EF59F725858E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6EA32AF6-695E-4D3A-AEEC-EF59F725858E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6EA32AF6-695E-4D3A-AEEC-EF59F725858E}.Release|Any CPU.Build.0 = Release|Any CPU
{9D9EFF95-25EB-4FD1-BED2-86ACCA1C69D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D9EFF95-25EB-4FD1-BED2-86ACCA1C69D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D9EFF95-25EB-4FD1-BED2-86ACCA1C69D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D9EFF95-25EB-4FD1-BED2-86ACCA1C69D2}.Release|Any CPU.Build.0 = Release|Any CPU
{6C7B99EB-4B4E-444D-A5B7-426D33B99222}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C7B99EB-4B4E-444D-A5B7-426D33B99222}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C7B99EB-4B4E-444D-A5B7-426D33B99222}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C7B99EB-4B4E-444D-A5B7-426D33B99222}.Release|Any CPU.Build.0 = Release|Any CPU
{156CC687-F598-4F4F-BBF8-5F3A7D02F6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{156CC687-F598-4F4F-BBF8-5F3A7D02F6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{156CC687-F598-4F4F-BBF8-5F3A7D02F6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{156CC687-F598-4F4F-BBF8-5F3A7D02F6E4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4D05E9EF-78BF-48A6-9CF6-D4F6AEBE2C7A} = {BB91417F-1345-4FAD-9D56-7B11DF593084}
{9C954639-D343-4E02-A5C8-B3A466CE2F70} = {5DC26A60-8775-4076-A94D-1BDC36B0A828}
{6EA32AF6-695E-4D3A-AEEC-EF59F725858E} = {BB91417F-1345-4FAD-9D56-7B11DF593084}
{9D9EFF95-25EB-4FD1-BED2-86ACCA1C69D2} = {BB91417F-1345-4FAD-9D56-7B11DF593084}
{6C7B99EB-4B4E-444D-A5B7-426D33B99222} = {BB91417F-1345-4FAD-9D56-7B11DF593084}
{156CC687-F598-4F4F-BBF8-5F3A7D02F6E4} = {BB91417F-1345-4FAD-9D56-7B11DF593084}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6D84DD44-76E1-4131-9E5E-075E384BFEE6}
Expand Down
4 changes: 0 additions & 4 deletions src/TestContainers/TestContainers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Docker.Dotnet" Version="3.125.2" />
<PackageReference Include="MySql.Data" Version="6.10.6" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Npgsql" Version="4.0.2" />
<PackageReference Include="Polly" Version="6.0.1" />
<PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
<PackageReference Include="StackExchange.Redis" Version="1.2.6" />
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)../../Shared.msbuild" />
</Project>
0 ...tainers/Core/Containers/MySqlContainer.cs → ...containers.Module.MySql/MySqlContainer.cs
View file
Open in desktop
File renamed without changes.
13 changes: 13 additions & 0 deletions src/Testcontainers.Module.MySql/Testcontainers.Module.MySql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Testcontainers.Core.Containers</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../TestContainers/TestContainers.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MySql.Data" Version="6.10.6" />
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)../../Shared.msbuild" />
</Project>
0 ...rs/Core/Containers/PostgreSqlContainer.cs → ....Module.PostgreSQL/PostgreSqlContainer.cs
View file
Open in desktop
File renamed without changes.
13 changes: 13 additions & 0 deletions src/Testcontainers.Module.PostgreSQL/Testcontainers.Module.PostgreSQL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Testcontainers.Core.Containers</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../TestContainers/TestContainers.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Npgsql" Version="4.0.2" />
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)../../Shared.msbuild" />
</Project>
0 ...ners/Core/Containers/RabbitMQContainer.cs → ...ners.Module.RabbitMQ/RabbitMQContainer.cs
View file
Open in desktop
File renamed without changes.
13 changes: 13 additions & 0 deletions src/Testcontainers.Module.RabbitMQ/Testcontainers.Module.RabbitMQ.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Testcontainers.Core.Containers</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../TestContainers/TestContainers.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)../../Shared.msbuild" />
</Project>
0 ...tainers/Core/Containers/RedisContainer.cs → ...containers.Module.Redis/RedisContainer.cs
View file
Open in desktop
File renamed without changes.
13 changes: 13 additions & 0 deletions src/Testcontainers.Module.Redis/Testcontainers.Module.Redis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Testcontainers.Core.Containers</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../TestContainers/TestContainers.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="StackExchange.Redis" Version="1.2.6" />
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)../../Shared.msbuild" />
</Project>
5 changes: 4 additions & 1 deletion test/TestContainers.Tests/TestContainers.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@
<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.6.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
<PackageReference Include="MySql.Data" Version="6.10.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../../src/TestContainers/TestContainers.csproj" />
<ProjectReference Include="../../src/Testcontainers.Module.MySql/Testcontainers.Module.MySql.csproj" />
<ProjectReference Include="../../src/Testcontainers.Module.PostgreSQL/Testcontainers.Module.PostgreSQL.csproj" />
<ProjectReference Include="../../src/Testcontainers.Module.RabbitMQ/Testcontainers.Module.RabbitMQ.csproj" />
<ProjectReference Include="../../src/Testcontainers.Module.Redis/Testcontainers.Module.Redis.csproj" />
</ItemGroup>
<Target Name="CopyRedisConfig" AfterTargets="AfterBuild">
<Copy SourceFiles="../RedisConfigs/master-6379.conf" DestinationFolder="$(Outdir)" />
Expand Down