From a9ce760515907742ca6fe18b53a4f2efb12bd56a Mon Sep 17 00:00:00 2001 From: Robert Raboud Date: Thu, 1 Feb 2018 14:59:34 -0500 Subject: [PATCH 01/13] Revert "automatic changes" This reverts commit f7dda83785c444af6587f9e0aa5436b3d6883ecb. --- .../Resources/Resource.Designer.cs | 18 ------------------ .../Resources/Resource.Designer.cs | 18 ------------------ src/Web/WebSPA/WebSPA.csproj | 1 - 3 files changed, 37 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs index b3aa8d16c..074729b61 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs @@ -2274,27 +2274,9 @@ namespace eShopOnContainers.Droid // aapt resource value: 0x7f020054 public const int avd_hide_password = 2130837588; - // aapt resource value: 0x7f020127 - public const int avd_hide_password_1 = 2130837799; - - // aapt resource value: 0x7f020128 - public const int avd_hide_password_2 = 2130837800; - - // aapt resource value: 0x7f020129 - public const int avd_hide_password_3 = 2130837801; - // aapt resource value: 0x7f020055 public const int avd_show_password = 2130837589; - // aapt resource value: 0x7f02012a - public const int avd_show_password_1 = 2130837802; - - // aapt resource value: 0x7f02012b - public const int avd_show_password_2 = 2130837803; - - // aapt resource value: 0x7f02012c - public const int avd_show_password_3 = 2130837804; - // aapt resource value: 0x7f020056 public const int background = 2130837590; diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs index 694a01864..cf88d1538 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs @@ -2268,27 +2268,9 @@ namespace eShopOnContainers.TestRunner.Droid // aapt resource value: 0x7f020053 public const int avd_hide_password = 2130837587; - // aapt resource value: 0x7f020112 - public const int avd_hide_password_1 = 2130837778; - - // aapt resource value: 0x7f020113 - public const int avd_hide_password_2 = 2130837779; - - // aapt resource value: 0x7f020114 - public const int avd_hide_password_3 = 2130837780; - // aapt resource value: 0x7f020054 public const int avd_show_password = 2130837588; - // aapt resource value: 0x7f020115 - public const int avd_show_password_1 = 2130837781; - - // aapt resource value: 0x7f020116 - public const int avd_show_password_2 = 2130837782; - - // aapt resource value: 0x7f020117 - public const int avd_show_password_3 = 2130837783; - // aapt resource value: 0x7f020055 public const int design_bottom_navigation_item_background = 2130837589; diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj index b6aeb94b5..b5274462c 100644 --- a/src/Web/WebSPA/WebSPA.csproj +++ b/src/Web/WebSPA/WebSPA.csproj @@ -8,7 +8,6 @@ true wwwroot/dist/** $(DefaultItemExcludes);$(GeneratedItemPatterns) - 2.5 From 047e3a945a309860ac6f972c987bd66d31904b1e Mon Sep 17 00:00:00 2001 From: Robert Raboud Date: Fri, 2 Mar 2018 21:54:02 -0500 Subject: [PATCH 02/13] Handled uncaught exception in command handling --- .../Commands/IdentifiedCommandHandler.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Services/Ordering/Ordering.API/Application/Commands/IdentifiedCommandHandler.cs b/src/Services/Ordering/Ordering.API/Application/Commands/IdentifiedCommandHandler.cs index 1f0b3ddca..f00ea44c8 100644 --- a/src/Services/Ordering/Ordering.API/Application/Commands/IdentifiedCommandHandler.cs +++ b/src/Services/Ordering/Ordering.API/Application/Commands/IdentifiedCommandHandler.cs @@ -48,11 +48,16 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands else { await _requestManager.CreateRequestForCommandAsync(message.Id); - - // Send the embeded business command to mediator so it runs its related CommandHandler - var result = await _mediator.Send(message.Command); - - return result; + try + { + // Send the embeded business command to mediator so it runs its related CommandHandler + var result = await _mediator.Send(message.Command); + return result; + } + catch + { + return default(R); + } } } } From 1e2bd352852c979aa2b5973fbcf32400c2d872bc Mon Sep 17 00:00:00 2001 From: Robert Raboud Date: Fri, 2 Mar 2018 21:54:35 -0500 Subject: [PATCH 03/13] Assembly name was incorrect --- test/Services/IntegrationTests/IntegrationTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Services/IntegrationTests/IntegrationTests.csproj b/test/Services/IntegrationTests/IntegrationTests.csproj index e3fe11e13..6118572b2 100644 --- a/test/Services/IntegrationTests/IntegrationTests.csproj +++ b/test/Services/IntegrationTests/IntegrationTests.csproj @@ -2,7 +2,7 @@ netcoreapp2.0 - FunctionalTests + IntegrationTests FunctionalTests true $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; From ccad354645633389622aff67bbc86a9924d9bcd5 Mon Sep 17 00:00:00 2001 From: Sychev Igor Date: Mon, 26 Feb 2018 21:08:09 +0300 Subject: [PATCH 04/13] packages update --- src/BuildingBlocks/EventBus/EventBus/EventBus.csproj | 2 +- .../EventBusRabbitMQ/EventBusRabbitMQ.csproj | 5 +++-- .../EventBusServiceBus/EventBusServiceBus.csproj | 1 + .../IntegrationEventLogEF.csproj | 2 +- ...osoft.Extensions.HealthChecks.AzureStorage.csproj | 2 +- .../Microsoft.Extensions.HealthChecks.csproj | 2 +- .../Resilience.Http/Resilience.Http.csproj | 4 ++-- .../WebHost.Customization.csproj | 4 ++-- src/Services/Basket/Basket.API/Basket.API.csproj | 8 ++++---- src/Services/Catalog/Catalog.API/Catalog.API.csproj | 8 ++++---- .../Identity/Identity.API/Identity.API.csproj | 12 ++++++------ .../Location/Locations.API/Locations.API.csproj | 10 +++++----- .../Marketing/Marketing.API/Marketing.API.csproj | 8 ++++---- .../Ordering/Ordering.API/Ordering.API.csproj | 12 ++++++------ .../Ordering.BackgroundTasks.csproj | 2 +- src/Services/Payment/Payment.API/Payment.API.csproj | 6 +++--- src/Web/WebMVC/WebMVC.csproj | 8 ++++---- src/Web/WebSPA/WebSPA.csproj | 8 ++++---- src/Web/WebStatus/WebStatus.csproj | 6 +++--- test/Services/FunctionalTests/FunctionalTests.csproj | 8 ++++---- .../IntegrationTests/IntegrationTests.csproj | 12 ++++++------ test/Services/UnitTest/UnitTest.csproj | 10 +++++----- 22 files changed, 71 insertions(+), 69 deletions(-) diff --git a/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj b/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj index ac2d3783e..b219dcfa1 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 a7e31fcd7..d6c9fc8e2 100644 --- a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj +++ b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj @@ -7,9 +7,10 @@ + - - + + diff --git a/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj b/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj index 17076b2f5..8e76a02db 100644 --- a/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj +++ b/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj @@ -8,6 +8,7 @@ + diff --git a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj index 7e9b67fc0..d4f380a14 100644 --- a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj +++ b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj @@ -11,7 +11,7 @@ - + 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 eaa067a54..b12be5b4e 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 @@ -20,7 +20,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 1b642d062..6c102c33d 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 @@ -10,7 +10,7 @@ - + diff --git a/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj b/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj index b166812cb..276c1a23f 100644 --- a/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj +++ b/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj @@ -8,8 +8,8 @@ - - + + \ No newline at end of file diff --git a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj index c1240c521..6a6632379 100644 --- a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj +++ b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index a613151e7..fccf4a232 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -13,13 +13,13 @@ - - + + - + - + diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj index acb17ce16..05b40dccd 100644 --- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj +++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj @@ -35,12 +35,12 @@ - - + + - - + + diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index 0d30c43c0..f14c895a0 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -15,15 +15,15 @@ - - + + - - - + + + - + diff --git a/src/Services/Location/Locations.API/Locations.API.csproj b/src/Services/Location/Locations.API/Locations.API.csproj index e1c41a251..5a9478f5d 100644 --- a/src/Services/Location/Locations.API/Locations.API.csproj +++ b/src/Services/Location/Locations.API/Locations.API.csproj @@ -7,17 +7,17 @@ - - + + - + - - + + diff --git a/src/Services/Marketing/Marketing.API/Marketing.API.csproj b/src/Services/Marketing/Marketing.API/Marketing.API.csproj index a6c6eb83b..04721ace7 100644 --- a/src/Services/Marketing/Marketing.API/Marketing.API.csproj +++ b/src/Services/Marketing/Marketing.API/Marketing.API.csproj @@ -21,16 +21,16 @@ - - + + - + - + diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj index 533149591..7b0a48a31 100644 --- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -30,20 +30,20 @@ - + - - + + - + - + - + diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj index 731d6df06..ea11d868f 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Services/Payment/Payment.API/Payment.API.csproj b/src/Services/Payment/Payment.API/Payment.API.csproj index bd0d595c0..1eea535f7 100644 --- a/src/Services/Payment/Payment.API/Payment.API.csproj +++ b/src/Services/Payment/Payment.API/Payment.API.csproj @@ -8,11 +8,11 @@ - - + + - + diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index d31fec311..05fa9769d 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -18,13 +18,13 @@ - - + + - + - + diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj index 00199f08f..3b5921159 100644 --- a/src/Web/WebSPA/WebSPA.csproj +++ b/src/Web/WebSPA/WebSPA.csproj @@ -27,13 +27,13 @@ - - + + - + - + diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj index 02ee3e622..a13215880 100644 --- a/src/Web/WebStatus/WebStatus.csproj +++ b/src/Web/WebStatus/WebStatus.csproj @@ -5,11 +5,11 @@ ..\..\..\docker-compose.dcproj - - + + - + diff --git a/test/Services/FunctionalTests/FunctionalTests.csproj b/test/Services/FunctionalTests/FunctionalTests.csproj index c85cd2e67..96ed1510f 100644 --- a/test/Services/FunctionalTests/FunctionalTests.csproj +++ b/test/Services/FunctionalTests/FunctionalTests.csproj @@ -44,10 +44,10 @@ - - - - + + + + diff --git a/test/Services/IntegrationTests/IntegrationTests.csproj b/test/Services/IntegrationTests/IntegrationTests.csproj index e3fe11e13..ad056f789 100644 --- a/test/Services/IntegrationTests/IntegrationTests.csproj +++ b/test/Services/IntegrationTests/IntegrationTests.csproj @@ -44,13 +44,13 @@ - - - - + + + + - - + + diff --git a/test/Services/UnitTest/UnitTest.csproj b/test/Services/UnitTest/UnitTest.csproj index 7c008e431..ebc17095f 100644 --- a/test/Services/UnitTest/UnitTest.csproj +++ b/test/Services/UnitTest/UnitTest.csproj @@ -21,12 +21,12 @@ - - + + - - - + + + From c1db0703a76441cabbe771b773caf25fda05597f Mon Sep 17 00:00:00 2001 From: Sychev Igor Date: Sun, 4 Mar 2018 13:53:59 +0300 Subject: [PATCH 05/13] packages update 2 --- ...osoft.Extensions.HealthChecks.AzureStorage.csproj | 2 +- src/Services/Basket/Basket.API/Basket.API.csproj | 10 +++++----- src/Services/Basket/Basket.API/Startup.cs | 3 ++- src/Services/Catalog/Catalog.API/Catalog.API.csproj | 10 +++++----- .../Identity/Identity.API/Identity.API.csproj | 10 +++++----- .../Location/Locations.API/Locations.API.csproj | 12 ++++++------ src/Services/Location/Locations.API/Startup.cs | 3 ++- .../Marketing/Marketing.API/Marketing.API.csproj | 10 +++++----- src/Services/Marketing/Marketing.API/Startup.cs | 3 ++- .../Ordering/Ordering.API/Ordering.API.csproj | 12 ++++++------ src/Services/Ordering/Ordering.API/Startup.cs | 3 ++- .../Ordering.BackgroundTasks.csproj | 2 +- src/Services/Payment/Payment.API/Payment.API.csproj | 8 ++++---- src/Web/WebMVC/WebMVC.csproj | 8 ++++---- src/Web/WebSPA/WebSPA.csproj | 6 +++--- src/Web/WebStatus/WebStatus.csproj | 6 +++--- 16 files changed, 56 insertions(+), 52 deletions(-) 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 b12be5b4e..007f66f65 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 @@ -20,7 +20,7 @@ - + diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index fccf4a232..d7ffa46b8 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -13,13 +13,13 @@ - - - + + + - - + + diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index 86b57c0cd..7d65ba8b4 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -205,7 +205,8 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API .UseSwaggerUI(c => { c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Basket.API V1"); - c.ConfigureOAuth2("basketswaggerui", "", "", "Basket Swagger UI"); + c.OAuthClientId ("basketswaggerui"); + c.OAuthAppName("Basket Swagger UI"); }); ConfigureEventBus(app); diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj index 05b40dccd..55e7f8be5 100644 --- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj +++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj @@ -34,13 +34,13 @@ - - - - + + + + - + diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index f14c895a0..5a30673e6 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -14,16 +14,16 @@ - - - - + + + + - + diff --git a/src/Services/Location/Locations.API/Locations.API.csproj b/src/Services/Location/Locations.API/Locations.API.csproj index 5a9478f5d..13cb71821 100644 --- a/src/Services/Location/Locations.API/Locations.API.csproj +++ b/src/Services/Location/Locations.API/Locations.API.csproj @@ -6,18 +6,18 @@ aspnet-Locations.API-20161122013619 - - - - + + + + - - + + diff --git a/src/Services/Location/Locations.API/Startup.cs b/src/Services/Location/Locations.API/Startup.cs index e69180e61..be0263312 100644 --- a/src/Services/Location/Locations.API/Startup.cs +++ b/src/Services/Location/Locations.API/Startup.cs @@ -176,7 +176,8 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API .UseSwaggerUI(c => { c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Locations.API V1"); - c.ConfigureOAuth2("locationsswaggerui", "", "", "Locations Swagger UI"); + c.OAuthClientId("locationsswaggerui"); + c.OAuthAppName("Locations Swagger UI"); }); LocationsContextSeed.SeedAsync(app, loggerFactory) diff --git a/src/Services/Marketing/Marketing.API/Marketing.API.csproj b/src/Services/Marketing/Marketing.API/Marketing.API.csproj index 04721ace7..3f07c3970 100644 --- a/src/Services/Marketing/Marketing.API/Marketing.API.csproj +++ b/src/Services/Marketing/Marketing.API/Marketing.API.csproj @@ -20,17 +20,17 @@ - - - - + + + + - + diff --git a/src/Services/Marketing/Marketing.API/Startup.cs b/src/Services/Marketing/Marketing.API/Startup.cs index f2dcd1578..5683dc72d 100644 --- a/src/Services/Marketing/Marketing.API/Startup.cs +++ b/src/Services/Marketing/Marketing.API/Startup.cs @@ -208,7 +208,8 @@ .UseSwaggerUI(c => { c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Marketing.API V1"); - c.ConfigureOAuth2("marketingswaggerui", "", "", "Marketing Swagger UI"); + c.OAuthClientId("marketingswaggerui"); + c.OAuthAppName("Marketing Swagger UI"); }); ConfigureEventBus(app); diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj index 7b0a48a31..c1ee1f57c 100644 --- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -30,16 +30,16 @@ - + - - - - + + + + - + diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs index 1879175c9..bf715c235 100644 --- a/src/Services/Ordering/Ordering.API/Startup.cs +++ b/src/Services/Ordering/Ordering.API/Startup.cs @@ -226,7 +226,8 @@ .UseSwaggerUI(c => { c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Ordering.API V1"); - c.ConfigureOAuth2("orderingswaggerui", "", "", "Ordering Swagger UI"); + c.OAuthClientId("orderingswaggerui"); + c.OAuthAppName("Ordering Swagger UI"); }); ConfigureEventBus(app); diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj index ea11d868f..f2a7ad465 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Services/Payment/Payment.API/Payment.API.csproj b/src/Services/Payment/Payment.API/Payment.API.csproj index 1eea535f7..e7e4fc739 100644 --- a/src/Services/Payment/Payment.API/Payment.API.csproj +++ b/src/Services/Payment/Payment.API/Payment.API.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index 05fa9769d..ac2261a45 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -18,13 +18,13 @@ - - - + + + - + diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj index 3b5921159..7d82fda2b 100644 --- a/src/Web/WebSPA/WebSPA.csproj +++ b/src/Web/WebSPA/WebSPA.csproj @@ -27,9 +27,9 @@ - - - + + + diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj index a13215880..32a311f9d 100644 --- a/src/Web/WebStatus/WebStatus.csproj +++ b/src/Web/WebStatus/WebStatus.csproj @@ -5,9 +5,9 @@ ..\..\..\docker-compose.dcproj - - - + + + From 34770da7386d0a7586369206509ca8f259c3335b Mon Sep 17 00:00:00 2001 From: Sychev Igor Date: Tue, 27 Feb 2018 14:55:19 +0300 Subject: [PATCH 06/13] aks cluster version --- k8s/gen-k8s-env-aks.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/k8s/gen-k8s-env-aks.ps1 b/k8s/gen-k8s-env-aks.ps1 index 6b8449565..a22588fa1 100644 --- a/k8s/gen-k8s-env-aks.ps1 +++ b/k8s/gen-k8s-env-aks.ps1 @@ -6,7 +6,8 @@ [parameter(Mandatory=$true)][string]$dnsName, [parameter(Mandatory=$true)][string]$createAcr=$true, [parameter(Mandatory=$false)][int]$nodeCount=2, - [parameter(Mandatory=$false)][string]$nodeVMSize="Standard_D2_v2" + [parameter(Mandatory=$false)][string]$nodeVMSize="Standard_D2_v2", + [parameter(Mandatory=$false)][string]$kubernetesVersion="1.7.7" ) # Create resource group @@ -21,7 +22,7 @@ if ($createAcr -eq $true) { # Create kubernetes orchestrator Write-Host "Creating kubernetes orchestrator..." -ForegroundColor Yellow -az aks create --resource-group=$resourceGroupName --name=$serviceName --dns-name-prefix=$dnsName --generate-ssh-keys --node-count=$nodeCount --node-vm-size=$nodeVMSize +az aks create --resource-group=$resourceGroupName --name=$serviceName --dns-name-prefix=$dnsName --generate-ssh-keys --node-count=$nodeCount --node-vm-size=$nodeVMSize --kubernetes-version $kubernetesVersion # Retrieve kubernetes cluster configuration and save it under ~/.kube/config az aks get-credentials --resource-group=$resourceGroupName --name=$serviceName From 039632bebd78800453407aadc9249db6e2b90662 Mon Sep 17 00:00:00 2001 From: Sychev Igor Date: Sun, 4 Mar 2018 23:16:24 +0300 Subject: [PATCH 07/13] docker to 2.0.5 .net core --- src/Services/Basket/Basket.API/Dockerfile | 2 +- src/Services/Catalog/Catalog.API/Dockerfile | 2 +- src/Services/Identity/Identity.API/Dockerfile | 2 +- src/Services/Location/Locations.API/Dockerfile | 2 +- src/Services/Marketing/Marketing.API/Dockerfile | 2 +- src/Services/Ordering/Ordering.API/Dockerfile | 2 +- src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile | 2 +- src/Services/Payment/Payment.API/Dockerfile | 2 +- src/Web/WebMVC/Dockerfile | 2 +- src/Web/WebSPA/Dockerfile | 2 +- src/Web/WebStatus/Dockerfile | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile index 22f0c6486..410238eba 100644 --- a/src/Services/Basket/Basket.API/Dockerfile +++ b/src/Services/Basket/Basket.API/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:2.0.3 AS base +FROM microsoft/aspnetcore:2.0.5 AS base WORKDIR /app EXPOSE 80 diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile index a73b51dcf..aebea1cd1 100644 --- a/src/Services/Catalog/Catalog.API/Dockerfile +++ b/src/Services/Catalog/Catalog.API/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:2.0.3 AS base +FROM microsoft/aspnetcore:2.0.5 AS base WORKDIR /app EXPOSE 80 diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile index e5b453731..9f566e3a8 100644 --- a/src/Services/Identity/Identity.API/Dockerfile +++ b/src/Services/Identity/Identity.API/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:2.0.3 AS base +FROM microsoft/aspnetcore:2.0.5 AS base WORKDIR /app EXPOSE 80 diff --git a/src/Services/Location/Locations.API/Dockerfile b/src/Services/Location/Locations.API/Dockerfile index 9f42ab1f9..c31feecd2 100644 --- a/src/Services/Location/Locations.API/Dockerfile +++ b/src/Services/Location/Locations.API/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:2.0.3 AS base +FROM microsoft/aspnetcore:2.0.5 AS base WORKDIR /app EXPOSE 80 diff --git a/src/Services/Marketing/Marketing.API/Dockerfile b/src/Services/Marketing/Marketing.API/Dockerfile index dea524632..e38394a1d 100644 --- a/src/Services/Marketing/Marketing.API/Dockerfile +++ b/src/Services/Marketing/Marketing.API/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:2.0.3 AS base +FROM microsoft/aspnetcore:2.0.5 AS base WORKDIR /app EXPOSE 80 diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile index d3076209f..c3095af3b 100644 --- a/src/Services/Ordering/Ordering.API/Dockerfile +++ b/src/Services/Ordering/Ordering.API/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:2.0.3 AS base +FROM microsoft/aspnetcore:2.0.5 AS base WORKDIR /app EXPOSE 80 diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile index 391d8c17b..b20999462 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:2.0.3 AS base +FROM microsoft/aspnetcore:2.0.5 AS base WORKDIR /app EXPOSE 80 diff --git a/src/Services/Payment/Payment.API/Dockerfile b/src/Services/Payment/Payment.API/Dockerfile index 896a81f84..e5b946645 100644 --- a/src/Services/Payment/Payment.API/Dockerfile +++ b/src/Services/Payment/Payment.API/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:2.0.3 AS base +FROM microsoft/aspnetcore:2.0.5 AS base WORKDIR /app EXPOSE 80 diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile index 5fb657dd8..870adad9b 100644 --- a/src/Web/WebMVC/Dockerfile +++ b/src/Web/WebMVC/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:2.0.3 AS base +FROM microsoft/aspnetcore:2.0.5 AS base WORKDIR /app EXPOSE 80 diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile index 47032f41f..7883b4016 100644 --- a/src/Web/WebSPA/Dockerfile +++ b/src/Web/WebSPA/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:2.0.3 AS base +FROM microsoft/aspnetcore:2.0.5 AS base WORKDIR /app EXPOSE 80 diff --git a/src/Web/WebStatus/Dockerfile b/src/Web/WebStatus/Dockerfile index b143bd875..c5f73adc3 100644 --- a/src/Web/WebStatus/Dockerfile +++ b/src/Web/WebStatus/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:2.0.3 AS base +FROM microsoft/aspnetcore:2.0.5 AS base WORKDIR /app EXPOSE 80 From 5e9c12e5c39adc36c520d474d92b566afe15b63c Mon Sep 17 00:00:00 2001 From: OuJun Date: Thu, 15 Mar 2018 18:15:57 +0800 Subject: [PATCH 08/13] Update readme.md --- deploy/az/storage/marketing/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/az/storage/marketing/readme.md b/deploy/az/storage/marketing/readme.md index 2b457b608..c0ec2be7a 100644 --- a/deploy/az/storage/marketing/readme.md +++ b/deploy/az/storage/marketing/readme.md @@ -24,7 +24,7 @@ Once parameter file is edited you can deploy it using [create-resources script]( i. e. if you are in windows, to deploy a Storage account in a new resourcegroup located in westus, go to `deploy\az` folder and type: ``` -create-resources.cmd marketing\deploystorage newResourceGroup -c westus +create-resources.cmd storage\marketing\deploystorage newResourceGroup -c westus ``` From 81477f07579e5662e2408dc0a0cc2b49ee5731d4 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Llorente Date: Fri, 16 Mar 2018 10:31:39 -0700 Subject: [PATCH 09/13] Fix bug in microsoft/aspnetcore-build:2.0.5-2.1.4 name. --- src/Services/Location/Locations.API/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Services/Location/Locations.API/Dockerfile b/src/Services/Location/Locations.API/Dockerfile index f8c731295..d3b1d6426 100644 --- a/src/Services/Location/Locations.API/Dockerfile +++ b/src/Services/Location/Locations.API/Dockerfile @@ -2,7 +2,7 @@ FROM microsoft/aspnetcore:2.0.3 AS base WORKDIR /app EXPOSE 80 -FROM aspnetcore-build:2.0.5-2.1.4 AS build +FROM microsoft/aspnetcore-build:2.0.5-2.1.4 AS build WORKDIR /src COPY . . RUN dotnet restore -nowarn:msb3202,nu1503 From b78daa46854e96967e0a3ec2b7c0c8add1586117 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Llorente Date: Fri, 16 Mar 2018 10:41:23 -0700 Subject: [PATCH 10/13] Fix microsoft/aspnetcore-build:2.0.5-2.1.4 name in dockerfiles --- src/Services/Basket/Basket.API/Dockerfile | 2 +- src/Services/Catalog/Catalog.API/Dockerfile | 2 +- src/Services/Identity/Identity.API/Dockerfile | 2 +- src/Services/Marketing/Marketing.API/Dockerfile | 2 +- src/Services/Ordering/Ordering.API/Dockerfile | 2 +- src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile | 2 +- src/Services/Payment/Payment.API/Dockerfile | 2 +- src/Web/WebMVC/Dockerfile | 2 +- src/Web/WebSPA/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile index a3cd2be2c..f3ed942cd 100644 --- a/src/Services/Basket/Basket.API/Dockerfile +++ b/src/Services/Basket/Basket.API/Dockerfile @@ -2,7 +2,7 @@ FROM microsoft/aspnetcore:2.0.3 AS base WORKDIR /app EXPOSE 80 -FROM aspnetcore-build:2.0.5-2.1.4 AS build +FROM microsoft/aspnetcore-build:2.0.5-2.1.4 AS build WORKDIR /src COPY . . RUN dotnet restore -nowarn:msb3202,nu1503 diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile index a5ea6b645..aabfc1ccd 100644 --- a/src/Services/Catalog/Catalog.API/Dockerfile +++ b/src/Services/Catalog/Catalog.API/Dockerfile @@ -2,7 +2,7 @@ FROM microsoft/aspnetcore:2.0.3 AS base WORKDIR /app EXPOSE 80 -FROM aspnetcore-build:2.0.5-2.1.4 AS build +FROM microsoft/aspnetcore-build:2.0.5-2.1.4 AS build WORKDIR /src COPY . . RUN dotnet restore -nowarn:msb3202,nu1503 diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile index f7a4b0c25..2ee93d00a 100644 --- a/src/Services/Identity/Identity.API/Dockerfile +++ b/src/Services/Identity/Identity.API/Dockerfile @@ -2,7 +2,7 @@ FROM microsoft/aspnetcore:2.0.3 AS base WORKDIR /app EXPOSE 80 -FROM aspnetcore-build:2.0.5-2.1.4 AS build +FROM microsoft/aspnetcore-build:2.0.5-2.1.4 AS build WORKDIR /src COPY . . RUN dotnet restore -nowarn:msb3202,nu1503 diff --git a/src/Services/Marketing/Marketing.API/Dockerfile b/src/Services/Marketing/Marketing.API/Dockerfile index b1772f9b6..78d262996 100644 --- a/src/Services/Marketing/Marketing.API/Dockerfile +++ b/src/Services/Marketing/Marketing.API/Dockerfile @@ -2,7 +2,7 @@ FROM microsoft/aspnetcore:2.0.3 AS base WORKDIR /app EXPOSE 80 -FROM aspnetcore-build:2.0.5-2.1.4 AS build +FROM microsoft/aspnetcore-build:2.0.5-2.1.4 AS build WORKDIR /src COPY . . RUN dotnet restore -nowarn:msb3202,nu1503 diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile index 8df9cf7a0..1b16caaec 100644 --- a/src/Services/Ordering/Ordering.API/Dockerfile +++ b/src/Services/Ordering/Ordering.API/Dockerfile @@ -2,7 +2,7 @@ FROM microsoft/aspnetcore:2.0.3 AS base WORKDIR /app EXPOSE 80 -FROM aspnetcore-build:2.0.5-2.1.4 AS build +FROM microsoft/aspnetcore-build:2.0.5-2.1.4 AS build WORKDIR /src COPY . . RUN dotnet restore -nowarn:msb3202,nu1503 diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile index 2577e5064..653fcb395 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile @@ -2,7 +2,7 @@ FROM microsoft/aspnetcore:2.0.3 AS base WORKDIR /app EXPOSE 80 -FROM aspnetcore-build:2.0.5-2.1.4 AS build +FROM microsoft/aspnetcore-build:2.0.5-2.1.4 AS build WORKDIR /src COPY . . RUN dotnet restore -nowarn:msb3202,nu1503 diff --git a/src/Services/Payment/Payment.API/Dockerfile b/src/Services/Payment/Payment.API/Dockerfile index 691301289..b6940000c 100644 --- a/src/Services/Payment/Payment.API/Dockerfile +++ b/src/Services/Payment/Payment.API/Dockerfile @@ -2,7 +2,7 @@ FROM microsoft/aspnetcore:2.0.3 AS base WORKDIR /app EXPOSE 80 -FROM aspnetcore-build:2.0.5-2.1.4 AS build +FROM microsoft/aspnetcore-build:2.0.5-2.1.4 AS build WORKDIR /src COPY . . RUN dotnet restore -nowarn:msb3202,nu1503 diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile index 9cb9a7fb7..e4b920cb8 100644 --- a/src/Web/WebMVC/Dockerfile +++ b/src/Web/WebMVC/Dockerfile @@ -2,7 +2,7 @@ FROM microsoft/aspnetcore:2.0.3 AS base WORKDIR /app EXPOSE 80 -FROM aspnetcore-build:2.0.5-2.1.4 AS build +FROM microsoft/aspnetcore-build:2.0.5-2.1.4 AS build WORKDIR /src COPY . . RUN dotnet restore -nowarn:msb3202,nu1503 diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile index 938850901..b53f1d3c4 100644 --- a/src/Web/WebSPA/Dockerfile +++ b/src/Web/WebSPA/Dockerfile @@ -2,7 +2,7 @@ FROM microsoft/aspnetcore:2.0.3 AS base WORKDIR /app EXPOSE 80 -FROM aspnetcore-build:2.0.5-2.1.4 AS build +FROM microsoft/aspnetcore-build:2.0.5-2.1.4 AS build WORKDIR /src COPY . . RUN dotnet restore -nowarn:msb3202,nu1503 From 49cf975af59e17fb4a01afa0ad1b8586ab3784e8 Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Sun, 18 Mar 2018 17:27:59 +0000 Subject: [PATCH 11/13] Fixed PackageId for consistency --- test/Services/IntegrationTests/IntegrationTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Services/IntegrationTests/IntegrationTests.csproj b/test/Services/IntegrationTests/IntegrationTests.csproj index 6118572b2..ba1a25efe 100644 --- a/test/Services/IntegrationTests/IntegrationTests.csproj +++ b/test/Services/IntegrationTests/IntegrationTests.csproj @@ -3,7 +3,7 @@ netcoreapp2.0 IntegrationTests - FunctionalTests + IntegrationTests true $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false From ed26c3359c9782b20d8927115deaeeb5e63e2836 Mon Sep 17 00:00:00 2001 From: Alex Kryvdyk Date: Fri, 23 Mar 2018 15:50:25 +0200 Subject: [PATCH 12/13] Remove private setters to make class immutable Remove private setters to make a class truly immutable. Otherwise, properties can be updated outside of constructor. This also makes code cleaner. Same in docs https://github.com/dotnet/docs/pull/4755 --- .../Events/OrderStartedDomainEvent.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Services/Ordering/Ordering.Domain/Events/OrderStartedDomainEvent.cs b/src/Services/Ordering/Ordering.Domain/Events/OrderStartedDomainEvent.cs index a457067f6..1b47ae901 100644 --- a/src/Services/Ordering/Ordering.Domain/Events/OrderStartedDomainEvent.cs +++ b/src/Services/Ordering/Ordering.Domain/Events/OrderStartedDomainEvent.cs @@ -11,13 +11,13 @@ namespace Ordering.Domain.Events /// public class OrderStartedDomainEvent : INotification { - public string UserId { get; private set; } - public int CardTypeId { get; private set; } - public string CardNumber { get; private set; } - public string CardSecurityNumber { get; private set; } - public string CardHolderName { get; private set; } - public DateTime CardExpiration { get; private set; } - public Order Order { get; private set; } + public string UserId { get; } + public int CardTypeId { get; } + public string CardNumber { get; } + public string CardSecurityNumber { get; } + public string CardHolderName { get; } + public DateTime CardExpiration { get; } + public Order Order { get; } public OrderStartedDomainEvent(Order order, string userId, int cardTypeId, string cardNumber, From 6869ad249a026480e1585310e0e0f9e6d07fe37d Mon Sep 17 00:00:00 2001 From: Alex Kryvdyk Date: Mon, 26 Mar 2018 19:17:59 +0300 Subject: [PATCH 13/13] Remove private property setters in Address value object to make it truly immutable --- .../AggregatesModel/OrderAggregate/Address.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Address.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Address.cs index 9576940df..b05ea92bf 100644 --- a/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Address.cs +++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Address.cs @@ -6,11 +6,11 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.O { public class Address : ValueObject { - public String Street { get; private set; } - public String City { get; private set; } - public String State { get; private set; } - public String Country { get; private set; } - public String ZipCode { get; private set; } + public String Street { get; } + public String City { get; } + public String State { get; } + public String Country { get; } + public String ZipCode { get; } private Address() { }