From 1ed37d741a01a2ee181369e7b21b6884c9a3f466 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Sun, 8 Mar 2015 12:51:04 -0700
Subject: [PATCH] Update aspnet50/aspnetcore50 => dnx451/dnxcore50.

---
 samples/IdentitySample.Mvc/project.json                     | 6 +++---
 src/Microsoft.AspNet.Identity.EntityFramework/project.json  | 6 +++---
 src/Microsoft.AspNet.Identity/UserValidator.cs              | 6 +++---
 src/Microsoft.AspNet.Identity/project.json                  | 6 +++---
 .../project.json                                            | 4 ++--
 .../project.json                                            | 4 ++--
 test/Microsoft.AspNet.Identity.InMemory.Test/project.json   | 4 ++--
 test/Microsoft.AspNet.Identity.Test/project.json            | 4 ++--
 test/Shared/UserManagerTestBase.cs                          | 4 ++--
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/samples/IdentitySample.Mvc/project.json b/samples/IdentitySample.Mvc/project.json
index cb305d4802..2bd7a26692 100644
--- a/samples/IdentitySample.Mvc/project.json
+++ b/samples/IdentitySample.Mvc/project.json
@@ -1,4 +1,4 @@
-{
+{
     "authors": [
         "Microsoft"
     ],
@@ -28,9 +28,9 @@
     },
     "webroot": ".",
     "frameworks": {
-        "aspnet50": {
+        "dnx451": {
         },
-        "aspnetcore50": {
+        "dnxcore50": {
         }
     }
 }
diff --git a/src/Microsoft.AspNet.Identity.EntityFramework/project.json b/src/Microsoft.AspNet.Identity.EntityFramework/project.json
index 73339aa319..162d2a5e53 100644
--- a/src/Microsoft.AspNet.Identity.EntityFramework/project.json
+++ b/src/Microsoft.AspNet.Identity.EntityFramework/project.json
@@ -1,14 +1,14 @@
-{
+{
   "version": "3.0.0-*",
   "dependencies": {
     "Microsoft.AspNet.Identity": "3.0.0-*",
     "EntityFramework.SqlServer": "7.0.0-*"
   },
   "frameworks": {
-    "aspnet50": {
+    "dnx451": {
       "dependencies": { }
     },
-    "aspnetcore50": {
+    "dnxcore50": {
       "dependencies": {
         "System.Collections": "4.0.10-beta-*",
         "System.ComponentModel": "4.0.0-beta-*",
diff --git a/src/Microsoft.AspNet.Identity/UserValidator.cs b/src/Microsoft.AspNet.Identity/UserValidator.cs
index b19aaf2cb7..b1c0b6ec6a 100644
--- a/src/Microsoft.AspNet.Identity/UserValidator.cs
+++ b/src/Microsoft.AspNet.Identity/UserValidator.cs
@@ -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.
 
 using System;
 using System.Collections.Generic;
-#if ASPNET50
+#if DNX451
 using System.Net.Mail;
 #endif
 using System.Text.RegularExpressions;
@@ -82,7 +82,7 @@ namespace Microsoft.AspNet.Identity
                 errors.Add(Describer.InvalidEmail(email));
                 return;
             }
-#if ASPNET50
+#if DNX451
             try
             {
                 var m = new MailAddress(email);
diff --git a/src/Microsoft.AspNet.Identity/project.json b/src/Microsoft.AspNet.Identity/project.json
index 924b80bd33..ecd5e99e01 100644
--- a/src/Microsoft.AspNet.Identity/project.json
+++ b/src/Microsoft.AspNet.Identity/project.json
@@ -1,4 +1,4 @@
-{
+{
   "version": "3.0.0-*",
   "dependencies": {
     "Microsoft.AspNet.Authentication" : "1.0.0-*",
@@ -11,8 +11,8 @@
     "Microsoft.Framework.OptionsModel": "1.0.0-*"
   },
   "frameworks": {
-    "aspnet50": {},
-    "aspnetcore50": {
+    "dnx451": {},
+    "dnxcore50": {
       "dependencies": {
         "System.Collections": "4.0.10-beta-*",
         "System.ComponentModel": "4.0.0-beta-*",
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/project.json b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/project.json
index 78bdbab70d..746b9b6cf5 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/project.json
@@ -1,4 +1,4 @@
-{
+{
   "dependencies": {
     "Microsoft.AspNet.Hosting": "1.0.0-*",
     "Microsoft.AspNet.Http": "1.0.0-*",
@@ -14,7 +14,7 @@
   },
   "code": "**\\*.cs;..\\Shared\\*.cs",
   "frameworks": {
-    "aspnet50": {
+    "dnx451": {
       "dependencies": {
         "Moq" : "4.2.1312.1622"
       }
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/project.json b/test/Microsoft.AspNet.Identity.EntityFramework.Test/project.json
index ad670a434b..d060f84898 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/project.json
@@ -1,4 +1,4 @@
-{
+{
   "dependencies": {
     "Microsoft.AspNet.Hosting": "1.0.0-*",
     "Microsoft.AspNet.Http": "1.0.0-*",
@@ -15,7 +15,7 @@
   },
   "code": "**\\*.cs;..\\Shared\\*.cs",
   "frameworks": {
-    "aspnet50": {
+    "dnx451": {
       "dependencies": {
         "Moq" : "4.2.1312.1622"
       }
diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/project.json b/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
index 32aafec7e1..8d184b6e5c 100644
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
@@ -1,4 +1,4 @@
-{
+{
   "dependencies": {
     "Microsoft.AspNet.Hosting": "1.0.0-*",
     "Microsoft.AspNet.Http" : "1.0.0-*",
@@ -14,7 +14,7 @@
   },
   "code": "**\\*.cs;..\\Shared\\*.cs",
   "frameworks": {
-    "aspnet50": {
+    "dnx451": {
       "dependencies": {
         "Moq" : "4.2.1312.1622"
       }
diff --git a/test/Microsoft.AspNet.Identity.Test/project.json b/test/Microsoft.AspNet.Identity.Test/project.json
index 60d12687be..e42bea8a65 100644
--- a/test/Microsoft.AspNet.Identity.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.Test/project.json
@@ -1,4 +1,4 @@
-{
+{
   "dependencies": {
     "Microsoft.AspNet.Hosting" : "1.0.0-*",
     "Microsoft.AspNet.Http" : "1.0.0-*",
@@ -12,7 +12,7 @@
   },
   "code": "**\\*.cs;..\\Shared\\*.cs",
   "frameworks": {
-    "aspnet50": {
+    "dnx451": {
       "dependencies": {
         "Moq" : "4.2.1312.1622"
       }
diff --git a/test/Shared/UserManagerTestBase.cs b/test/Shared/UserManagerTestBase.cs
index d834cda845..ed9557bdb7 100644
--- a/test/Shared/UserManagerTestBase.cs
+++ b/test/Shared/UserManagerTestBase.cs
@@ -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.
 
 using System;
@@ -205,7 +205,7 @@ namespace Microsoft.AspNet.Identity.Test
             IdentityResultAssert.IsFailure(await manager.CreateAsync(user), IdentityErrorDescriber.Default.InvalidEmail(email));
         }
 
-#if ASPNET50
+#if DNX451
         [Theory]
         [InlineData("@@afd")]
         [InlineData("bogus")]