Merge pull request #70 from rockfordlhotka/red22

Re-add docker-compose project
rockfordlhotka · Aug 10, 2022 · cc494d3 · cc494d3
2 parents 550363f + a0b1477
commit cc494d3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/Lab03/End/Gateway/Gateway.csproj b/src/Lab03/End/Gateway/Gateway.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <UserSecretsId>2e808f4a-4930-458c-90f8-778515ffb859</UserSecretsId>
+    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Lab03/End/ServicesDemo.sln b/src/Lab03/End/ServicesDemo.sln
@@ -1,21 +1,23 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31410.357
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32728.150
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gateway", "Gateway\Gateway.csproj", "{C84069C4-CBF5-4386-8DB1-50F148221282}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gateway", "Gateway\Gateway.csproj", "{C84069C4-CBF5-4386-8DB1-50F148221282}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BreadService", "BreadService\BreadService.csproj", "{B7F7FEF6-81FF-4DFD-B62A-F1B857DDA2CE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BreadService", "BreadService\BreadService.csproj", "{B7F7FEF6-81FF-4DFD-B62A-F1B857DDA2CE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CheeseService", "CheeseService\CheeseService.csproj", "{C53DD878-72A3-4A70-A452-9D096A6D6A0F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CheeseService", "CheeseService\CheeseService.csproj", "{C53DD878-72A3-4A70-A452-9D096A6D6A0F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LettuceService", "LettuceService\LettuceService.csproj", "{61ACA271-DD02-4AD7-950A-F6A4C2D1E8BB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LettuceService", "LettuceService\LettuceService.csproj", "{61ACA271-DD02-4AD7-950A-F6A4C2D1E8BB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeatService", "MeatService\MeatService.csproj", "{BE5871AD-4D06-4193-8E45-E52B6F6AD9E4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MeatService", "MeatService\MeatService.csproj", "{BE5871AD-4D06-4193-8E45-E52B6F6AD9E4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitQueue", "RabbitQueue\RabbitQueue.csproj", "{6C318770-C8B5-43A4-A5EE-7074B3C4B15A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RabbitQueue", "RabbitQueue\RabbitQueue.csproj", "{6C318770-C8B5-43A4-A5EE-7074B3C4B15A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SandwichMaker", "SandwichMaker\SandwichMaker.csproj", "{AB364D4F-E098-4416-BFD2-7823D8577302}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SandwichMaker", "SandwichMaker\SandwichMaker.csproj", "{AB364D4F-E098-4416-BFD2-7823D8577302}"
+EndProject
+Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{4B0B0105-BCAA-4BB3-92E7-85A953B94EAF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,6 +53,10 @@ Global
 		{AB364D4F-E098-4416-BFD2-7823D8577302}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AB364D4F-E098-4416-BFD2-7823D8577302}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AB364D4F-E098-4416-BFD2-7823D8577302}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B0B0105-BCAA-4BB3-92E7-85A953B94EAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B0B0105-BCAA-4BB3-92E7-85A953B94EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B0B0105-BCAA-4BB3-92E7-85A953B94EAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B0B0105-BCAA-4BB3-92E7-85A953B94EAF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE