309 Commits

Author SHA1 Message Date
Christian Arenas
2111d56766 remove unused dbset 2017-06-03 00:59:58 +02:00
Christian Arenas
f058cfde21 fix error merge 2017-06-02 16:36:16 +02:00
Christian Arenas
345b71b50e cleanup 2017-06-02 16:35:21 +02:00
Christian Arenas
1e3fd13362 Merge branch 'marketingcampaign' of https://github.com/dotnet-architecture/eShopOnContainers into marketingcampaign
# Conflicts:
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
2017-06-02 16:34:37 +02:00
Christian Arenas
ae7f1e8e7a initialitze the list in constructor 2017-06-02 16:32:50 +02:00
Christian Arenas
a705127653 Add migration folder 2017-06-02 16:32:24 +02:00
Christian Arenas
59b8fed228 modify context 2017-06-02 16:31:48 +02:00
Christian Arenas
5f976e90d4 update inital migration 2017-06-02 16:31:35 +02:00
Christian Arenas
05fe4ccd6d Add exceptions filters 2017-06-02 16:31:03 +02:00
Christian Arenas
d4ab5b24d2 Add dtos 2017-06-02 16:30:39 +02:00
Christian Arenas
ac5daa6146 add version 1 to Campaigns web api 2017-06-01 22:19:07 +02:00
Christian Arenas
314768b9ce rename file name 2017-06-01 22:13:19 +02:00
Christian Arenas
baab0d2a98 Remove unused class 2017-06-01 20:26:10 +02:00
Christian Arenas
8d3ae671a8 Merge remote-tracking branch 'origin/dev' into marketingcampaing
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
2017-06-01 20:19:33 +02:00
Christian Arenas
9b95bd9762 Add marketing api 2017-06-01 20:15:21 +02:00
Eduard Tomas
694253d4e9 Resilience enhancements.
MVC app now waits other containers
2017-06-01 14:32:22 +02:00
Christian Arenas
3a8481086c Add marketing resource to identity 2017-06-01 10:10:37 +02:00
Christian Arenas
4dc8b65e8b Add Marketing.API project 2017-06-01 10:10:00 +02:00
Ramón Tomás
9d44a397b0 Merge branch 'dev' into hybrid-flow-xamarin 2017-05-29 08:31:49 +02:00
Ramón Tomás
55271568e9 Changed Xamarin app authentication to Hybrid flow 2017-05-29 08:30:33 +02:00
Cesar De la Torre
ad4142b94f 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
Cesar De la Torre
a5479ff7e7 Merge pull request #199 from SychevIgor/dev
Packages update to 1.1.* and Swagger update
2017-05-23 09:21:32 -07:00
igorsych
c211f9689d swagger/ui to swagger url fix 2017-05-23 16:39:22 +03:00
Cesar De la Torre
f2769c2b73 Update BasketController.cs 2017-05-22 15:56:22 -07:00
Cesar De la Torre
e7608f4b12 Update BasketController.cs 2017-05-22 15:54:18 -07:00
igorsych
ec07a68751 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
b13fce7043 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
b2d28218dc swagger update https://github.com/domaindrivendev/Swashbuckle.AspNetCore 2017-05-19 08:11:32 +03:00
igorsych
e4f5b5014b .NET core packages update 2017-05-19 08:11:18 +03:00
Ramón Tomás
0a1897788f Remove hard-coded values from Identity srv configuration 2017-05-10 12:39:11 +02:00
Eduard Tomas
d17495cb99 FailingMiddleware is now IStartupFilter 2017-05-09 18:33:58 +02:00
Eduard Tomas
5d098b1478 Autorefresh on healthchecks with config timeout 2017-05-09 13:54:45 +02:00
Cesar De la Torre
660e1932a3 Merge pull request #181 from BillWagner/use-IEnumerable-dynamic
Use IEnumerable<dynamic> instead of dynamic for collections
2017-05-05 15:53:44 -07:00
Ramón Tomás
42d23a7da8 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-05-05 09:45:18 +02:00
Cesar De la Torre
e31ee0dcd8 Minor refactoring for the CreateOrder Web API method and the Entity base class 2017-05-04 12:29:00 -07:00
BillWagner
aa69e11095 add back the async state machine
Because of the using blocks, these one line methods need the async
modifier so that the that async state machiner is created. Otherwise, if
the method does not complete synchronously, the connection is closed
before the database has returned its results.
2017-05-04 10:36:23 -04:00
Bill Wagner
e813332890 Fix API signatures for collections
The methods that return collections should return
Task<IEnumerable<dynamic>> not Task<dynamic>
2017-05-04 10:36:23 -04:00
Ramón Tomás
0d71edf214 Merge from Dev 2017-05-04 11:57:49 +02:00
Cesar De la Torre
e5217c1756 CreateOrder refactored so return code lines are more compact 2017-05-03 18:36:52 -07:00
Eduard Tomas
4bf1988d3f Merge branch 'dev' 2017-05-03 12:04:43 +02:00
Eduard Tomas
f5c196925a Merge branch 'refactor-event-bus' into dev 2017-05-03 11:00:03 +02:00
Eduard Tomas
a09d7fd3a5 EventBus refactor.
Instead to register EventHandlers we register Func<EventHandlers> which solves scope problems (having transient/scoped objects owned by singletons)
2017-05-03 10:59:36 +02:00
Cesar De la Torre
69d7399eec Fixing the CreateOrderCommand so it is 100% immutable. It shouldn't have the AddOrderItem() method. In any case, it was not really used but in the tets, since this Command is serialized in the client side, then deserialized in the service level. 2017-05-02 17:42:59 -07:00
Eduard Tomas
22cc8daa65 Updated healthcheck lib 2017-05-02 10:29:24 +02:00
Cesar De la Torre
a4b7d485cd Minor comment typo changeed 2017-05-01 17:56:33 -07:00
Cesar De la Torre
aeddf51a33 Refactoring to better terms 2017-04-29 21:58:11 -07:00
Cesar De la Torre
ee787dcaad Revert "Fix API signatures for collections" 2017-04-29 15:30:17 -07:00
Bill Wagner
077868e51d Fix API signatures for collections
The methods that return collections should return
Task<IEnumerable<dynamic>> not Task<dynamic>
2017-04-28 09:25:24 -04:00
Eduard Tomas
9d0e1e0e64 Merge branch 'reviews/rabbitmq' 2017-04-24 12:18:16 +02:00
Steve Smith
ac9775c90c Cleaning up and fixing typos 2017-04-22 15:14:42 -04:00