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

Update aspnet50/aspnetcore50 => dnx451/dnxcore50.

This commit is contained in:
N. Taylor Mullen 2015-03-08 12:51:04 -07:00
parent 8542a676cb
commit 1ed37d741a
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/IdentitySample.Mvc/project.json
View File

@ -1,4 +1,4 @@
{ {
"authors": [ "authors": [
"Microsoft" "Microsoft"
], ],
@ -28,9 +28,9 @@
}, },
"webroot": ".", "webroot": ".",
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
}, },
"aspnetcore50": { "dnxcore50": {
} }
} }
} }

6
src/Microsoft.AspNet.Identity.EntityFramework/project.json
View File

@ -1,14 +1,14 @@
{ {
"version": "3.0.0-*", "version": "3.0.0-*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Identity": "3.0.0-*", "Microsoft.AspNet.Identity": "3.0.0-*",
"EntityFramework.SqlServer": "7.0.0-*" "EntityFramework.SqlServer": "7.0.0-*"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { } "dependencies": { }
}, },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.10-beta-*", "System.Collections": "4.0.10-beta-*",
"System.ComponentModel": "4.0.0-beta-*", "System.ComponentModel": "4.0.0-beta-*",

6
src/Microsoft.AspNet.Identity/UserValidator.cs
View File

@ -1,9 +1,9 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
#if ASPNET50 #if DNX451
using System.Net.Mail; using System.Net.Mail;
#endif #endif
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
@ -82,7 +82,7 @@ namespace Microsoft.AspNet.Identity
errors.Add(Describer.InvalidEmail(email)); errors.Add(Describer.InvalidEmail(email));
return; return;
} }
#if ASPNET50 #if DNX451
try try
{ {
var m = new MailAddress(email); var m = new MailAddress(email);

6
src/Microsoft.AspNet.Identity/project.json
View File

@ -1,4 +1,4 @@
{ {
"version": "3.0.0-*", "version": "3.0.0-*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Authentication" : "1.0.0-*", "Microsoft.AspNet.Authentication" : "1.0.0-*",
@ -11,8 +11,8 @@
"Microsoft.Framework.OptionsModel": "1.0.0-*" "Microsoft.Framework.OptionsModel": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"aspnet50": {}, "dnx451": {},
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.10-beta-*", "System.Collections": "4.0.10-beta-*",
"System.ComponentModel": "4.0.0-beta-*", "System.ComponentModel": "4.0.0-beta-*",

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

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Hosting": "1.0.0-*", "Microsoft.AspNet.Hosting": "1.0.0-*",
"Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*",
@ -14,7 +14,7 @@
}, },
"code": "**\\*.cs;..\\Shared\\*.cs", "code": "**\\*.cs;..\\Shared\\*.cs",
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Moq" : "4.2.1312.1622" "Moq" : "4.2.1312.1622"
} }

4
test/Microsoft.AspNet.Identity.EntityFramework.Test/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Hosting": "1.0.0-*", "Microsoft.AspNet.Hosting": "1.0.0-*",
"Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*",
@ -15,7 +15,7 @@
}, },
"code": "**\\*.cs;..\\Shared\\*.cs", "code": "**\\*.cs;..\\Shared\\*.cs",
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Moq" : "4.2.1312.1622" "Moq" : "4.2.1312.1622"
} }

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

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Hosting": "1.0.0-*", "Microsoft.AspNet.Hosting": "1.0.0-*",
"Microsoft.AspNet.Http" : "1.0.0-*", "Microsoft.AspNet.Http" : "1.0.0-*",
@ -14,7 +14,7 @@
}, },
"code": "**\\*.cs;..\\Shared\\*.cs", "code": "**\\*.cs;..\\Shared\\*.cs",
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Moq" : "4.2.1312.1622" "Moq" : "4.2.1312.1622"
} }

4
test/Microsoft.AspNet.Identity.Test/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Hosting" : "1.0.0-*", "Microsoft.AspNet.Hosting" : "1.0.0-*",
"Microsoft.AspNet.Http" : "1.0.0-*", "Microsoft.AspNet.Http" : "1.0.0-*",
@ -12,7 +12,7 @@
}, },
"code": "**\\*.cs;..\\Shared\\*.cs", "code": "**\\*.cs;..\\Shared\\*.cs",
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Moq" : "4.2.1312.1622" "Moq" : "4.2.1312.1622"
} }

4
test/Shared/UserManagerTestBase.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -205,7 +205,7 @@ namespace Microsoft.AspNet.Identity.Test
IdentityResultAssert.IsFailure(await manager.CreateAsync(user), IdentityErrorDescriber.Default.InvalidEmail(email)); IdentityResultAssert.IsFailure(await manager.CreateAsync(user), IdentityErrorDescriber.Default.InvalidEmail(email));
} }
#if ASPNET50 #if DNX451
[Theory] [Theory]
[InlineData("@@afd")] [InlineData("@@afd")]
[InlineData("bogus")] [InlineData("bogus")]