From 35edba737102cfce1eb8395466be640acda6e5d8 Mon Sep 17 00:00:00 2001 From: rafsanulhasan Date: Sat, 1 Sep 2018 14:04:02 +0600 Subject: [PATCH 01/24] a. Updated NuGet References to support ASP.NET Core 2.1.3 1. Microsoft.ApplicationInsights.AspNetCore 2.2.1->2.4.1 2. Microsoft.ApplicationInsights.DependencyCollector 2.6.1-> 2.7.2 3. Microsoft.ApplicationInsights.ServiceFabric 2.1.1-beta1->2.1.1 4. Microsoft.Extensions.Logging.AzureAppServices 2.1.0-> 2.1.1 5. Microsoft.AspNetCore.App 2.1.0->2.1.3 6. Microsoft.VisualStudio.Azure.Fabric.MSBuild 1.6.5->1.6.7 7. Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.SqlServer 2.1.0->2.1.2 8. Microsoft.AspNetCore.Hosting 2.1.0->2.1.1 9. Microsoft.Extensions.Logging 2.1.0->2.1.1 10. Polly 6.0.1->6.1.0 11. Microsoft.Extensions.Http.Polly 2.1.0->2.1.1 12. Microsoft.AspNetCore.DataProtection.Redis 0.3.3->0.4.1 13. Microsoft.Extensions.Configuration.AzureKeyVault 2.1.0-->2.1.1 14. Swashbuckle.AspNetCore 1.1.0->2.4.0 b. Updated NuGet packages 1. BuildBundleMinifier 2.6.375->2.8.391 2. Microsoft.ApplicationInsights.Kubernetes 1.0.0-beta8->1.0.0-beta9 --- src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj | 21 +- .../Mobile.Shopping.HttpAggregator.csproj | 29 +- .../Web.Shopping.HttpAggregator.csproj | 31 +- .../Basket/Basket.API/Basket.API.csproj | 59 ++-- .../Catalog/Catalog.API/Catalog.API.csproj | 14 +- .../Locations.API/Locations.API.csproj | 57 +-- .../Marketing.API/Marketing.API.csproj | 99 +++--- .../Ordering/Ordering.API/Ordering.API.csproj | 99 +++--- .../Ordering.BackgroundTasks.csproj | 49 +-- .../Ordering.Infrastructure.csproj | 28 +- .../Ordering.SignalrHub.csproj | 49 +-- .../Payment/Payment.API/Payment.API.csproj | 47 +-- src/Web/WebMVC/WebMVC.csproj | 95 ++--- src/Web/WebSPA/WebSPA.csproj | 329 +++++++++--------- src/Web/WebStatus/WebStatus.csproj | 35 +- 15 files changed, 527 insertions(+), 514 deletions(-) diff --git a/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj b/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj index d3b1a049b..9ab762c58 100644 --- a/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj +++ b/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj @@ -1,15 +1,16 @@  - - netcoreapp2.1 - + + netcoreapp2.1 + 2.1.3 + - - - + + + - - - - + + + + diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj index d49c6a18f..42211afd3 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj @@ -1,20 +1,21 @@  - - netcoreapp2.1 - Mobile.Shopping.HttpAggregator - Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator - ..\..\..\docker-compose.dcproj - + + netcoreapp2.1 + 2.1.3 + Mobile.Shopping.HttpAggregator + Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator + ..\..\..\docker-compose.dcproj + - - - + + + - - - - - + + + + + diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj index 7a0f6cc01..df2eb1069 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj @@ -1,21 +1,22 @@  - - netcoreapp2.1 - Web.Shopping.HttpAggregator - Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator - ..\..\..\docker-compose.dcproj - + + netcoreapp2.1 + 2.1.3 + Web.Shopping.HttpAggregator + Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator + ..\..\..\docker-compose.dcproj + - - - + + + - - - - - - + + + + + + diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index 36fc95496..255facfb9 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -1,36 +1,37 @@  - - netcoreapp2.1 - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - ..\..\..\..\docker-compose.dcproj - + + netcoreapp2.1 + 2.1.3 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + ..\..\..\..\docker-compose.dcproj + - - - PreserveNewest - - + + + PreserveNewest + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj index 90abe593a..51f7d2148 100644 --- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj +++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj @@ -35,13 +35,13 @@ - - - - - - - + + + + + + + diff --git a/src/Services/Location/Locations.API/Locations.API.csproj b/src/Services/Location/Locations.API/Locations.API.csproj index 9ca1205eb..9613071cf 100644 --- a/src/Services/Location/Locations.API/Locations.API.csproj +++ b/src/Services/Location/Locations.API/Locations.API.csproj @@ -1,32 +1,33 @@  - - netcoreapp2.1 - ..\..\..\..\docker-compose.dcproj - aspnet-Locations.API-20161122013619 - - - - - - - - - - - - - - - - - - - - - - - - + + netcoreapp2.1 + 2.1.3 + ..\..\..\..\docker-compose.dcproj + aspnet-Locations.API-20161122013619 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Services/Marketing/Marketing.API/Marketing.API.csproj b/src/Services/Marketing/Marketing.API/Marketing.API.csproj index c65da0eee..a4544d258 100644 --- a/src/Services/Marketing/Marketing.API/Marketing.API.csproj +++ b/src/Services/Marketing/Marketing.API/Marketing.API.csproj @@ -1,55 +1,56 @@  - - netcoreapp2.1 - ..\..\..\..\docker-compose.dcproj - Microsoft.eShopOnContainers.Services.Marketing.API - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - aspnet-Marketing.API-20161122013619 - - /subscriptions/6c22bb55-0221-4ce4-9bf1-3c4a10a7294c/resourcegroups/eshop-log/providers/microsoft.insights/components/eshopappinsights - /subscriptions/6c22bb55-0221-4ce4-9bf1-3c4a10a7294c/resourcegroups/eshop-log/providers/microsoft.insights/components/eshopappinsights - + + netcoreapp2.1 + 2.1.3 + ..\..\..\..\docker-compose.dcproj + Microsoft.eShopOnContainers.Services.Marketing.API + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + aspnet-Marketing.API-20161122013619 + + /subscriptions/6c22bb55-0221-4ce4-9bf1-3c4a10a7294c/resourcegroups/eshop-log/providers/microsoft.insights/components/eshopappinsights + /subscriptions/6c22bb55-0221-4ce4-9bf1-3c4a10a7294c/resourcegroups/eshop-log/providers/microsoft.insights/components/eshopappinsights + - - - - - PreserveNewest - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + - - - PreserveNewest - - + + + PreserveNewest + + - - - + + + diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj index 11b2d13f9..6164a0ca4 100644 --- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -1,56 +1,57 @@  - - netcoreapp2.1 - aspnet-Ordering.API-20161122013547 - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - ..\..\..\..\docker-compose.dcproj - + + netcoreapp2.1 + 2.1.3 + aspnet-Ordering.API-20161122013547 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + ..\..\..\..\docker-compose.dcproj + - - - PreserveNewest - - - PreserveNewest - - + + + PreserveNewest + + + PreserveNewest + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj index 5ca8b4b3b..c5d9df46e 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj @@ -1,31 +1,32 @@  - - netcoreapp2.1 - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - ..\..\..\..\docker-compose.dcproj - + + netcoreapp2.1 + 2.1.3 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + ..\..\..\..\docker-compose.dcproj + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + diff --git a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj index 72cd00442..ca22afadc 100644 --- a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj +++ b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj @@ -1,21 +1,21 @@  - - netstandard2.0 - + + netstandard2.0 + - - - + + + - - - - - + + + + + - - - + + + diff --git a/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj b/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj index fad53bbcf..748b126af 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj +++ b/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj @@ -1,31 +1,32 @@  - - netcoreapp2.1 - ..\..\..\..\docker-compose.dcproj - + + netcoreapp2.1 + 2.1.3 + ..\..\..\..\docker-compose.dcproj + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + diff --git a/src/Services/Payment/Payment.API/Payment.API.csproj b/src/Services/Payment/Payment.API/Payment.API.csproj index 061e5f237..b0fbbe33e 100644 --- a/src/Services/Payment/Payment.API/Payment.API.csproj +++ b/src/Services/Payment/Payment.API/Payment.API.csproj @@ -1,28 +1,29 @@  - - netcoreapp2.1 - ..\..\..\..\docker-compose.dcproj - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - + + netcoreapp2.1 + 2.1.3 + ..\..\..\..\docker-compose.dcproj + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index 1426517d3..1bdf54b97 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -1,51 +1,52 @@  - - netcoreapp2.1 - aspnet-Microsoft.eShopOnContainers-946ae052-8305-4a99-965b-ec8636ddbae3 - ..\..\..\docker-compose.dcproj - - - - - PreserveNewest - PreserveNewest - - - PreserveNewest - PreserveNewest - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + netcoreapp2.1 + 2.1.3 + aspnet-Microsoft.eShopOnContainers-946ae052-8305-4a99-965b-ec8636ddbae3 + ..\..\..\docker-compose.dcproj + + + + + PreserveNewest + PreserveNewest + + + PreserveNewest + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj index 3f6e188c3..e7220dadf 100644 --- a/src/Web/WebSPA/WebSPA.csproj +++ b/src/Web/WebSPA/WebSPA.csproj @@ -1,102 +1,103 @@  - - netcoreapp2.1 - aspnetcorespa-c23d27a4-eb88-4b18-9b77-2a93f3b15119 - ..\..\..\docker-compose.dcproj - false - true - wwwroot/dist/** - $(DefaultItemExcludes);$(GeneratedItemPatterns) - + + netcoreapp2.1 + 2.1.3 + aspnetcorespa-c23d27a4-eb88-4b18-9b77-2a93f3b15119 + ..\..\..\docker-compose.dcproj + false + true + wwwroot/dist/** + $(DefaultItemExcludes);$(GeneratedItemPatterns) + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + - - - - - - - - - - + + + + + + + + + + - - + - - - - + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj index 39e945291..3c694cb30 100644 --- a/src/Web/WebStatus/WebStatus.csproj +++ b/src/Web/WebStatus/WebStatus.csproj @@ -1,21 +1,22 @@  - - netcoreapp2.1 - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - ..\..\..\docker-compose.dcproj - - - - - - - - - + + netcoreapp2.1 + 2.1.3 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + ..\..\..\docker-compose.dcproj + + + + + + + + + - - - - + + + + From bc7e8e7b584e10ad2f9ae871cf360f56fe535100 Mon Sep 17 00:00:00 2001 From: rafsanulhasan Date: Sat, 1 Sep 2018 14:06:09 +0600 Subject: [PATCH 02/24] Update Linux container images: 1. runtime 2.1->2.1.3 2. sdk 2.1->2.1.401 --- src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile | 4 ++-- src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile | 4 ++-- src/Services/Catalog/Catalog.API/Dockerfile | 4 ++-- src/Services/Identity/Identity.API/Dockerfile | 4 ++-- src/Services/Location/Locations.API/Dockerfile | 4 ++-- src/Services/Marketing/Marketing.API/Dockerfile | 4 ++-- src/Services/Ordering/Ordering.API/Dockerfile | 4 ++-- src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile | 4 ++-- src/Services/Ordering/Ordering.SignalrHub/Dockerfile | 4 ++-- src/Services/Payment/Payment.API/Dockerfile | 4 ++-- src/Web/WebMVC/Dockerfile | 4 ++-- src/Web/WebSPA/Dockerfile | 4 ++-- src/Web/WebStatus/Dockerfile | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile index 7787dd159..b955542f9 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile @@ -1,8 +1,8 @@ -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.1.401-sdk AS build WORKDIR /src COPY . . WORKDIR /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile index d4940d436..c9572c9ab 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile @@ -1,8 +1,8 @@ -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.1.401-sdk AS build WORKDIR /src COPY . . WORKDIR /src/src/ApiGateways/Web.Bff.Shopping/aggregator diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile index 4cbc9c8aa..e21218e69 100644 --- a/src/Services/Catalog/Catalog.API/Dockerfile +++ b/src/Services/Catalog/Catalog.API/Dockerfile @@ -1,8 +1,8 @@ -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.1.401-sdk AS build WORKDIR /src COPY . . WORKDIR /src/src/Services/Catalog/Catalog.API diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile index 3931a135b..4841f89e5 100644 --- a/src/Services/Identity/Identity.API/Dockerfile +++ b/src/Services/Identity/Identity.API/Dockerfile @@ -1,9 +1,9 @@ ARG NODE_IMAGE=node:8.11 -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk as dotnet-build +FROM microsoft/dotnet:2.1.401-sdk as dotnet-build WORKDIR /src FROM ${NODE_IMAGE} as node-build diff --git a/src/Services/Location/Locations.API/Dockerfile b/src/Services/Location/Locations.API/Dockerfile index 12ac0e442..2e4d7c4a9 100644 --- a/src/Services/Location/Locations.API/Dockerfile +++ b/src/Services/Location/Locations.API/Dockerfile @@ -1,8 +1,8 @@ -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.1.401-sdk AS build WORKDIR /src COPY . . WORKDIR /src/src/Services/Location/Locations.API diff --git a/src/Services/Marketing/Marketing.API/Dockerfile b/src/Services/Marketing/Marketing.API/Dockerfile index 75d698bfe..be3141fb2 100644 --- a/src/Services/Marketing/Marketing.API/Dockerfile +++ b/src/Services/Marketing/Marketing.API/Dockerfile @@ -1,8 +1,8 @@ -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.1.401-sdk AS build WORKDIR /src COPY . . WORKDIR /src/src/Services/Marketing/Marketing.API diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile index 78c153641..af1adb170 100644 --- a/src/Services/Ordering/Ordering.API/Dockerfile +++ b/src/Services/Ordering/Ordering.API/Dockerfile @@ -1,8 +1,8 @@ -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.1.401-sdk AS build WORKDIR /src COPY . . WORKDIR /src/src/Services/Ordering/Ordering.API diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile index 0c01dcb96..d8ed0edb3 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile @@ -1,8 +1,8 @@ -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.1.401-sdk AS build WORKDIR /src COPY . . WORKDIR /src/src/Services/Ordering/Ordering.BackgroundTasks diff --git a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile index 367b8db36..4d6083d5f 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile +++ b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile @@ -1,8 +1,8 @@ -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.1.401-sdk AS build WORKDIR /src COPY . . WORKDIR /src/src/Services/Ordering/Ordering.SignalrHub diff --git a/src/Services/Payment/Payment.API/Dockerfile b/src/Services/Payment/Payment.API/Dockerfile index d644417c6..8bea8a1ef 100644 --- a/src/Services/Payment/Payment.API/Dockerfile +++ b/src/Services/Payment/Payment.API/Dockerfile @@ -1,8 +1,8 @@ -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.1.401-sdk AS build WORKDIR /src COPY . . WORKDIR /src/src/Services/Payment/Payment.API diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile index 9847ad772..d9f54151c 100644 --- a/src/Web/WebMVC/Dockerfile +++ b/src/Web/WebMVC/Dockerfile @@ -1,9 +1,9 @@ ARG NODE_IMAGE=node:8.11 -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk as dotnet-build +FROM microsoft/dotnet:2.1.401-sdk as dotnet-build WORKDIR /src FROM ${NODE_IMAGE} as node-build diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile index 4e806786c..0ddfd4040 100644 --- a/src/Web/WebSPA/Dockerfile +++ b/src/Web/WebSPA/Dockerfile @@ -1,9 +1,9 @@ ARG NODE_IMAGE=node:8.11 -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk as dotnet-build +FROM microsoft/dotnet:2.1.401-sdk as dotnet-build WORKDIR /src FROM ${NODE_IMAGE} as node-build diff --git a/src/Web/WebStatus/Dockerfile b/src/Web/WebStatus/Dockerfile index 10cfa25e5..4ba896750 100644 --- a/src/Web/WebStatus/Dockerfile +++ b/src/Web/WebStatus/Dockerfile @@ -1,8 +1,8 @@ -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.1.401-sdk AS build WORKDIR /src COPY . . WORKDIR /src/src/Web/WebStatus From d04a7a1c0efc2435d2756b565c29bb6aede198c6 Mon Sep 17 00:00:00 2001 From: rafsanulhasan Date: Sat, 1 Sep 2018 14:07:09 +0600 Subject: [PATCH 03/24] Update Linux container images: 1. runtime 2.1->2.1.3 2. sdk 2.1->2.1.401 --- src/ApiGateways/ApiGw-Base/Dockerfile | 4 ++-- src/Services/Basket/Basket.API/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ApiGateways/ApiGw-Base/Dockerfile b/src/ApiGateways/ApiGw-Base/Dockerfile index 7fdd5f073..3126d6e37 100644 --- a/src/ApiGateways/ApiGw-Base/Dockerfile +++ b/src/ApiGateways/ApiGw-Base/Dockerfile @@ -1,8 +1,8 @@ -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base +FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.1.401-sdk AS build WORKDIR /src COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/ RUN dotnet restore src/ApiGateways/ApiGw-Base/ diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile index 7027cfc2d..00c00e8d6 100644 --- a/src/Services/Basket/Basket.API/Dockerfile +++ b/src/Services/Basket/Basket.API/Dockerfile @@ -2,7 +2,7 @@ FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.1.304-sdk AS build WORKDIR /src COPY . . WORKDIR /src/src/Services/Basket/Basket.API From bde315d278e8718e0caeff29c35f9da3114995af Mon Sep 17 00:00:00 2001 From: rafsanulhasan Date: Sat, 1 Sep 2018 14:08:59 +0600 Subject: [PATCH 04/24] a. Updated NuGet References to support ASP.NET Core 2.1.3 1. Microsoft.ApplicationInsights.AspNetCore 2.2.1->2.4.1 2. Microsoft.ApplicationInsights.DependencyCollector 2.6.1-> 2.7.2 3. Microsoft.ApplicationInsights.ServiceFabric 2.1.1-beta1->2.1.1 4. Microsoft.Extensions.Logging.AzureAppServices 2.1.0-> 2.1.1 5. Microsoft.AspNetCore.App 2.1.0->2.1.3 6. Microsoft.VisualStudio.Azure.Fabric.MSBuild 1.6.5->1.6.7 7. Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.SqlServer 2.1.0->2.1.2 8. Microsoft.AspNetCore.Hosting 2.1.0->2.1.1 9. Microsoft.Extensions.Logging 2.1.0->2.1.1 10. Polly 6.0.1->6.1.0 11. Microsoft.Extensions.Http.Polly 2.1.0->2.1.1 12. Microsoft.AspNetCore.DataProtection.Redis 0.3.3->0.4.1 13. Microsoft.Extensions.Configuration.AzureKeyVault 2.1.0-->2.1.1 14. Swashbuckle.AspNetCore 1.1.0->2.4.0 b. Updated NuGet packages 1. BuildBundleMinifier 2.6.375->2.8.391 2. Microsoft.ApplicationInsights.Kubernetes 1.0.0-beta8->1.0.0-beta9 --- .../EventBus/EventBus/EventBus.csproj | 15 +++---- .../EventBusRabbitMQ/EventBusRabbitMQ.csproj | 33 ++++++++-------- .../EventBusServiceBus.csproj | 27 ++++++------- .../IntegrationEventLogEF.csproj | 29 +++++++------- .../Microsoft.AspNetCore.HealthChecks.csproj | 25 ++++++------ ...xtensions.HealthChecks.AzureStorage.csproj | 39 ++++++++++--------- ...t.Extensions.HealthChecks.SqlServer.csproj | 24 ++++++------ .../Microsoft.Extensions.HealthChecks.csproj | 29 +++++++------- .../WebHost.Customization.csproj | 15 +++---- 9 files changed, 122 insertions(+), 114 deletions(-) diff --git a/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj b/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj index 9704f6ff5..54e925ef7 100644 --- a/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj +++ b/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj @@ -1,12 +1,13 @@  - - netstandard2.0 - Microsoft.eShopOnContainers.BuildingBlocks.EventBus - + + netstandard2.0 + 2.1.3 + Microsoft.eShopOnContainers.BuildingBlocks.EventBus + - - - + + + \ No newline at end of file diff --git a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj index 06514ba41..0837aff75 100644 --- a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj +++ b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj @@ -1,22 +1,23 @@  - - netstandard2.0 - Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ - + + netstandard2.0 + 2.1.3 + Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ + - - - - - - - - - + + + + + + + + + - - - + + + \ No newline at end of file diff --git a/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj b/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj index 9eb4bd19a..589811c6c 100644 --- a/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj +++ b/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj @@ -1,19 +1,20 @@  - - netstandard2.0 - Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus - + + netstandard2.0 + 2.1.3 + Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus + - - - - - - + + + + + + - - - + + + \ No newline at end of file diff --git a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj index 5ffc3c9eb..c7ea277bc 100644 --- a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj +++ b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj @@ -1,19 +1,20 @@  - - netstandard2.0 - Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF - + + netstandard2.0 + 2.1.3 + Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj b/src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj index ce659345f..81ccc3493 100644 --- a/src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj +++ b/src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj @@ -1,19 +1,20 @@  - - netstandard2.0 - + + netstandard2.0 + 2.1.3 + - - - + + + - - - + + + - - - + + + \ No newline at end of file diff --git a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj index 844098052..870bf2ef2 100644 --- a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj +++ b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj @@ -1,26 +1,27 @@  - - netstandard2.0 - false - false - false - + + netstandard2.0 + 2.1.3 + false + false + false + - - - + + + - - - + + + - - - - - - - + + + + + + + diff --git a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj index 6217f6069..6ef30d59d 100644 --- a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj +++ b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj @@ -1,19 +1,19 @@  - - netstandard2.0 - + + netstandard2.0 + - - - + + + - - - + + + - - - + + + \ No newline at end of file diff --git a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj index 5e63cac75..3c029efc6 100644 --- a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj +++ b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj @@ -1,20 +1,21 @@  - - netstandard2.0 - + + netstandard2.0 + 2.1.3 + - - - + + + - - - - - - - - + + + + + + + + diff --git a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj index ad891e6bd..31cb22337 100644 --- a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj +++ b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj @@ -1,12 +1,13 @@  - - netcoreapp2.1 - + + netcoreapp2.1 + 2.1.3 + - - - - + + + + From e18c325fcf867384ce160d294d200e68c3f39a87 Mon Sep 17 00:00:00 2001 From: rafsanulhasan Date: Sat, 1 Sep 2018 14:09:18 +0600 Subject: [PATCH 05/24] a. Updated NuGet References to support ASP.NET Core 2.1.3 1. Microsoft.ApplicationInsights.AspNetCore 2.2.1->2.4.1 2. Microsoft.ApplicationInsights.DependencyCollector 2.6.1-> 2.7.2 3. Microsoft.ApplicationInsights.ServiceFabric 2.1.1-beta1->2.1.1 4. Microsoft.Extensions.Logging.AzureAppServices 2.1.0-> 2.1.1 5. Microsoft.AspNetCore.App 2.1.0->2.1.3 6. Microsoft.VisualStudio.Azure.Fabric.MSBuild 1.6.5->1.6.7 7. Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.SqlServer 2.1.0->2.1.2 8. Microsoft.AspNetCore.Hosting 2.1.0->2.1.1 9. Microsoft.Extensions.Logging 2.1.0->2.1.1 10. Polly 6.0.1->6.1.0 11. Microsoft.Extensions.Http.Polly 2.1.0->2.1.1 12. Microsoft.AspNetCore.DataProtection.Redis 0.3.3->0.4.1 13. Microsoft.Extensions.Configuration.AzureKeyVault 2.1.0-->2.1.1 14. Swashbuckle.AspNetCore 1.1.0->2.4.0 b. Updated NuGet packages 1. BuildBundleMinifier 2.6.375->2.8.391 2. Microsoft.ApplicationInsights.Kubernetes 1.0.0-beta8->1.0.0-beta9 --- .../Identity/Identity.API/Identity.API.csproj | 111 +++++++++--------- 1 file changed, 56 insertions(+), 55 deletions(-) diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index 96a45e5ef..ea7d6bd62 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -1,59 +1,60 @@  - - netcoreapp2.1 - aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5 - ..\..\..\..\docker-compose.dcproj - - - - - PreserveNewest - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - - - - + + netcoreapp2.1 + 2.1.3 + aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5 + ..\..\..\..\docker-compose.dcproj + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + + + + From 63b4e56ffea4cfaad17b896e448cba933f68a3a1 Mon Sep 17 00:00:00 2001 From: rafsanulhasan Date: Sat, 1 Sep 2018 14:32:21 +0600 Subject: [PATCH 06/24] Removed DotNetCliReferenceTools --- src/Services/Identity/Identity.API/Identity.API.csproj | 4 ---- src/Web/WebMVC/WebMVC.csproj | 5 ----- 2 files changed, 9 deletions(-) diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index ea7d6bd62..65705e8b4 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -32,10 +32,6 @@ - - - - diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index 1bdf54b97..9c97cf8fd 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -35,11 +35,6 @@ - - - - - From 9f4d34c9cff7d6770d88a61c37d57cdf8940d311 Mon Sep 17 00:00:00 2001 From: rafsanulhasan Date: Sat, 1 Sep 2018 14:34:30 +0600 Subject: [PATCH 07/24] =?UTF-8?q?Updated=20Test=20projects'=20NuGet=20refe?= =?UTF-8?q?rences=20to=20support=20ASP.NET=20Core=202.1.3=20=20=E2=80=A6?= =?UTF-8?q?=20=20=20=20=201.=20Microsoft.NET.Test.Sdk=2015.7.0->15.8.0=20?= =?UTF-8?q?=20=20=20=202.=20Microsoft.AspNetCore.TestHost=202.1.0->2.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Basket.FunctionalTests.csproj | 51 +++--- .../Basket.UnitTests/Basket.UnitTests.csproj | 33 ++-- .../Catalog.FunctionalTests.csproj | 77 ++++---- .../Catalog.UnitTests.csproj | 31 ++-- .../Locations.FunctionalTests.csproj | 45 ++--- .../Marketing.FunctionalTests.csproj | 47 ++--- .../Ordering.FunctionalTests.csproj | 51 +++--- .../Ordering.UnitTests.csproj | 37 ++-- .../Application.FunctionalTests.csproj | 167 +++++++++--------- 9 files changed, 274 insertions(+), 265 deletions(-) diff --git a/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj b/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj index 21c64158c..69a65a257 100644 --- a/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj +++ b/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj @@ -1,33 +1,34 @@  - - netcoreapp2.1 + + netcoreapp2.1 + 2.1.3 - false - + false + - - - + + + - - - PreserveNewest - - + + + PreserveNewest + + - - - - - - - - + + + + + + + + - - - - - + + + + + diff --git a/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj b/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj index cc2326841..55e54aabc 100644 --- a/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj +++ b/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj @@ -1,23 +1,24 @@  - - netcoreapp2.1 + + netcoreapp2.1 + 2.1.3 - false - + false + - - - - - - - - + + + + + + + + - - - - + + + + diff --git a/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj b/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj index a8e691e22..73815983a 100644 --- a/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj +++ b/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj @@ -1,47 +1,48 @@  - - netcoreapp2.1 + + netcoreapp2.1 + 2.1.3 - false - + false + - - - - - - - + + + + + + + - - - Always - - - Always - - - Always - - - Always - - - Always - - + + + Always + + + Always + + + Always + + + Always + + + Always + + - - - - - - - + + + + + + + - - - + + + diff --git a/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj b/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj index a336ba98d..f45f3d8ef 100644 --- a/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj +++ b/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj @@ -1,22 +1,23 @@  - - netcoreapp2.1 + + netcoreapp2.1 + 2.1.3 - false - + false + - - - - - - - + + + + + + + - - - - + + + + diff --git a/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj b/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj index 28a8bf0b4..21bf22ad3 100644 --- a/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj +++ b/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj @@ -1,31 +1,32 @@  - - netcoreapp2.1 + + netcoreapp2.1 + 2.1.3 - false - + false + - - - + + + - - - Always - - + + + Always + + - - - - - - - + + + + + + + - - - + + + diff --git a/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj b/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj index 9a5d833c8..da71e9349 100644 --- a/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj +++ b/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj @@ -1,32 +1,33 @@  - - netcoreapp2.1 + + netcoreapp2.1 + 2.1.3 - false - + false + - - - + + + - - - Always - - + + + Always + + - - - - - - - + + + + + + + - - - - + + + + diff --git a/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj b/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj index 23fff0c44..4d3d4d834 100644 --- a/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj +++ b/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj @@ -1,34 +1,35 @@  - - netcoreapp2.1 + + netcoreapp2.1 + 2.1.3 - false - + false + - - - + + + - - - Always - - + + + Always + + - - - - - - - + + + + + + + - - - - - - + + + + + + diff --git a/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj b/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj index ae35fa4ad..48a08cdb6 100644 --- a/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj +++ b/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj @@ -1,25 +1,26 @@  - - netcoreapp2.1 + + netcoreapp2.1 + 2.1.3 - false - + false + - - - - - - - - + + + + + + + + - - - - - - + + + + + + diff --git a/test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj b/test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj index fd3b506c7..5eb2d4ae9 100644 --- a/test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj +++ b/test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj @@ -1,95 +1,96 @@  - - netcoreapp2.1 - true - false - false - false - + + netcoreapp2.1 + 2.1.3 + true + false + false + false + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - PreserveNewest - - - PreserveNewest - - - Always - - - Always - - - Always - - - Always - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + + + PreserveNewest + + + PreserveNewest + + + Always + + + Always + + + Always + + + Always + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - PreserveNewest - - + + + PreserveNewest + + - - - + + + \ No newline at end of file From 58159a2cecec8bec87d9f7debede89273ff28188 Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:28:54 +0600 Subject: [PATCH 08/24] Delete docker-compose.override.yml --- docker-compose.override.yml | 329 ------------------------------------ 1 file changed, 329 deletions(-) delete mode 100644 docker-compose.override.yml diff --git a/docker-compose.override.yml b/docker-compose.override.yml deleted file mode 100644 index 284b518ab..000000000 --- a/docker-compose.override.yml +++ /dev/null @@ -1,329 +0,0 @@ -version: '3.4' - -# The default docker-compose.override file can use the "localhost" as the external name for testing web apps within the same dev machine. -# The ESHOP_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: -# ESHOP_EXTERNAL_DNS_NAME_OR_IP=localhost -# but values present in the environment vars at runtime will always override those defined inside the .env file -# An external IP or DNS name has to be used (instead localhost and the 10.0.75.1 IP) when testing the Web apps and the Xamarin apps from remote machines/devices using the same WiFi, for instance. - -services: - sql.data: - environment: - - SA_PASSWORD=Pass@word - - ACCEPT_EULA=Y - ports: - - "5433:1433" # Important: In a production environment your should remove the external port - - nosql.data: - ports: - - "27017:27017" # Important: In a production environment your should remove the external port - - basket.data: - ports: - - "6379:6379" # Important: In a production environment your should remove the external port - - rabbitmq: - ports: - - "15672:15672" # Important: In a production environment your should remove the external port - - "5672:5672" # Important: In a production environment your should remove the external port - - identity.api: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - ASPNETCORE_URLS=http://+:80;https://+:443 - - SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104;http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:4104 - - XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:4105/xamarincallback #localhost do not work for UWP login, so we have to use "external" IP always - - ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word} - - MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your local dev-machine firewall at range 5100-5110. - - LocationApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5109 - - MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110 - - BasketApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103 - - OrderingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102 - - MobileShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120 - - WebShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121 - - UseCustomizationData=True - - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - - OrchestratorType=${ORCHESTRATOR_TYPE} - ports: - - "5105:80" - - "4105:443" - volumes: - - ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:rw - - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:rw - - basket.api: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - ASPNETCORE_URLS=http://0.0.0.0:80 - - ConnectionString=${ESHOP_AZURE_REDIS_BASKET_DB:-basket.data} - - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. - - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105 - - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq} - - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME} - - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD} - - AzureServiceBusEnabled=False - - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - - OrchestratorType=${ORCHESTRATOR_TYPE} - - UseLoadTest=${USE_LOADTEST:-False} - - ports: - - "5103:80" # Important: In a production environment your should remove the external port (5103) kept here for microservice debugging purposes. - # The API Gateway redirects and access through the internal port (80). - - catalog.api: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - ASPNETCORE_URLS=http://0.0.0.0:80 - - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word} - - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG_URL:-http://localhost:5202/api/v1/c/catalog/items/[0]/pic/} #Local: You need to open your local dev-machine firewall at range 5100-5110. - - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq} - - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME} - - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD} - - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME} - - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY} - - UseCustomizationData=True - - AzureServiceBusEnabled=False - - AzureStorageEnabled=False - - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - - OrchestratorType=${ORCHESTRATOR_TYPE} - ports: - - "5101:80" # Important: In a production environment your should remove the external port (5101) kept here for microservice debugging purposes. - # The API Gateway redirects and access through the internal port (80). - - ordering.api: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - ASPNETCORE_URLS=http://0.0.0.0:80 - - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word} - - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. - - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105 - - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq} - - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME} - - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD} - - UseCustomizationData=True - - AzureServiceBusEnabled=False - - CheckUpdateTime=30000 - - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - - OrchestratorType=${ORCHESTRATOR_TYPE} - - UseLoadTest=${USE_LOADTEST:-False} - ports: - - "5102:80" # Important: In a production environment your should remove the external port (5102) kept here for microservice debugging purposes. - # The API Gateway redirects and access through the internal port (80). - - - ordering.backgroundtasks: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - ASPNETCORE_URLS=http://0.0.0.0:80 - - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word} - - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq} - - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME} - - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD} - - UseCustomizationData=True - - AzureServiceBusEnabled=False - - CheckUpdateTime=30000 - - GracePeriodTime=1 - - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - - OrchestratorType=${ORCHESTRATOR_TYPE} - - UseLoadTest=${USE_LOADTEST:-False} - ports: - - "5111:80" - - marketing.api: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - ASPNETCORE_URLS=http://0.0.0.0:80 - - ConnectionString=${ESHOP_AZURE_MARKETING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word} - - MongoConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data} - - MongoDatabase=MarketingDb - - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq} - - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME} - - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD} - - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. - - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105 - - CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI} - - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING_URL:-http://localhost:5110/api/v1/campaigns/[0]/pic/} - - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_MARKETING_NAME} - - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_MARKETING_KEY} - - AzureServiceBusEnabled=False - - AzureStorageEnabled=False - - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - - OrchestratorType=${ORCHESTRATOR_TYPE} - - UseLoadTest=${USE_LOADTEST:-False} - ports: - - "5110:80" # Important: In a production environment your should remove the external port (5110) kept here for microservice debugging purposes. - # The API Gateway redirects and access through the internal port (80). - - payment.api: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - ASPNETCORE_URLS=http://0.0.0.0:80 - - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq} - - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME} - - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD} - - AzureServiceBusEnabled=False - - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - - OrchestratorType=${ORCHESTRATOR_TYPE} - ports: - - "5108:80" # Important: In a production environment your should remove the external port (5108) kept here for microservice debugging purposes. - # The API Gateway redirects and access through the internal port (80). - - locations.api: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - ASPNETCORE_URLS=http://0.0.0.0:80 - - ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data} - - Database=LocationsDb - - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. - - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105 - - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq} - - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME} - - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD} - - AzureServiceBusEnabled=False - - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - - OrchestratorType=${ORCHESTRATOR_TYPE} - - UseLoadTest=${USE_LOADTEST:-False} - ports: - - "5109:80" # Important: In a production environment your should remove the external port (5109) kept here for microservice debugging purposes. - # The API Gateway redirects and access through the internal port (80). - - mobileshoppingapigw: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. - ports: - - "5200:80" - volumes: - - ./src/ApiGateways/Mobile.Bff.Shopping/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration} - - mobilemarketingapigw: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. - ports: - - "5201:80" - volumes: - - ./src/ApiGateways/Mobile.Bff.Marketing/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration} - - webshoppingapigw: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. - ports: - - "5202:80" - volumes: - - ./src/ApiGateways/Web.Bff.Shopping/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration} - - webmarketingapigw: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. - ports: - - "5203:80" - volumes: - - ./src/ApiGateways/Web.Bff.Marketing/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration} - - mobileshoppingagg: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - urls__basket=http://basket.api - - urls__catalog=http://catalog.api - - urls__orders=http://ordering.api - - urls__identity=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. - ports: - - "5120:80" # Important: In a production environment your should remove the external port (5120) kept here for microservice debugging purposes. - # The API Gateway redirects and access through the internal port (80). - - webshoppingagg: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - urls__basket=http://basket.api - - urls__catalog=http://catalog.api - - urls__orders=http://ordering.api - - urls__identity=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. - ports: - - "5121:80" # Important: In a production environment your should remove the external port (5121) kept here for microservice debugging purposes. - # The API Gateway redirects and access through the internal port (80). - - ordering.signalrhub: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - ASPNETCORE_URLS=http://0.0.0.0:80 - - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq} - - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME} - - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD} - - AzureServiceBusEnabled=False - - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - - OrchestratorType=${ORCHESTRATOR_TYPE} - - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. - ports: - - "5112:80" - - webstatus: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - ASPNETCORE_URLS=http://0.0.0.0:80 - - CatalogUrl=http://catalog.api/hc - - OrderingUrl=http://ordering.api/hc - - OrderingBackgroundTasksUrl=http://ordering.backgroundtasks/hc - - BasketUrl=http://basket.api/hc - - IdentityUrl=http://identity.api/hc - - LocationsUrl=http://locations.api/hc - - MarketingUrl=http://marketing.api/hc - - PaymentUrl=http://payment.api/hc - - mvc=http://webmvc/hc - - spa=http://webspa/hc - - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - - OrchestratorType=${ORCHESTRATOR_TYPE} - ports: - - "5107:80" - - webspa: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - ASPNETCORE_URLS=http://+:80;https://+:443 - - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:4105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. - - PurchaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202 - - MarketingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5203 - - CatalogUrlHC=http://catalog.api/hc - - OrderingUrlHC=http://ordering.api/hc - - IdentityUrlHC=http://identity.api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser. - - BasketUrlHC=http://basket.api/hc - - MarketingUrlHC=http://marketing.api/hc - - PaymentUrlHC=http://payment.api/hc - - UseCustomizationData=True - - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - - OrchestratorType=${ORCHESTRATOR_TYPE} - - SignalrHubUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202 - ports: - - "5104:80" - - "4104:443" - volumes: - - ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:rw - - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:rw - - webmvc: - environment: - - ASPNETCORE_ENVIRONMENT=Development - - ASPNETCORE_URLS=http://+:80;https://+:443 - - PurchaseUrl=http://webshoppingapigw - - IdentityUrl=http://10.0.75.1:4105 # Local Mac: Use http://docker.for.mac.localhost:5105 || Local Windows: Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. || #Remote access: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser. - - MarketingUrl=http://webmarketingapigw - - CatalogUrlHC=http://catalog.api/hc - - OrderingUrlHC=http://ordering.api/hc - - IdentityUrlHC=http://identity.api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser. - - BasketUrlHC=http://basket.api/hc - - MarketingUrlHC=http://marketing.api/hc - - PaymentUrlHC=http://payment.api/hc - - SignalrHubUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202 - - UseCustomizationData=True - - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY} - - OrchestratorType=${ORCHESTRATOR_TYPE} - - UseLoadTest=${USE_LOADTEST:-False} - ports: - - "5100:80" - - "4100:443" - volumes: - - ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:rw - - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:rw - From 01e13b3ed891b1db0004a51bacd32d088aced966 Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:30:13 +0600 Subject: [PATCH 09/24] Delete appsettings.localhost.json --- .../aggregator/appsettings.localhost.json | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.localhost.json diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.localhost.json b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.localhost.json deleted file mode 100644 index 08539a485..000000000 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.localhost.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "urls": { - "basket": "http://localhost:55105", - "catalog": "http://localhost:55101", - "orders": "http://localhost:55102", - "identity": "https://localhost:54105" - } -} From 79a26b9e42144257170ff3f1ea7de1b1fd22f183 Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:30:53 +0600 Subject: [PATCH 10/24] Delete appsettings.localhost.json --- .../aggregator/appsettings.localhost.json | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.localhost.json diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.localhost.json b/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.localhost.json deleted file mode 100644 index 08539a485..000000000 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.localhost.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "urls": { - "basket": "http://localhost:55105", - "catalog": "http://localhost:55101", - "orders": "http://localhost:55102", - "identity": "https://localhost:54105" - } -} From 393a4c90d4cb94d8983c9eb43b46ca656ef5748d Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:31:05 +0600 Subject: [PATCH 11/24] Delete appsettings.json --- .../Basket/Basket.API/appsettings.json | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 src/Services/Basket/Basket.API/appsettings.json diff --git a/src/Services/Basket/Basket.API/appsettings.json b/src/Services/Basket/Basket.API/appsettings.json deleted file mode 100644 index 70970cabd..000000000 --- a/src/Services/Basket/Basket.API/appsettings.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - }, - "IdentityUrl": "https://localhost:4105", - "ConnectionString": "127.0.0.1", - "AzureServiceBusEnabled": false, - "SubscriptionClientName": "Basket", - "ApplicationInsights": { - "InstrumentationKey": "" - }, - "EventBusRetryCount": 5, - "UseVault": false, - "Vault": { - "Name": "eshop", - "ClientId": "your-clien-id", - "ClientSecret": "your-client-secret" - } -} \ No newline at end of file From f7159d52e7f0a5a602561ea737f218ac466e2bc0 Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:31:32 +0600 Subject: [PATCH 12/24] Delete Dockerfile --- src/Services/Identity/Identity.API/Dockerfile | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 src/Services/Identity/Identity.API/Dockerfile diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile deleted file mode 100644 index 102fc8c13..000000000 --- a/src/Services/Identity/Identity.API/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -ARG NODE_IMAGE=node:8.11 -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base -WORKDIR /app -EXPOSE 80 -EXPOSE 443 - -FROM microsoft/dotnet:2.1-sdk as dotnet-build -WORKDIR /src - -FROM ${NODE_IMAGE} as node-build -WORKDIR /web -COPY src/Services/Identity/Identity.API . -RUN npm install -g bower@1.8.4 -RUN bower install --allow-root - -FROM dotnet-build as build -WORKDIR /src/src/Services/Identity/Identity.API/wwwroot -COPY --from=node-build /web/wwwroot . -WORKDIR /src -COPY ./Certificates/eShopOnContainers.pfx /root/.aspnet/https/ -COPY . . -WORKDIR /src/src/Services/Identity/Identity.API -RUN dotnet restore -nowarn:msb3202,nu1503 -RUN dotnet build --no-restore -c Release -o /app - -FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app - -FROM base AS final -WORKDIR /app -COPY --from=publish /app . -ENTRYPOINT ["dotnet", "Identity.API.dll"] From b219ead1c72c0bb5118adb992e4555c95e266b11 Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:32:27 +0600 Subject: [PATCH 13/24] Delete Startup.cs --- src/Services/Identity/Identity.API/Startup.cs | 179 ------------------ 1 file changed, 179 deletions(-) delete mode 100644 src/Services/Identity/Identity.API/Startup.cs diff --git a/src/Services/Identity/Identity.API/Startup.cs b/src/Services/Identity/Identity.API/Startup.cs deleted file mode 100644 index 22dd039a0..000000000 --- a/src/Services/Identity/Identity.API/Startup.cs +++ /dev/null @@ -1,179 +0,0 @@ -using Microsoft.eShopOnContainers.Services.Identity.API.Certificates; -using Microsoft.eShopOnContainers.Services.Identity.API.Data; -using Microsoft.eShopOnContainers.Services.Identity.API.Models; -using Microsoft.eShopOnContainers.Services.Identity.API.Services; - -namespace Microsoft.eShopOnContainers.Services.Identity.API -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public IServiceProvider ConfigureServices(IServiceCollection services) - { - RegisterAppInsights(services); - - // Add framework services. - services.AddDbContext(options => - options.UseSqlServer(Configuration["ConnectionString"], - sqlServerOptionsAction: sqlOptions => - { - sqlOptions.MigrationsAssembly(typeof(Startup).GetTypeInfo().Assembly.GetName().Name); - //Configuring Connection Resiliency: https://docs.microsoft.com/en-us/ef/core/miscellaneous/connection-resiliency - sqlOptions.EnableRetryOnFailure(maxRetryCount: 15, maxRetryDelay: TimeSpan.FromSeconds(30), errorNumbersToAdd: null); - })); - - services.AddIdentity() - .AddEntityFrameworkStores() - .AddDefaultTokenProviders(); - - services.Configure(Configuration); - - services.AddMvc(opts => - { - opts.SslPort = 4105; - opts.RequireHttpsPermanent = true; - }); - - services.AddHttpsRedirection(opts => - { - opts.HttpsPort = 4105; - }); - - if (Configuration.GetValue("IsClusterEnv") == bool.TrueString) - { - services.AddDataProtection(opts => - { - opts.ApplicationDiscriminator = "eshop.identity"; - }) - .PersistKeysToRedis(ConnectionMultiplexer.Connect(Configuration["DPConnectionString"]), "DataProtection-Keys"); - } - - services.AddHealthChecks(checks => - { - var minutes = 1; - if (int.TryParse(Configuration["HealthCheck:Timeout"], out var minutesParsed)) - { - minutes = minutesParsed; - } - checks.AddSqlCheck("Identity_Db", Configuration["ConnectionString"], TimeSpan.FromMinutes(minutes)); - }); - - services.AddTransient, EFLoginService>(); - services.AddTransient(); - - var connectionString = Configuration["ConnectionString"]; - var migrationsAssembly = typeof(Startup).GetTypeInfo().Assembly.GetName().Name; - - // Adds IdentityServer - services.AddIdentityServer(x => x.IssuerUri = "null") - .AddSigningCredential(Certificate.Get()) - .AddAspNetIdentity() - .AddConfigurationStore(options => - { - options.ConfigureDbContext = builder => builder.UseSqlServer(connectionString, - sqlServerOptionsAction: sqlOptions => - { - sqlOptions.MigrationsAssembly(migrationsAssembly); - //Configuring Connection Resiliency: https://docs.microsoft.com/en-us/ef/core/miscellaneous/connection-resiliency - sqlOptions.EnableRetryOnFailure(maxRetryCount: 15, maxRetryDelay: TimeSpan.FromSeconds(30), errorNumbersToAdd: null); - }); - }) - .AddOperationalStore(options => - { - options.ConfigureDbContext = builder => builder.UseSqlServer(connectionString, - sqlServerOptionsAction: sqlOptions => - { - sqlOptions.MigrationsAssembly(migrationsAssembly); - //Configuring Connection Resiliency: https://docs.microsoft.com/en-us/ef/core/miscellaneous/connection-resiliency - sqlOptions.EnableRetryOnFailure(maxRetryCount: 15, maxRetryDelay: TimeSpan.FromSeconds(30), errorNumbersToAdd: null); - }); - }) - .Services.AddTransient(); - - var container = new ContainerBuilder(); - container.Populate(services); - - return new AutofacServiceProvider(container.Build()); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) - { - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - loggerFactory.AddAzureWebAppDiagnostics(); - loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); - - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - app.UseDatabaseErrorPage(); - } - else - { - app.UseExceptionHandler("/Home/Error"); - app.UseHsts(); - } - - app.UseHttpsRedirection(); - - var pathBase = Configuration["PATH_BASE"]; - if (!string.IsNullOrEmpty(pathBase)) - { - loggerFactory.CreateLogger("init").LogDebug($"Using PATH BASE '{pathBase}'"); - app.UsePathBase(pathBase); - } - - -#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously - app.Map("/liveness", lapp => lapp.Run(async ctx => ctx.Response.StatusCode = 200)); -#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously - - app.UseStaticFiles(); - - - // Make work identity server redirections in Edge and lastest versions of browers. WARN: Not valid in a production environment. - app.Use(async (context, next) => - { - context.Response.Headers.Add("Content-Security-Policy", "script-src 'unsafe-inline'"); - await next(); - }); - - app.UseForwardedHeaders(); - // Adds IdentityServer - app.UseIdentityServer(); - - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); - } - - private void RegisterAppInsights(IServiceCollection services) - { - services.AddApplicationInsightsTelemetry(Configuration); - var orchestratorType = Configuration.GetValue("OrchestratorType"); - - if (orchestratorType?.ToUpper() == "K8S") - { - // Enable K8s telemetry initializer - services.EnableKubernetes(); - } - if (orchestratorType?.ToUpper() == "SF") - { - // Enable SF telemetry initializer - services.AddSingleton((serviceProvider) => - new FabricTelemetryInitializer()); - } - } - } -} From bca401475a44df9d9258b0e51915ed85ece6bbee Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:33:10 +0600 Subject: [PATCH 14/24] Delete appsettings.json --- .../Identity/Identity.API/appsettings.json | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 src/Services/Identity/Identity.API/appsettings.json diff --git a/src/Services/Identity/Identity.API/appsettings.json b/src/Services/Identity/Identity.API/appsettings.json deleted file mode 100644 index 40cf02804..000000000 --- a/src/Services/Identity/Identity.API/appsettings.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word;", - "IsClusterEnv": "False", - "MvcClient": "https://localhost:4100", - "SpaClient": "https://localhost:4104", - "XamarinCallback": "https://localhost:4105/xamarincallback", - "UseCustomizationData": false, - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Trace", - "System": "Information", - "Microsoft": "Information" - } - }, - "ApplicationInsights": { - "InstrumentationKey": "" - }, - "UseVault": false, - "Vault": { - "Name": "eshop", - "ClientId": "your-clien-id", - "ClientSecret": "your-client-secret" - }, - "Kestrel": { - "Certificates": { - "Default": { - "Path": "./Certificates/eShopOnContainers.pfx", - "Password": "D0tNet@" - } - } - } - -} From 68fb27a7831c8ce405d732eaafea08e32476728f Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:33:22 +0600 Subject: [PATCH 15/24] Delete appsettings.json --- .../Location/Locations.API/appsettings.json | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 src/Services/Location/Locations.API/appsettings.json diff --git a/src/Services/Location/Locations.API/appsettings.json b/src/Services/Location/Locations.API/appsettings.json deleted file mode 100644 index 603322578..000000000 --- a/src/Services/Location/Locations.API/appsettings.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "ConnectionString": "mongodb://nosql.data", - "Database": "LocationsDb", - "IdentityUrl": "https://localhost:4105", - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Trace", - "System": "Information", - "Microsoft": "Information" - } - }, - "AzureServiceBusEnabled": false, - "SubscriptionClientName": "Locations", - "ApplicationInsights": { - "InstrumentationKey": "" - }, - "EventBusRetryCount": 5, - "UseVault": false, - "Vault": { - "Name": "eshop", - "ClientId": "your-clien-id", - "ClientSecret": "your-client-secret" - } -} \ No newline at end of file From 117d9f67a3078c5087c59a2288e518e0836f8c89 Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:33:30 +0600 Subject: [PATCH 16/24] Delete appsettings.json --- .../Marketing/Marketing.API/appsettings.json | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 src/Services/Marketing/Marketing.API/appsettings.json diff --git a/src/Services/Marketing/Marketing.API/appsettings.json b/src/Services/Marketing/Marketing.API/appsettings.json deleted file mode 100644 index ece52a754..000000000 --- a/src/Services/Marketing/Marketing.API/appsettings.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Trace" - } - }, - "ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word", - "MongoConnectionString": "mongodb://nosql.data", - "MongoDatabase": "MarketingDb", - "IdentityUrl": "https://localhost:4105", - "PicBaseUrl": "http://localhost:5110/api/v1/campaigns/[0]/pic/", - "AzureServiceBusEnabled": false, - "SubscriptionClientName": "Marketing", - "AzureStorageEnabled": false, - "ApplicationInsights": { - "InstrumentationKey": "" - }, - "EventBusRetryCount": 5, - "UseVault": false, - "Vault": { - "Name": "eshop", - "ClientId": "your-clien-id", - "ClientSecret": "your-client-secret" - } -} \ No newline at end of file From a11bc8b8e3996443c8fb264fad331bc30b653709 Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:33:40 +0600 Subject: [PATCH 17/24] Delete appsettings.json --- .../Ordering/Ordering.API/appsettings.json | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 src/Services/Ordering/Ordering.API/appsettings.json diff --git a/src/Services/Ordering/Ordering.API/appsettings.json b/src/Services/Ordering/Ordering.API/appsettings.json deleted file mode 100644 index bd80e47cc..000000000 --- a/src/Services/Ordering/Ordering.API/appsettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;", - "IdentityUrl": "https://localhost:4105", - "UseCustomizationData": false, - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Trace", - "System": "Information", - "Microsoft": "Information" - } - }, - "AzureServiceBusEnabled": false, - "SubscriptionClientName": "Ordering", - "CheckUpdateTime": "30000", - "ApplicationInsights": { - "InstrumentationKey": "" - }, - "EventBusRetryCount": 5, - "EventBusConnection": "localhost", - "UseVault": false, - "Vault": { - "Name": "eshop", - "ClientId": "your-clien-id", - "ClientSecret": "your-client-secret" - } -} From 1bdb8bcbb1b0f4d4fe6409494f667ca23c06e6f5 Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:34:36 +0600 Subject: [PATCH 18/24] Delete appsettings.json --- .../Ordering/Ordering.SignalrHub/appsettings.json | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 src/Services/Ordering/Ordering.SignalrHub/appsettings.json diff --git a/src/Services/Ordering/Ordering.SignalrHub/appsettings.json b/src/Services/Ordering/Ordering.SignalrHub/appsettings.json deleted file mode 100644 index 8bf78a9d0..000000000 --- a/src/Services/Ordering/Ordering.SignalrHub/appsettings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "IdentityUrl": "https://localhost:4105", - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Trace", - "System": "Information", - "Microsoft": "Information" - } - }, - "AzureServiceBusEnabled": false, - "SubscriptionClientName": "Ordering.signalrhub", - "EventBusRetryCount": 5, - "EventBusConnection": "localhost" -} \ No newline at end of file From 51be43441499866866d6bf35d83e0679864b7f9e Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:35:45 +0600 Subject: [PATCH 19/24] Delete appsettings.json --- src/Web/WebMVC/appsettings.json | 36 --------------------------------- 1 file changed, 36 deletions(-) delete mode 100644 src/Web/WebMVC/appsettings.json diff --git a/src/Web/WebMVC/appsettings.json b/src/Web/WebMVC/appsettings.json deleted file mode 100644 index 05a1f35c3..000000000 --- a/src/Web/WebMVC/appsettings.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "CatalogUrl": "http://localhost:5101", - "OrderingUrl": "http://localhost:5102", - "BasketUrl": "http://localhost:5103", - "MarketingUrl": "http://localhost:5110", - "IdentityUrl": "https://localhost:4105", - "CallBackUrl": "https://localhost:4100/", - "LocationsUrl": "http://localhost:5109/", - "IsClusterEnv": "False", - "UseResilientHttp": "True", - "UseLoadTest": false, - "ActivateCampaignDetailFunction": "False", - "UseCustomizationData": false, - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Trace", - "System": "Information", - "Microsoft": "Information" - } - }, - "ApplicationInsights": { - "InstrumentationKey": "" - }, - "HttpClientRetryCount": 8, - "HttpClientExceptionsAllowedBeforeBreaking": 7, - "Kestrel": { - "Certificates": { - "Default": { - "Path": "./Certificates/eShopOnContainers.pfx", - "Password": "D0tNet@" - } - } - } - -} \ No newline at end of file From 0b2dc64f873343d675116febf8a617b83e04077f Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:36:08 +0600 Subject: [PATCH 20/24] Delete Dockerfile --- src/Web/WebSPA/Dockerfile | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 src/Web/WebSPA/Dockerfile diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile deleted file mode 100644 index 9a03bce6d..000000000 --- a/src/Web/WebSPA/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -ARG NODE_IMAGE=node:8.11 -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base -WORKDIR /app -EXPOSE 80 -EXPOSE 443 - -FROM microsoft/dotnet:2.1-sdk as dotnet-build -WORKDIR /src - -FROM ${NODE_IMAGE} as node-build -WORKDIR /web -COPY src/Web/WebSPA . -RUN npm install -RUN npm run build:prod - -FROM dotnet-build as publish -WORKDIR /src/src/Web/WebSPA/wwwroot -COPY --from=node-build /web/wwwroot . -WORKDIR /src -COPY ./Certificates/eShopOnContainers.pfx /root/.aspnet/https/ -COPY . . -WORKDIR /src/src/Web/WebSPA -RUN dotnet publish -c Release -o /app - -FROM base AS final -WORKDIR /app -COPY --from=publish /app . -ENTRYPOINT ["dotnet", "WebSPA.dll"] From 218b97b274a139c986d6207d5c153648e8ba621d Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:36:51 +0600 Subject: [PATCH 21/24] Delete appsettings.json --- src/Web/WebStatus/appsettings.json | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 src/Web/WebStatus/appsettings.json diff --git a/src/Web/WebStatus/appsettings.json b/src/Web/WebStatus/appsettings.json deleted file mode 100644 index 1e04ced4e..000000000 --- a/src/Web/WebStatus/appsettings.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - }, - "OrderingUrl": "http://localhost:5102/hc", - "OrderingBackgroundTasksUrl": "http://localhost:5111/hc", - "BasketUrl": "http://localhost:5103/hc", - "CatalogUrl": "http://localhost:5101/hc", - "IdentityUrl": "https://localhost:4105/hc", - "MarketingUrl": "http://localhost:5110/hc", - "LocationsUrl": "http://localhost:5109/hc", - "PaymentUrl": "http://localhost:5108/hc", - "ApplicationInsights": { - "InstrumentationKey": "" - } -} From 2ec4e41e43303933fec49b9e67acde044e9436ac Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:37:05 +0600 Subject: [PATCH 22/24] Delete appsettings.json --- src/Web/WebSPA/appsettings.json | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 src/Web/WebSPA/appsettings.json diff --git a/src/Web/WebSPA/appsettings.json b/src/Web/WebSPA/appsettings.json deleted file mode 100644 index d843edeec..000000000 --- a/src/Web/WebSPA/appsettings.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "IdentityUrl": "https://localhost:4105", - "MarketingUrl": "http://localhost:5110", - "CallBackUrl": "https://localhost:4104/", - "PurchaseUrl": "http://localhost:5200", - "UseCustomizationData": true, - "IsClusterEnv": "False", - "ActivateCampaignDetailFunction": true, - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - }, - "ApplicationInsights": { - "InstrumentationKey": "" - }, - "Kestrel": { - "Certificates": { - "Default": { - "Path": "./Certificates/eShopOnContainers.pfx", - "Password": "D0tNet@" - } - } - } - -} \ No newline at end of file From 22053e33b4a13a028f51f2c83582bab1c1db5b0f Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:37:44 +0600 Subject: [PATCH 23/24] Delete Dockerfile --- src/Web/WebMVC/Dockerfile | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/Web/WebMVC/Dockerfile diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile deleted file mode 100644 index 3b0e08ea4..000000000 --- a/src/Web/WebMVC/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -ARG NODE_IMAGE=node:8.11 -FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base -WORKDIR /app -EXPOSE 80 -EXPOSE 443 - -FROM microsoft/dotnet:2.1-sdk as dotnet-build -WORKDIR /src - -FROM ${NODE_IMAGE} as node-build -WORKDIR /web -COPY src/Web/WebMVC . -RUN npm install -g bower@1.8.4 -RUN bower install --allow-root - -FROM dotnet-build as build -WORKDIR /src/src/Web/WebMVC/wwwroot -COPY --from=node-build /web/wwwroot . -WORKDIR /src -COPY ./Certificates/eShopOnContainers.pfx /root/.aspnet/https/ -COPY . . -WORKDIR /src/src/Web/WebMVC -RUN dotnet restore -nowarn:msb3202,nu1503 - -FROM build AS publish -RUN dotnet publish --no-restore -c Release -o /app - -FROM base AS final -WORKDIR /app -COPY --from=publish /app . -ENTRYPOINT ["dotnet", "WebMVC.dll"] From e5821ea6c805989852acf89c1765687171c1790f Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Sat, 1 Sep 2018 17:39:21 +0600 Subject: [PATCH 24/24] Delete Startup.cs --- src/Web/WebSPA/Startup.cs | 160 -------------------------------------- 1 file changed, 160 deletions(-) delete mode 100644 src/Web/WebSPA/Startup.cs diff --git a/src/Web/WebSPA/Startup.cs b/src/Web/WebSPA/Startup.cs deleted file mode 100644 index c0c89f663..000000000 --- a/src/Web/WebSPA/Startup.cs +++ /dev/null @@ -1,160 +0,0 @@ -using eShopOnContainers.WebSPA; -using WebSPA.Infrastructure; - -namespace eShopConContainers.WebSPA -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - private readonly IHostingEnvironment _hostingEnv; - public Startup(IHostingEnvironment env) - { - _hostingEnv = env; - - var localPath = new Uri(Configuration["ASPNETCORE_URLS"])?.LocalPath ?? "/"; - Configuration["BaseUrl"] = localPath; - } - - // This method gets called by the runtime. Use this method to add services to the container. - // For more information on how to configure your application, visit http://go.microsoft.com/fwlink/?LinkID=398940 - public void ConfigureServices(IServiceCollection services) - { - RegisterAppInsights(services); - - services.AddHealthChecks(checks => - { - var minutes = 1; - if (int.TryParse(Configuration["HealthCheck:Timeout"], out var minutesParsed)) - { - minutes = minutesParsed; - } - - checks.AddUrlCheck(Configuration["CatalogUrlHC"], TimeSpan.FromMinutes(minutes)); - checks.AddUrlCheck(Configuration["OrderingUrlHC"], TimeSpan.FromMinutes(minutes)); - checks.AddUrlCheck(Configuration["BasketUrlHC"], TimeSpan.Zero); //No cache for this HealthCheck, better just for demos - checks.AddUrlCheck(Configuration["IdentityUrlHC"], TimeSpan.FromMinutes(minutes)); - checks.AddUrlCheck(Configuration["MarketingUrlHC"], TimeSpan.FromMinutes(minutes)); - - }); - - services.Configure(Configuration); - - if (Configuration.GetValue("IsClusterEnv") == bool.TrueString) - { - services.AddDataProtection(opts => - { - opts.ApplicationDiscriminator = "eshop.webspa"; - }) - .PersistKeysToRedis(ConnectionMultiplexer.Connect(Configuration["DPConnectionString"]), "DataProtection-Keys"); - } - - services.AddAntiforgery(options => options.HeaderName = "X-XSRF-TOKEN"); - - services - .AddMvc(opts => - { - opts.SslPort = 4104; - opts.RequireHttpsPermanent = true; - }) - .AddJsonOptions(options => - { - options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); - }); - - services.AddHttpsRedirection(opts => - { - opts.HttpsPort = 4104; - }); - } - - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, IAntiforgery antiforgery) - { - - loggerFactory.AddAzureWebAppDiagnostics(); - loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); - - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - else - { - app.UseHsts(); - } - - app.UseHttpsRedirection(); - - // Configure XSRF middleware, This pattern is for SPA style applications where XSRF token is added on Index page - // load and passed back token on every subsequent async request - // app.Use(async (context, next) => - // { - // if (string.Equals(context.Request.Path.Value, "/", StringComparison.OrdinalIgnoreCase)) - // { - // var tokens = antiforgery.GetAndStoreTokens(context); - // context.Response.Cookies.Append("XSRF-TOKEN", tokens.RequestToken, new CookieOptions() { HttpOnly = false }); - // } - // await next.Invoke(); - // }); - - //Seed Data - WebContextSeed.Seed(app, env, loggerFactory); - - var pathBase = Configuration["PATH_BASE"]; - if (!string.IsNullOrEmpty(pathBase)) - { - loggerFactory.CreateLogger("init").LogDebug($"Using PATH BASE '{pathBase}'"); - app.UsePathBase(pathBase); - } - - -#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously - app.Map("/liveness", lapp => lapp.Run(async ctx => ctx.Response.StatusCode = 200)); -#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously - - app.Use(async (context, next) => - { - await next(); - - // If there's no available file and the request doesn't contain an extension, we're probably trying to access a page. - // Rewrite request to use app root - if (context.Response.StatusCode == 404 && !Path.HasExtension(context.Request.Path.Value) && !context.Request.Path.Value.StartsWith("/api")) - { - context.Request.Path = "/index.html"; - context.Response.StatusCode = 200; // Make sure we update the status code, otherwise it returns 404 - await next(); - } - }); - - app.UseDefaultFiles(); - app.UseStaticFiles(); - - app.UseMvcWithDefaultRoute(); - } - - private void RegisterAppInsights(IServiceCollection services) - { - services.AddApplicationInsightsTelemetry(Configuration); - var orchestratorType = Configuration.GetValue("OrchestratorType"); - - if (orchestratorType?.ToUpper() == "K8S") - { - // Enable K8s telemetry initializer - services.EnableKubernetes(); - } - if (orchestratorType?.ToUpper() == "SF") - { - // Enable SF telemetry initializer - services.AddSingleton((serviceProvider) => - new FabricTelemetryInitializer()); - } - } - } -}