OptionsModel => Options

samples/IdentitySample.Mvc/Models/IdentityModels.cs

@@ -2,7 +2,7 @@ using System;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.Data.Entity;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 
 namespace IdentitySample.Models
 {

samples/IdentitySample.Mvc/Models/SampleData.cs

@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 
 namespace IdentitySample.Models
 {

samples/IdentitySample.Mvc/project.json

@@ -21,7 +21,6 @@
     "EntityFramework.MicrosoftSqlServer": "7.0.0-*",
     "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
     "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
-    "Microsoft.Extensions.OptionsModel": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*"
   },
   "compilationOptions": {

samples/Interop45/packages.config

@@ -23,7 +23,7 @@
   <package id="Microsoft.Extensions.DependencyInjection" version="1.0.0-rc2-15748" targetFramework="net46" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0-rc2-15748" targetFramework="net46" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0-rc2-15757" targetFramework="net46" />
-  <package id="Microsoft.Extensions.OptionsModel" version="1.0.0-rc2-15753" targetFramework="net46" />
+  <package id="Microsoft.Extensions.Options" version="1.0.0-rc2-15753" targetFramework="net46" />
   <package id="Microsoft.Extensions.PlatformAbstractions" version="1.0.0-rc2-16062" targetFramework="net46" />
   <package id="Microsoft.Extensions.Primitives" version="1.0.0-rc2-15802" targetFramework="net46" />
   <package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.3" targetFramework="net45" />

src/Microsoft.AspNet.Identity/BuilderExtensions.cs

@@ -5,7 +5,7 @@ using System;
 
 using Microsoft.AspNet.Identity;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNet.Builder
 {

src/Microsoft.AspNet.Identity/DataProtectionTokenProvider.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.DataProtection;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNet.Identity
 {

src/Microsoft.AspNet.Identity/PasswordHasher.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 using Microsoft.AspNet.Cryptography.KeyDerivation;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNet.Identity
 {

src/Microsoft.AspNet.Identity/SecurityStampValidator.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Authentication.Cookies;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNet.Identity
 {

src/Microsoft.AspNet.Identity/SignInManager.cs

@@ -10,7 +10,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.AspNet.Http.Features.Authentication;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNet.Identity
 {

src/Microsoft.AspNet.Identity/UserClaimsPrincipalFactory.cs

@@ -6,7 +6,7 @@ using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
 
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNet.Identity
 {

src/Microsoft.AspNet.Identity/UserManager.cs

@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNet.Identity
 {

test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/project.json

@@ -8,10 +8,8 @@
     "Microsoft.AspNet.Http": "1.0.0-*",
     "Microsoft.AspNet.Identity": "3.0.0-*",
     "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*",
-    "Microsoft.AspNet.DataProtection": "1.0.0-*",
     "Microsoft.AspNet.Testing": "1.0.0-*",
     "EntityFramework.InMemory": "7.0.0-*",
-    "Microsoft.Extensions.OptionsModel": "1.0.0-*",
     "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "compile": "../Shared/*.cs",

test/Microsoft.AspNet.Identity.EntityFramework.Test/project.json

@@ -10,10 +10,8 @@
     "Microsoft.AspNet.Http": "1.0.0-*",
     "Microsoft.AspNet.Identity": "3.0.0-*",
     "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*",
-    "Microsoft.AspNet.DataProtection": "1.0.0-*",
     "Microsoft.AspNet.TestHost": "1.0.0-*",
     "Microsoft.AspNet.Testing": "1.0.0-*",
-    "Microsoft.Extensions.OptionsModel": "1.0.0-*",
     "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "compile": "../Shared/*.cs",

test/Microsoft.AspNet.Identity.InMemory.Test/project.json

@@ -11,9 +11,6 @@
     "Microsoft.AspNet.Identity": "3.0.0-*",
     "Microsoft.AspNet.TestHost": "1.0.0-*",
     "Microsoft.AspNet.Testing": "1.0.0-*",
-    "Microsoft.Extensions.Configuration": "1.0.0-*",
-    "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
-    "Microsoft.Extensions.OptionsModel": "1.0.0-*",
     "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "compile": "../Shared/*.cs",

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

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 using Xunit;
 
 namespace Microsoft.AspNet.Identity.Test

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

@@ -7,7 +7,7 @@ using System.Security.Claims;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration.Memory;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 using Xunit;
 
 namespace Microsoft.AspNet.Identity.Test

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

@@ -3,7 +3,7 @@
 
 using System;
 using System.Security.Cryptography;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 using Xunit;
 
 namespace Microsoft.AspNet.Identity.Test

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

@@ -10,7 +10,7 @@ using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 using Moq;
 using Xunit;
 
@@ -28,7 +28,7 @@ namespace Microsoft.AspNet.Identity.Test
             var ticket = new AuthenticationTicket(id, new AuthenticationProperties { IssuedUtc = DateTimeOffset.UtcNow }, scheme);
             var context = new CookieValidatePrincipalContext(httpContext.Object, ticket, new CookieAuthenticationOptions());
             var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => SecurityStampValidator.ValidatePrincipalAsync(context));
-            Assert.True(ex.Message.Contains("No service for type 'Microsoft.Extensions.OptionsModel.IOptions"));
+            Assert.True(ex.Message.Contains("No service for type 'Microsoft.Extensions.Options.IOptions"));
         }
 
         [Theory]

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

@@ -12,7 +12,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.AspNet.Http.Features.Authentication;
 using Microsoft.AspNet.Http.Internal;
-using Microsoft.Extensions.OptionsModel;
+using Microsoft.Extensions.Options;
 using Moq;
 using Xunit;
 

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

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

test/Microsoft.AspNet.Identity.Test/project.json

@@ -9,8 +9,6 @@
     "Microsoft.AspNet.Identity": "3.0.0-*",
     "Microsoft.AspNet.Testing": "1.0.0-*",
     "Microsoft.Extensions.Configuration": "1.0.0-*",
-    "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
-    "Microsoft.Extensions.OptionsModel": "1.0.0-*",
     "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-*",
     "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },