From a4144caedd5f69435c16088fb6f00b8b33e5a537 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 26 Aug 2015 16:05:01 -0700 Subject: [PATCH] React to options --- .../DataProtectionProviderFactory.cs | 2 +- .../DataProtectionServiceDescriptors.cs | 2 +- .../RegistryPolicyResolverTests.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.AspNet.DataProtection/DataProtectionProviderFactory.cs b/src/Microsoft.AspNet.DataProtection/DataProtectionProviderFactory.cs index a7b4aed888..788db53ac1 100644 --- a/src/Microsoft.AspNet.DataProtection/DataProtectionProviderFactory.cs +++ b/src/Microsoft.AspNet.DataProtection/DataProtectionProviderFactory.cs @@ -43,7 +43,7 @@ namespace Microsoft.AspNet.DataProtection { var keyRingProvider = new KeyRingProvider( keyManager: services.GetRequiredService(), - keyManagementOptions: services.GetService>()?.Options, // might be null + keyManagementOptions: services.GetService>()?.Value, // might be null services: services); dataProtectionProvider = new KeyRingBasedDataProtectionProvider(keyRingProvider, services); } diff --git a/src/Microsoft.AspNet.DataProtection/DataProtectionServiceDescriptors.cs b/src/Microsoft.AspNet.DataProtection/DataProtectionServiceDescriptors.cs index 802249aace..4cbe0e6fd0 100644 --- a/src/Microsoft.AspNet.DataProtection/DataProtectionServiceDescriptors.cs +++ b/src/Microsoft.AspNet.DataProtection/DataProtectionServiceDescriptors.cs @@ -86,7 +86,7 @@ namespace Microsoft.Framework.DependencyInjection { return ServiceDescriptor.Singleton( services => DataProtectionProviderFactory.GetProviderFromServices( - options: services.GetRequiredService>().Options, + options: services.GetRequiredService>().Value, services: services, mustCreateImmediately: true /* this is the ultimate fallback */)); } diff --git a/test/Microsoft.AspNet.DataProtection.Test/RegistryPolicyResolverTests.cs b/test/Microsoft.AspNet.DataProtection.Test/RegistryPolicyResolverTests.cs index 8e7e0a13b1..3aa2902904 100644 --- a/test/Microsoft.AspNet.DataProtection.Test/RegistryPolicyResolverTests.cs +++ b/test/Microsoft.AspNet.DataProtection.Test/RegistryPolicyResolverTests.cs @@ -63,7 +63,7 @@ namespace Microsoft.AspNet.DataProtection var services = serviceCollection.BuildServiceProvider(); var keyManagementOptions = services.GetService>(); - Assert.Equal(TimeSpan.FromDays(1024), keyManagementOptions.Options.NewKeyLifetime); + Assert.Equal(TimeSpan.FromDays(1024), keyManagementOptions.Value.NewKeyLifetime); } [ConditionalFact]