From b13fce704313ca61b7e63fcb045e74a573801562 Mon Sep 17 00:00:00 2001 From: igorsych Date: Fri, 19 May 2017 09:02:05 +0300 Subject: [PATCH] Test packages update to the latest version Redis and RabbitMQ also updated Identity server changes reflectiong https://github.com/IdentityServer/IdentityServer4.AccessTokenValidation/commit/ac59db6e16561f38ec8b42789f0187d714d8c168 commit --- .../EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj | 2 +- .../Microsoft.AspNetCore.HealthChecks.csproj | 2 +- src/Services/Basket/Basket.API/Basket.API.csproj | 4 ++-- src/Services/Basket/Basket.API/Startup.cs | 2 +- src/Services/Identity/Identity.API/Identity.API.csproj | 4 ++-- src/Services/Ordering/Ordering.API/Ordering.API.csproj | 4 ++-- src/Services/Ordering/Ordering.API/Startup.cs | 2 +- src/Web/WebMVC/WebMVC.csproj | 2 +- test/Services/FunctionalTests/FunctionalTests.csproj | 9 +++++---- test/Services/IntegrationTests/IntegrationTests.csproj | 10 +++++----- test/Services/UnitTest/UnitTest.csproj | 10 +++++----- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj index d5f82bb82..18a6e9767 100644 --- a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj +++ b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj b/src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj index 2317d20cf..023554e60 100644 --- a/src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj +++ b/src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj @@ -1,7 +1,7 @@  - netcoreapp1.0 + netstandard1.3 diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index 2670bfe72..5145213df 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -34,9 +34,9 @@ - + - + diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index ce7c37749..c21b163da 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -148,7 +148,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API app.UseIdentityServerAuthentication(new IdentityServerAuthenticationOptions { Authority = identityUrl.ToString(), - ScopeName = "basket", + ApiName = "basket", RequireHttpsMetadata = false }); } diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index a4ab115c9..095b3e138 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -41,8 +41,8 @@ All - - + + diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj index 676fd7b54..acb310ed4 100644 --- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -37,7 +37,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs index b20d82ad7..0158e14bf 100644 --- a/src/Services/Ordering/Ordering.API/Startup.cs +++ b/src/Services/Ordering/Ordering.API/Startup.cs @@ -171,7 +171,7 @@ app.UseIdentityServerAuthentication(new IdentityServerAuthenticationOptions { Authority = identityUrl.ToString(), - ScopeName = "orders", + ApiName = "orders", RequireHttpsMetadata = false }); } diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index a9aece365..109dc5865 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -39,7 +39,7 @@ All - + diff --git a/test/Services/FunctionalTests/FunctionalTests.csproj b/test/Services/FunctionalTests/FunctionalTests.csproj index b2e21957b..23ec8c228 100644 --- a/test/Services/FunctionalTests/FunctionalTests.csproj +++ b/test/Services/FunctionalTests/FunctionalTests.csproj @@ -2,6 +2,7 @@ netcoreapp1.1 + 1.1.0 @@ -16,10 +17,10 @@ - - - - + + + + diff --git a/test/Services/IntegrationTests/IntegrationTests.csproj b/test/Services/IntegrationTests/IntegrationTests.csproj index 436731593..c5ccfa11e 100644 --- a/test/Services/IntegrationTests/IntegrationTests.csproj +++ b/test/Services/IntegrationTests/IntegrationTests.csproj @@ -33,12 +33,12 @@ - - - - + + + + - + diff --git a/test/Services/UnitTest/UnitTest.csproj b/test/Services/UnitTest/UnitTest.csproj index 63eaf2fcd..019d94c97 100644 --- a/test/Services/UnitTest/UnitTest.csproj +++ b/test/Services/UnitTest/UnitTest.csproj @@ -23,12 +23,12 @@ - - + + - - - + + +