Update aspnet50/aspnetcore50 => dnx451/dnxcore50.

samples/RoutingSample.Web/project.json

@@ -1,4 +1,4 @@
-{
+{
     "dependencies": {
         "Kestrel": "1.0.0-*",
         "Microsoft.AspNet.Server.IIS": "1.0.0-*",
@@ -10,8 +10,8 @@
         "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000"
     },
     "frameworks": {
-        "aspnet50": { },
-        "aspnetcore50": { }
+        "dnx451": { },
+        "dnxcore50": { }
     },
     "webroot": "wwwroot"
 }

src/Microsoft.AspNet.Routing/project.json

@@ -1,4 +1,4 @@
-{
+{
   "description": "ASP.NET 5 middleware and abstractions for routing requests to application logic and for generating links.",
   "version": "1.0.0-*",
   "compilationOptions": {
@@ -10,8 +10,8 @@
     "Microsoft.Framework.Logging.Interfaces": "1.0.0-*"
   },
   "frameworks": {
-    "aspnet50": {},
-    "aspnetcore50": {
+    "dnx451": {},
+    "dnxcore50": {
       "dependencies": {
         "System.Reflection.Extensions": "4.0.0-beta-*",
         "System.Text.RegularExpressions": "4.0.10-beta-*"

test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTest.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.Collections.Generic;
 using Microsoft.AspNet.Http;
-#if ASPNET50
+#if DNX451
 using Microsoft.AspNet.Routing.Logging;
 using Microsoft.Framework.Logging.Testing;
 using Moq;
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Routing
 {
     public class ConstraintMatcherTest
     {
-#if ASPNET50
+#if DNX451
         private const string _name = "name";
 
         [Fact]

test/Microsoft.AspNet.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using Microsoft.AspNet.Routing.Constraints;
 using Xunit;

test/Microsoft.AspNet.Routing.Tests/Constraints/BoolRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System;
 using System.Collections.Generic;

test/Microsoft.AspNet.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System;
 using System.Collections.Generic;

test/Microsoft.AspNet.Routing.Tests/Constraints/ConstraintsTestHelper.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System;
 using System.Collections.Generic;

test/Microsoft.AspNet.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System;
 using System.Collections.Generic;

test/Microsoft.AspNet.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System.Collections.Generic;
 using Microsoft.AspNet.Routing.Constraints;

test/Microsoft.AspNet.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using Microsoft.AspNet.Routing.Constraints;
 using Xunit;

test/Microsoft.AspNet.Routing.Tests/Constraints/FloatRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using Microsoft.AspNet.Routing.Constraints;
 using Xunit;

test/Microsoft.AspNet.Routing.Tests/Constraints/GuidRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System;
 using System.Collections.Generic;

test/Microsoft.AspNet.Routing.Tests/Constraints/IntRouteConstraintsTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using Microsoft.AspNet.Routing.Constraints;
 using Xunit;

test/Microsoft.AspNet.Routing.Tests/Constraints/LengthRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System;
 using Microsoft.AspNet.Routing.Constraints;

test/Microsoft.AspNet.Routing.Tests/Constraints/LongRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using Microsoft.AspNet.Routing.Constraints;
 using Xunit;

test/Microsoft.AspNet.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System;
 using Microsoft.AspNet.Routing.Constraints;

test/Microsoft.AspNet.Routing.Tests/Constraints/MaxRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using Microsoft.AspNet.Routing.Constraints;
 using Xunit;

test/Microsoft.AspNet.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System;
 using Microsoft.AspNet.Routing.Constraints;

test/Microsoft.AspNet.Routing.Tests/Constraints/MinRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using Microsoft.AspNet.Routing.Constraints;
 using Xunit;

test/Microsoft.AspNet.Routing.Tests/Constraints/RangeRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System;
 using Microsoft.AspNet.Routing.Constraints;

test/Microsoft.AspNet.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System.Globalization;
 using System.Threading;

test/Microsoft.AspNet.Routing.Tests/Constraints/RegexRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System.Globalization;
 using System.Text.RegularExpressions;

test/Microsoft.AspNet.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System;
 using Microsoft.AspNet.Http;

test/Microsoft.AspNet.Routing.Tests/DefaultInlineConstraintResolverTest.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Http;

test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -51,7 +51,7 @@ namespace Microsoft.AspNet.Routing
         [Theory]
         [InlineData(@"\u0130", @"\u0130", true)]
         [InlineData(@"\u0049", @"\u0049", true)]
-        [InlineData(@"üino", @"üino", true)]
+        [InlineData(@"<EFBFBD>ino", @"<22>ino", true)]
         public void GetVirtualPath_DoesntLowerCaseUrls_Invariant(
             string returnUrl,
             string lowercaseUrl,

test/Microsoft.AspNet.Routing.Tests/RouteConstraintBuilderTest.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 using System;
 using System.Linq;
 using Microsoft.AspNet.Http;

test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 using System;
 using System.Collections.Generic;
 using System.Linq;

test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 using System.Collections.Generic;
 using Microsoft.AspNet.Routing.Constraints;
 using Microsoft.Framework.DependencyInjection;

test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 using System;
 using System.Collections.Generic;
 using System.Linq;

test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 using System;
 using System.Collections.Generic;
 using System.Linq;

test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs

@@ -1,7 +1,7 @@
-// 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.
 
-#if ASPNET50
+#if DNX451
 
 using System;
 using Microsoft.AspNet.Builder;

test/Microsoft.AspNet.Routing.Tests/project.json

@@ -1,4 +1,4 @@
-{
+{
     "compilationOptions": {
         "warningsAsErrors": "true"
     },
@@ -10,8 +10,8 @@
         "xunit.runner.kre": "1.0.0-*"
     },
     "frameworks": {
-        "aspnetcore50": { },
-        "aspnet50": {
+        "dnxcore50": { },
+        "dnx451": {
             "dependencies": {
                 "Moq": "4.2.1312.1622"
             }
@@ -20,4 +20,4 @@
     "commands": {
         "test": "xunit.runner.kre"
     }
-}
+}