From d1b6bc84fac3bf65af6f4cac8a97458851991da5 Mon Sep 17 00:00:00 2001 From: Unai Zorrilla Castro Date: Tue, 15 May 2018 12:42:08 +0200 Subject: [PATCH] Migrated projects and references to use 2.1 rc1 libraries --- global.json | 10 +++---- src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj | 7 ++--- .../Mobile.Shopping.HttpAggregator.csproj | 10 ++----- .../Web.Bff.Shopping/aggregator/Startup.cs | 2 +- .../Web.Shopping.HttpAggregator.csproj | 13 ++++----- .../EventBus/EventBus/EventBus.csproj | 2 +- .../EventBusRabbitMQ/EventBusRabbitMQ.csproj | 10 +++---- .../EventBusServiceBus.csproj | 6 ++-- .../IntegrationEventLogEF.csproj | 18 ++++-------- .../Microsoft.AspNetCore.HealthChecks.csproj | 2 +- ...xtensions.HealthChecks.AzureStorage.csproj | 4 +-- ...t.Extensions.HealthChecks.SqlServer.csproj | 2 +- .../Microsoft.Extensions.HealthChecks.csproj | 6 ++-- .../Resilience.Http/Resilience.Http.csproj | 8 +++--- .../Resilience.Http/ResilientHttpClient.cs | 12 ++++---- .../WebHost.Customization.csproj | 8 +++--- .../Basket/Basket.API/Basket.API.csproj | 14 ++++++---- .../Catalog/Catalog.API/Catalog.API.csproj | 17 +++++------ .../Identity/Identity.API/Identity.API.csproj | 23 ++++++--------- .../Locations.API/Locations.API.csproj | 18 ++++++------ .../Marketing.API/Marketing.API.csproj | 16 +++++------ .../Ordering/Ordering.API/Ordering.API.csproj | 26 ++++++++--------- .../Ordering.BackgroundTasks.csproj | 10 ++----- .../Ordering.BackgroundTasks/Startup.cs | 2 +- .../Ordering.Infrastructure.csproj | 6 ++-- .../Ordering.SignalrHub/NotificationHub.cs | 4 +-- .../Ordering.SignalrHub.csproj | 17 +++++++---- .../Ordering/Ordering.SignalrHub/Startup.cs | 2 +- .../Payment/Payment.API/Payment.API.csproj | 14 ++++------ .../ResilientHttpClientFactory.cs | 2 +- src/Web/WebMVC/Startup.cs | 1 - src/Web/WebMVC/WebMVC.csproj | 19 +++++-------- src/Web/WebSPA/WebSPA.csproj | 28 +++++++++---------- src/Web/WebStatus/Startup.cs | 1 - src/Web/WebStatus/WebStatus.csproj | 15 +++++----- .../FunctionalTests/FunctionalTests.csproj | 7 ++--- .../IntegrationTests/IntegrationTests.csproj | 10 +++---- test/Services/UnitTest/UnitTest.csproj | 8 +++--- 38 files changed, 170 insertions(+), 210 deletions(-) diff --git a/global.json b/global.json index 00b3f36f2..97e2836a2 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ -{ - "sdk": { - "version": "2.1.4" - } -} \ No newline at end of file +// { +// "sdk": { +// "version": "2.1.4" +// } +// } \ No newline at end of file diff --git a/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj b/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj index d72d014b4..d3b1a049b 100644 --- a/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj +++ b/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.0 + netcoreapp2.1 @@ -9,8 +9,7 @@ - + - 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 bd6d73950..90bd68cda 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.0 + netcoreapp2.1 Mobile.Shopping.HttpAggregator Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator ..\..\..\docker-compose.dcproj @@ -12,14 +12,10 @@ - + - - - - diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs index 17f9f90e6..f303d843d 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs @@ -129,7 +129,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator app.UseSwagger().UseSwaggerUI(c => { c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Purchase BFF V1"); - c.ConfigureOAuth2("Microsoft.eShopOnContainers.Web.Shopping.HttpAggregatorwaggerui", "", "", "Purchase BFF Swagger UI"); + //c.ConfigureOAuth2("Microsoft.eShopOnContainers.Web.Shopping.HttpAggregatorwaggerui", "", "", "Purchase BFF Swagger UI"); }); 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 0b6dbf44b..1e7a1f38c 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.0 + netcoreapp2.1 Web.Shopping.HttpAggregator Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator ..\..\..\docker-compose.dcproj @@ -12,12 +12,9 @@ - - - - - - + + + diff --git a/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj b/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj index b219dcfa1..9704f6ff5 100644 --- a/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj +++ b/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj @@ -6,7 +6,7 @@ - + \ No newline at end of file diff --git a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj index d6c9fc8e2..ab5285c89 100644 --- a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj +++ b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj @@ -7,12 +7,12 @@ - - - - + + + + - + diff --git a/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj b/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj index 8e76a02db..facceac2a 100644 --- a/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj +++ b/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj index d4f380a14..685cd2735 100644 --- a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj +++ b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj @@ -6,18 +6,12 @@ - - - - - - - - - - - - + + + + + + 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 5018e198c..1abd12278 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 @@ -13,7 +13,7 @@ - + \ 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 007f66f65..dc498e8c1 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 @@ -16,10 +16,10 @@ - + - + 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 0aef3c907..17fb3f68d 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 @@ -9,7 +9,7 @@ - + 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 6c102c33d..2de3689ba 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 @@ -9,12 +9,12 @@ - - + + - + diff --git a/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj b/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj index 276c1a23f..4f22ad943 100644 --- a/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj +++ b/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj @@ -6,10 +6,10 @@ - - - - + + + + \ No newline at end of file diff --git a/src/BuildingBlocks/Resilience/Resilience.Http/ResilientHttpClient.cs b/src/BuildingBlocks/Resilience/Resilience.Http/ResilientHttpClient.cs index 9fa38ee8d..aaa709e79 100644 --- a/src/BuildingBlocks/Resilience/Resilience.Http/ResilientHttpClient.cs +++ b/src/BuildingBlocks/Resilience/Resilience.Http/ResilientHttpClient.cs @@ -51,7 +51,7 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http { var origin = GetOriginFromUri(uri); - return HttpInvoker(origin, async () => + return HttpInvoker(origin, async (_) => { var requestMessage = new HttpRequestMessage(HttpMethod.Delete, uri); @@ -75,8 +75,8 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http public Task GetStringAsync(string uri, string authorizationToken = null, string authorizationMethod = "Bearer") { var origin = GetOriginFromUri(uri); - - return HttpInvoker(origin, async () => + + return HttpInvoker(origin, async (_) => { var requestMessage = new HttpRequestMessage(HttpMethod.Get, uri); @@ -117,7 +117,7 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http // as it is disposed after each call var origin = GetOriginFromUri(uri); - return HttpInvoker(origin, async () => + return HttpInvoker(origin, async (_) => { var requestMessage = new HttpRequestMessage(method, uri); @@ -149,7 +149,7 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http }); } - private async Task HttpInvoker(string origin, Func> action) + private async Task HttpInvoker(string origin, Func> action) { var normalizedOrigin = NormalizeOrigin(origin); @@ -161,7 +161,7 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http // Executes the action applying all // the policies defined in the wrapper - return await policyWrap.ExecuteAsync(action, new Context(normalizedOrigin)); + return await policyWrap.ExecuteAsync(action, new Context(normalizedOrigin)); } diff --git a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj index 6a6632379..487fd7dc4 100644 --- a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj +++ b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj @@ -1,12 +1,12 @@ - + - netcoreapp2.0 + netcoreapp2.1 - - + + diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index 3bc5cee4c..4efca69c1 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; ..\..\..\..\docker-compose.dcproj @@ -14,12 +14,14 @@ - - - - + + + + - + + + diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj index ad36cf3b7..c50c32ad0 100644 --- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj +++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 portable true Catalog.API @@ -36,18 +36,15 @@ - - - - - + + + + + + - - - - diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index 84a87a231..f531e418a 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -1,8 +1,7 @@  - netcoreapp2.0 - 2.0.0 + netcoreapp2.1 aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5 ..\..\..\..\docker-compose.dcproj @@ -16,14 +15,15 @@ - - - - + + + + + - - + + @@ -31,13 +31,6 @@ - - - - - - - diff --git a/src/Services/Location/Locations.API/Locations.API.csproj b/src/Services/Location/Locations.API/Locations.API.csproj index aef0fe9e9..5ec30d526 100644 --- a/src/Services/Location/Locations.API/Locations.API.csproj +++ b/src/Services/Location/Locations.API/Locations.API.csproj @@ -1,26 +1,24 @@  - netcoreapp2.0 + netcoreapp2.1 ..\..\..\..\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 36da8fceb..5573370f2 100644 --- a/src/Services/Marketing/Marketing.API/Marketing.API.csproj +++ b/src/Services/Marketing/Marketing.API/Marketing.API.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 ..\..\..\..\docker-compose.dcproj Microsoft.eShopOnContainers.Services.Marketing.API $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; @@ -22,18 +22,16 @@ - - - - + + + + + - - - - + diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj index c95cff6e1..f48b34a92 100644 --- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 aspnet-Ordering.API-20161122013547 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; ..\..\..\..\docker-compose.dcproj @@ -31,25 +31,21 @@ - + - - - - - - + + + + + + + - - + + - - - - - PreserveNewest diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj index f2a7ad465..9f832bdfd 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.0 + netcoreapp2.1 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; ..\..\..\..\docker-compose.dcproj @@ -13,11 +13,7 @@ - - - - - + diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Startup.cs b/src/Services/Ordering/Ordering.BackgroundTasks/Startup.cs index bb7ae0902..2bc085dbf 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Startup.cs +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Startup.cs @@ -110,7 +110,7 @@ namespace Ordering.BackgroundTasks // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, Microsoft.AspNetCore.Hosting.IHostingEnvironment env) { #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously diff --git a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj index e4731db13..af536efbf 100644 --- a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj +++ b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/src/Services/Ordering/Ordering.SignalrHub/NotificationHub.cs b/src/Services/Ordering/Ordering.SignalrHub/NotificationHub.cs index 8a4c1c90f..5fd6f3eb9 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/NotificationHub.cs +++ b/src/Services/Ordering/Ordering.SignalrHub/NotificationHub.cs @@ -13,13 +13,13 @@ namespace Ordering.SignalrHub public override async Task OnConnectedAsync() { - await Groups.AddAsync(Context.ConnectionId, Context.User.Identity.Name); + await Groups.AddToGroupAsync(Context.ConnectionId, Context.User.Identity.Name); await base.OnConnectedAsync(); } public override async Task OnDisconnectedAsync(Exception ex) { - await Groups.RemoveAsync(Context.ConnectionId, Context.User.Identity.Name); + await Groups.AddToGroupAsync(Context.ConnectionId, Context.User.Identity.Name); await base.OnDisconnectedAsync(ex); } } diff --git a/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj b/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj index 8b8aa5832..fa27ad55a 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj +++ b/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.0 + netcoreapp2.1 ..\..\..\..\docker-compose.dcproj @@ -11,10 +11,15 @@ - - - - + + + + + + + + + diff --git a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs index b2bc2346a..927bb6d74 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs +++ b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs @@ -134,7 +134,7 @@ namespace Ordering.SignalrHub app.UseSignalR(routes => { routes.MapHub("/notificationhub", options => - options.Transports = Microsoft.AspNetCore.Http.Connections.TransportType.All); + options.Transports = Microsoft.AspNetCore.Http.Connections.HttpTransportType.WebSockets); }); ConfigureEventBus(app); diff --git a/src/Services/Payment/Payment.API/Payment.API.csproj b/src/Services/Payment/Payment.API/Payment.API.csproj index 278dcc6cb..7c4868139 100644 --- a/src/Services/Payment/Payment.API/Payment.API.csproj +++ b/src/Services/Payment/Payment.API/Payment.API.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 ..\..\..\..\docker-compose.dcproj $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; @@ -9,13 +9,11 @@ - - - - - - - + + + + + diff --git a/src/Web/WebMVC/Infrastructure/ResilientHttpClientFactory.cs b/src/Web/WebMVC/Infrastructure/ResilientHttpClientFactory.cs index 43eac7b30..783dae631 100644 --- a/src/Web/WebMVC/Infrastructure/ResilientHttpClientFactory.cs +++ b/src/Web/WebMVC/Infrastructure/ResilientHttpClientFactory.cs @@ -40,7 +40,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Infrastructure { var msg = $"Retry {retryCount} implemented with Polly's RetryPolicy " + $"of {context.PolicyKey} " + - $"at {context.ExecutionKey}, " + + $"at {context.OperationKey}, " + $"due to: {exception}."; _logger.LogWarning(msg); _logger.LogDebug(msg); diff --git a/src/Web/WebMVC/Startup.cs b/src/Web/WebMVC/Startup.cs index a83bfa644..6d26e5790 100644 --- a/src/Web/WebMVC/Startup.cs +++ b/src/Web/WebMVC/Startup.cs @@ -148,7 +148,6 @@ namespace Microsoft.eShopOnContainers.WebMVC if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - app.UseBrowserLink(); } else { diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index 0160c9132..2c102e98f 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 aspnet-Microsoft.eShopOnContainers-946ae052-8305-4a99-965b-ec8636ddbae3 ..\..\..\docker-compose.dcproj @@ -20,11 +20,12 @@ - - - - - + + + + + + @@ -33,12 +34,6 @@ - - - - - - diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj index f34177d65..99f228ec4 100644 --- a/src/Web/WebSPA/WebSPA.csproj +++ b/src/Web/WebSPA/WebSPA.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 aspnetcorespa-c23d27a4-eb88-4b18-9b77-2a93f3b15119 ..\..\..\docker-compose.dcproj false @@ -85,12 +85,13 @@ - - - - - - + + + + + + + @@ -103,11 +104,6 @@ - - - - - - + @@ -187,6 +183,10 @@ - + + + + + diff --git a/src/Web/WebStatus/Startup.cs b/src/Web/WebStatus/Startup.cs index a4900db30..6a9ed32d1 100644 --- a/src/Web/WebStatus/Startup.cs +++ b/src/Web/WebStatus/Startup.cs @@ -62,7 +62,6 @@ namespace WebStatus if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - app.UseBrowserLink(); } else { diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj index e31928fe2..d95a60a9b 100644 --- a/src/Web/WebStatus/WebStatus.csproj +++ b/src/Web/WebStatus/WebStatus.csproj @@ -1,19 +1,18 @@  - netcoreapp2.0 + netcoreapp2.1 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; ..\..\..\docker-compose.dcproj - - - - - - - + + + + + + diff --git a/test/Services/FunctionalTests/FunctionalTests.csproj b/test/Services/FunctionalTests/FunctionalTests.csproj index 96ed1510f..afc1bf422 100644 --- a/test/Services/FunctionalTests/FunctionalTests.csproj +++ b/test/Services/FunctionalTests/FunctionalTests.csproj @@ -1,9 +1,8 @@  - netcoreapp2.0 + netcoreapp2.1 true - false false false @@ -44,8 +43,8 @@ - - + + diff --git a/test/Services/IntegrationTests/IntegrationTests.csproj b/test/Services/IntegrationTests/IntegrationTests.csproj index bf176495a..6bc8221b6 100644 --- a/test/Services/IntegrationTests/IntegrationTests.csproj +++ b/test/Services/IntegrationTests/IntegrationTests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 IntegrationTests IntegrationTests true @@ -44,13 +44,13 @@ - - + + - + - + diff --git a/test/Services/UnitTest/UnitTest.csproj b/test/Services/UnitTest/UnitTest.csproj index ebc17095f..b8688052c 100644 --- a/test/Services/UnitTest/UnitTest.csproj +++ b/test/Services/UnitTest/UnitTest.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 true $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false @@ -21,12 +21,12 @@ - + - + - +