Updated to use the new target framework in project.json

2014-09-04 02:10:19 -07:00 · 2014-09-04 02:10:19 -07:00 · 9d26c40144
--- a/samples/IdentitySample.Mvc/Controllers/ManageController.cs
+++ b/samples/IdentitySample.Mvc/Controllers/ManageController.cs
@ -1,4 +1,4 @@
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Mvc;
 using IdentitySample.Models;
 using System.Security.Principal;
@ -92,7 +92,7 @@ namespace IdentitySample
                return View(model);
            }
            // Generate the token and send it
-#if NET45
+#if ASPNET50
            var code = await UserManager.GenerateChangePhoneNumberTokenAsync(await GetCurrentUserAsync(), model.Number);
            if (UserManager.SmsService != null)
            {
@ -165,7 +165,7 @@ namespace IdentitySample
        {
            // This code allows you exercise the flow without actually sending codes
            // For production use please register a SMS provider in IdentityConfig and generate a code here.
-#if NET45
+#if ASPNET50
            var code = await UserManager.GenerateChangePhoneNumberTokenAsync(await GetCurrentUserAsync(), phoneNumber);
            ViewBag.Status = "For DEMO purposes only, the current code is " + code;
 #endif
@ -377,4 +377,4 @@ namespace IdentitySample

        #endregion
    }
-}
+}
--- a/samples/IdentitySample.Mvc/project.json
+++ b/samples/IdentitySample.Mvc/project.json
@ -22,7 +22,7 @@
        "run": "run server.urls=http://localhost:5003"
    },
    "frameworks": {
-        "net451": {
+        "aspnet50": {
        },
        "aspnetcore50": {
        }
--- a/src/Microsoft.AspNet.Identity.Authentication/project.json
+++ b/src/Microsoft.AspNet.Identity.Authentication/project.json
@ -8,7 +8,7 @@
    "System.Security.Claims" : "1.0.0-*"
  },
  "frameworks": {
-    "net45": {},
+    "aspnet50": {},
    "aspnetcore50": {
      "dependencies": {
        "System.Collections": "4.0.10.0",
--- a/src/Microsoft.AspNet.Identity.SqlServer/project.json
+++ b/src/Microsoft.AspNet.Identity.SqlServer/project.json
@ -6,7 +6,7 @@
    "System.Security.Claims" : "1.0.0-*"
  },
  "frameworks": {
-    "net451": {
+    "aspnet50": {
      "dependencies": {
        "System.Collections": "",
        "System.Runtime": ""
--- a/src/Microsoft.AspNet.Identity/UserValidator.cs
+++ b/src/Microsoft.AspNet.Identity/UserValidator.cs
@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-#if NET45
+#if ASPNET50
 using System.Net.Mail;
 #endif
 using System.Threading;
@ -120,7 +120,7 @@ namespace Microsoft.AspNet.Identity
                errors.Add(String.Format(CultureInfo.CurrentCulture, Resources.PropertyTooShort, "Email"));
                return;
            }
-#if NET45
+#if ASPNET50
            try
            {
                var m = new MailAddress(email);
@ -139,4 +139,4 @@ namespace Microsoft.AspNet.Identity
            }
        }
    }
-}
+}
--- a/src/Microsoft.AspNet.Identity/project.json
+++ b/src/Microsoft.AspNet.Identity/project.json
@ -7,7 +7,7 @@
    "System.Security.Claims" : "1.0.0-*"
  },
  "frameworks": {
-    "net45": {},
+    "aspnet50": {},
    "aspnetcore50": {
      "dependencies": {
        "System.Collections": "4.0.10.0",
--- a/test/Microsoft.AspNet.Identity.Authentication.Test/HttpSignInTest.cs
+++ b/test/Microsoft.AspNet.Identity.Authentication.Test/HttpSignInTest.cs
@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Identity.Authentication.Test

    public class HttpSignInTest
    {
-#if NET45
+#if ASPNET50
        //[Theory]
        //[InlineData(true)]
        //[InlineData(false)]
@ -527,4 +527,4 @@ namespace Microsoft.AspNet.Identity.Authentication.Test
        }
 #endif
    }
-}
+}
--- a/test/Microsoft.AspNet.Identity.Authentication.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.Authentication.Test/project.json
@ -19,7 +19,7 @@
  },
  "code": "**\\*.cs;..\\Shared\\*.cs",
  "frameworks": {
-    "net45": {
+    "aspnet50": {
      "dependencies": {
        "Moq" : "4.2.1312.1622",
        "System.Runtime": "",
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/HttpSignInTest.cs
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/HttpSignInTest.cs
@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Identity.InMemory.Test

    public class HttpSignInTest
    {
-#if NET45
+#if ASPNET50
        [Theory]
        [InlineData(true)]
        [InlineData(false)]
@ -63,4 +63,4 @@ namespace Microsoft.AspNet.Identity.InMemory.Test
        }
 #endif
    }
-}
+}
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
@ -15,7 +15,7 @@
  },
  "code": "**\\*.cs;..\\Shared\\*.cs",
  "frameworks": {
-    "net45": {
+    "aspnet50": {
      "dependencies": {
        "Moq" : "4.2.1312.1622",
        "System.Collections": "",
--- a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/project.json
@ -14,7 +14,7 @@
  },
  "code": "**\\*.cs;..\\Shared\\*.cs",
  "frameworks": {
-    "net451": {
+    "aspnet50": {
      "dependencies": {
        "Moq" : "4.2.1312.1622",
        "System.Collections": "",
--- a/test/Microsoft.AspNet.Identity.SqlServer.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.SqlServer.Test/project.json
@ -15,7 +15,7 @@
  },
  "code": "**\\*.cs;..\\Shared\\*.cs",
  "frameworks": {
-    "net451": {
+    "aspnet50": {
      "dependencies": {
        "Moq" : "4.2.1312.1622",
        "System.Collections": "",
@ -23,7 +23,6 @@
      }
    }
  },
-  "code": "**\\*.cs;..\\Shared\\*.cs",
  "commands": {
    "test": "Xunit.KRunner"
  }
--- a/test/Microsoft.AspNet.Identity.Test/ClaimsIdentityFactoryTest.cs
+++ b/test/Microsoft.AspNet.Identity.Test/ClaimsIdentityFactoryTest.cs
@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Identity.Test
                async () => await factory.CreateAsync(new TestUser(), null));
        }

-#if NET45
+#if ASPNET50
        //TODO: Mock fails in K (this works fine in net45)
        [Theory]
        [InlineData(false, false, false)]
@ -102,4 +102,4 @@ namespace Microsoft.AspNet.Identity.Test
        }
 #endif
    }
-}
+}
--- a/test/Microsoft.AspNet.Identity.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.Test/project.json
@ -12,7 +12,7 @@
  },
  "code": "**\\*.cs;..\\Shared\\*.cs",
  "frameworks": {
-    "net45": {
+    "aspnet50": {
      "dependencies": {
        "Moq" : "4.2.1312.1622",
        "System.Collections": "",
--- a/test/Shared/UserManagerTestBase.cs
+++ b/test/Shared/UserManagerTestBase.cs
@ -125,7 +125,7 @@ namespace Microsoft.AspNet.Identity.Test
            IdentityResultAssert.IsFailure(await manager.CreateAsync(user), "Email cannot be null or empty.");
        }

-#if NET45
+#if ASPNET50
        [Theory]
        [InlineData("@@afd")]
        [InlineData("bogus")]
@ -1564,4 +1564,4 @@ namespace Microsoft.AspNet.Identity.Test
        }

    }
-}
+}