From a091c191bb292aa55fe4693cbd9c97ee601ef687 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 21 Oct 2014 17:37:35 -0700 Subject: [PATCH 1/2] React to DI changes --- src/Microsoft.AspNet.Identity/IdentityBuilder.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.AspNet.Identity/IdentityBuilder.cs b/src/Microsoft.AspNet.Identity/IdentityBuilder.cs index 259fc42a95..3481b848bd 100644 --- a/src/Microsoft.AspNet.Identity/IdentityBuilder.cs +++ b/src/Microsoft.AspNet.Identity/IdentityBuilder.cs @@ -16,12 +16,6 @@ namespace Microsoft.AspNet.Identity Services = services; } - public IdentityBuilder AddInstance(T obj) - { - Services.AddInstance(obj); - return this; - } - public IdentityBuilder AddUserStore(IUserStore store) { return AddInstance(store); @@ -64,5 +58,12 @@ namespace Microsoft.AspNet.Identity Services.AddScoped(); return this; } + + private IdentityBuilder AddInstance(TService instance) + where TService : class + { + Services.AddInstance(instance); + return this; + } } } \ No newline at end of file From 9bd1e8f0a996466946b796d2fd990949f714c3ef Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 21 Oct 2014 18:08:24 -0700 Subject: [PATCH 2/2] Adding type constraint on IdentityBuilder.AddService --- src/Microsoft.AspNet.Identity/IdentityBuilder.cs | 14 +++++++------- .../IdentityBuilderTest.cs | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.AspNet.Identity/IdentityBuilder.cs b/src/Microsoft.AspNet.Identity/IdentityBuilder.cs index 3481b848bd..a6214cce5b 100644 --- a/src/Microsoft.AspNet.Identity/IdentityBuilder.cs +++ b/src/Microsoft.AspNet.Identity/IdentityBuilder.cs @@ -16,6 +16,13 @@ namespace Microsoft.AspNet.Identity Services = services; } + public IdentityBuilder AddInstance(TService instance) + where TService : class + { + Services.AddInstance(instance); + return this; + } + public IdentityBuilder AddUserStore(IUserStore store) { return AddInstance(store); @@ -58,12 +65,5 @@ namespace Microsoft.AspNet.Identity Services.AddScoped(); return this; } - - private IdentityBuilder AddInstance(TService instance) - where TService : class - { - Services.AddInstance(instance); - return this; - } } } \ No newline at end of file diff --git a/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs b/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs index dcea443aea..5ce7b7ce57 100644 --- a/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs +++ b/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs @@ -52,6 +52,7 @@ namespace Microsoft.AspNet.Identity.Test } private static void CanOverride(TService instance) + where TService : class { var services = new ServiceCollection(); services.AddIdentity().AddInstance(instance);