huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to renames + cleanup

This commit is contained in:
David Fowler 2014-05-06 03:37:06 -07:00
parent 73f1c6ac46
commit 0c8cbdab31
16 changed files with 26 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNet.Identity.Entity/project.json
View File

@ -3,7 +3,7 @@
"dependencies": { "dependencies": {
"Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
"Microsoft.AspNet.DependencyInjection": "0.1-alpha-*", "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
"Microsoft.AspNet.Identity": "0.1-alpha-*", "Microsoft.AspNet.Identity": "",
"Microsoft.Data.Entity": "0.1-alpha-*", "Microsoft.Data.Entity": "0.1-alpha-*",
"Microsoft.Data.Entity.Relational": "0.1-alpha-*", "Microsoft.Data.Entity.Relational": "0.1-alpha-*",
"Microsoft.Data.Entity.SqlServer": "0.1-alpha-*", "Microsoft.Data.Entity.SqlServer": "0.1-alpha-*",
@ -16,7 +16,7 @@
"System.Runtime": "", "System.Runtime": "",
"System.Collections": "" "System.Collections": ""
} }
}, },
"k10": { "k10": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.0.0", "System.Collections": "4.0.0.0",

2
src/Microsoft.AspNet.Identity.InMemory/project.json
View File

@ -1,7 +1,7 @@
{ {
"version": "0.1-alpha-*", "version": "0.1-alpha-*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Identity": "0.1-alpha-*", "Microsoft.AspNet.Identity": "",
"Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*",
"System.Security.Claims": "0.1-alpha-*" "System.Security.Claims": "0.1-alpha-*"
}, },

4
src/Microsoft.AspNet.Identity.Security/SignInManager.cs
View File

@ -15,12 +15,12 @@
// See the Apache 2 License for the specific language governing // See the Apache 2 License for the specific language governing
// permissions and limitations under the License. // permissions and limitations under the License.
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.Abstractions.Security;
using Microsoft.AspNet.DependencyInjection; using Microsoft.AspNet.DependencyInjection;
using System; using System;
using System.Security.Claims; using System.Security.Claims;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Security;
namespace Microsoft.AspNet.Identity.Security namespace Microsoft.AspNet.Identity.Security
{ {

4
src/Microsoft.AspNet.Identity.Security/project.json
View File

@ -3,8 +3,8 @@
"dependencies": { "dependencies": {
"Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*",
"System.Security.Claims" : "0.1-alpha-*", "System.Security.Claims" : "0.1-alpha-*",
"Microsoft.AspNet.Abstractions" : "0.1-alpha-*", "Microsoft.AspNet.Http" : "0.1-alpha-*",
"Microsoft.AspNet.Identity" : "0.1-alpha-*", "Microsoft.AspNet.Identity" : "",
"Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*" "Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*"
}, },
"configurations": { "configurations": {

1
test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs
View File

@ -19,7 +19,6 @@ using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.DependencyInjection; using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.DependencyInjection.Fallback; using Microsoft.AspNet.DependencyInjection.Fallback;
using Microsoft.AspNet.Identity.Test;
using Microsoft.Data.Entity; using Microsoft.Data.Entity;
using Microsoft.Data.Entity.InMemory; using Microsoft.Data.Entity.InMemory;
using Xunit; using Xunit;

8
test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs
View File

@ -2,12 +2,12 @@ using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.DependencyInjection.Fallback; using Microsoft.AspNet.DependencyInjection.Fallback;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.AspNet.Identity.Entity; using Microsoft.AspNet.Identity.Entity;
using Microsoft.AspNet.Identity.Test;
using Microsoft.AspNet.PipelineCore; using Microsoft.AspNet.PipelineCore;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Data.Entity; using Microsoft.Data.Entity;
using Xunit; using Xunit;
using Microsoft.AspNet.Builder;
namespace Microsoft.AspNet.Identity.Entity.Test namespace Microsoft.AspNet.Identity.Entity.Test
{ {
@ -36,7 +36,7 @@ namespace Microsoft.AspNet.Identity.Entity.Test
[Fact] [Fact]
public void CanCustomizeIdentityOptions() public void CanCustomizeIdentityOptions()
{ {
IBuilder builder = new Builder(new ServiceCollection().BuildServiceProvider()); IBuilder builder = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
builder.UseServices(services => { builder.UseServices(services => {
services.AddIdentity<IdentityUser>(identityServices => { }); services.AddIdentity<IdentityUser>(identityServices => { });
services.AddSetup<PasswordsNegativeLengthSetup>(); services.AddSetup<PasswordsNegativeLengthSetup>();
@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Identity.Entity.Test
[Fact] [Fact]
public void CanSetupIdentityOptions() public void CanSetupIdentityOptions()
{ {
IBuilder app = new Builder(new ServiceCollection().BuildServiceProvider()); IBuilder app = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
app.UseServices(services => services.AddIdentity<IdentityUser>(identityServices => identityServices.SetupOptions(options => options.User.RequireUniqueEmail = true))); app.UseServices(services => services.AddIdentity<IdentityUser>(identityServices => identityServices.SetupOptions(options => options.User.RequireUniqueEmail = true)));
var optionsGetter = app.ApplicationServices.GetService<IOptionsAccessor<IdentityOptions>>(); var optionsGetter = app.ApplicationServices.GetService<IOptionsAccessor<IdentityOptions>>();
@ -72,7 +72,7 @@ namespace Microsoft.AspNet.Identity.Entity.Test
[Fact] [Fact]
public async Task EnsureStartupUsageWorks() public async Task EnsureStartupUsageWorks()
{ {
IBuilder builder = new Builder(new ServiceCollection().BuildServiceProvider()); IBuilder builder = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
//builder.UseServices(services => services.AddIdentity<ApplicationUser>(s => //builder.UseServices(services => services.AddIdentity<ApplicationUser>(s =>
// s.AddEntity<ApplicationDbContext>() // s.AddEntity<ApplicationDbContext>()

1
test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs
View File

@ -17,7 +17,6 @@
using Microsoft.AspNet.DependencyInjection; using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.DependencyInjection.Fallback; using Microsoft.AspNet.DependencyInjection.Fallback;
using Microsoft.AspNet.Identity.Test;
using Microsoft.AspNet.Testing; using Microsoft.AspNet.Testing;
using Microsoft.Data.Entity; using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Metadata;

10
test/Microsoft.AspNet.Identity.Entity.Test/project.json
View File

@ -1,10 +1,9 @@
{ {
"version": "0.1-alpha-*", "version": "0.1-alpha-*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Abstractions": "0.1-alpha-*", "Microsoft.AspNet.Http": "0.1-alpha-*",
"Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
"Microsoft.AspNet.DependencyInjection": "0.1-alpha-*", "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
"Microsoft.AspNet.Identity": "",
"Microsoft.AspNet.Identity.Entity": "", "Microsoft.AspNet.Identity.Entity": "",
"Microsoft.AspNet.PipelineCore": "0.1-alpha-*", "Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
"Microsoft.AspNet.Logging": "0.1-alpha-*", "Microsoft.AspNet.Logging": "0.1-alpha-*",
@ -12,12 +11,6 @@
"Microsoft.AspNet.Security.DataProtection": "0.1-alpha-*", "Microsoft.AspNet.Security.DataProtection": "0.1-alpha-*",
"Microsoft.AspNet.Testing": "0.1-alpha-*", "Microsoft.AspNet.Testing": "0.1-alpha-*",
"Microsoft.Bcl.Immutable": "1.1.18-beta-*", "Microsoft.Bcl.Immutable": "1.1.18-beta-*",
"Microsoft.Data.Entity": "0.1-alpha-*",
"Microsoft.Data.Entity.InMemory": "0.1-alpha-*",
"Microsoft.Data.Entity.Migrations": "0.1-alpha-*",
"Microsoft.Data.Entity.Relational": "0.1-alpha-*",
"Microsoft.Data.Entity.SqlServer": "0.1-alpha-*",
"Remotion.Linq": "1.15.13.0",
"System.Security.Claims": "0.1-alpha-*", "System.Security.Claims": "0.1-alpha-*",
"Xunit.KRunner": "0.1-alpha-*", "Xunit.KRunner": "0.1-alpha-*",
"xunit.abstractions": "2.0.0-aspnet-*", "xunit.abstractions": "2.0.0-aspnet-*",
@ -25,7 +18,6 @@
"xunit.core": "2.0.0-aspnet-*", "xunit.core": "2.0.0-aspnet-*",
"xunit.execution": "2.0.0-aspnet-*" "xunit.execution": "2.0.0-aspnet-*"
}, },
"code": "**\\*.cs;..\\Shared\\*.cs",
"configurations": { "configurations": {
"net45": { "net45": {
"dependencies": { "dependencies": {

3
test/Microsoft.AspNet.Identity.InMemory.Test/Microsoft.AspNet.Identity.InMemory.Test.kproj
View File

@ -25,8 +25,5 @@
<Compile Include="InMemoryStoreTest.cs" /> <Compile Include="InMemoryStoreTest.cs" />
<Compile Include="StartupTest.cs" /> <Compile Include="StartupTest.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
</Project> </Project>

11
test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs
View File

@ -15,13 +15,14 @@
// See the Apache 2 License for the specific language governing // See the Apache 2 License for the specific language governing
// permissions and limitations under the License. // permissions and limitations under the License.
using System;
using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.DependencyInjection; using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.DependencyInjection.Fallback; using Microsoft.AspNet.DependencyInjection.Fallback;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.AspNet.Identity.Test; using Microsoft.AspNet.Identity.Test;
using Microsoft.AspNet.PipelineCore; using Microsoft.AspNet.PipelineCore;
using System;
using System.Threading.Tasks;
using Xunit; using Xunit;
namespace Microsoft.AspNet.Identity.InMemory.Test namespace Microsoft.AspNet.Identity.InMemory.Test
@ -47,7 +48,7 @@ namespace Microsoft.AspNet.Identity.InMemory.Test
[Fact] [Fact]
public void CanCustomizeIdentityOptions() public void CanCustomizeIdentityOptions()
{ {
IBuilder builder = new Builder(new ServiceCollection().BuildServiceProvider()); IBuilder builder = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
builder.UseServices(services => { builder.UseServices(services => {
services.AddIdentity<IdentityUser>(identityServices => { }); services.AddIdentity<IdentityUser>(identityServices => { });
services.AddSetup<PasswordsNegativeLengthSetup>(); services.AddSetup<PasswordsNegativeLengthSetup>();
@ -70,7 +71,7 @@ namespace Microsoft.AspNet.Identity.InMemory.Test
[Fact] [Fact]
public void CanSetupIdentityOptions() public void CanSetupIdentityOptions()
{ {
IBuilder app = new Builder(new ServiceCollection().BuildServiceProvider()); IBuilder app = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
app.UseServices(services => services.AddIdentity<IdentityUser>(identityServices => identityServices.SetupOptions(options => options.User.RequireUniqueEmail = true))); app.UseServices(services => services.AddIdentity<IdentityUser>(identityServices => identityServices.SetupOptions(options => options.User.RequireUniqueEmail = true)));
var optionsGetter = app.ApplicationServices.GetService<IOptionsAccessor<IdentityOptions>>(); var optionsGetter = app.ApplicationServices.GetService<IOptionsAccessor<IdentityOptions>>();
@ -83,7 +84,7 @@ namespace Microsoft.AspNet.Identity.InMemory.Test
[Fact] [Fact]
public async Task EnsureStartupUsageWorks() public async Task EnsureStartupUsageWorks()
{ {
IBuilder builder = new Builder(new ServiceCollection().BuildServiceProvider()); IBuilder builder = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
//builder.UseServices(services => services.AddIdentity<ApplicationUser>(s => //builder.UseServices(services => services.AddIdentity<ApplicationUser>(s =>
// s.AddEntity<ApplicationDbContext>() // s.AddEntity<ApplicationDbContext>()

2
test/Microsoft.AspNet.Identity.InMemory.Test/project.json
View File

@ -1,7 +1,7 @@
{ {
"version": "0.1-alpha-*", "version": "0.1-alpha-*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Abstractions" : "0.1-alpha-*", "Microsoft.AspNet.Http" : "0.1-alpha-*",
"Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
"Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*",
"Microsoft.AspNet.Identity" : "0.1-alpha-*", "Microsoft.AspNet.Identity" : "0.1-alpha-*",

3
test/Microsoft.AspNet.Identity.Security.Test/Microsoft.AspNet.Identity.Security.Test.kproj
View File

@ -25,8 +25,5 @@
<Compile Include="SignInManagerTest.cs" /> <Compile Include="SignInManagerTest.cs" />
<Compile Include="TestUser.cs" /> <Compile Include="TestUser.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
</Project> </Project>

3
test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs
View File

@ -31,6 +31,7 @@ using Moq;
using System.Security.Claims; using System.Security.Claims;
using System.Threading.Tasks; using System.Threading.Tasks;
using Xunit; using Xunit;
using Microsoft.AspNet.Builder;
namespace Microsoft.AspNet.Identity.Security.Test namespace Microsoft.AspNet.Identity.Security.Test
{ {
@ -42,7 +43,7 @@ namespace Microsoft.AspNet.Identity.Security.Test
[InlineData(false)] [InlineData(false)]
public async Task VerifyAccountControllerSignIn(bool isPersistent) public async Task VerifyAccountControllerSignIn(bool isPersistent)
{ {
IBuilder app = new Builder(new ServiceCollection().BuildServiceProvider()); IBuilder app = new Microsoft.AspNet.Builder.Builder(new ServiceCollection().BuildServiceProvider());
app.UseCookieAuthentication(new CookieAuthenticationOptions app.UseCookieAuthentication(new CookieAuthenticationOptions
{ {
AuthenticationType = DefaultAuthenticationTypes.ApplicationCookie AuthenticationType = DefaultAuthenticationTypes.ApplicationCookie

2
test/Microsoft.AspNet.Identity.Security.Test/project.json
View File

@ -1,7 +1,7 @@
{ {
"version": "0.1-alpha-*", "version": "0.1-alpha-*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Abstractions" : "0.1-alpha-*", "Microsoft.AspNet.Http" : "0.1-alpha-*",
"Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
"Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*",
"Microsoft.AspNet.Identity" : "0.1-alpha-*", "Microsoft.AspNet.Identity" : "0.1-alpha-*",

6
test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs
View File

@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Identity.Test
{"identity:password:RequireDigit", "false"}, {"identity:password:RequireDigit", "false"},
{"identity:password:RequireLowerCase", "false"} {"identity:password:RequireLowerCase", "false"}
}; };
var config = new ConfigurationModel.Configuration { new MemoryConfigurationSource(dic) }; var config = new Configuration { new MemoryConfigurationSource(dic) };
Assert.Equal(roleClaimType, config.Get("identity:claimtype:role")); Assert.Equal(roleClaimType, config.Get("identity:claimtype:role"));
var options = new IdentityOptions(config); var options = new IdentityOptions(config);
Assert.Equal(roleClaimType, options.ClaimType.Role); Assert.Equal(roleClaimType, options.ClaimType.Role);
@ -91,7 +91,7 @@ namespace Microsoft.AspNet.Identity.Test
{"userid", useridClaimType}, {"userid", useridClaimType},
{"securitystamp", securityStampClaimType} {"securitystamp", securityStampClaimType}
}; };
var config = new ConfigurationModel.Configuration {new MemoryConfigurationSource(dic)}; var config = new Configuration {new MemoryConfigurationSource(dic)};
Assert.Equal(roleClaimType, config.Get("role")); Assert.Equal(roleClaimType, config.Get("role"));
var options = new ClaimTypeOptions(config); var options = new ClaimTypeOptions(config);
Assert.Equal(roleClaimType, options.Role); Assert.Equal(roleClaimType, options.Role);
@ -111,7 +111,7 @@ namespace Microsoft.AspNet.Identity.Test
{"RequireDigit", "false"}, {"RequireDigit", "false"},
{"RequireLowerCase", "false"} {"RequireLowerCase", "false"}
}; };
var config = new ConfigurationModel.Configuration { new MemoryConfigurationSource(dic) }; var config = new Configuration { new MemoryConfigurationSource(dic) };
var options = new PasswordOptions(config); var options = new PasswordOptions(config);
Assert.False(options.RequireDigit); Assert.False(options.RequireDigit);
Assert.False(options.RequireLowercase); Assert.False(options.RequireLowercase);

7
test/Microsoft.AspNet.Identity.Test/Microsoft.AspNet.Identity.Test.kproj
View File

@ -23,20 +23,15 @@
<ItemGroup> <ItemGroup>
<Compile Include="ClaimsIdentityFactoryTest.cs" /> <Compile Include="ClaimsIdentityFactoryTest.cs" />
<Compile Include="IdentityBuilderTest.cs" /> <Compile Include="IdentityBuilderTest.cs" />
<Compile Include="IdentityResultAssert.cs" /> <Compile Include="IdentityOptionsTest.cs" />
<Compile Include="IdentityResultTest.cs" /> <Compile Include="IdentityResultTest.cs" />
<Compile Include="NoopRoleStore.cs" /> <Compile Include="NoopRoleStore.cs" />
<Compile Include="NoopUserStore.cs" /> <Compile Include="NoopUserStore.cs" />
<Compile Include="PasswordValidatorTest.cs" /> <Compile Include="PasswordValidatorTest.cs" />
<Compile Include="RoleManagerTest.cs" /> <Compile Include="RoleManagerTest.cs" />
<Compile Include="RoleValidatorTest.cs" /> <Compile Include="RoleValidatorTest.cs" />
<Compile Include="TestRole.cs" />
<Compile Include="TestUser.cs" />
<Compile Include="UserManagerTest.cs" /> <Compile Include="UserManagerTest.cs" />
<Compile Include="UserValidatorTest.cs" /> <Compile Include="UserValidatorTest.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
</Project> </Project>