From 368952d4328484053d9f9c7cef3c0e842837711d Mon Sep 17 00:00:00 2001 From: Tarun Jain Date: Fri, 3 Feb 2023 14:50:35 +0530 Subject: [PATCH 1/3] update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 28c57eb6f..8498db06e 100644 --- a/README.md +++ b/README.md @@ -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 6 +## Updated for .NET 7 -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. +eShopOnContainers is updated to .NET 7 "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 6 "wave" of technologies. Not just compilat ### Architecture overview -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. +This reference application is cross-platform at the server and client-side, thanks to .NET 7 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) From 4119fe06dcb99c96218e774f2f408f105ae2ad4e Mon Sep 17 00:00:00 2001 From: Tarun Jain Date: Mon, 6 Feb 2023 16:20:32 +0530 Subject: [PATCH 2/3] updates the branch-guide.md --- branch-guide.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/branch-guide.md b/branch-guide.md index 633dc8faf..decce0bc4 100644 --- a/branch-guide.md +++ b/branch-guide.md @@ -2,7 +2,8 @@ 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 6` +- `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 7` +- `release/net-6`: Contains the code changes specific to the `.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` From ad8c8054fe7fe1982613acd2015be4f404d6820c Mon Sep 17 00:00:00 2001 From: Tarun Jain Date: Mon, 6 Feb 2023 16:29:19 +0530 Subject: [PATCH 3/3] updated Contributing.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ccb80afb8..75ea5b017 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -47,7 +47,7 @@ All contributions must be submitted as a [Pull Request (PR)](https://help.github The main branches are **`dev`** and **`master`**: - **`dev`**: Contains the latest code **and it is the branch actively developed**. -**All PRs must be against `dev` branch to be considered**. This branch is developed using `.NET 5` +**All PRs must be against `dev` branch to be considered**. This branch is developed using `.NET 7` - **`main`**: Synced from time to time from **`dev`**. It contains "stable" code.This branch contains changes specific to `.NET Core 3.1` (**Keep in mind "stable" does not mean PRODUCTION-READY!**)