Merge branch 'dev' into fix/nugget-packages

build/azure-devops/apigws/azure-pipelines.yml

@@ -1,5 +1,3 @@
-pool:
-  vmImage: 'ubuntu-16.04'
 variables:
     registryEndpoint: eshop-registry
 trigger:
@@ -17,34 +15,66 @@ trigger:
     exclude:
     - src/ApiGateways/Mobile.Bff.Shopping/aggregator/*
     - src/ApiGateways/Web.Bff.Shopping/aggregator/*
-steps:
+jobs:
-- task: DockerCompose@0
+- job: BuildLinux
-  displayName: Compose build apigws
+  pool:
-  inputs:
+    vmImage: 'ubuntu-16.04'
-    dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
+  steps:
-    containerregistrytype: Container Registry
+  - task: DockerCompose@0
-    dockerRegistryEndpoint: $(registryEndpoint)
+    displayName: Compose build apigws
-    dockerComposeFile: docker-compose.yml
+    inputs:
-    qualifyImageNames: true
+      dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
-    projectName: ""
+      containerregistrytype: Container Registry
-    dockerComposeFileArgs: |
+      dockerRegistryEndpoint: $(registryEndpoint)
-      TAG=$(Build.SourceBranchName)
+      dockerComposeFile: docker-compose.yml
-- task: DockerCompose@0
+      qualifyImageNames: true
-  displayName: Compose push apigws
+      projectName: ""
-  inputs:
+      dockerComposeFileArgs: |
-    dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
+        TAG=$(Build.SourceBranchName)
-    containerregistrytype: Container Registry
+  - task: DockerCompose@0
-    dockerRegistryEndpoint: $(registryEndpoint)
+    displayName: Compose push apigws
-    dockerComposeFile: docker-compose.yml
+    inputs:
-    qualifyImageNames: true
+      dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
-    projectName: ""
+      containerregistrytype: Container Registry
-    dockerComposeFileArgs: |
+      dockerRegistryEndpoint: $(registryEndpoint)
-      TAG=$(Build.SourceBranchName)        
+      dockerComposeFile: docker-compose.yml
-- task: CopyFiles@2
+      qualifyImageNames: true
-  inputs:
+      projectName: ""
-    sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
+      dockerComposeFileArgs: |
-    targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+        TAG=$(Build.SourceBranchName)        
-- task: PublishBuildArtifacts@1
+  - task: CopyFiles@2
-  inputs:
+    inputs:
-    pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      sourceFolder: $(Build.SourcesDirectory)/k8s/helm    
-    artifactName: helm
+      targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+      artifactName: helm
+- job: BuildWindows
+  pool:
+    vmImage: 'vs2017-win2016'
+  steps:
+  - task: DockerCompose@0
+    displayName: Compose build apigws
+    inputs:
+      dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win
+  - task: DockerCompose@0
+    displayName: Compose push apigws
+    inputs:
+      dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
+      containerregistrytype: Container Registry
+      dockerRegistryEndpoint: $(registryEndpoint)
+      dockerComposeFile: docker-compose.yml
+      qualifyImageNames: true
+      projectName: ""
+      dockerComposeFileArgs: |
+        TAG=$(Build.SourceBranchName)
+        PLATFORM=win

src/Services/Catalog/Catalog.API/Model/CatalogItem.cs

@@ -64,7 +64,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API.Model
 
             if (quantityDesired <= 0)
             {
-                throw new CatalogDomainException($"Item units desired should be greater than cero");
+                throw new CatalogDomainException($"Item units desired should be greater than zero");
             }
 
             int removed = Math.Min(quantityDesired, this.AvailableStock);

src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs

@@ -131,7 +131,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.O
 				AddDomainEvent(new OrderStatusChangedToPaidDomainEvent(Id, OrderItems));
 
 				_orderStatusId = OrderStatus.Paid.Id;
-				_description = "The payment was performed at a simulated \"American Bank checking bank account endinf on XX35071\"";
+				_description = "The payment was performed at a simulated \"American Bank checking bank account ending on XX35071\"";
 			}
 		}