11 Commits

Author SHA1 Message Date
Miguel Veloso
e8d99c06c9 Merge branch 'features/migration-dotnet3' into dotnet3-migration/dev-dotnet3
# Conflicts:
#	README.md
#	docker-compose.override.yml
#	docker-compose.yml
#	k8s/helm/deploy-all.ps1
#	k8s/helm/webstatus/values.yaml
#	src/ApiGateways/ApiGw-Base/Dockerfile
#	src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj
#	src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
#	src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
#	src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
#	src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
#	src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj
#	src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj
#	src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj
#	src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
#	src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
#	src/Services/Basket/Basket.API/Basket.API.csproj
#	src/Services/Basket/Basket.API/Dockerfile
#	src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj
#	src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj
#	src/Services/Catalog/Catalog.API/Catalog.API.csproj
#	src/Services/Catalog/Catalog.API/Dockerfile
#	src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj
#	src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj
#	src/Services/Identity/Identity.API/Dockerfile
#	src/Services/Identity/Identity.API/Identity.API.csproj
#	src/Services/Location/Locations.API/Dockerfile
#	src/Services/Location/Locations.API/Locations.API.csproj
#	src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj
#	src/Services/Marketing/Infrastructure/AzureFunctions/marketing-functions.csproj
#	src/Services/Marketing/Marketing.API/Dockerfile
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj
#	src/Services/Ordering/Ordering.API/Dockerfile
#	src/Services/Ordering/Ordering.API/Ordering.API.csproj
#	src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
#	src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj
#	src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj
#	src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj
#	src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj
#	src/Services/Ordering/Ordering.SignalrHub/Dockerfile
#	src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
#	src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj
#	src/Services/Payment/Payment.API/Dockerfile
#	src/Services/Payment/Payment.API/Payment.API.csproj
#	src/Services/Webhooks/Webhooks.API/Dockerfile
#	src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj
#	src/Web/WebMVC/Dockerfile
#	src/Web/WebMVC/WebMVC.csproj
#	src/Web/WebSPA/Dockerfile
#	src/Web/WebSPA/WebSPA.csproj
#	src/Web/WebStatus/Dockerfile
#	src/Web/WebStatus/WebStatus.csproj
#	src/Web/WebStatus/appsettings.Development.json
#	src/Web/WebhookClient/Dockerfile
#	test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj
2019-11-07 16:31:17 +00:00
Miguel Veloso
9bbb37aed5 Sort package references 2019-11-06 10:40:03 +00:00
eiximenis
577aca1d4c Basket.API updated to net3 2019-07-19 13:09:30 +02:00
eiximenis
96c3b12721 More package refs moved to dependencies.props 2019-07-18 12:31:27 +02:00
eiximenis
437bdd7431 Using Directory.Build.props for handling versions. Needed to start the update to net3 2019-07-17 18:26:20 +02:00
Miguel Veloso
2717659a0d Refactor ModelDTOs for a more consistent folder structure 2019-03-04 13:31:29 +00:00
Igor_Sychev
185a5dcc31 minor packages update
replace preview apis with production
replace EnableKubernetes with AddApplicationInsightsKubernetesEnricher
replace  loggerFactory.AddAzureWebAppDiagnostics(); with  loggerBuilder.AddAzureWebAppDiagnostics();
2019-02-26 22:28:30 +03:00
Erik Pique
9775219a34 change netcore 2.1 to 2.2 and update nugets 2018-11-12 17:27:54 +01:00
Miguel Veloso
0733df5318 Funtional test failling because it didn't find appsettings path, assuming the current folder name is the correct one. 2018-07-27 10:23:53 +01:00
Unai Zorrilla Castro
d7d4dd4bf1 Added Cesar's feedback 2018-07-03 14:34:04 +02:00
unaizorrilla
bfd75b62a2 Remove unused projects, rename folder and created some doc 2018-06-28 10:28:27 +02:00