diff --git a/README.md b/README.md index c3c05d76b..39b2a87f4 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ Dev branch contains the latest "stable" code, and their images are tagged with ` [![Web Status](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/webstatus?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=211&branchName=dev) | [![Webhooks API](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/webhooks?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=207&branchName=dev) | [![Webhooks demo client](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/webhooks-client?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=208&branchName=dev) | ## IMPORTANT NOTES! + **You can use either the latest version of Visual Studio or simply Docker CLI and .NET CLI for Windows, Mac and Linux**. **Note for Pull Requests (PRs)**: We accept pull request from the community. When doing it, please do it onto the **DEV branch** which is the consolidated work-in-progress branch. Do not request it onto Master branch, if possible. @@ -29,7 +30,14 @@ Dev branch contains the latest "stable" code, and their images are tagged with ` **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 +## Update to .NET Core 3 + +> There's currently an update to .NET Core 3 going on in the branch [features/migration-dotnet3](https://github.com/dotnet-architecture/eShopOnContainers/tree/features/migration-dotnet3). +> +> You can monitor this branch, but it's being changed frequently, community contributions will be accepted once it's officially released. + ## Updated for .NET Core 2.2 "wave" of technologies + eShopOnContainers is updated to .NET Core 2.x (currently updated to 2.2) "wave" of technologies. Not just compilation but also new recommended code in EF Core, ASP.NET Core, and other new related versions. The **dockerfiles** in the solution have also been updated and now support [**Docker Multi-Stage**](https://blogs.msdn.microsoft.com/stevelasker/2017/09/11/net-and-multistage-dockerfiles/) since mid-December 2017. @@ -37,6 +45,7 @@ The **dockerfiles** in the solution have also been updated and now support [**Do >**PLEASE** Read our [branch guide](./branch-guide.md) to know about our branching policy > ### DISCLAIMER +> > **IMPORTANT:** The current state of this sample application is **BETA**, because we are constantly evolving towards newly released technologies. Therefore, many areas could be improved and change significantly while refactoring the current code and implementing new features. Feedback with improvements and pull requests from the community will be highly appreciated and accepted. > > This reference application proposes a simplified microservice oriented architecture implementation to introduce technologies like .NET Core with Docker containers through a comprehensive application. The chosen domain is eShop/eCommerce but simply because it is a well-known domain by most people/developers. diff --git a/docs/Decks/BRK3175_CesarDeIaTorre.pptx b/docs/Decks/BRK3175_CesarDeIaTorre.pptx deleted file mode 100644 index e04d7338e..000000000 Binary files a/docs/Decks/BRK3175_CesarDeIaTorre.pptx and /dev/null differ diff --git a/docs/Decks/eShopOnContainers-Architecture-v2.1.pptx b/docs/Decks/eShopOnContainers-Architecture-v2.1.pptx deleted file mode 100644 index 52398f823..000000000 Binary files a/docs/Decks/eShopOnContainers-Architecture-v2.1.pptx and /dev/null differ diff --git a/src/Services/Location/Locations.API/Locations.API.csproj b/src/Services/Location/Locations.API/Locations.API.csproj index 3bf3f5814..4f4cf0b3e 100644 --- a/src/Services/Location/Locations.API/Locations.API.csproj +++ b/src/Services/Location/Locations.API/Locations.API.csproj @@ -20,7 +20,6 @@ - diff --git a/src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs b/src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs index 1f6e41005..d54b5add5 100644 --- a/src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs +++ b/src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs @@ -15,7 +15,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands // http://cqrs.nu/Faq // https://docs.spine3.org/motivation/immutability.html // http://blog.gauffin.org/2012/06/griffin-container-introducing-command-support/ - // https://msdn.microsoft.com/en-us/library/bb383979.aspx + // https://docs.microsoft.com/dotnet/csharp/programming-guide/classes-and-structs/how-to-implement-a-lightweight-class-with-auto-implemented-properties [DataContract] public class CreateOrderCommand diff --git a/src/Services/Ordering/Ordering.Infrastructure/MediatorExtension.cs b/src/Services/Ordering/Ordering.Infrastructure/MediatorExtension.cs index 82a7235a2..8d0ea1d63 100644 --- a/src/Services/Ordering/Ordering.Infrastructure/MediatorExtension.cs +++ b/src/Services/Ordering/Ordering.Infrastructure/MediatorExtension.cs @@ -21,12 +21,8 @@ namespace Ordering.Infrastructure domainEntities.ToList() .ForEach(entity => entity.Entity.ClearDomainEvents()); - var tasks = domainEvents - .Select(async (domainEvent) => { - await mediator.Publish(domainEvent); - }); - - await Task.WhenAll(tasks); + foreach (var domainEvent in domainEvents) + await mediator.Publish(domainEvent); } } } diff --git a/src/Services/Payment/Payment.API/IntegrationEvents/EventHandling/OrderStatusChangedToStockConfirmedIntegrationEventHandler.cs b/src/Services/Payment/Payment.API/IntegrationEvents/EventHandling/OrderStatusChangedToStockConfirmedIntegrationEventHandler.cs index c2f31b4cf..5921529b2 100644 --- a/src/Services/Payment/Payment.API/IntegrationEvents/EventHandling/OrderStatusChangedToStockConfirmedIntegrationEventHandler.cs +++ b/src/Services/Payment/Payment.API/IntegrationEvents/EventHandling/OrderStatusChangedToStockConfirmedIntegrationEventHandler.cs @@ -41,7 +41,7 @@ // Instead of a real payment we just take the env. var to simulate the payment // The payment can be successful or it can fail - if (_settings.PaymentSucceded) + if (_settings.PaymentSucceeded) { orderPaymentIntegrationEvent = new OrderPaymentSucceededIntegrationEvent(@event.OrderId); } diff --git a/src/Services/Payment/Payment.API/PaymentSettings.cs b/src/Services/Payment/Payment.API/PaymentSettings.cs index e31acb52e..fdb8a29cc 100644 --- a/src/Services/Payment/Payment.API/PaymentSettings.cs +++ b/src/Services/Payment/Payment.API/PaymentSettings.cs @@ -2,7 +2,7 @@ { public class PaymentSettings { - public bool PaymentSucceded { get; set; } + public bool PaymentSucceeded { get; set; } public string EventBusConnection { get; set; } } } diff --git a/src/Services/Payment/Payment.API/appsettings.json b/src/Services/Payment/Payment.API/appsettings.json index a73471214..9964a8bd2 100644 --- a/src/Services/Payment/Payment.API/appsettings.json +++ b/src/Services/Payment/Payment.API/appsettings.json @@ -11,7 +11,7 @@ } } }, - "PaymentSucceded": true, + "PaymentSucceeded": true, "AzureServiceBusEnabled": false, "SubscriptionClientName": "Payment", "ApplicationInsights": {