ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,049 Commits 36 Branches 19 Tags 655 MiB
Commit Graph

452 Commits

Author SHA1 Message Date
Eduard Tomas
d9b9578e48 Merge remote-tracking branch 'origin/dev' into netcore2 
# Conflicts:
#	docker-compose.dcproj
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/Startup.cs
#	src/Web/WebMVC/WebMVC.csproj
 2017-07-11 12:01:45 +02:00
Christian Arenas
03f23eafa4 Merge branch 'load-testing' into dev 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Identity/Identity.API/Configuration/Config.cs
#	src/Web/WebMVC/appsettings.json
 2017-07-10 14:40:26 +02:00
Christian Arenas
06cbab4731 Merge branch 'feature/marketing-details-azure-function' into dev 
# Conflicts:
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/appsettings.json
#	src/Web/WebSPA/AppSettings.cs
#	test/Services/FunctionalTests/Services/Marketing/MarketingScenarios.cs
 2017-07-07 11:56:57 +02:00
Ramón Tomás
f993463856 Implemented service bus for marketing.api locations.api graceperiodProcess payment.api 2017-06-30 08:59:26 +02:00
Eduard Tomas
d65a112535 References updated to preview-2 
code adjustements to work with preview-2
 2017-06-29 18:36:57 +02:00
Eduard Tomas
10d03a68e3 Merge remote-tracking branch 'eShopOnAzure/dev' into dev 
# Conflicts:
#	docker-compose.override.yml
#	src/Services/Catalog/Catalog.API/CatalogSettings.cs
#	src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
#	src/Services/Catalog/Catalog.API/Controllers/PicController.cs
#	src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
#	src/Services/Catalog/Catalog.API/settings.json
#	src/Services/Ordering/Ordering.API/Startup.cs
 2017-06-28 12:40:21 +02:00
Ramón Tomás
a56f99f684 Fix merge 2017-06-26 18:05:02 +02:00
Ramón Tomás
a3e63c11aa Merge from eShopOnContainers Dev 2017-06-26 13:51:49 +02:00
Shaun Walker
18b91ee5f1 minor fixes to data and UI customization 2017-06-23 11:49:25 -07:00
Eduard Tomas
6b466a2c66 Fixing NetStandard.Library versions 2017-06-22 16:15:58 +02:00
Eduard Tomas
3c2ce4d7a7 Ordering.API nuget update 2017-06-21 19:48:13 +02:00
Eduard Tomas
56902a5549 [WIP] Projects & Dockerfile migrated to 2.0 
Lots of things to address yet, because nuget packages are still on 1.1
 2017-06-21 19:03:48 +02:00
Shaun Walker
445101b376 data and UI customization enhancements 2017-06-20 12:54:32 -07:00
Ramón Tomás
a9c185a41a Updated number of products in catalog stock 
Orders list ordered
Refresh orders list periodically
Fix bug SPA basket not dropped after creating order
 2017-06-14 16:38:27 +02:00
Ramón Tomás
4be61abdde Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
Ramón Tomás
8c0d41e4ad Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0 2017-06-06 19:20:42 +02:00
Eduard Tomas
b42fe3527a Resilience enhancements. 
MVC app now waits other containers
 2017-06-01 14:32:22 +02:00
Christian Arenas
18167186c9 Apply EventBusConnectionChanges 2017-05-30 17:59:57 +02:00
Christian Arenas
83ae0d48fc remove ServiceBusConnectionString variable from appsettings.json 2017-05-30 17:56:36 +02:00
Christian Arenas
41a6814293 Add new connection string 2017-05-29 10:12:07 +02:00
Cesar De la Torre
4410e455e0 Updates to target .NET Core 1.1.2 - Version changes at every .csproj file, dockerfile and the docker-compose.ci.build.yml file for building from the CLI. 2017-05-25 17:01:10 -07:00
Christian Arenas
ed0e548e2d minor naming 2017-05-26 01:35:44 +02:00
Christian Arenas
e454940801 environment variable renaming 2017-05-24 19:23:14 +02:00
Christian Arenas
9a100c9a27 Remove retry policy from DefaultServiceBusPersisterConnection parameter 2017-05-24 18:59:29 +02:00
Christian Arenas
04b35492c3 Add SubscriptionClientName EnvironmentVariable 2017-05-24 16:25:41 +02:00
Ramón Tomás
8c2af8c048 Clean Basket event is launched once basket is converted to order and before starting creating order. 
Change grace period time  to 1 minute
Remove unecessary clean basket methods on client
 2017-05-24 16:09:03 +02:00
Christian Arenas
7980c2679d - Declare new ServiceBus instance with "AzureServiceBus" boolean condition 
- Add ServiceBusConnection and AzureServiceBus variables in settings
- Add EventBusServiceBus dependencies
 2017-05-24 15:32:22 +02:00
Ramón Tomás
1ef6e0c060 Removed Saga feature 2017-05-24 08:53:36 +02:00
igorsych
4790981e80 swagger/ui to swagger url fix 2017-05-23 16:39:22 +03:00
Cesar De la Torre
2a7c1d740b Minor refactoring 2017-05-20 12:35:16 -07:00
igorsych
9e75504690 Newtonsoft.Json and MediatR with fixes of all based on MediatR classes 
also from csproj files excluded direct specification of runtime to make compile happy if on a system we have higher version.
 2017-05-19 18:03:05 +03:00
igorsych
85b61a2bfd Test packages update to the latest version 
Redis and RabbitMQ also updated
Identity server changes reflectiong  ac59db6e16 commit
 2017-05-19 09:02:05 +03:00
igorsych
c1320f4445 swagger update https://github.com/domaindrivendev/Swashbuckle.AspNetCore 2017-05-19 08:11:32 +03:00
igorsych
c5778a04f3 .NET core packages update 2017-05-19 08:11:18 +03:00
Ramón Tomás
87e57b9a44 Merge from Dev 2017-05-18 15:39:31 +02:00
Christian Arenas
45fff656d0 - Remove unused IntegrationCommands folders 
- minor name changes
 2017-05-18 12:03:17 +02:00
Christian Arenas
a2eb2a348d Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign 
# Conflicts:
#	src/Services/Ordering/Ordering.API/Startup.cs
 2017-05-18 11:51:12 +02:00
Christian Arenas
55a82c24f4 - Change Integration Command to Integration Events 
- Refactor PublishThroughEventBusAsync methods from OrderingIntegrationEventService
- Add private empty Address constructor.
- Modify order aggregate methods.
- Remove GetWithDependenciesAsync methods and modify GetAsync with entity framework Explicit loading.
 2017-05-18 11:42:22 +02:00
Ramón Tomás
62a29b6d7e Fix merge 2017-05-18 09:14:38 +02:00
Ramón Tomás
3f9574c8c9 Merge 2017-05-18 09:14:21 +02:00
Ramón Tomás
6c9d2cdb31 Adapt test cases to new order flow 
Create new service test cases
 2017-05-18 08:40:35 +02:00
Christian Arenas
0ee173cd34 naming changes 2017-05-17 11:57:02 +02:00
Christian Arenas
f3b6444e63 minor changes 2017-05-17 00:40:40 +02:00
Christian Arenas
b95bf247cf Change SaveEntitiesAsync to SaveChangesAsync 2017-05-16 18:40:34 +02:00
Christian Arenas
2b202bdc6c SaveChangesAsync() from Integration events 2017-05-16 15:11:03 +02:00
Christian Arenas
888dca003e Get ChildItems 2017-05-16 15:10:23 +02:00
Christian Arenas
504efbd191 Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign 
# Conflicts:
#	src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
 2017-05-16 11:21:37 +02:00
Christian Arenas
db41124d78 Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign 
# Conflicts:
#	src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
 2017-05-16 11:11:09 +02:00
Christian Arenas
36ca700df8 Add SetCancelledStatus method 2017-05-16 10:19:35 +02:00
Christian Arenas
e6c59f093c remove CheckValidSagaId replicated method 2017-05-16 10:18:57 +02:00