diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln index b1ab3dbcd..d4d39437c 100644 --- a/eShopOnContainers-ServicesAndWebApps.sln +++ b/eShopOnContainers-ServicesAndWebApps.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26228.0 +VisualStudioVersion = 15.0.26228.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}" EndProject @@ -86,7 +86,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebStatus", "src\Web\WebSta EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Resilience", "Resilience", "{FBF43D93-F2E7-4FF8-B4AB-186895949B88}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpResilience", "src\BuildingBlocks\Resilience\HttpResilience\HttpResilience.csproj", "{D1C47FF1-91F1-4CAF-9ABB-AD642B821502}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Resilience.Http", "src\BuildingBlocks\Resilience\Resilience.Http\Resilience.Http.csproj", "{D1C47FF1-91F1-4CAF-9ABB-AD642B821502}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/BuildingBlocks/Resilience/HttpResilience/IHttpClient.cs b/src/BuildingBlocks/Resilience/Resilience.Http/IHttpClient.cs similarity index 96% rename from src/BuildingBlocks/Resilience/HttpResilience/IHttpClient.cs rename to src/BuildingBlocks/Resilience/Resilience.Http/IHttpClient.cs index 611abfbba..0e56a66da 100644 --- a/src/BuildingBlocks/Resilience/HttpResilience/IHttpClient.cs +++ b/src/BuildingBlocks/Resilience/Resilience.Http/IHttpClient.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; -namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience +namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http { public interface IHttpClient { diff --git a/src/BuildingBlocks/Resilience/HttpResilience/Policies/CircuitBreakerPolicy.cs b/src/BuildingBlocks/Resilience/Resilience.Http/Policies/CircuitBreakerPolicy.cs similarity index 96% rename from src/BuildingBlocks/Resilience/HttpResilience/Policies/CircuitBreakerPolicy.cs rename to src/BuildingBlocks/Resilience/Resilience.Http/Policies/CircuitBreakerPolicy.cs index 0b65edce6..0f64f7403 100644 --- a/src/BuildingBlocks/Resilience/HttpResilience/Policies/CircuitBreakerPolicy.cs +++ b/src/BuildingBlocks/Resilience/Resilience.Http/Policies/CircuitBreakerPolicy.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience.Policies +namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http.Policies { internal class CircuitBreakerPolicy : ResiliencePolicy { diff --git a/src/BuildingBlocks/Resilience/HttpResilience/Policies/RetryPolicy.cs b/src/BuildingBlocks/Resilience/Resilience.Http/Policies/RetryPolicy.cs similarity index 95% rename from src/BuildingBlocks/Resilience/HttpResilience/Policies/RetryPolicy.cs rename to src/BuildingBlocks/Resilience/Resilience.Http/Policies/RetryPolicy.cs index 0bb27d929..ac2bf3807 100644 --- a/src/BuildingBlocks/Resilience/HttpResilience/Policies/RetryPolicy.cs +++ b/src/BuildingBlocks/Resilience/Resilience.Http/Policies/RetryPolicy.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience.Policies +namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http.Policies { internal class RetryPolicy : ResiliencePolicy { diff --git a/src/BuildingBlocks/Resilience/HttpResilience/HttpResilience.csproj b/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj similarity index 89% rename from src/BuildingBlocks/Resilience/HttpResilience/HttpResilience.csproj rename to src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj index 9760a884b..8f60105fc 100644 --- a/src/BuildingBlocks/Resilience/HttpResilience/HttpResilience.csproj +++ b/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj @@ -2,7 +2,7 @@ netstandard1.4 - Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience + Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http diff --git a/src/BuildingBlocks/Resilience/HttpResilience/ResiliencePolicy.cs b/src/BuildingBlocks/Resilience/Resilience.Http/ResiliencePolicy.cs similarity index 92% rename from src/BuildingBlocks/Resilience/HttpResilience/ResiliencePolicy.cs rename to src/BuildingBlocks/Resilience/Resilience.Http/ResiliencePolicy.cs index f0adb1871..63eadc857 100644 --- a/src/BuildingBlocks/Resilience/HttpResilience/ResiliencePolicy.cs +++ b/src/BuildingBlocks/Resilience/Resilience.Http/ResiliencePolicy.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience +namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http { public class ResiliencePolicy { diff --git a/src/BuildingBlocks/Resilience/HttpResilience/ResiliencePolicyFactory.cs b/src/BuildingBlocks/Resilience/Resilience.Http/ResiliencePolicyFactory.cs similarity index 94% rename from src/BuildingBlocks/Resilience/HttpResilience/ResiliencePolicyFactory.cs rename to src/BuildingBlocks/Resilience/Resilience.Http/ResiliencePolicyFactory.cs index 0b964dc71..8c2e5f8ab 100644 --- a/src/BuildingBlocks/Resilience/HttpResilience/ResiliencePolicyFactory.cs +++ b/src/BuildingBlocks/Resilience/Resilience.Http/ResiliencePolicyFactory.cs @@ -1,9 +1,9 @@ -using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience.Policies; +using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http.Policies; using System; using System.Collections.Generic; using System.Text; -namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience +namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http { public static class ResiliencePolicyFactory { diff --git a/src/BuildingBlocks/Resilience/HttpResilience/ResilientHttpClient.cs b/src/BuildingBlocks/Resilience/Resilience.Http/ResilientHttpClient.cs similarity index 99% rename from src/BuildingBlocks/Resilience/HttpResilience/ResilientHttpClient.cs rename to src/BuildingBlocks/Resilience/Resilience.Http/ResilientHttpClient.cs index 9e739f05d..f091363ac 100644 --- a/src/BuildingBlocks/Resilience/HttpResilience/ResilientHttpClient.cs +++ b/src/BuildingBlocks/Resilience/Resilience.Http/ResilientHttpClient.cs @@ -1,4 +1,4 @@ -using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience.Policies; +using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http.Policies; using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Polly; @@ -9,7 +9,7 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; -namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience +namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http { /// /// HttpClient wrapper that integrates Retry and Circuit diff --git a/src/BuildingBlocks/Resilience/HttpResilience/StandardHttpClient.cs b/src/BuildingBlocks/Resilience/Resilience.Http/StandardHttpClient.cs similarity index 98% rename from src/BuildingBlocks/Resilience/HttpResilience/StandardHttpClient.cs rename to src/BuildingBlocks/Resilience/Resilience.Http/StandardHttpClient.cs index db0594a53..4f400caf5 100644 --- a/src/BuildingBlocks/Resilience/HttpResilience/StandardHttpClient.cs +++ b/src/BuildingBlocks/Resilience/Resilience.Http/StandardHttpClient.cs @@ -4,7 +4,7 @@ using System; using System.Net.Http; using System.Threading.Tasks; -namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience +namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http { public class StandardHttpClient : IHttpClient { diff --git a/src/Web/WebMVC/Services/BasketService.cs b/src/Web/WebMVC/Services/BasketService.cs index 9b85e8f67..7d82a0fc6 100644 --- a/src/Web/WebMVC/Services/BasketService.cs +++ b/src/Web/WebMVC/Services/BasketService.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; -using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience; +using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http; using Microsoft.eShopOnContainers.WebMVC.ViewModels; using Microsoft.Extensions.Options; using Newtonsoft.Json; diff --git a/src/Web/WebMVC/Services/CatalogService.cs b/src/Web/WebMVC/Services/CatalogService.cs index d1eb9deb9..f7225ff0b 100644 --- a/src/Web/WebMVC/Services/CatalogService.cs +++ b/src/Web/WebMVC/Services/CatalogService.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience; +using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http; using Microsoft.eShopOnContainers.WebMVC.ViewModels; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/Web/WebMVC/Services/OrderingService.cs b/src/Web/WebMVC/Services/OrderingService.cs index fd2266ce6..570a48361 100644 --- a/src/Web/WebMVC/Services/OrderingService.cs +++ b/src/Web/WebMVC/Services/OrderingService.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Options; using System.Net.Http; using Newtonsoft.Json; using Microsoft.AspNetCore.Authentication; -using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience; +using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http; namespace Microsoft.eShopOnContainers.WebMVC.Services { diff --git a/src/Web/WebMVC/Startup.cs b/src/Web/WebMVC/Startup.cs index 335c34710..72b764925 100644 --- a/src/Web/WebMVC/Startup.cs +++ b/src/Web/WebMVC/Startup.cs @@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Http; using System.Threading; using Microsoft.Extensions.Options; using Microsoft.Extensions.HealthChecks; -using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience; +using Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http; namespace Microsoft.eShopOnContainers.WebMVC { diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index 96cffcbea..5121973c8 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -54,7 +54,7 @@ - +