diff --git a/samples/RoutingSample.Web/project.json b/samples/RoutingSample.Web/project.json index c064d98586..f3c5b60fb9 100644 --- a/samples/RoutingSample.Web/project.json +++ b/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" } diff --git a/src/Microsoft.AspNet.Routing/project.json b/src/Microsoft.AspNet.Routing/project.json index 8efb0d040c..28880e77ad 100644 --- a/src/Microsoft.AspNet.Routing/project.json +++ b/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-*" diff --git a/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTest.cs b/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTest.cs index ff9c83674b..8247a9c912 100644 --- a/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTest.cs +++ b/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] diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs index 33217838ab..550ede2b7a 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/BoolRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/BoolRouteConstraintTests.cs index 18a4f6f821..bc596b1682 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/BoolRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs index 1f616a860c..079d2e5313 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/ConstraintsTestHelper.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/ConstraintsTestHelper.cs index 4a2361667d..a17b7bf014 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/ConstraintsTestHelper.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs index b0c1185964..c9cb45350e 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs index f1b3c94d37..ca279084d4 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs index c1b5994837..ea16287ca6 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/FloatRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/FloatRouteConstraintTests.cs index f13186f98f..35e2fbfa5c 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/FloatRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/GuidRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/GuidRouteConstraintTests.cs index 62cb789214..51478d774b 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/GuidRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/IntRouteConstraintsTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/IntRouteConstraintsTests.cs index 9c540dc50a..18cc4ea44a 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/IntRouteConstraintsTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/LengthRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/LengthRouteConstraintTests.cs index 7db3d54806..d0eb9e3f6e 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/LengthRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/LongRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/LongRouteConstraintTests.cs index e2ce447c5a..4385c59d2f 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/LongRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs index 05fbde111e..477dc8b9e4 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/MaxRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/MaxRouteConstraintTests.cs index 38df456c6e..01a91bac17 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/MaxRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs index c4644ffaf5..aed35b29da 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/MinRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/MinRouteConstraintTests.cs index d56daf676b..793589b52f 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/MinRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/RangeRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/RangeRouteConstraintTests.cs index 4106be1114..691884b440 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/RangeRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs index f8ae357bdd..b409bb4efe 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/RegexRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/RegexRouteConstraintTests.cs index 90da38cdb0..853d2243a0 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/RegexRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs index 2d4425fa45..cc7d71b906 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/DefaultInlineConstraintResolverTest.cs b/test/Microsoft.AspNet.Routing.Tests/DefaultInlineConstraintResolverTest.cs index c09f45deab..beee35d2b1 100644 --- a/test/Microsoft.AspNet.Routing.Tests/DefaultInlineConstraintResolverTest.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs b/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs index 8c5c04850f..52e36b232f 100644 --- a/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs +++ b/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(@"�ino", @"�ino", true)] public void GetVirtualPath_DoesntLowerCaseUrls_Invariant( string returnUrl, string lowercaseUrl, diff --git a/test/Microsoft.AspNet.Routing.Tests/RouteConstraintBuilderTest.cs b/test/Microsoft.AspNet.Routing.Tests/RouteConstraintBuilderTest.cs index 92d56222de..1a5a93656e 100644 --- a/test/Microsoft.AspNet.Routing.Tests/RouteConstraintBuilderTest.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs index bf7575dcc4..5de9447e76 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs index 72615e9cdb..5ceeb6a48b 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs index cd20a47192..bee2666670 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs index 941765a760..727d7e06b7 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs b/test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs index a2680297bb..f5dbac2d86 100644 --- a/test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Routing.Tests/project.json b/test/Microsoft.AspNet.Routing.Tests/project.json index 87d29740a8..4bf1df7255 100644 --- a/test/Microsoft.AspNet.Routing.Tests/project.json +++ b/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" } -} \ No newline at end of file +}