From a9ce760515907742ca6fe18b53a4f2efb12bd56a Mon Sep 17 00:00:00 2001 From: Robert Raboud Date: Thu, 1 Feb 2018 14:59:34 -0500 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 49cf975af59e17fb4a01afa0ad1b8586ab3784e8 Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Sun, 18 Mar 2018 17:27:59 +0000 Subject: [PATCH 4/4] 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