From b34b8d24034a467355d4cf39ae2701e9ac23e5d2 Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Wed, 6 Nov 2019 11:14:19 +0000 Subject: [PATCH 1/2] Sort package references --- .../Mobile.Shopping.HttpAggregator.csproj | 6 +++--- .../Web.Shopping.HttpAggregator.csproj | 8 ++++---- .../EventBus.Tests/EventBus.Tests.csproj | 2 +- .../IntegrationEventLogEF.csproj | 5 +++-- .../WebHost.Customization.csproj | 4 ++-- .../Clients.Grpc.Caller.csproj | 1 + .../eShopOnContainers.Core.csproj | 7 ++++--- .../eShopOnContainers.UnitTests.csproj | 3 ++- .../Basket/Basket.API/Basket.API.csproj | 4 ++-- .../Basket.FunctionalTests.csproj | 7 +++---- .../Basket.UnitTests/Basket.UnitTests.csproj | 13 ++++++------ .../Catalog/Catalog.API/Catalog.API.csproj | 9 ++++----- .../Catalog.FunctionalTests.csproj | 5 ++--- .../Catalog.UnitTests.csproj | 9 ++++----- .../Identity/Identity.API/Identity.API.csproj | 20 ++++++------------- .../Locations.API/Locations.API.csproj | 5 +++-- .../Locations.FunctionalTests.csproj | 5 ++--- .../AzureFunctions/marketing-functions.csproj | 4 +++- .../Marketing.API/Marketing.API.csproj | 8 +++++--- .../Marketing.FunctionalTests.csproj | 5 ++--- .../Ordering/Ordering.API/Ordering.API.csproj | 15 +++++++------- .../Ordering.BackgroundTasks.csproj | 9 ++++----- .../Ordering.Domain/Ordering.Domain.csproj | 2 +- .../Ordering.FunctionalTests.csproj | 3 +-- .../Ordering.Infrastructure.csproj | 2 +- .../Ordering.SignalrHub.csproj | 8 +++----- .../Ordering.UnitTests.csproj | 11 +++++----- .../Payment/Payment.API/Payment.API.csproj | 3 ++- .../Webhooks/Webhooks.API/Webhooks.API.csproj | 13 ++++++------ src/Web/WebMVC/WebMVC.csproj | 20 ++++++------------- src/Web/WebSPA/WebSPA.csproj | 12 +---------- src/Web/WebStatus/WebStatus.csproj | 6 ++++-- src/Web/WebhookClient/WebhookClient.csproj | 5 ++--- 33 files changed, 107 insertions(+), 132 deletions(-) diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj index 060cf3a3b..31d56dda7 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj @@ -15,18 +15,18 @@ - - + + + - diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj index 86b660e21..0f8ae5efe 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj @@ -15,19 +15,19 @@ - - + + - + + - diff --git a/src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj b/src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj index ef1a920e9..1d3f2bc0f 100644 --- a/src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj +++ b/src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj @@ -6,8 +6,8 @@ - + diff --git a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj index 793171c78..14b867059 100644 --- a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj +++ b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj @@ -6,15 +6,16 @@ - all runtime; build; native; contentfiles; analyzers; buildtransitive + - + + diff --git a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj index 4352c2dee..38ab6b285 100644 --- a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj +++ b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj @@ -6,16 +6,16 @@ - - all runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/src/Clients/Clients.Grpc.Caller/Clients.Grpc.Caller.csproj b/src/Clients/Clients.Grpc.Caller/Clients.Grpc.Caller.csproj index 379eb2de1..7cf903982 100644 --- a/src/Clients/Clients.Grpc.Caller/Clients.Grpc.Caller.csproj +++ b/src/Clients/Clients.Grpc.Caller/Clients.Grpc.Caller.csproj @@ -10,6 +10,7 @@ + diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj index 99606079f..8b77f5733 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj @@ -5,15 +5,16 @@ - - + + + - + diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj index d5c8bdb3b..f31ca2aed 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj @@ -6,9 +6,10 @@ - + + diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index 769260d44..df260ed7e 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -21,8 +21,8 @@ - + @@ -36,8 +36,8 @@ - + diff --git a/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj b/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj index 8d0081e18..5e9e5c036 100644 --- a/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj +++ b/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj @@ -17,15 +17,14 @@ - - + + all runtime; build; native; contentfiles; analyzers - - + diff --git a/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj b/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj index 019d5bdfc..92731fb9c 100644 --- a/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj +++ b/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj @@ -7,20 +7,19 @@ - - + - - + + - + + all runtime; build; native; contentfiles; analyzers - - + diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj index 3d64e1181..662c55c08 100644 --- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj +++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj @@ -42,16 +42,15 @@ - - - - + + + @@ -62,8 +61,8 @@ - + diff --git a/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj b/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj index 22ca35532..5e7fcefbe 100644 --- a/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj +++ b/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj @@ -34,14 +34,13 @@ - - + all runtime; build; native; contentfiles; analyzers - + diff --git a/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj b/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj index 29729d05d..44b5660c1 100644 --- a/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj +++ b/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj @@ -7,17 +7,16 @@ - - + - + + all runtime; build; native; contentfiles; analyzers - - + diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index 27eda89f5..f2e7bec58 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -19,17 +19,19 @@ - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -44,21 +46,11 @@ - + - - - - diff --git a/src/Services/Location/Locations.API/Locations.API.csproj b/src/Services/Location/Locations.API/Locations.API.csproj index 789c518b7..517586eb4 100644 --- a/src/Services/Location/Locations.API/Locations.API.csproj +++ b/src/Services/Location/Locations.API/Locations.API.csproj @@ -8,6 +8,7 @@ true $(LangVersion) + @@ -24,14 +25,14 @@ - + - + diff --git a/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj b/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj index 97670c9d1..1e3e15e8a 100644 --- a/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj +++ b/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj @@ -18,14 +18,13 @@ - - + all runtime; build; native; contentfiles; analyzers - + diff --git a/src/Services/Marketing/Infrastructure/AzureFunctions/marketing-functions.csproj b/src/Services/Marketing/Infrastructure/AzureFunctions/marketing-functions.csproj index e159feb69..33e93b625 100644 --- a/src/Services/Marketing/Infrastructure/AzureFunctions/marketing-functions.csproj +++ b/src/Services/Marketing/Infrastructure/AzureFunctions/marketing-functions.csproj @@ -2,11 +2,13 @@ net461 + - + + diff --git a/src/Services/Marketing/Marketing.API/Marketing.API.csproj b/src/Services/Marketing/Marketing.API/Marketing.API.csproj index f0b370ba4..339da9be2 100644 --- a/src/Services/Marketing/Marketing.API/Marketing.API.csproj +++ b/src/Services/Marketing/Marketing.API/Marketing.API.csproj @@ -22,6 +22,7 @@ + @@ -33,23 +34,24 @@ + - + - + - + diff --git a/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj b/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj index 26f54e7d8..9f51dfbbc 100644 --- a/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj +++ b/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj @@ -18,14 +18,13 @@ - - + all runtime; build; native; contentfiles; analyzers - + diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj index 0728d5f5e..e3e5c8767 100644 --- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -37,10 +37,6 @@ - - - - @@ -48,13 +44,18 @@ - + + + + + + @@ -63,13 +64,13 @@ - + - + PreserveNewest diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj index f068176d2..5e9a6eb83 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj @@ -13,21 +13,20 @@ - + - - - + + - + diff --git a/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj b/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj index c7e83afc6..0574427f0 100644 --- a/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj +++ b/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj @@ -5,8 +5,8 @@ - + diff --git a/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj b/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj index 363154aab..05668125f 100644 --- a/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj +++ b/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj @@ -20,12 +20,11 @@ - all runtime; build; native; contentfiles; analyzers - + diff --git a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj index 0f7038bfd..22bfb2a56 100644 --- a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj +++ b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj @@ -9,8 +9,8 @@ - + diff --git a/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj b/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj index e079f0e4e..b64c881a8 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj +++ b/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj @@ -8,8 +8,6 @@ $(LangVersion) - - @@ -22,6 +20,8 @@ + + @@ -29,13 +29,11 @@ - - - + diff --git a/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj b/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj index 3c12dc001..5b7ed2060 100644 --- a/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj +++ b/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj @@ -7,18 +7,17 @@ - - + + + - + all runtime; build; native; contentfiles; analyzers - - - + diff --git a/src/Services/Payment/Payment.API/Payment.API.csproj b/src/Services/Payment/Payment.API/Payment.API.csproj index dfca01597..497349a66 100644 --- a/src/Services/Payment/Payment.API/Payment.API.csproj +++ b/src/Services/Payment/Payment.API/Payment.API.csproj @@ -24,9 +24,10 @@ - + + diff --git a/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj b/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj index b179b4e42..1e9b44858 100644 --- a/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj +++ b/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj @@ -11,19 +11,20 @@ - - + + - + - + + + - - + diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index f5da398b3..f6d02d0cd 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -23,36 +23,28 @@ - + + + + - - + - - - + - - diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj index 5929a758b..a3b247086 100644 --- a/src/Web/WebSPA/WebSPA.csproj +++ b/src/Web/WebSPA/WebSPA.csproj @@ -92,24 +92,14 @@ + - - - - - diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj index 5fc1ca257..7ddadb6f2 100644 --- a/src/Web/WebStatus/WebStatus.csproj +++ b/src/Web/WebStatus/WebStatus.csproj @@ -6,9 +6,10 @@ true $(LangVersion) + - + @@ -21,9 +22,10 @@ - + + Always diff --git a/src/Web/WebhookClient/WebhookClient.csproj b/src/Web/WebhookClient/WebhookClient.csproj index 1e87e6404..95f4b79e8 100644 --- a/src/Web/WebhookClient/WebhookClient.csproj +++ b/src/Web/WebhookClient/WebhookClient.csproj @@ -11,12 +11,11 @@ $(LangVersion) - + + - - From 8712d7eaac22d71e9ac7fdfb5de888d32f57960c Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Wed, 6 Nov 2019 12:33:02 +0000 Subject: [PATCH 2/2] Aling basket-data-test entry with base .yml --- src/docker-compose-tests.override.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/docker-compose-tests.override.yml b/src/docker-compose-tests.override.yml index 068f02e66..cee5c6623 100644 --- a/src/docker-compose-tests.override.yml +++ b/src/docker-compose-tests.override.yml @@ -6,6 +6,10 @@ services: - "15672:15672" - "5672:5672" + basket-data-test: + ports: + - "6379:6379" + sql-data-test: environment: - SA_PASSWORD=Pass@word @@ -17,10 +21,6 @@ services: ports: - "27017:27017" - basket-data-test: - ports: - - "6379:6379" - identity-api-test: environment: - ASPNETCORE_ENVIRONMENT=Development