Revert "Update to ASP.NET Core 2.1.3"

docker-compose.dcproj

@@ -3,7 +3,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>fea0c318-ffed-4d39-8781-265718ca43dd</ProjectGuid>
     <DockerLaunchBrowser>True</DockerLaunchBrowser>
-    <DockerServiceUrl>https://localhost:4100</DockerServiceUrl>
+    <DockerServiceUrl>http://localhost:5100</DockerServiceUrl>
     <DockerServiceName>webmvc</DockerServiceName>
     <DockerTargetOS>Linux</DockerTargetOS>
     <ProjectVersion>2.1</ProjectVersion>

docker-compose.override.yml

@@ -30,11 +30,11 @@ services:
   identity.api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80;https://+:443
+      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104;https://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:4104
+      - SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
       - XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/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;https://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:4100              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
+      - 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
@@ -46,10 +46,6 @@ services:
       - 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:
@@ -281,7 +277,7 @@ services:
   webspa:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://+:80;https://+:443
+      - ASPNETCORE_URLS=http://0.0.0.0:80
       - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105              #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   
@@ -297,15 +293,11 @@ services:
       - 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
+      - ASPNETCORE_URLS=http://0.0.0.0:80
       - PurchaseUrl=http://webshoppingapigw
       - IdentityUrl=http://10.0.75.1:5105  # 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                                                    
@@ -322,7 +314,4 @@ services:
       - 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

src/ApiGateways/ApiGw-Base/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/
 RUN dotnet restore src/ApiGateways/ApiGw-Base/

src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Ocelot" Version="3.0.0" />
   </ItemGroup>
 </Project>

src/ApiGateways/ApiGw-Base/Properties/launchSettings.json

@@ -13,8 +13,7 @@
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "OcelotApiGw": {
       "commandName": "Project",

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
     <AssemblyName>Mobile.Shopping.HttpAggregator</AssemblyName>
     <RootNamespace>Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator</RootNamespace>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
@@ -13,9 +12,9 @@
   </ItemGroup>
 
   <ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
-		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" />
   </ItemGroup>
 
 </Project>

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Properties/launchSettings.json

@@ -14,8 +14,7 @@
       "launchUrl": "api/values",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "PurchaseForMvc": {
       "commandName": "Project",

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs

@@ -31,20 +31,15 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-			services
+            services.AddCustomMvc(Configuration)
-				.AddCustomMvc(Configuration)
                  .AddCustomAuthentication(Configuration)
                  .AddHttpServices();
-			//services.AddHttpsRedirection(opts =>
-			//{
-			//	opts.HttpsPort = 4120;
-			//});
         }
 
         // 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)
         {
-			string pathBase = Configuration["PATH_BASE"];
+            var pathBase = Configuration["PATH_BASE"];
 
             if (!string.IsNullOrEmpty(pathBase))
             {
@@ -78,10 +73,7 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
             services.AddOptions();
             services.Configure<UrlsConfig>(configuration.GetSection("urls"));
 
-			services
+            services.AddMvc();
-				   .AddMvc()
-				   .SetCompatibilityVersion(AspNetCore.Mvc.CompatibilityVersion.Version_2_1)
-				   ;
 
             services.AddSwaggerGen(options =>
             {
@@ -136,15 +128,13 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
                 options.Audience = "mobileshoppingagg";
                 options.Events = new JwtBearerEvents()
                 {
-#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
                     OnAuthenticationFailed = async ctx =>
-#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
                     {
+                        int i = 0;
                     },
-#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
                     OnTokenValidated = async ctx =>
-#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
                     {
+                        int i = 0;
                     }
                 };
             });

src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.json

@@ -11,13 +11,5 @@
         "Default": "Warning"
       }
     }
-	},
-	"Kestrel": {
-		"Certificates": {
-			"Default": {
-				"Path": "./synergydev.pfx",
-				"Password": "RH@ssl2018"
-			}
-		}
   }
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/ApiGateways/Web.Bff.Shopping/aggregator

src/ApiGateways/Web.Bff.Shopping/aggregator/Properties/launchSettings.json

@@ -14,8 +14,7 @@
       "launchUrl": "api/values",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "PurchaseForMvc": {
       "commandName": "Project",

src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs

@@ -11,6 +11,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Polly;
 using Polly.Extensions.Http;
+using Polly.Timeout;
 using Swashbuckle.AspNetCore.Swagger;
 using System;
 using System.Collections.Generic;
@@ -31,8 +32,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-			services
+            services.AddCustomMvc(Configuration)
-				.AddCustomMvc(Configuration)
                 .AddCustomAuthentication(Configuration)
                 .AddApplicationServices();
         }
@@ -53,6 +53,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
             {
                 app.UseDeveloperExceptionPage();
             }
+
             app.UseAuthentication();
 
             app.UseMvc();
@@ -72,29 +73,26 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
         public static IServiceCollection AddCustomAuthentication(this IServiceCollection services, IConfiguration configuration)
         {
             JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
-			string identityUrl = configuration.GetValue<string>("urls:identity");
+            var identityUrl = configuration.GetValue<string>("urls:identity");
             services.AddAuthentication(options =>
             {
                 options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
                 options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
 
-			})
+            }).AddJwtBearer(options =>
-			.AddJwtBearer(options =>
             {
                 options.Authority = identityUrl;
                 options.RequireHttpsMetadata = false;
                 options.Audience = "webshoppingagg";
                 options.Events = new JwtBearerEvents()
                 {
-#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
                     OnAuthenticationFailed = async ctx =>
-#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
                     {
+                        int i = 0;
                     },
-#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
                     OnTokenValidated = async ctx =>
-#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
                     {
+                        int i = 0;
                     }
                 };
             });
@@ -106,15 +104,12 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
             services.AddOptions();
             services.Configure<UrlsConfig>(configuration.GetSection("urls"));
 
-			services
+            services.AddMvc();
-				.AddMvc()
-				.SetCompatibilityVersion(AspNetCore.Mvc.CompatibilityVersion.Version_2_1)
-				;
 
             services.AddSwaggerGen(options =>
             {
                 options.DescribeAllEnumsAsStrings();
-				options.SwaggerDoc("v1", new Info
+                options.SwaggerDoc("v1", new Swashbuckle.AspNetCore.Swagger.Info
                 {
                     Title = "Shopping Aggregator for Web Clients",
                     Version = "v1",
@@ -139,12 +134,8 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
 
             services.AddCors(options =>
             {
-				options
+                options.AddPolicy("CorsPolicy",
-					.AddPolicy(
+                    builder => builder.AllowAnyOrigin()
-						"CorsPolicy",
-					builder =>
-						builder
-							.AllowAnyOrigin()
                     .AllowAnyMethod()
                     .AllowAnyHeader()
                     .AllowCredentials());
@@ -156,7 +147,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
         {
             //register delegating handlers
             services.AddTransient<HttpClientAuthorizationDelegatingHandler>();
-			services.AddHttpContextAccessor();
+            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
             //register http services
           

src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj

@@ -2,11 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
     <AssemblyName>Web.Shopping.HttpAggregator</AssemblyName>
     <RootNamespace>Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator</RootNamespace>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
-		<UserSecretsId>0890cb23-79b5-408d-9aeb-13e6ff218d71</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,10 +12,10 @@
   </ItemGroup>
 
   <ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="2.4.0" />
-		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" />
   </ItemGroup>
 
 </Project>

src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj

@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>  
   <ItemGroup>

src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.0" />
   </ItemGroup>
 
 </Project>

src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj

@@ -16,11 +16,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.0" />
     <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.0" />
-    <PackageReference Include="WindowsAzure.Storage" Version="9.3.1" />
+    <PackageReference Include="WindowsAzure.Storage" Version="9.1.0" />
   </ItemGroup>
 
 </Project>

src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj

@@ -9,12 +9,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
     <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.0" />
   </ItemGroup>
 
 </Project>

src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Polly" Version="6.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
   </ItemGroup>
 
 </Project>

src/Services/Basket/Basket.API/Basket.API.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
@@ -14,14 +13,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" />
+    <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
-		<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" />
-		<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" />
-		<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.1" />
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
-		<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" />
     <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
   </ItemGroup>

src/Services/Basket/Basket.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Basket/Basket.API

src/Services/Basket/Basket.API/Properties/launchSettings.json

@@ -14,8 +14,7 @@
       "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "Microsoft.eShopOnContainers.Services.Basket.API": {
       "commandName": "Project",

src/Services/Basket/Basket.API/Startup.cs

@@ -54,10 +54,8 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
             {
                 options.Filters.Add(typeof(HttpGlobalExceptionFilter));
                 options.Filters.Add(typeof(ValidateModelStateFilter));
-			})
+
-			.AddControllersAsServices()
+            }).AddControllersAsServices();
-			.SetCompatibilityVersion(AspNetCore.Mvc.CompatibilityVersion.Version_2_1)
-			;
 
             ConfigureAuthService(services);
 
@@ -76,7 +74,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
             //and then creating the connection it seems reasonable to move
             //that cost to startup instead of having the first request pay the
             //penalty.
-			services.AddSingleton(sp =>
+            services.AddSingleton<ConnectionMultiplexer>(sp =>
             {
                 var settings = sp.GetRequiredService<IOptions<BasketSettings>>().Value;
                 var configuration = ConfigurationOptions.Parse(settings.ConnectionString, true);
@@ -207,7 +205,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
                .UseSwaggerUI(c =>
                {
                    c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Basket.API V1");
-				   c.OAuthClientId("basketswaggerui");
+                   c.OAuthClientId ("basketswaggerui");
                    c.OAuthAppName("Basket Swagger UI");
                });
 

src/Services/Basket/Basket.API/appsettings.json

@@ -7,7 +7,7 @@
       "Microsoft": "Information"
     }
   },
-	"IdentityUrl": "https://localhost:4105",
+  "IdentityUrl": "http://localhost:5105",
   "ConnectionString": "127.0.0.1",
   "AzureServiceBusEnabled": false,
   "SubscriptionClientName": "Basket",

src/Services/Catalog/Catalog.API/Catalog.API.csproj

@@ -35,13 +35,13 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
-    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" />
     <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" />
-    <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
     <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
   </ItemGroup>

src/Services/Catalog/Catalog.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Catalog/Catalog.API

src/Services/Catalog/Catalog.API/Properties/launchSettings.json

@@ -14,8 +14,7 @@
       "launchUrl": "/swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "Microsoft.eShopOnContainers.Services.Catalog.API": {
       "commandName": "Project",

src/Services/Catalog/Catalog.API/Startup.cs

@@ -124,7 +124,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
             services.AddHealthChecks(checks =>
             {
                 var minutes = 1;
-				if (int.TryParse(configuration["HealthCheck:Timeout"], out int minutesParsed))
+                if (int.TryParse(configuration["HealthCheck:Timeout"], out var minutesParsed))
                 {
                     minutes = minutesParsed;
                 }
@@ -141,10 +141,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
             services.AddMvc(options =>
             {
                 options.Filters.Add(typeof(HttpGlobalExceptionFilter));
-			})
+            }).AddControllersAsServices();
-			.AddControllersAsServices()
-			.SetCompatibilityVersion(CompatibilityVersion.Version_2_1)
-			;
 
             services.AddCors(options =>
             {

src/Services/Identity/Identity.API/Dockerfile

@@ -1,10 +1,9 @@
 ARG NODE_IMAGE=node:8.11
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
-EXPOSE 443
 
-FROM microsoft/dotnet:2.1.401-sdk as dotnet-build
+FROM microsoft/dotnet:2.1-sdk as dotnet-build
 WORKDIR /src
 
 FROM ${NODE_IMAGE} as node-build
@@ -17,7 +16,6 @@ FROM dotnet-build as build
 WORKDIR /src/src/Services/Identity/Identity.API/wwwroot
 COPY --from=node-build /web/wwwroot .
 WORKDIR /src
-COPY src/Services/Identity/Identity.API/Setup/eShopOnContainers.pfx /root/.aspnet/https/
 COPY . .
 WORKDIR /src/src/Services/Identity/Identity.API
 RUN dotnet restore -nowarn:msb3202,nu1503

src/Services/Identity/Identity.API/Identity.API.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
     <UserSecretsId>aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5</UserSecretsId>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
@@ -13,20 +12,15 @@
     </Content>
   </ItemGroup>
 
-	<ItemGroup>
-	  <None Remove="Setup\DotNet Foundation CA.pfx" />
-	  <None Remove="Setup\eShopOnContainers.pfx" />
-	</ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" />
     <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" />
-		<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" />
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
     <PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.1.0" />
     <PackageReference Include="IdentityServer4.EntityFramework" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.3.3" />

src/Services/Identity/Identity.API/Properties/launchSettings.json

@@ -3,8 +3,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:5105/",
+      "applicationUrl": "http://localhost:54010/",
-      "sslPort": 4105
+      "sslPort": 0
     }
   },
   "profiles": {
@@ -14,8 +14,7 @@
       "launchUrl": "http://localhost:55105",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "eShopOnContainers.Identity": {
       "commandName": "Project",

src/Services/Identity/Identity.API/Startup.cs

@@ -52,14 +52,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
 
             services.Configure<AppSettings>(Configuration);
 
-			services
+            services.AddMvc();
-				.AddMvc(opts=>
-				{
-					opts.SslPort = 4105;
-					opts.RequireHttpsPermanent = true;
-				})
-				.SetCompatibilityVersion(AspNetCore.Mvc.CompatibilityVersion.Version_2_1)
-				;
 
             if (Configuration.GetValue<string>("IsClusterEnv") == bool.TrueString)
             {
@@ -72,8 +65,8 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
 
             services.AddHealthChecks(checks =>
             {
-				int minutes = 1;
+                var minutes = 1;
-				if (int.TryParse(Configuration["HealthCheck:Timeout"], out int minutesParsed))
+                if (int.TryParse(Configuration["HealthCheck:Timeout"], out var minutesParsed))
                 {
                     minutes = minutesParsed;
                 }
@@ -83,8 +76,8 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
             services.AddTransient<ILoginService<ApplicationUser>, EFLoginService>();
             services.AddTransient<IRedirectService, RedirectService>();
 
-			string connectionString = Configuration["ConnectionString"];
+            var connectionString = Configuration["ConnectionString"];
-			string migrationsAssembly = typeof(Startup).GetTypeInfo().Assembly.GetName().Name;
+            var migrationsAssembly = typeof(Startup).GetTypeInfo().Assembly.GetName().Name;
 
             // Adds IdentityServer
             services.AddIdentityServer(x => x.IssuerUri = "null")
@@ -112,12 +105,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
                  })
                 .Services.AddTransient<IProfileService, ProfileService>();
 
-			services.AddHttpsRedirection(opts =>
+            var container = new ContainerBuilder();
-			{
-				opts.HttpsPort = 4105;
-			});
-
-			ContainerBuilder container = new ContainerBuilder();
             container.Populate(services);
 
             return new AutofacServiceProvider(container.Build());
@@ -139,11 +127,9 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
             else
             {
                 app.UseExceptionHandler("/Home/Error");
-				app.UseHsts();
             }
 
-			app.UseHttpsRedirection();
+            var pathBase = Configuration["PATH_BASE"];
-			string pathBase = Configuration["PATH_BASE"];
             if (!string.IsNullOrEmpty(pathBase))
             {
                 loggerFactory.CreateLogger("init").LogDebug($"Using PATH BASE '{pathBase}'");
@@ -180,7 +166,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
         private void RegisterAppInsights(IServiceCollection services)
         {
             services.AddApplicationInsightsTelemetry(Configuration);
-			string orchestratorType = Configuration.GetValue<string>("OrchestratorType");
+            var orchestratorType = Configuration.GetValue<string>("OrchestratorType");
 
             if (orchestratorType?.ToUpper() == "K8S")
             {

src/Services/Identity/Identity.API/appsettings.json

@@ -1,9 +1,9 @@
 {
   "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",
+  "MvcClient": "http://localhost:5100",
-	"SpaClient": "https://localhost:4104",
+  "SpaClient": "http://localhost:5104",
-	"XamarinCallback": "https://localhost:4105/xamarincallback",
+  "XamarinCallback": "http://localhost:5105/xamarincallback",
   "UseCustomizationData": false,
   "Logging": {
     "IncludeScopes": false,
@@ -21,13 +21,5 @@
     "Name": "eshop",
     "ClientId": "your-clien-id",
     "ClientSecret": "your-client-secret"
-	},
-	"Kestrel": {
-		"Certificates": {
-			"Default": {
-				"Path": "./Setup/eshopOnContainers.pfx",
-				"Password": "D0tNet@"
-			}
-		}
   }
 }

src/Services/Location/Locations.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Location/Locations.API

src/Services/Location/Locations.API/Locations.API.csproj

@@ -2,19 +2,18 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
     <UserSecretsId>aspnet-Locations.API-20161122013619</UserSecretsId>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" />
+    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" />
-		<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" />
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
     <PackageReference Include="mongocsharpdriver" Version="2.5.0" />
     <PackageReference Include="MongoDB.Bson" Version="2.5.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.5.0" />

src/Services/Location/Locations.API/Properties/launchSettings.json

@@ -14,8 +14,7 @@
       "launchUrl": "api/values",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "Locations.API": {
       "commandName": "Project",

src/Services/Marketing/Marketing.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Marketing/Marketing.API

src/Services/Marketing/Marketing.API/Marketing.API.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
     <RootNamespace>Microsoft.eShopOnContainers.Services.Marketing.API</RootNamespace>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@@ -22,13 +21,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" />
+    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" />
-		<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
     <PackageReference Include="mongocsharpdriver" Version="2.5.0" />
     <PackageReference Include="MongoDB.Bson" Version="2.5.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.5.0" />

src/Services/Marketing/Marketing.API/Properties/launchSettings.json

@@ -14,8 +14,7 @@
       "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "Marketing.API": {
       "commandName": "Project",

src/Services/Ordering/Ordering.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Ordering/Ordering.API

src/Services/Ordering/Ordering.API/Ordering.API.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
     <UserSecretsId>aspnet-Ordering.API-20161122013547</UserSecretsId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
@@ -31,22 +30,22 @@
   </ItemGroup>
 
   <ItemGroup>
-		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" />
-		<PackageReference Include="Dapper" Version="1.50.4" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="7.5.0" />
-		<PackageReference Include="MediatR" Version="4.1.0" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="4.1.0" />
-		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" />
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
-		<PackageReference Include="Polly" Version="6.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
+    <PackageReference Include="MediatR" Version="4.1.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
     <PackageReference Include="System.Reflection" Version="4.3.0" />
+    <PackageReference Include="Dapper" Version="1.50.4" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Polly" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup>
     <None Update="Setup\*">

src/Services/Ordering/Ordering.API/Properties/launchSettings.json

@@ -14,8 +14,7 @@
       "launchUrl": "/swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "Microsoft.eShopOnContainers.Services.Ordering.API": {
       "commandName": "Project",

src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Ordering/Ordering.BackgroundTasks

src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
@@ -17,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" />
     <PackageReference Include="Dapper" Version="1.50.4" />
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Services/Ordering/Ordering.BackgroundTasks/Properties/launchSettings.json

@@ -14,8 +14,7 @@
       "launchUrl": "api/values",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "Ordering.BackgroundTasks": {
       "commandName": "Project",

src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj

@@ -9,9 +9,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Services/Ordering/Ordering.SignalrHub/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Ordering/Ordering.SignalrHub

src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
@@ -12,15 +11,15 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" />
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
-		<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.SignalR.Redis" Version="1.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Redis" Version="1.0.0" />
-		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" />
+    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" />
-		<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Services/Ordering/Ordering.SignalrHub/Properties/launchSettings.json

@@ -13,8 +13,7 @@
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "Ordering.SignalrHub": {
       "commandName": "Project",

src/Services/Payment/Payment.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Payment/Payment.API

src/Services/Payment/Payment.API/Payment.API.csproj

@@ -2,19 +2,18 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" />
+    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" />
-		<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" />

src/Services/Payment/Payment.API/Properties/launchSettings.json

@@ -14,8 +14,7 @@
       "launchUrl": "api/values",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "Payment.API": {
       "commandName": "Project",

src/Web/WebMVC/Controllers/HomeController.cs

@@ -1,13 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace WebMVC.Controllers
-{
-	public class HomeController : Controller
-	{
-		public IActionResult Privacy()
-		{
-			return View();
-		}
-
-	}
-}

src/Web/WebMVC/Dockerfile

@@ -1,10 +1,9 @@
 ARG NODE_IMAGE=node:8.11
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
-EXPOSE 443
 
-FROM microsoft/dotnet:2.1.401-sdk as dotnet-build
+FROM microsoft/dotnet:2.1-sdk as dotnet-build
 WORKDIR /src
 
 FROM ${NODE_IMAGE} as node-build
@@ -17,7 +16,6 @@ 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

src/Web/WebMVC/Properties/launchSettings.json

@@ -4,7 +4,7 @@
     "anonymousAuthentication": true,
     "iisExpress": {
       "applicationUrl": "http://localhost:5100",
-      "sslPort": 4100
+      "sslPort": 0
     }
   },
   "profiles": {
@@ -12,16 +12,15 @@
       "commandName": "IISExpress",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "Microsoft.eShopOnContainers.WebMVC": {
       "commandName": "Project",
-				"launchUrl": "http://localhost:4001",
+      "launchBrowser": true,
+      "launchUrl": "http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-				},
+      }
-				"applicationUrl": "https://localhost:4001;http://localhost:5001"
     }
   }
 }

src/Web/WebMVC/Services/CatalogService.cs

@@ -45,10 +45,9 @@ namespace Microsoft.eShopOnContainers.WebMVC.Services
 
             var responseString = await _httpClient.GetStringAsync(uri);
 
-			var items = new List<SelectListItem>
+            var items = new List<SelectListItem>();
-			{
+
-				new SelectListItem() { Value = null, Text = "All", Selected = true }
+            items.Add(new SelectListItem() { Value = null, Text = "All", Selected = true });
-			};
 
             var brands = JArray.Parse(responseString);
 

src/Web/WebMVC/Startup.cs

@@ -36,22 +36,12 @@ namespace Microsoft.eShopOnContainers.WebMVC
         // This method gets called by the runtime. Use this method to add services to the IoC container.
         public void ConfigureServices(IServiceCollection services)
         {
-			services.Configure<CookiePolicyOptions>(opts =>
+            services.AddAppInsight(Configuration)
-			{
-				opts.MinimumSameSitePolicy = SameSiteMode.None;
-				opts.CheckConsentNeeded = context => true;
-			});
-			services
-					.AddAppInsight(Configuration)
                     .AddHealthChecks(Configuration)
                     .AddCustomMvc(Configuration)
                     .AddHttpClientServices(Configuration)
                     //.AddHttpClientLogging(Configuration)  //Opt-in HttpClientLogging config
                     .AddCustomAuthentication(Configuration);
-			services.AddHttpsRedirection(options =>
-			{
-				options.HttpsPort = 4100;
-			});
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -69,13 +59,9 @@ namespace Microsoft.eShopOnContainers.WebMVC
             else
             {
                 app.UseExceptionHandler("/Error");
-				app.UseHsts();
             }
 
-			app.UseHttpsRedirection();
+            var pathBase = Configuration["PATH_BASE"];
-			app.UseCookiePolicy();
-
-			string pathBase = Configuration["PATH_BASE"];
             if (!string.IsNullOrEmpty(pathBase))
             {
                 loggerFactory.CreateLogger("init").LogDebug($"Using PATH BASE '{pathBase}'");
@@ -97,7 +83,7 @@ namespace Microsoft.eShopOnContainers.WebMVC
 
             app.UseAuthentication();
 
-			ILogger log = loggerFactory.CreateLogger("identity");
+            var log = loggerFactory.CreateLogger("identity");
 
             WebContextSeed.Seed(app, env, loggerFactory);
 
@@ -120,7 +106,7 @@ namespace Microsoft.eShopOnContainers.WebMVC
         public static IServiceCollection AddAppInsight(this IServiceCollection services, IConfiguration configuration)
         {
             services.AddApplicationInsightsTelemetry(configuration);
-			string orchestratorType = configuration.GetValue<string>("OrchestratorType");
+            var orchestratorType = configuration.GetValue<string>("OrchestratorType");
 
             if (orchestratorType?.ToUpper() == "K8S")
             {
@@ -142,8 +128,8 @@ namespace Microsoft.eShopOnContainers.WebMVC
         {
             services.AddHealthChecks(checks =>
             {
-				int minutes = 1;
+                var minutes = 1;
-				if (int.TryParse(configuration["HealthCheck:Timeout"], out int minutesParsed))
+                if (int.TryParse(configuration["HealthCheck:Timeout"], out var minutesParsed))
                 {
                     minutes = minutesParsed;
                 }
@@ -163,13 +149,7 @@ namespace Microsoft.eShopOnContainers.WebMVC
             services.AddOptions();
             services.Configure<AppSettings>(configuration);
 
-			services
+            services.AddMvc();
-				.AddMvc(opts =>
-				{
-					opts.SslPort = 4100;
-					opts.RequireHttpsPermanent = true;
-				})
-				.SetCompatibilityVersion(AspNetCore.Mvc.CompatibilityVersion.Version_2_1);
 
             services.AddSession();
 
@@ -247,9 +227,9 @@ namespace Microsoft.eShopOnContainers.WebMVC
 
         public static IServiceCollection AddCustomAuthentication(this IServiceCollection services, IConfiguration configuration)
         {
-			bool useLoadTest = configuration.GetValue<bool>("UseLoadTest");
+            var useLoadTest = configuration.GetValue<bool>("UseLoadTest");
-			string identityUrl = configuration.GetValue<string>("IdentityUrl");
+            var identityUrl = configuration.GetValue<string>("IdentityUrl");
-			string callBackUrl = configuration.GetValue<string>("CallBackUrl");
+            var callBackUrl = configuration.GetValue<string>("CallBackUrl");
 
             // Add Authentication services          
 

src/Web/WebMVC/Views/Campaigns/Details.cshtml

@@ -1,9 +1,5 @@
 @{
     ViewData["Title"] = "Campaign details";
-	var headers = new List<Header>{
-		new Header { Controller = "Campaigns", Text = "Back to Campaigns" },
-		new Header { Controller = "Catalog", Text = "Back to catalog" }
-	};
     @model CampaignItem
 }
 <section class="esh-campaigns-hero">
@@ -12,7 +8,9 @@
     </div>
 </section>
 
-<partial name="_Header" model="headers" />
+@Html.Partial("_Header", new List<Header>() {
+            new Header() { Controller = "Catalog", Text = "Back to catalog" },
+        new Header() { Controller = "Campaigns", Text = "Back to Campaigns" } })
 
 <div class="container">
     <div class="card esh-campaigns-items">

src/Web/WebMVC/Views/Campaigns/Index.cshtml

@@ -1,8 +1,6 @@
 @{
     ViewData["Title"] = "Campaigns";
-	@model WebMVC.ViewModels.CampaignViewModel
+@model WebMVC.ViewModels.CampaignViewModel
-	var headers = new List<Header>() {
-new Header() { Controller = "Catalog", Text = "Back to catalog" } };
 }
 
 <section class="esh-campaigns-hero">
@@ -11,7 +9,8 @@ new Header() { Controller = "Catalog", Text = "Back to catalog" } };
     </div>
 </section>
 
-<partial name="_Header" model="headers" />
+@Html.Partial("_Header", new List<Header>() {
+    new Header() { Controller = "Catalog", Text = "Back to catalog" } })
 
 <div class="container">
     <br />
@@ -49,20 +48,18 @@ new Header() { Controller = "Catalog", Text = "Back to catalog" } };
         </div>        
     </div>    
     <br />
-	@if (Model != null && Model.CampaignItems != null && Model.CampaignItems.Any())
+        @if (Model != null && Model.CampaignItems !=null && Model.CampaignItems.Any())
         {
             <div class="card-group esh-campaigns-items row">
                 @foreach (var catalogItem in Model.CampaignItems)
                 {
                     <div class="esh-campaigns-item col-md-4">
-					@*@Html.Partial("_campaign", catalogItem)*@
+                        @Html.Partial("_campaign", catalogItem)
-					<partial name="_campaign" model="catalogItem" />
                     </div>
                 }
             </div>
 
-		@*@Html.Partial("_pagination", Model.PaginationInfo)*@
+            @Html.Partial("_pagination", Model.PaginationInfo)
-		<partial name="_pagination" model="Model.PaginationInfo" />
         }
         else
         {

src/Web/WebMVC/Views/Cart/Index.cshtml

@@ -6,13 +6,13 @@
 
 @{
     ViewData["Title"] = "My Cart";
-	var headers = new List<Header>() {
-		    new Header() { Controller = "Catalog", Text = "Back to catalog" } };
 }
 
 <form method="post" id="cartForm">
     <div class="esh-basket">
-		<partial name="_header" model="headers" />
+        @Html.Partial("_Header", new List<Header>() {
+            new Header() { Controller = "Catalog", Text = "Back to catalog" } })
+
         @await Component.InvokeAsync("CartList", new { user = UserManager.Parse(User) })
     </div>
 </form>

src/Web/WebMVC/Views/Catalog/Index.cshtml

@@ -25,7 +25,7 @@
 <div class="container">
     <div class="row">
         <br />
-		@if (ViewBag.BasketInoperativeMsg != null)
+        @if(ViewBag.BasketInoperativeMsg != null)
         {
             <div class="alert alert-warning" role="alert">
                 &nbsp;@ViewBag.BasketInoperativeMsg
@@ -35,18 +35,18 @@
 
     @if (Model.CatalogItems.Count() > 0)
     {
-		<partial name="_pagination" model="Model.PaginationInfo" />
+        @Html.Partial("_pagination", Model.PaginationInfo)
 
         <div class="esh-catalog-items row">
             @foreach (var catalogItem in Model.CatalogItems)
             {
                 <div class="esh-catalog-item col-md-4">
-					<partial name="_product" , model="catalogItem" />
+                    @Html.Partial("_product", catalogItem)
                 </div>
             }
         </div>
 
-		<partial name="_pagination" model="Model.PaginationInfo" />
+        @Html.Partial("_pagination", Model.PaginationInfo)
     }
     else
     {

src/Web/WebMVC/Views/Home/Privacy.cshtml

@@ -1,6 +0,0 @@
-@{
-    ViewData["Title"] = "Privacy Policy";
-}
-<h2>@ViewData["Title"]</h2>
-
-<p>Use this page to detail your site's privacy policy.</p>

src/Web/WebMVC/Views/Order/Create.cshtml

@@ -4,17 +4,15 @@
 
 @{
     ViewData["Title"] = "New Order";
-	var header = new Header { Controller = "Cart", Text = "Back to cart" };
 }
 
-<partial name="_header" model="new List<Header> { header  }" />
+@Html.Partial("_Header", new List<Header>() {
-
+        new Header() { Controller = "Cart", Text = "Back to cart" } })
 <div class="container">
     <form method="post" asp-controller="Order" asp-action="Checkout">
         <section class="esh-orders_new-section">
             <div class="row">
-				@foreach (var error in ViewData.ModelState.Values.SelectMany(err => err.Errors))
+                @foreach (var error in ViewData.ModelState.Values.SelectMany(err => err.Errors)) {
-				{
                     <div class="alert alert-warning" role="alert">                    
                         &nbsp;@error.ErrorMessage
                     </div>
@@ -25,28 +23,28 @@
                 <div class="col-md-6">
                     <div class="form-group">
                         <label asp-for="Street" class="esh-orders_new-title">Address</label>
-						<input asp-for="Street" class="form-control form-input" type="text" placeholder="Street" />
+                        <input asp-for="Street" class="form-control form-input" type="text" placeholder="Street"/>
                         <span asp-validation-for="Street" class="alert alert-danger" />
                     </div>
                 </div>
                 <div class="col-md-6">
                     <div class="form-group">
                         <label asp-for="City" class="esh-orders_new-title">City</label>
-						<input asp-for="City" class="form-control form-input" type="text" placeholder="City" />
+                        <input asp-for="City" class="form-control form-input" type="text" placeholder="City"/>
                         <span asp-validation-for="City" class="alert alert-danger" />
                     </div>
                 </div>
                 <div class="col-md-6">
                     <div class="form-group">
                         <label asp-for="State" class="esh-orders_new-title">State</label>
-						<input asp-for="State" class="form-control form-input" type="text" placeholder="State" />
+                        <input asp-for="State" class="form-control form-input" type="text" placeholder="State"/>
                         <span asp-validation-for="State" class="alert alert-danger" />
                     </div>
                 </div>
                 <div class="col-md-6">
                     <div class="form-group">
                         <label asp-for="Country" class="esh-orders_new-title">Country</label>
-						<input asp-for="Country" class="form-control form-input" type="text" placeholder="Country" />
+                        <input asp-for="Country" class="form-control form-input" type="text" placeholder="Country"/>
                         <span asp-validation-for="Country" class="alert alert-danger" />
                     </div>
                 </div>
@@ -58,35 +56,35 @@
                 <div class="col-md-6">
                     <div class="form-group">
                         <label asp-for="CardNumber" class="esh-orders_new-title">Card number</label>
-						<input asp-for="CardNumber" class="form-control form-input" type="text" placeholder="000000000000000" />
+                        <input asp-for="CardNumber" class="form-control form-input" type="text" placeholder="000000000000000"/>
                         <span asp-validation-for="CardNumber" class="alert alert-danger" />
                     </div>
                 </div>
                 <div class="col-md-6">
                     <div class="form-group">
                         <label asp-for="CardHolderName" class="esh-orders_new-title">Cardholder name</label>
-						<input asp-for="CardHolderName" class="form-control form-input" type="text" placeholder="Cardholder" />
+                        <input asp-for="CardHolderName" class="form-control form-input" type="text" placeholder="Cardholder"/>
                         <span asp-validation-for="CardHolderName" class="alert alert-danger" />
                     </div>
                 </div>
                 <div class="col-md-6">
                     <div class="form-group">
                         <label asp-for="CardExpirationShort" class="esh-orders_new-title">Expiration date</label>
-						<input asp-for="CardExpirationShort" class="form-control form-input form-input-medium" type="text" placeholder="MM/YY" />
+                        <input asp-for="CardExpirationShort" class="form-control form-input form-input-medium" type="text" placeholder="MM/YY"/>
                         <span asp-validation-for="CardExpirationShort" class="alert alert-danger" />
                     </div>
                 </div>
                 <div class="col-md-6">
                     <div class="form-group">
                         <label asp-for="CardSecurityNumber" class="esh-orders_new-title">Security code</label>
-						<input asp-for="CardSecurityNumber" class="form-control form-input form-input-small" type="text" placeholder="000" />
+                        <input asp-for="CardSecurityNumber" class="form-control form-input form-input-small" type="text" placeholder="000"/>
                         <span asp-validation-for="CardSecurityNumber" class="alert alert-danger" />
                     </div>
                 </div>
             </div>
         </section>
 
-		<partial name="_OrderItems" />
+        @await Html.PartialAsync("_OrderItems")
 
         <section class="esh-orders_new-section">
             <div class="form-group">
@@ -98,10 +96,10 @@
             </div>
         </section>
         <input asp-for="ZipCode" type="hidden" />
-		<input asp-for="RequestId" type="hidden" value="@Guid.NewGuid().ToString()" />
+        <input asp-for="RequestId" type="hidden" value="@Guid.NewGuid().ToString()"/>
     </form>
 </div>
 
 @section Scripts {
-	<partial name="_ValidationScriptsPartial" />
+    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
 }

src/Web/WebMVC/Views/Order/Detail.cshtml

@@ -4,12 +4,11 @@
 
 @{
     ViewData["Title"] = "Order Detail";
-	var headers = new List<Header>() {
-		new Header() { Controller = "Catalog", Text = "Back to catalog" } };
 }
 
 <div class="esh-orders_detail">
-	<partial name="_Header" model="headers" />
+    @Html.Partial("_Header", new List<Header>() {
+        new Header() { Controller = "Catalog", Text = "Back to catalog" } })
 
     <div class="container">
         <section class="esh-orders_detail-section">

src/Web/WebMVC/Views/Order/Index.cshtml

@@ -4,15 +4,13 @@
 
 @{
     ViewData["Title"] = "My Orders";
-	var headers = new List<Header>() {
-new Header() { Controller = "Catalog", Text = "Back to catalog" },
-new Header() { Text = " / " },
-new Header() { Controller = "OrderManagement", Text = "Orders Management" }
-};
 }
 
 <div class="esh-orders">
-	<partial name="_Header" model="headers" />
+    @Html.Partial("_Header", new List<Header>() {
+new Header() { Controller = "Catalog", Text = "Back to catalog" },
+new Header() { Text = " / " },
+new Header() { Controller = "OrderManagement", Text = "Orders Management" } })
 
     <div class="container">
         <article class="esh-orders-titles row">

src/Web/WebMVC/Views/OrderManagement/Index.cshtml

@@ -4,12 +4,11 @@
 
 @{
     ViewData["Title"] = "My Orders";
-	var headers = new List<Header>() {
-	    new Header { Controller = " Catalog", Text="Back to catalog" } };
 }
 
 <div class="esh-orders">
-	<partial name="_Header" model="headers" />
+    @Html.Partial("_Header", new List<Header>() {
+            new Header() { Controller = "Catalog", Text = "Back to catalog" } })
 
     <div class="container">
         <article class="esh-orders-titles row">

src/Web/WebMVC/Views/Shared/_CookieConsentPartial.cshtml

@@ -1,41 +0,0 @@
-@using Microsoft.AspNetCore.Http.Features
-
-@{
-    var consentFeature = Context.Features.Get<ITrackingConsentFeature>();
-    var showBanner = !consentFeature?.CanTrack ?? false;
-    var cookieString = consentFeature?.CreateConsentCookie();
-}
-
-@if (showBanner)
-{
-    <nav id="cookieConsent" class="navbar navbar-default navbar-fixed-top" role="alert">
-        <div class="container">
-            <div class="navbar-header">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#cookieConsent .navbar-collapse">
-                    <span class="sr-only">Toggle cookie consent banner</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                <span class="navbar-brand"><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span></span>
-            </div>
-            <div class="collapse navbar-collapse">
-                <p class="navbar-text">
-                    Use this space to summarize your privacy and cookie use policy.
-                </p>
-                <div class="navbar-right">
-                    <a asp-controller="Home" asp-action="Privacy" class="btn btn-info navbar-btn">Learn More</a>
-                    <button type="button" class="btn btn-default navbar-btn" data-cookie-string="@cookieString">Accept</button>
-                </div>
-            </div>
-        </div>
-    </nav>
-    <script>
-        (function () {
-            document.querySelector("#cookieConsent button[data-cookie-string]").addEventListener("click", function (el) {
-                document.cookie = el.target.dataset.cookieString;
-                document.querySelector("#cookieConsent").classList.add("hidden");
-            }, false);
-        })();
-    </script>
-}

src/Web/WebMVC/Views/Shared/_Layout.cshtml

@@ -49,7 +49,6 @@
 		</div>
 	</header>
 
-	<partial name="_CookieConsentPartial" />
 
 	@RenderBody()
 

src/Web/WebMVC/WebMVC.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
     <UserSecretsId>aspnet-Microsoft.eShopOnContainers-946ae052-8305-4a99-965b-ec8636ddbae3</UserSecretsId>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
@@ -19,24 +18,27 @@
   </ItemGroup>
 
   <ItemGroup>
-		<PackageReference Include="BuildBundlerMinifier" Version="2.8.391" />
+    <PackageReference Include="BuildBundlerMinifier" Version="2.6.375" />
-		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" />
+    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" />
-		<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" />
-		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
-		<PackageReference Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.4.1" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.3.3" />
-		<PackageReference Include="Microsoft.VisualStudio.Azure.Fabric.MSBuild" Version="1.6.7" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Fabric.MSBuild" Version="1.6.5" />
-		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.3" />
+    <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="1.0.113" />
-		<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="1.0.163" />
   </ItemGroup>
 
   <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
     <Exec Command="dotnet bundle" Condition="'$(ASPNETCORE_ENVIRONMENT)'!='Development'" />
   </Target>
 
+  <ItemGroup>
+     <DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.7.385" />
+  </ItemGroup>
+
 
   <ItemGroup>
     <ProjectReference Include="..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" />

src/Web/WebMVC/appsettings.json

@@ -1,11 +1,10 @@
 {
-	"AllowedHosts": "*",
   "CatalogUrl": "http://localhost:5101",
   "OrderingUrl": "http://localhost:5102",
   "BasketUrl": "http://localhost:5103",
   "MarketingUrl": "http://localhost:5110",
-	"IdentityUrl": "https://localhost:4105",
+  "IdentityUrl": "http://localhost:5105",
-	"CallBackUrl": "https://localhost:4100/",
+  "CallBackUrl": "http://localhost:5100/",
   "LocationsUrl": "http://localhost:5109/",
   "IsClusterEnv": "False",
   "UseResilientHttp": "True",
@@ -24,13 +23,5 @@
     "InstrumentationKey": ""
   },
   "HttpClientRetryCount": 8,
-	"HttpClientExceptionsAllowedBeforeBreaking": 7,
+  "HttpClientExceptionsAllowedBeforeBreaking": 7
-	"Kestrel": {
-		"Certificates": {
-			"Default": {
-				"Path": "./synergydev.pfx",
-				"Password": "RH@ssl2018"
-			}
-		}
-	}
 }

src/Web/WebSPA/Dockerfile

@@ -1,10 +1,9 @@
 ARG NODE_IMAGE=node:8.11
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
-EXPOSE 443
 
-FROM microsoft/dotnet:2.1.401-sdk as dotnet-build
+FROM microsoft/dotnet:2.1-sdk as dotnet-build
 WORKDIR /src
 
 FROM ${NODE_IMAGE} as node-build
@@ -17,7 +16,6 @@ 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

src/Web/WebSPA/Properties/launchSettings.json

@@ -4,7 +4,7 @@
     "anonymousAuthentication": true,
     "iisExpress": {
       "applicationUrl": "http://localhost:58018/",
-			"sslPort": 4104
+      "sslPort": 0
     }
   },
   "profiles": {
@@ -12,8 +12,7 @@
       "commandName": "IISExpress",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Production"
-			},
+      }
-			"use64Bit": true
     }
   }
 }

src/Web/WebSPA/Startup.cs

@@ -26,12 +26,12 @@ namespace eShopConContainers.WebSPA
 
         public IConfiguration Configuration { get; }
 
-		private readonly IHostingEnvironment _hostingEnv;
+        private IHostingEnvironment _hostingEnv;
         public Startup(IHostingEnvironment env)
         {
             _hostingEnv = env;
 
-			string localPath = new Uri(Configuration["ASPNETCORE_URLS"])?.LocalPath ?? "/";
+            var localPath = new Uri(Configuration["ASPNETCORE_URLS"])?.LocalPath ?? "/";
             Configuration["BaseUrl"] = localPath;
         }
 
@@ -43,8 +43,8 @@ namespace eShopConContainers.WebSPA
 
             services.AddHealthChecks(checks =>
             {
-				int minutes = 1;
+                var minutes = 1;
-				if (int.TryParse(Configuration["HealthCheck:Timeout"], out int minutesParsed))
+                if (int.TryParse(Configuration["HealthCheck:Timeout"], out var minutesParsed))
                 {
                     minutes = minutesParsed;
                 }
@@ -74,11 +74,6 @@ namespace eShopConContainers.WebSPA
                 .AddJsonOptions(options =>
                 {
                     options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
-			    })
-			    .SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_1);
-			services.AddHttpsRedirection(opts =>
-			{
-				opts.HttpsPort = 4104;
                 });
         }
 
@@ -94,12 +89,6 @@ namespace eShopConContainers.WebSPA
             {
                 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            
@@ -116,7 +105,7 @@ namespace eShopConContainers.WebSPA
             //Seed Data
             WebContextSeed.Seed(app, env, loggerFactory);
 
-			string pathBase = Configuration["PATH_BASE"];
+            var pathBase = Configuration["PATH_BASE"];
             if (!string.IsNullOrEmpty(pathBase))
             {
                 loggerFactory.CreateLogger("init").LogDebug($"Using PATH BASE '{pathBase}'");
@@ -151,7 +140,7 @@ namespace eShopConContainers.WebSPA
         private void RegisterAppInsights(IServiceCollection services)
         {
             services.AddApplicationInsightsTelemetry(Configuration);
-			string orchestratorType = Configuration.GetValue<string>("OrchestratorType");
+            var orchestratorType = Configuration.GetValue<string>("OrchestratorType");
 
             if (orchestratorType?.ToUpper() == "K8S")
             {

src/Web/WebSPA/WebSPA.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
     <UserSecretsId>aspnetcorespa-c23d27a4-eb88-4b18-9b77-2a93f3b15119</UserSecretsId>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
     <TypeScriptCompileOnSaveEnabled>false</TypeScriptCompileOnSaveEnabled>
@@ -70,10 +69,6 @@
     <None Remove="Client\polyfills.ts" />
     <None Remove="Client\test.ts" />
     <None Remove="Client\typings.d.ts" />
-		<None Remove="Setup\DotNet Foundation CA.pfx" />
-		<None Remove="Setup\eShopOnContainers.pfx" />
-		<Content Include="Setup\DotNet Foundation CA.pfx" />
-		<Content Include="Setup\eShopOnContainers.pfx" />
     <Content Include="Setup\images.zip">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
@@ -89,13 +84,13 @@
   </ItemGroup>
 
   <ItemGroup>
-		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" />
+    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" />
-		<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
-		<PackageReference Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.4.1" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.3.3" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
@@ -178,13 +173,10 @@
     <TypeScriptCompile Include="Client\typings.d.ts" />
   </ItemGroup>
 
-	<ItemGroup>
+  <ProjectExtensions>
-	  <Content Update="Setup\DotNet Foundation CA.pfx">
+    <VisualStudio>
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <UserProperties package-lock_1json__JSONSchema="http://json.schemastore.org/bower" />
-	  </Content>
+    </VisualStudio>
-	  <Content Update="Setup\eShopOnContainers.pfx">
+  </ProjectExtensions>
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </Content>
-	</ItemGroup>
 
 </Project>

src/Web/WebSPA/appsettings.json

@@ -1,7 +1,7 @@
 {
-	"IdentityUrl": "https://localhost:4105",
+  "IdentityUrl": "http://localhost:5105",
   "MarketingUrl": "http://localhost:5110",
-	"CallBackUrl": "https://localhost:4104/",
+  "CallBackUrl": "http://localhost:5104/",
   "PurchaseUrl": "http://localhost:5200",
   "UseCustomizationData": true,
   "IsClusterEnv": "False",
@@ -16,13 +16,5 @@
   },
   "ApplicationInsights": {
     "InstrumentationKey": ""
-	},
-	"Kestrel": {
-		"Certificates": {
-			"Default": {
-				"Path": "./Setup/eShopOnContainers.pfx",
-				"Password": "D0tNet@"
-			}
-		}
   }
 }

src/Web/WebStatus/Dockerfile

@@ -1,13 +1,12 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Web/WebStatus
 RUN dotnet restore -nowarn:msb3202,nu1503
-COPY src/Web/WebMVC/synergydev.pfx /root/.aspnet/https/
 RUN dotnet build --no-restore -c Release -o /app
 
 FROM build AS publish

src/Web/WebStatus/Properties/launchSettings.json

@@ -13,8 +13,7 @@
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "use64Bit": true
     },
     "WebStatus": {
       "commandName": "Project",

src/Web/WebStatus/Startup.cs

@@ -1,13 +1,15 @@
-using Microsoft.ApplicationInsights.Extensibility;
+using System;
-using Microsoft.ApplicationInsights.ServiceFabric;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using WebStatus.Extensions;
-
+using Microsoft.ApplicationInsights.Extensibility;
-using TimeSpan = System.TimeSpan;
+using Microsoft.ApplicationInsights.ServiceFabric;
 
 namespace WebStatus
 {
@@ -31,7 +33,7 @@ namespace WebStatus
             services.AddHealthChecks(checks =>
             {
                 var minutes = 1;
-				if (int.TryParse(Configuration["HealthCheck:Timeout"], out int minutesParsed))
+                if (int.TryParse(Configuration["HealthCheck:Timeout"], out var minutesParsed))
                 {
                     minutes = minutesParsed;
                 }
@@ -48,10 +50,7 @@ namespace WebStatus
                 checks.AddUrlCheckIfNotNull(Configuration["spa"], TimeSpan.Zero); //No cache for this HealthCheck, better just for demos 
             });
 
-			services
+            services.AddMvc();
-				.AddMvc()
-				.SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_1)
-				;
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

src/Web/WebStatus/WebStatus.csproj

@@ -1,17 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
   <ItemGroup>
-		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
-		<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" />
     <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" />
-		<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
-		<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
     <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="1.0.113" />
   </ItemGroup>