338 Commits

Author SHA1 Message Date
Cesar De la Torre
373bdd9896 Set Retries with exponential backoff to most microservices sqlOptions, so errors when spinning the SQL container late shouldn't happen. 2017-10-10 19:56:34 -07:00
Unai Zorrilla Castro
d8b374ac4a Create DesignTimeFactories for context used on startup with dependencies 2017-09-14 15:33:39 +02:00
Unai Zorrilla Castro
226c03b573 Refactoring all dbcontext seed using new MigrateDbContext extension method on IWebHost. This prevent errors when using dotnet ef cli and seeders in Startup 2017-09-13 14:53:06 +02:00
Eduard Tomàs
7321d5e5fc Base path fix and k8s config updated 2017-09-07 19:18:53 +02:00
Eduard Tomàs
6fd4f46058 Fix for rabbitMQ under windows containers.
Also some config tweaking on windows
2017-09-05 15:55:17 +02:00
Eduard Tomàs
8198126daf Use dotnet multi-architecture images.
Removing docker-compose.windows.override (not needed as is identical to docker-compose.override)
2017-09-04 19:07:53 +02:00
Unai Zorrilla Castro
70e429b760 Added IEntityTypeConfiguration feature from EF Core 2 2017-08-31 17:16:28 +02:00
RamonTC
4ea8f6814e Merge pull request #299 from SychevIgor/SychevIgor/WindowsDockerFiles20
windows docker files update to 2.0 base images
2017-08-30 17:55:26 +02:00
Igor Sychev
dc566ea2a1 nanowin 2017-08-30 08:48:06 +03:00
Ramón Tomás
9ed7325e0e Downgrade Identity.api version due to compatibility issues
Updated Test project version
Fix issue Idsrv token
2017-08-29 18:11:30 +02:00
Ramón Tomás
364c07a528 Included AspnetCore.all metapackage 2017-08-29 12:03:20 +02:00
Ramón Tomás
01469da7d3 Fixed bug Swagger is not working for the services #290 2017-08-24 15:41:11 +02:00
Ramón Tomás
8288acf3a4 Update projects from netcore 2.0.0 preview to 2.0.0
Fix netcore 2.0.0 breaking changes in authentication middleware
2017-08-22 22:36:23 +02:00
Ramón Tomás
2baedadc7a Merge from Dev 2017-08-22 19:46:53 +02:00
Cesar De la Torre
a3fad613bc Fixed ZIP file that was corrupted 2017-08-14 15:41:38 -07:00
Eduard Tomàs
8683efcaf9 Merge branch 'dev'
# Conflicts:
#	docs/Enterprise-Application-Patterns-using-XamarinForms.pdf
2017-08-10 09:07:33 +02:00
Cesar De la Torre
5588515abf Fix bug for Linux environment. Case sensitive. It has to be CatalogItems.zip 2017-08-06 15:50:23 -07:00
Cesar De la Torre
9b9db6b721 temp rename for file with wrong case letter. It will be CatalogItems.zip 2017-08-06 15:49:25 -07:00
Christian Arenas
f0f88aee98 Add PicBaseUrl with a replaced parameter 2017-07-11 12:43:06 +02:00
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
b74a1b6db5 Add 100 stock units to products 2017-07-07 12:36: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
dsanz
8051114da9 Add Azure Storage check in Catalog health checks. 2017-07-06 11:38:45 +02:00
Christian Arenas
d6e140a49b Add PictureFileName seed and add rename PictureUri column name to PictureFileName 2017-07-04 12:01:09 +02:00
Ramón Tomás
525040b9b6 Created Azure functions for details campaign
Adapt MVC app to azure function details campaign
Adapt SPA app to azure function details campaign
2017-06-30 16:31:22 +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
Eduard Tomas
96c3f5c2bc Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev
# Conflicts:
#	docker-compose.override.yml
#	src/Web/WebMVC/WebMVC.csproj
#	src/Web/WebMVC/wwwroot/css/shared/components/identity/identity.css
#	src/Web/WebMVC/wwwroot/css/site.min.css
#	src/Web/WebSPA/AppSettings.cs
2017-06-28 12:20:20 +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
Shaun Walker
632c023a3f strip quotes, fix image transparency, format price and amount 2017-06-22 17:26:57 -07:00
Shaun Walker
9229a8d0fd support for additional CatalogItem properties 2017-06-21 15:27:12 -07:00
Eduard Tomas
4069a3a048 Catalog.API nuget updated 2017-06-21 19:36:33 +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
d657428e78 Merge from Dev 2017-06-02 13:22:40 +02:00
Eduard Tomas
b42fe3527a Resilience enhancements.
MVC app now waits other containers
2017-06-01 14:32:22 +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
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
7694602be2 Rename property PictureFile to PictureFileName in Migration Designer 2017-05-30 17:53:15 +02:00
Christian Arenas
1a385a2179 Add AzureStorageEnabled environment variable to get the origin of the product image from PicBaseUrl environment variable 2017-05-30 17:16:17 +02:00
Christian Arenas
45ed8a60ad Add PictureFileName field for saving the name of the file. PictureUri will be the url of the image (api or azure storage) 2017-05-30 17:14:28 +02:00
Ramón Tomás
9d5cde2057 #2412-Create Location Microservice 2017-05-30 15:01:58 +02:00
Christian Arenas
41a6814293 Add new connection string 2017-05-29 10:12:07 +02:00