Fixes

docker-compose.override.yml

@@ -62,6 +62,10 @@ services:
     ports:
       - "5115:80"
 
+  tenantacustomisation:
+    ports:
+      - "5116:80"
+
   basket.api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development

docker-compose.yml

@@ -43,6 +43,12 @@ services:
     depends_on:
       - sql.data
 
+  tenantacustomisation:
+    image:  ${REGISTRY:-eshop}/tenantacustomisation:${PLATFORM:-linux}-${TAG:-latest}
+    build:
+      context: .
+      dockerfile: src/Services/TenantCustomisations/TenantACustomisations/Dockerfile
+
   catalog.api:
     image: ${REGISTRY:-eshop}/catalog.api:${PLATFORM:-linux}-${TAG:-latest}
     build:

eShopOnContainers-ServicesAndWebApps.sln

@@ -156,7 +156,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TenantManager", "src\Servic
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TenantCustomisations", "TenantCustomisations", "{773A0C2A-CA6F-4D4A-860B-C518EFA6FACB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TenantACustomisations", "src\Services\TenantACustomisations\TenantACustomisations.csproj", "{58221C04-F14C-47E3-A802-E5979B4A5630}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TenantACustomisations", "src\Services\TenantCustomisations\TenantACustomisations\TenantACustomisations.csproj", "{76651DAE-FF27-44A4-AF84-34689E2FFDF2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1852,54 +1852,54 @@ Global
 		{9C101827-119D-44EE-B0F0-94E7ABA8AE6A}.Release|x64.Build.0 = Release|Any CPU
 		{9C101827-119D-44EE-B0F0-94E7ABA8AE6A}.Release|x86.ActiveCfg = Release|Any CPU
 		{9C101827-119D-44EE-B0F0-94E7ABA8AE6A}.Release|x86.Build.0 = Release|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.AppStore|x64.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.AppStore|x86.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Debug|ARM.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Debug|x64.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Debug|x86.Build.0 = Debug|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Release|ARM.ActiveCfg = Release|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Release|ARM.Build.0 = Release|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Release|iPhone.Build.0 = Release|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Release|x64.ActiveCfg = Release|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Release|x64.Build.0 = Release|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Release|x86.ActiveCfg = Release|Any CPU
-		{58221C04-F14C-47E3-A802-E5979B4A5630}.Release|x86.Build.0 = Release|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.AppStore|x64.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.AppStore|x86.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Debug|ARM.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Debug|x64.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Debug|x86.Build.0 = Debug|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Release|ARM.ActiveCfg = Release|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Release|ARM.Build.0 = Release|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Release|iPhone.Build.0 = Release|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Release|x64.ActiveCfg = Release|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Release|x64.Build.0 = Release|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Release|x86.ActiveCfg = Release|Any CPU
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1969,7 +1969,7 @@ Global
 		{71587505-2945-4286-BF0B-BA4C004B0BA7} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
 		{9C101827-119D-44EE-B0F0-94E7ABA8AE6A} = {71587505-2945-4286-BF0B-BA4C004B0BA7}
 		{773A0C2A-CA6F-4D4A-860B-C518EFA6FACB} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
-		{58221C04-F14C-47E3-A802-E5979B4A5630} = {773A0C2A-CA6F-4D4A-860B-C518EFA6FACB}
+		{76651DAE-FF27-44A4-AF84-34689E2FFDF2} = {773A0C2A-CA6F-4D4A-860B-C518EFA6FACB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}

src/Services/TenantACustomisations/Dockerfile → src/Services/TenantCustomisations/TenantACustomisations/Dockerfile

@@ -48,7 +48,7 @@ COPY test/ServicesTests/LoadTest/LoadTest.csproj test/ServicesTests/LoadTest/
 RUN dotnet restore eShopOnContainers-ServicesAndWebApps.sln
 
 COPY . .
-WORKDIR /src/src/Services/TenantCustomisations/TenantACustomisations
+WORKDIR /src/src/Services/TenantCustomisations/TenantACustomisations 
 RUN dotnet publish --no-restore -c Release -o /app
 
 FROM build AS publish

src/Services/TenantACustomisations/Program.cs → src/Services/TenantCustomisations/TenantACustomisations/Program.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.eShopOnContainers.Services.TenantACustomisations;
 using Microsoft.Extensions.Configuration;
 using Serilog;
 using System;

src/Services/TenantACustomisations/TenantACustomisations.csproj → src/Services/TenantCustomisations/TenantACustomisations/TenantACustomisations.csproj

@@ -48,10 +48,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" />
-    <ProjectReference Include="..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" />
-    <ProjectReference Include="..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" />
-    <ProjectReference Include="..\..\BuildingBlocks\EventBus\IntegrationEventLogEF\IntegrationEventLogEF.csproj" />
+    <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" />
+    <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" />
+    <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" />
+    <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\IntegrationEventLogEF\IntegrationEventLogEF.csproj" />
   </ItemGroup>
 
   <ItemGroup>