From 3a29c26c46f9614210c93a14de902e9238b01e92 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 8 Jun 2017 12:15:51 -0700
Subject: [PATCH] Remove usage of TaskCache

---
 .../Microsoft.AspNetCore.Localization.Routing.csproj        | 1 -
 .../RouteDataRequestCultureProvider.cs                      | 2 +-
 .../AcceptLanguageHeaderRequestCultureProvider.cs           | 6 +++---
 .../CookieRequestCultureProvider.cs                         | 2 +-
 .../Microsoft.AspNetCore.Localization.csproj                | 1 -
 .../QueryStringRequestCultureProvider.cs                    | 4 ++--
 .../RequestCultureProvider.cs                               | 6 ++++++
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj b/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj
index 8000e365c3..b2303cb6b6 100644
--- a/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj
+++ b/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj
@@ -17,7 +17,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.Localization.Routing/RouteDataRequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization.Routing/RouteDataRequestCultureProvider.cs
index 93921b1cb2..c14db98721 100644
--- a/src/Microsoft.AspNetCore.Localization.Routing/RouteDataRequestCultureProvider.cs
+++ b/src/Microsoft.AspNetCore.Localization.Routing/RouteDataRequestCultureProvider.cs
@@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Localization.Routing
             if (culture == null && uiCulture == null)
             {
                 // No values specified for either so no match
-                return TaskCache<ProviderCultureResult>.DefaultCompletedTask;
+                return NullProviderCultureResult;
             }
 
             if (culture != null && uiCulture == null)
diff --git a/src/Microsoft.AspNetCore.Localization/AcceptLanguageHeaderRequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/AcceptLanguageHeaderRequestCultureProvider.cs
index 7162ef52a9..ecde6636f7 100644
--- a/src/Microsoft.AspNetCore.Localization/AcceptLanguageHeaderRequestCultureProvider.cs
+++ b/src/Microsoft.AspNetCore.Localization/AcceptLanguageHeaderRequestCultureProvider.cs
@@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Localization
 
             if (acceptLanguageHeader == null || acceptLanguageHeader.Count == 0)
             {
-                return TaskCache<ProviderCultureResult>.DefaultCompletedTask;
+                return NullProviderCultureResult;
             }
 
             var languages = acceptLanguageHeader.AsEnumerable();
@@ -49,12 +49,12 @@ namespace Microsoft.AspNetCore.Localization
             var orderedLanguages = languages.OrderByDescending(h => h, StringWithQualityHeaderValueComparer.QualityComparer)
                 .Select(x => x.Value).ToList();
 
-            if (orderedLanguages.Any())
+            if (orderedLanguages.Count > 0)
             {
                 return Task.FromResult(new ProviderCultureResult(orderedLanguages));
             }
 
-            return TaskCache<ProviderCultureResult>.DefaultCompletedTask;
+            return NullProviderCultureResult;
         }
     }
 }
diff --git a/src/Microsoft.AspNetCore.Localization/CookieRequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/CookieRequestCultureProvider.cs
index b1c389225b..59a2891dbb 100644
--- a/src/Microsoft.AspNetCore.Localization/CookieRequestCultureProvider.cs
+++ b/src/Microsoft.AspNetCore.Localization/CookieRequestCultureProvider.cs
@@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Localization
 
             if (string.IsNullOrEmpty(cookie))
             {
-                return TaskCache<ProviderCultureResult>.DefaultCompletedTask;
+                return NullProviderCultureResult;
             }
 
             var providerResultCulture = ParseCookieValue(cookie);
diff --git a/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj b/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj
index da0b250919..c7a5e230a4 100644
--- a/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj
+++ b/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj
@@ -18,7 +18,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.Localization/QueryStringRequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/QueryStringRequestCultureProvider.cs
index a39756c9b7..1f01c0d8c5 100644
--- a/src/Microsoft.AspNetCore.Localization/QueryStringRequestCultureProvider.cs
+++ b/src/Microsoft.AspNetCore.Localization/QueryStringRequestCultureProvider.cs
@@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Localization
             var request = httpContext.Request;
             if (!request.QueryString.HasValue)
             {
-                return TaskCache<ProviderCultureResult>.DefaultCompletedTask;
+                return NullProviderCultureResult;
             }
 
             string queryCulture = null;
@@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Localization
             if (queryCulture == null && queryUICulture == null)
             {
                 // No values specified for either so no match
-                return TaskCache<ProviderCultureResult>.DefaultCompletedTask;
+                return NullProviderCultureResult;
             }
 
             if (queryCulture != null && queryUICulture == null)
diff --git a/src/Microsoft.AspNetCore.Localization/RequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/RequestCultureProvider.cs
index c3103596e2..9430cbdd0a 100644
--- a/src/Microsoft.AspNetCore.Localization/RequestCultureProvider.cs
+++ b/src/Microsoft.AspNetCore.Localization/RequestCultureProvider.cs
@@ -12,6 +12,12 @@ namespace Microsoft.AspNetCore.Localization
     /// </summary>
     public abstract class RequestCultureProvider : IRequestCultureProvider
     {
+        /// <summary>
+        /// Result that indicates that this instance of <see cref="RequestCultureProvider" /> could not determine the
+        /// request culture.
+        /// </summary>
+        protected static readonly Task<ProviderCultureResult> NullProviderCultureResult = Task.FromResult(default(ProviderCultureResult));
+
         /// <summary>
         /// The current options for the <see cref="RequestLocalizationMiddleware"/>.
         /// </summary>