Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit 9a91488

Browse files
authored
Merge pull request #2045 from erjain/net7-duende-fix
update README.md
2 parents e15a622 + ad8c805 commit 9a91488

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ All contributions must be submitted as a [Pull Request (PR)](https://help.github
4747
The main branches are **`dev`** and **`master`**:
4848

4949
- **`dev`**: Contains the latest code **and it is the branch actively developed**.
50-
**All PRs must be against `dev` branch to be considered**. This branch is developed using `.NET 5`
50+
**All PRs must be against `dev` branch to be considered**. This branch is developed using `.NET 7`
5151

5252
- **`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!**)
5353

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ In the future, more features will be implemented in the advanced scenario.
7272
**NEWS / ANNOUNCEMENTS**
7373
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
7474

75-
## Updated for .NET 6
75+
## Updated for .NET 7
7676

77-
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.
77+
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.
7878

7979
**See more details in the [Release notes](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Release-notes) wiki page**.
8080

@@ -86,7 +86,7 @@ eShopOnContainers is updated to .NET 6 "wave" of technologies. Not just compilat
8686
8787
### Architecture overview
8888

89-
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.
89+
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.
9090
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).
9191

9292
![](img/eshop_logo.png)

branch-guide.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
Following are the most important branches:
44

5-
- `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`
5+
- `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`
6+
- `release/net-6`: Contains the code changes specific to the `.NET 6`
67
- `release/net-5`: Contains the code changes specific to the `.NET 5`
78
- `release/net-3.1.1`: Contains the code changes specific to the `.NET 3.1`
89

0 commit comments

Comments
 (0)