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

174 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
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
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
Eduard Tomas
ea129609d5 Basket.API nuget updated 2017-06-21 19:33:24 +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
Ramón Tomás
4be61abdde Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
Christian Arenas
39e69ee4e0 Merge branch 'servicebus' into dev 
# Conflicts:
#	docker-compose.override.yml
#	src/Services/Catalog/Catalog.API/CatalogSettings.cs
#	src/Services/Catalog/Catalog.API/settings.json
 2017-05-30 18:47:34 +02:00
Christian Arenas
4d07fecc3b fix merge error 2017-05-30 18:35:09 +02:00
Christian Arenas
ea02ecc160 Merge branch 'azureredis' into dev 
# Conflicts:
#	src/Services/Basket/Basket.API/Startup.cs
#	src/Services/Basket/Basket.API/appsettings.json
 2017-05-30 18:32:28 +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
6b480e3d41 Apply ConnectionString changes (remove condition) 2017-05-29 16:04:35 +02:00
Christian Arenas
e309d97d18 remove AzureRedisConnectionString variable from settings 2017-05-29 16:03:51 +02:00
Christian Arenas
0473a97225 change the "AzureRedisEnabled" condition to configure declaration 2017-05-29 12:42:51 +02:00
Christian Arenas
db7d2a3ff3 Add "AzureRedisConnectionString" environment variable and add a connectionString condition when "AzureRedisEnabled" environment variable is true 2017-05-29 11:01:56 +02:00
Christian Arenas
41a6814293 Add new connection string 2017-05-29 10:12:07 +02:00
Christian Arenas
cd790f276f Update StackExchange.Redis version 2017-05-27 18:35:44 +02:00
Christian Arenas
c23d2551cd Add new redis connection getting data from environment variable 2017-05-27 18:35:28 +02:00
Christian Arenas
b30d09fbf5 Add Redis connectionString to environment variable 2017-05-27 18:34:36 +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
Christian Arenas
721a4fd02b - Declare new ServiceBus instance with "AzureServiceBus" boolean condition DI 
- Add ServiceBusConnection and AzureServiceBus variables in settings
- Add EventBusServiceBus dependencies
 2017-05-24 15:33:38 +02:00
Cesar De la Torre
1f7dbac140 Merge pull request #199 from SychevIgor/dev 
Packages update to 1.1.* and Swagger update
 2017-05-23 09:21:32 -07:00
igorsych
4790981e80 swagger/ui to swagger url fix 2017-05-23 16:39:22 +03:00
Cesar De la Torre
e2b6580629 Update BasketController.cs 2017-05-22 15:56:22 -07:00
Cesar De la Torre
aee9ec768e Update BasketController.cs 2017-05-22 15:54:18 -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
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
1ecec231b0 Change variable parameter name 2017-05-18 09:43:37 +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
f3b6444e63 minor changes 2017-05-17 00:40:40 +02:00
Ramón Tomás
afc247da67 Change SPA app to call basket for order checkout 2017-05-16 09:23:35 +02:00
Ramón Tomás
f79806e899 Created Ship order process in WebMVC app 
Create Ship order command and handler in Ordering.api
Create Order management page in WebMVC app
 2017-05-14 14:48:37 +02:00
Ramón Tomás
e64a4fac24 Merge 2017-05-11 13:59:27 +02:00
Eduard Tomas
7fc63fe196 Messagebus dispatch messages in its own scope 2017-05-11 13:44:38 +02:00
Ramón Tomás
21fe9b7be4 Create checkout call in webmvc 
Created Cancel call in webmvc
 2017-05-11 11:51:13 +02:00
Ramón Tomás
46ee0db400 Merge branch 'dev' into order-processflow-redesign 2017-05-09 13:46:01 +02:00
Eduard Tomas
50f904f74a Fixing registers missing and routes 2017-05-08 13:36:31 +02:00
Ramón Tomás
fa048c22c1 Merge from Dev 2017-05-04 11:57:49 +02:00
Eduard Tomas
bfe86c1cba Refactor to event bus to support dynamic subscriptions to events 
Checkout HTTP entrypoint in Basket API
 2017-05-03 16:34:41 +02:00