Skip to content

Commit 1447697

Browse files
Merge pull request dotnet-architecture#60 from dotnet-architecture/dev
eShopOnContainers fork
2 parents 2faec10 + f8084f5 commit 1447697

9 files changed

Lines changed: 15 additions & 11 deletions

File tree

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,30 @@ Dev branch contains the latest "stable" code, and their images are tagged with `
2222
[![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) |
2323

2424
## IMPORTANT NOTES!
25+
2526
**You can use either the latest version of Visual Studio or simply Docker CLI and .NET CLI for Windows, Mac and Linux**.
2627

2728
**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.
2829

2930
**NEWS / ANNOUNCEMENTS**
3031
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
3132

33+
## Update to .NET Core 3
34+
35+
> 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).
36+
>
37+
> You can monitor this branch, but it's being changed frequently, community contributions will be accepted once it's officially released.
38+
3239
## Updated for .NET Core 2.2 "wave" of technologies
40+
3341
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.
3442

3543
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.
3644

3745
>**PLEASE** Read our [branch guide](./branch-guide.md) to know about our branching policy
3846
3947
> ### DISCLAIMER
48+
>
4049
> **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.
4150
>
4251
> 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.
-27.1 MB
Binary file not shown.
-5.55 MB
Binary file not shown.

src/Services/Location/Locations.API/Locations.API.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
2121
<PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.2.0" />
2222
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.2.0" />
23-
<PackageReference Include="mongocsharpdriver" Version="2.5.0" />
2423
<PackageReference Include="MongoDB.Bson" Version="2.5.0" />
2524
<PackageReference Include="MongoDB.Driver" Version="2.5.0" />
2625
<PackageReference Include="MongoDB.Driver.Core" Version="2.5.0" />

src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands
1515
// http://cqrs.nu/Faq
1616
// https://docs.spine3.org/motivation/immutability.html
1717
// http://blog.gauffin.org/2012/06/griffin-container-introducing-command-support/
18-
// https://msdn.microsoft.com/en-us/library/bb383979.aspx
18+
// https://docs.microsoft.com/dotnet/csharp/programming-guide/classes-and-structs/how-to-implement-a-lightweight-class-with-auto-implemented-properties
1919

2020
[DataContract]
2121
public class CreateOrderCommand

src/Services/Ordering/Ordering.Infrastructure/MediatorExtension.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,8 @@ public static async Task DispatchDomainEventsAsync(this IMediator mediator, Orde
2121
domainEntities.ToList()
2222
.ForEach(entity => entity.Entity.ClearDomainEvents());
2323

24-
var tasks = domainEvents
25-
.Select(async (domainEvent) => {
26-
await mediator.Publish(domainEvent);
27-
});
28-
29-
await Task.WhenAll(tasks);
24+
foreach (var domainEvent in domainEvents)
25+
await mediator.Publish(domainEvent);
3026
}
3127
}
3228
}

src/Services/Payment/Payment.API/IntegrationEvents/EventHandling/OrderStatusChangedToStockConfirmedIntegrationEventHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public async Task Handle(OrderStatusChangedToStockConfirmedIntegrationEvent @eve
4141
// Instead of a real payment we just take the env. var to simulate the payment
4242
// The payment can be successful or it can fail
4343

44-
if (_settings.PaymentSucceded)
44+
if (_settings.PaymentSucceeded)
4545
{
4646
orderPaymentIntegrationEvent = new OrderPaymentSucceededIntegrationEvent(@event.OrderId);
4747
}

src/Services/Payment/Payment.API/PaymentSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public class PaymentSettings
44
{
5-
public bool PaymentSucceded { get; set; }
5+
public bool PaymentSucceeded { get; set; }
66
public string EventBusConnection { get; set; }
77
}
88
}

src/Services/Payment/Payment.API/appsettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
}
1313
},
14-
"PaymentSucceded": true,
14+
"PaymentSucceeded": true,
1515
"AzureServiceBusEnabled": false,
1616
"SubscriptionClientName": "Payment",
1717
"ApplicationInsights": {

0 commit comments

Comments
 (0)