From 338f8779f4e5a4650452d98ae0922161f42ee314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Chalet?= <kevinchalet@gmail.com>
Date: Sat, 20 Oct 2018 19:13:55 +0200
Subject: [PATCH] Update the OpenIddict.Core extensions to register the memory
 cache services and remove unnecessary references

---
 src/OpenIddict.Core/OpenIddictCoreExtensions.cs               | 1 +
 .../OpenIddict.EntityFramework.csproj                         | 1 -
 .../OpenIddictEntityFrameworkExtensions.cs                    | 2 --
 .../OpenIddict.EntityFrameworkCore.csproj                     | 1 -
 .../OpenIddictEntityFrameworkCoreExtensions.cs                | 2 --
 src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj              | 3 +--
 src/OpenIddict.Mvc/Internal/OpenIddictMvcBinder.cs            | 4 +---
 7 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/OpenIddict.Core/OpenIddictCoreExtensions.cs b/src/OpenIddict.Core/OpenIddictCoreExtensions.cs
index f0c5ce72..72a75698 100644
--- a/src/OpenIddict.Core/OpenIddictCoreExtensions.cs
+++ b/src/OpenIddict.Core/OpenIddictCoreExtensions.cs
@@ -33,6 +33,7 @@ namespace Microsoft.Extensions.DependencyInjection
             }
 
             builder.Services.AddLogging();
+            builder.Services.AddMemoryCache();
             builder.Services.AddOptions();
 
             builder.Services.TryAddScoped(typeof(OpenIddictApplicationManager<>));
diff --git a/src/OpenIddict.EntityFramework/OpenIddict.EntityFramework.csproj b/src/OpenIddict.EntityFramework/OpenIddict.EntityFramework.csproj
index fcfe5273..2b8eef02 100644
--- a/src/OpenIddict.EntityFramework/OpenIddict.EntityFramework.csproj
+++ b/src/OpenIddict.EntityFramework/OpenIddict.EntityFramework.csproj
@@ -19,7 +19,6 @@
 
   <ItemGroup>
     <PackageReference Include="EntityFramework" Version="$(EntityFrameworkVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkExtensions.cs b/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkExtensions.cs
index a1c3e3ea..41cf8066 100644
--- a/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkExtensions.cs
+++ b/src/OpenIddict.EntityFramework/OpenIddictEntityFrameworkExtensions.cs
@@ -32,8 +32,6 @@ namespace Microsoft.Extensions.DependencyInjection
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            builder.Services.AddMemoryCache();
-
             // Since Entity Framework 6.x may be used with databases performing case-insensitive
             // or culture-sensitive comparisons, ensure the additional filtering logic is enforced
             // in case case-sensitive stores were registered before this extension was called.
diff --git a/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj b/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj
index 1a45afbd..cdca6b5e 100644
--- a/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj
+++ b/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj
@@ -20,7 +20,6 @@
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreExtensions.cs b/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreExtensions.cs
index 4198589e..7eccad4b 100644
--- a/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreExtensions.cs
+++ b/src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreExtensions.cs
@@ -33,8 +33,6 @@ namespace Microsoft.Extensions.DependencyInjection
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            builder.Services.AddMemoryCache();
-
             // Since Entity Framework Core may be used with databases performing case-insensitive
             // or culture-sensitive comparisons, ensure the additional filtering logic is enforced
             // in case case-sensitive stores were registered before this extension was called.
diff --git a/src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj b/src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj
index 9310c7e3..9cb05ac7 100644
--- a/src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj
+++ b/src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\build\packages.props" />
 
@@ -21,7 +21,6 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="MongoDB.Driver" Version="$(MongoDbVersion)" />
   </ItemGroup>
 
diff --git a/src/OpenIddict.Mvc/Internal/OpenIddictMvcBinder.cs b/src/OpenIddict.Mvc/Internal/OpenIddictMvcBinder.cs
index feae9a22..6b03ad90 100644
--- a/src/OpenIddict.Mvc/Internal/OpenIddictMvcBinder.cs
+++ b/src/OpenIddict.Mvc/Internal/OpenIddictMvcBinder.cs
@@ -33,9 +33,7 @@ namespace OpenIddict.Mvc.Internal
         /// directly from your code. This API may change or be removed in future minor releases.
         /// </summary>
         public OpenIddictMvcBinder([NotNull] IOptionsMonitor<OpenIddictMvcOptions> options)
-        {
-            _options = options;
-        }
+            => _options = options;
 
         /// <summary>
         /// Tries to bind a model from the request.