Merge branch 'dev' into eShop-servicebus

README.md

@@ -10,10 +10,6 @@ Sample .NET Core reference application, powered by Microsoft, based on a simplif
 
 ![](img/eshop-spa-app-home.png)
 
-## MVC application (ASP.NET Core)
-
-![](img/eshop-webmvc-app-screenshot.png)
-
 ## Build Status (GitHub Actions)
 
 | Image | Status | Image | Status |

deploy/windows/add-firewall-rules-for-sts-auth-thru-docker.ps1

@@ -10,10 +10,10 @@ function Check-Admin {
   $currentUser.IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)
 }
 function Add-InboundRule {
-  New-NetFirewallRule -DisplayName $InboundDisplayName -Confirm -Description "$Name Inbound Rule for port range 5100-5150" -LocalAddress Any -LocalPort 5100-5150 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Inbound
+  New-NetFirewallRule -DisplayName $InboundDisplayName -Confirm -Description "$Name Inbound Rule for port range 5100-5205" -LocalAddress Any -LocalPort 5100-5205 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Inbound
 }
 function Add-OutboundRule {
-  New-NetFirewallRule -DisplayName $OutboundDisplayName -Confirm -Description "$Name Outbound Rule for port range 5100-5150" -LocalAddress Any -LocalPort 5100-5150 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Outbound
+  New-NetFirewallRule -DisplayName $OutboundDisplayName -Confirm -Description "$Name Outbound Rule for port range 5100-5205" -LocalAddress Any -LocalPort 5100-5205 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Outbound
 }
 
 if ((Check-Admin) -eq $false) {

src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs

@@ -143,13 +143,10 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
                 {
                     _persistentConnection.TryConnect();
                 }
-
-                using (var channel = _persistentConnection.CreateModel())
-                {
-                    channel.QueueBind(queue: _queueName,
-                                      exchange: BROKER_NAME,
-                                      routingKey: eventName);
-                }
+ 
+                _consumerChannel.QueueBind(queue: _queueName,
+                                    exchange: BROKER_NAME,
+                                    routingKey: eventName);
             }
         }
 

src/Web/WebMVC/Views/Order/Detail.cshtml

@@ -40,7 +40,7 @@
 
         <section class="esh-orders_detail-section">
             <article class="esh-orders_detail-titles row">
-                <section class="esh-orders_detail-title col-12">Shiping address</section>
+                <section class="esh-orders_detail-title col-12">Shipping address</section>
             </article>
 
             <article class="esh-orders_detail-items row">

src/Web/WebSPA/Client/angular.json

@@ -36,7 +36,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,

src/Web/WebSPA/Client/package.json

@@ -28,15 +28,15 @@
   },
   "dependencies": {
     "@angular-devkit/schematics": "^11.0.4",
-    "@angular/animations": "10.2.5",
-    "@angular/common": "10.2.5",
-    "@angular/compiler": "10.2.5",
-    "@angular/core": "10.2.5",
-    "@angular/forms": "10.2.5",
-    "@angular/platform-browser": "10.2.5",
-    "@angular/platform-browser-dynamic": "10.2.5",
-    "@angular/platform-server": "10.2.5",
-    "@angular/router": "10.2.5",
+    "@angular/animations": "11.2.14",
+    "@angular/common": "11.2.14",
+    "@angular/compiler": "11.2.14",
+    "@angular/core": "11.2.14",
+    "@angular/forms": "11.2.14",
+    "@angular/platform-browser": "11.2.14",
+    "@angular/platform-browser-dynamic": "11.2.14",
+    "@angular/platform-server": "11.2.14",
+    "@angular/router": "11.2.14",
     "@microsoft/signalr": "3.0.1",
     "@ng-bootstrap/ng-bootstrap": "^8.0.0",
     "@popperjs/core": "2.0.0",
@@ -61,22 +61,22 @@
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1002.3",
-    "@angular/cli": "10.2.3",
-    "@angular/compiler-cli": "10.2.5",
-    "@angular/language-service": "10.2.5",
+    "@angular-devkit/build-angular": "~0.1102.14",
+    "@angular/cli": "11.2.14",
+    "@angular/compiler-cli": "11.2.14",
+    "@angular/language-service": "11.2.14",
     "@types/core-js": "2.5.0",
     "@types/hammerjs": "2.0.35",
-    "@types/jasmine": "^3.5.10",
+    "@types/jasmine": "~3.6.0",
     "@types/node": "^12.11.1",
     "@types/protractor": "4.0.0",
     "@types/selenium-webdriver": "3.0.10",
-    "codelyzer": "^5.1.2",
+    "codelyzer": "^6.0.0",
     "eslint": "^6.8.0",
     "handlebars": "^4.7.7",
-    "jasmine-core": "~3.5.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.0.0",
+    "karma": "~6.3.4",
     "karma-chrome-launcher": "~3.1.0",
     "karma-cli": "^2.0.0",
     "karma-jasmine": "~4.0.0",

src/Web/WebSPA/Client/src/modules/app.routes.ts

@@ -15,4 +15,4 @@ export const routes: Routes = [
     { path: 'order', component: OrdersNewComponent },
 ];
 
-export const routing = RouterModule.forRoot(routes);
+export const routing = RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' });

src/Web/WebSPA/Client/src/modules/orders/orders-detail/orders-detail.component.html

@@ -16,7 +16,7 @@
                 <section class="col-3">{{order.status}}</section>
             </article>
 
-            <h2 class="esh-orders_detail-title mt-5">Shiping address</h2>
+            <h2 class="esh-orders_detail-title mt-5">Shipping address</h2>
             <div class="u-mb-5">{{order.street}} {{order.city}} {{order.country}}</div>
 
             <article class="esh-orders_detail-items divider divider--bottom d-flex align-items-center pb-3 mt-3 u-text-sm"

src/Web/WebSPA/Client/src/modules/shared/components/page-not-found/page-not-found.component.spec.ts

@@ -1,6 +1,6 @@
 /* tslint:disable:no-unused-variable */
 
-import { TestBed, async } from '@angular/core/testing';
+import { TestBed, waitForAsync } from '@angular/core/testing';
 import { PageNotFoundComponent } from './page-not-found.component';
 
 describe('Component: PageNotFound', () => {