Merge 8ce8560214 into 4615188057

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs

@@ -2274,9 +2274,27 @@ 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;
 			

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs

@@ -2268,9 +2268,27 @@ 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;
 			

src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs

@@ -30,9 +30,10 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.IntegrationEvents.Even
 
         private async Task UpdatePriceInBasketItems(int productId, decimal newPrice, decimal oldPrice, CustomerBasket basket)
         {
-            var itemsToUpdate = basket?.Items?.Where(x => int.Parse(x.ProductId) == productId).ToList();
+			string match = productId.ToString();
+			var itemsToUpdate = basket?.Items?.Where(x => x.ProductId == match).ToList();
 
-            if (itemsToUpdate != null)
+			if (itemsToUpdate != null)
             {
                 foreach (var item in itemsToUpdate)
                 {

src/Web/WebSPA/WebSPA.csproj

@@ -8,6 +8,7 @@
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <GeneratedItemPatterns>wwwroot/dist/**</GeneratedItemPatterns>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(GeneratedItemPatterns)</DefaultItemExcludes>
+    <TypeScriptToolsVersion>2.5</TypeScriptToolsVersion>
   </PropertyGroup>
 
   <ItemGroup>