Updating to new options pattern

samples/IdentitySample.Mvc/Startup.cs

@@ -74,20 +74,20 @@ namespace IdentitySamples
             app.UseDeveloperExceptionPage()
                .UseStaticFiles()
                .UseIdentity()
-               .UseFacebookAuthentication(options =>
+               .UseFacebookAuthentication(new FacebookOptions
                {
-                   options.AppId = "901611409868059";
-                   options.AppSecret = "4aa3c530297b1dcebc8860334b39668b";
+                   AppId = "901611409868059",
+                   AppSecret = "4aa3c530297b1dcebc8860334b39668b"
                })
-               .UseGoogleAuthentication(options =>
+               .UseGoogleAuthentication(new GoogleOptions
                {
-                   options.ClientId = "514485782433-fr3ml6sq0imvhi8a7qir0nb46oumtgn9.apps.googleusercontent.com";
-                   options.ClientSecret = "V2nDD9SkFbvLTqAUBWBBxYAL";
+                   ClientId = "514485782433-fr3ml6sq0imvhi8a7qir0nb46oumtgn9.apps.googleusercontent.com",
+                   ClientSecret = "V2nDD9SkFbvLTqAUBWBBxYAL"
                })
-               .UseTwitterAuthentication(options =>
+               .UseTwitterAuthentication(new TwitterOptions
                {
-                   options.ConsumerKey = "BSdJJ0CrDuvEhpkchnukXZBUv";
-                   options.ConsumerSecret = "xKUNuKhsRdHD03eLn67xhPAyE1wFFEndFo1X2UJaK2m1jdAxf4";
+                   ConsumerKey = "BSdJJ0CrDuvEhpkchnukXZBUv",
+                   ConsumerSecret = "xKUNuKhsRdHD03eLn67xhPAyE1wFFEndFo1X2UJaK2m1jdAxf4"
                })
                .UseMvc(routes =>
                 {

src/Microsoft.AspNet.Identity/IdentityBuilder.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Reflection;
+using Microsoft.AspNet.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Identity

src/Microsoft.AspNet.Identity/IdentityCookieOptions.cs

@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Authentication.Cookies;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.Identity

src/Microsoft.AspNet.Identity/IdentityOptions.cs

@@ -2,8 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Identity;
 
-namespace Microsoft.AspNet.Identity
+namespace Microsoft.AspNet.Builder
 {
     /// <summary>
     /// Represents all the options you can use to configure the identity system.

src/Microsoft.AspNet.Identity/IdentityServiceCollectionExtensions.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Identity;
@@ -44,7 +45,6 @@ namespace Microsoft.Extensions.DependencyInjection
             where TRole : class
         {
             // Services used by identity
-            services.AddOptions();
             services.AddAuthentication(options =>
             {
                 // This is the Default value for ExternalCookieAuthenticationScheme

src/Microsoft.AspNet.Identity/SecurityStampValidator.cs

@@ -5,7 +5,7 @@ using System;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Authentication.Cookies;
-using Microsoft.AspNet.Http.Authentication;
+using Microsoft.AspNet.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 

src/Microsoft.AspNet.Identity/SignInManager.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.AspNet.Http.Features.Authentication;

src/Microsoft.AspNet.Identity/UserClaimsPrincipalFactory.cs

@@ -3,9 +3,8 @@
 
 using System;
 using System.Security.Claims;
-using System.Threading;
 using System.Threading.Tasks;
-
+using Microsoft.AspNet.Builder;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNet.Identity

src/Microsoft.AspNet.Identity/UserManager.cs

@@ -9,6 +9,7 @@ using System.Security.Claims;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;

test/Microsoft.AspNet.Identity.Test/ApiConsistencyTest.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Reflection;
+using Microsoft.AspNet.Builder;
 
 namespace Microsoft.AspNet.Identity.Test
 {

test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Xunit;

test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs

@@ -4,8 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Security.Claims;
+using Microsoft.AspNet.Builder;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Configuration.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Xunit;

test/Microsoft.AspNet.Identity.Test/SecurityStampValidatorTest.cs

@@ -6,7 +6,7 @@ using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Authentication;
 using Microsoft.AspNet.Authentication.Cookies;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.Extensions.DependencyInjection;

test/Microsoft.AspNet.Identity.Test/SignInManagerTest.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.AspNet.Http.Features.Authentication;

test/Microsoft.AspNet.Identity.Test/UserClaimsPrincipalFactoryTest.cs

@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Builder;
 using Microsoft.Extensions.Options;
 using Moq;
 using Xunit;

test/Shared/MockHelpers.cs

@@ -5,9 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Text;
+using Microsoft.AspNet.Builder;
 using Microsoft.Extensions.Logging;
-using Moq;
 using Microsoft.Extensions.Options;
+using Moq;
 
 namespace Microsoft.AspNet.Identity.Test
 {

test/Shared/UserManagerTestBase.cs

@@ -4,16 +4,17 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Testing;
+using Microsoft.AspNet.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Xunit;
-using System.Linq.Expressions;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Internal;
-using Microsoft.AspNet.Testing.xunit;
 
 namespace Microsoft.AspNet.Identity.Test
 {