zhiguohe
diff --git a/‎.github/workflows/catalog-api.yml
+1-1 b/‎.github/workflows/catalog-api.yml
+1-1
diff --git a/‎.github/workflows/ordering-api.yml
+1-1 b/‎.github/workflows/ordering-api.yml
+1-1
diff --git a/‎README.md
+3-3 b/‎README.md
+3-3
diff --git a/‎branch-guide.md
+5-2 b/‎branch-guide.md
+5-2
diff --git a/‎deploy/k8s/nginx-ingress/local-dockerk8s/mvc-fix.yaml
+20-18 b/‎deploy/k8s/nginx-ingress/local-dockerk8s/mvc-fix.yaml
+20-18
diff --git a/‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/Config/UrlsConfig.cs
+21-24 b/‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/Config/UrlsConfig.cs
+21-24
@@ -22,7 +22,7 @@ on:
 env:
   SERVICE: catalog-api
   IMAGE: catalog.api
-  DOTNET_VERSION: 5.0.x
+  DOTNET_VERSION: 6.0.x
   PROJECT_PATH: Services/Catalog/Catalog.API
   TESTS_PATH: Services/Catalog/Catalog.UnitTests
 
 
@@ -22,7 +22,7 @@ on:
 env:
   SERVICE: ordering-api
   IMAGE: ordering.api
-  DOTNET_VERSION: 5.0.x
+  DOTNET_VERSION: 6.0.x
   PROJECT_PATH: Services/Ordering/Ordering.API
   TESTS_PATH: Services/Ordering/Ordering.UnitTests
 
 
@@ -72,9 +72,9 @@ In the future, more features will be implemented in the advanced scenario.
 **NEWS / ANNOUNCEMENTS**
 Do you want to be up-to-date on .NET Architecture guidance and reference apps like eShopOnContainers? --> Subscribe by "WATCHING" this new GitHub repo: https://github.com/dotnet-architecture/News
 
-## Updated for .NET 5
+## Updated for .NET 6
 
-eShopOnContainers is updated to .NET 5 "wave" of technologies. Not just compilation but also new recommended code in EF Core, ASP.NET Core, and other new related versions with several significant changes.
+eShopOnContainers is updated to .NET 6 "wave" of technologies. Not just compilation but also new recommended code in EF Core, ASP.NET Core, and other new related versions with several significant changes.
 
 **See more details in the [Release notes](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Release-notes) wiki page**.
 
@@ -86,7 +86,7 @@ eShopOnContainers is updated to .NET 5 "wave" of technologies. Not just compilat
 
 ### Architecture overview
 
-This reference application is cross-platform at the server and client-side, thanks to .NET 5 services capable of running on Linux or Windows containers depending on your Docker host, and to Xamarin for mobile apps running on Android, iOS, or Windows/UWP plus any browser for the client web apps.
+This reference application is cross-platform at the server and client-side, thanks to .NET 6 services capable of running on Linux or Windows containers depending on your Docker host, and to Xamarin for mobile apps running on Android, iOS, or Windows/UWP plus any browser for the client web apps.
 The architecture proposes a microservice oriented architecture implementation with multiple autonomous microservices (each one owning its own data/db) and implementing different approaches within each microservice (simple CRUD vs. DDD/CQRS patterns) using HTTP as the communication protocol between the client apps and the microservices and supports asynchronous communication for data updates propagation across multiple services based on Integration Events and an Event Bus (a light message broker, to choose between RabbitMQ or Azure Service Bus, underneath) plus other features defined at the [roadmap](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Roadmap).
 
 ![](img/eshop_logo.png)
 
@@ -2,8 +2,11 @@
 
 Following are the most important branches:
 
-- `dev`: Contains the latest code **and it is the branch actively developed**. Note that **all PRs must be against the `dev` branch to be considered**. This branch is developed using `.NET 5`
-- `main`: Synced time to time from `dev`.It contains "stable" code, although not the latest one. Right now, this branch contains changes specific to `.NET Core 3.1`
+- `dev`: Contains the latest code **and it is the branch actively developed**. Note that **all PRs must be against the `dev` branch to be considered**. This branch is developed using `.NET 6`
+- `release/net-5`: Contains the code changes specific to the `.NET 5`
+- `release/net-3.1.1`: Contains the code changes specific to the `.NET 3.1`
+
+> [!DISCLAIMER]: The `main` branch contains the old code base and will get obsolete in the future. So it's recommended to refer to different [tags](https://github.com/dotnet-architecture/eShopOnContainers/tags) to avoid any confusion. 
 
 Any other branch is considered temporary and could be deleted at any time. Do not submit any PR against them!
 
 
@@ -11,15 +11,16 @@ metadata:
   namespace: default
 spec:
   rules:
-    http:
-      paths:
-      - path: /webmvc
-        pathType: Prefix
-        backend:
-          service: 
-            name: webmvc
-            port: 
-              number: 80  
+    - host: localhost
+      http:
+        paths:
+          - path: /webmvc
+            pathType: Prefix
+            backend:
+              service: 
+                name: webmvc
+                port: 
+                  number: 80  
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -34,12 +35,13 @@ metadata:
   namespace: default
 spec:
   rules:
-    http:
-      paths:
-      - path: /identity
-        pathType: Prefix
-        backend:
-          service: 
-            name: identity
-            port: 
-              number: 80
+    - host: localhost
+      http:
+        paths:
+          - path: /identity
+            pathType: Prefix
+            backend:
+              service: 
+                name: identity
+                port: 
+                  number: 80
@@ -1,38 +1,35 @@
-using System.Collections.Generic;
+namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config;
 
-namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config
+public class UrlsConfig
 {
-    public class UrlsConfig
+    public class CatalogOperations
     {
-        public class CatalogOperations
-        {
-            public static string GetItemById(int id) => $"/api/v1/catalog/items/{id}";
+        public static string GetItemById(int id) => $"/api/v1/catalog/items/{id}";
 
-            public static string GetItemsById(IEnumerable<int> ids) => $"/api/v1/catalog/items?ids={string.Join(',', ids)}";
-        }
+        public static string GetItemsById(IEnumerable<int> ids) => $"/api/v1/catalog/items?ids={string.Join(',', ids)}";
+    }
 
-        public class BasketOperations
-        {
-            public static string GetItemById(string id) => $"/api/v1/basket/{id}";
+    public class BasketOperations
+    {
+        public static string GetItemById(string id) => $"/api/v1/basket/{id}";
 
-            public static string UpdateBasket() => "/api/v1/basket";
-        }
+        public static string UpdateBasket() => "/api/v1/basket";
+    }
 
-        public class OrdersOperations
-        {
-            public static string GetOrderDraft() => "/api/v1/orders/draft";
-        }
+    public class OrdersOperations
+    {
+        public static string GetOrderDraft() => "/api/v1/orders/draft";
+    }
 
-        public string Basket { get; set; }
+    public string Basket { get; set; }
 
-        public string Catalog { get; set; }
+    public string Catalog { get; set; }
 
-        public string Orders { get; set; }
+    public string Orders { get; set; }
 
-        public string GrpcBasket { get; set; }
+    public string GrpcBasket { get; set; }
 
-        public string GrpcCatalog { get; set; }
+    public string GrpcCatalog { get; set; }
 
-        public string GrpcOrdering { get; set; }
-    }
+    public string GrpcOrdering { get; set; }
 }