From d9119f4c4703c8d12e082ac502070ca1e48ebe6f Mon Sep 17 00:00:00 2001
From: Hao Kung <haok@microsoft.com>
Date: Fri, 10 Oct 2014 16:11:13 -0700
Subject: [PATCH] React to options rename

---
 .../BlobStorageXmlRepository.cs                                 | 2 +-
 .../CngCbcAuthenticatedEncryptorConfigurationFactory.cs         | 2 +-
 .../CngGcmAuthenticatedEncryptorConfigurationFactory.cs         | 2 +-
 .../ManagedAuthenticatedEncryptorConfigurationFactory.cs        | 2 +-
 .../DefaultDataProtectionProvider.cs                            | 2 +-
 .../EphemeralDataProtectionProvider.cs                          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Microsoft.AspNet.Security.DataProtection.Azure/BlobStorageXmlRepository.cs b/src/Microsoft.AspNet.Security.DataProtection.Azure/BlobStorageXmlRepository.cs
index a08027f6a8..952b8ce28f 100644
--- a/src/Microsoft.AspNet.Security.DataProtection.Azure/BlobStorageXmlRepository.cs
+++ b/src/Microsoft.AspNet.Security.DataProtection.Azure/BlobStorageXmlRepository.cs
@@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Security.DataProtection.Azure
         internal static readonly XNamespace XmlNamespace = XNamespace.Get("http://www.asp.net/dataProtection/2014/azure");
         internal static readonly XName KeyRingElementName = XmlNamespace.GetName("keyRing");
 
-        public BlobStorageXmlRepository([NotNull] IOptionsAccessor<BlobStorageXmlRepositoryOptions> optionsAccessor)
+        public BlobStorageXmlRepository([NotNull] IOptions<BlobStorageXmlRepositoryOptions> optionsAccessor)
         {
             Directory = optionsAccessor.Options.Directory;
             CryptoUtil.Assert(Directory != null, "Directory != null");
diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationFactory.cs b/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationFactory.cs
index 375a7dc961..22b254fe85 100644
--- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationFactory.cs
+++ b/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationFactory.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption
     {
         private readonly CngCbcAuthenticatedEncryptorConfigurationOptions _options;
 
-        public CngCbcAuthenticatedEncryptorConfigurationFactory([NotNull] IOptionsAccessor<CngCbcAuthenticatedEncryptorConfigurationOptions> optionsAccessor)
+        public CngCbcAuthenticatedEncryptorConfigurationFactory([NotNull] IOptions<CngCbcAuthenticatedEncryptorConfigurationOptions> optionsAccessor)
         {
             _options = optionsAccessor.Options.Clone();
         }
diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationFactory.cs b/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationFactory.cs
index ac074377f8..b184da69ab 100644
--- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationFactory.cs
+++ b/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationFactory.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption
     {
         private readonly CngGcmAuthenticatedEncryptorConfigurationOptions _options;
 
-        public CngGcmAuthenticatedEncryptorConfigurationFactory([NotNull] IOptionsAccessor<CngGcmAuthenticatedEncryptorConfigurationOptions> optionsAccessor)
+        public CngGcmAuthenticatedEncryptorConfigurationFactory([NotNull] IOptions<CngGcmAuthenticatedEncryptorConfigurationOptions> optionsAccessor)
         {
             _options = optionsAccessor.Options.Clone();
         }
diff --git a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationFactory.cs b/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationFactory.cs
index 41cb60213e..50fee4ab58 100644
--- a/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationFactory.cs
+++ b/src/Microsoft.AspNet.Security.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationFactory.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Security.DataProtection.AuthenticatedEncryption
     {
         private readonly ManagedAuthenticatedEncryptorConfigurationOptions _options;
 
-        public ManagedAuthenticatedEncryptorConfigurationFactory([NotNull] IOptionsAccessor<ManagedAuthenticatedEncryptorConfigurationOptions> optionsAccessor)
+        public ManagedAuthenticatedEncryptorConfigurationFactory([NotNull] IOptions<ManagedAuthenticatedEncryptorConfigurationOptions> optionsAccessor)
         {
             _options = optionsAccessor.Options.Clone();
         }
diff --git a/src/Microsoft.AspNet.Security.DataProtection/DefaultDataProtectionProvider.cs b/src/Microsoft.AspNet.Security.DataProtection/DefaultDataProtectionProvider.cs
index d933097799..98ebba69dd 100644
--- a/src/Microsoft.AspNet.Security.DataProtection/DefaultDataProtectionProvider.cs
+++ b/src/Microsoft.AspNet.Security.DataProtection/DefaultDataProtectionProvider.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Security.DataProtection
         }
 
         public DefaultDataProtectionProvider(
-            [NotNull] IOptionsAccessor<DataProtectionOptions> optionsAccessor,
+            [NotNull] IOptions<DataProtectionOptions> optionsAccessor,
             [NotNull] IKeyManager keyManager)
         {
             KeyRingBasedDataProtectionProvider rootProvider = new KeyRingBasedDataProtectionProvider(new KeyRingProvider(keyManager));
diff --git a/src/Microsoft.AspNet.Security.DataProtection/EphemeralDataProtectionProvider.cs b/src/Microsoft.AspNet.Security.DataProtection/EphemeralDataProtectionProvider.cs
index 15e7ef1fbb..0e454e9e56 100644
--- a/src/Microsoft.AspNet.Security.DataProtection/EphemeralDataProtectionProvider.cs
+++ b/src/Microsoft.AspNet.Security.DataProtection/EphemeralDataProtectionProvider.cs
@@ -45,7 +45,7 @@ namespace Microsoft.AspNet.Security.DataProtection
             return _dataProtectionProvider.CreateProtector(purpose);
         }
 
-        private sealed class DefaultOptionsAccessor<T> : IOptionsAccessor<T> where T : class, new()
+        private sealed class DefaultOptionsAccessor<T> : IOptions<T> where T : class, new()
         {
             public T Options { get; } = new T();