From 4a8de5dad47baed206ce502d0c558ba4bf2e2297 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Thu, 4 Sep 2014 01:50:07 -0700 Subject: [PATCH] Updated to use the new target framework in project.json --- samples/RoutingSample.Web/project.json | 2 +- src/Microsoft.AspNet.Routing/project.json | 2 +- .../ConstraintMatcherTest.cs | 6 +++--- .../Constraints/AlphaRouteConstraintTests.cs | 6 +++--- .../Constraints/BoolRouteConstraintTests.cs | 6 +++--- .../Constraints/CompositeRouteConstraintTests.cs | 6 +++--- .../Constraints/ConstraintsTestHelper.cs | 6 +++--- .../Constraints/DateTimeRouteConstraintTests.cs | 6 +++--- .../Constraints/DecimalRouteConstraintTests.cs | 6 +++--- .../Constraints/DoubleRouteConstraintTests.cs | 6 +++--- .../Constraints/FloatRouteConstraintTests.cs | 6 +++--- .../Constraints/GuidRouteConstraintTests.cs | 6 +++--- .../Constraints/IntRouteConstraintsTests.cs | 6 +++--- .../Constraints/LengthRouteConstraintTests.cs | 6 +++--- .../Constraints/LongRouteConstraintTests.cs | 6 +++--- .../Constraints/MaxLengthRouteConstraintTests.cs | 6 +++--- .../Constraints/MaxRouteConstraintTests.cs | 6 +++--- .../Constraints/MinLengthRouteConstraintTests.cs | 6 +++--- .../Constraints/MinRouteConstraintTests.cs | 6 +++--- .../Constraints/RangeRouteConstraintTests.cs | 6 +++--- .../Constraints/RegexInlineRouteConstraintTests.cs | 4 ++-- .../Constraints/RegexRouteConstraintTests.cs | 4 ++-- .../Constraints/RequiredRouteConstraintTests.cs | 6 +++--- .../ConstraintsBuilderTests.cs | 4 ++-- .../DefaultInlineConstraintResolverTest.cs | 4 ++-- .../Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs | 4 ++-- .../RouterMiddlewareTest.cs | 8 ++++---- .../Template/TemplateBinderTests.cs | 4 ++-- .../Template/TemplateMatcherTests.cs | 4 ++-- .../Template/TemplateParserTests.cs | 4 ++-- .../Template/TemplateRouteTest.cs | 2 +- .../TemplateParserDefaultValuesTests.cs | 6 +++--- test/Microsoft.AspNet.Routing.Tests/project.json | 2 +- 33 files changed, 84 insertions(+), 84 deletions(-) diff --git a/samples/RoutingSample.Web/project.json b/samples/RoutingSample.Web/project.json index 3202a401bc..cfdb966ed8 100644 --- a/samples/RoutingSample.Web/project.json +++ b/samples/RoutingSample.Web/project.json @@ -6,7 +6,7 @@ "Microsoft.Framework.OptionsModel": "1.0.0-*" }, "frameworks": { - "net45": { }, + "aspnet50": { }, "aspnetcore50": { "dependencies": { "System.Diagnostics.Debug": "4.0.10.0", diff --git a/src/Microsoft.AspNet.Routing/project.json b/src/Microsoft.AspNet.Routing/project.json index 4c430e8c1c..b92978d8ed 100644 --- a/src/Microsoft.AspNet.Routing/project.json +++ b/src/Microsoft.AspNet.Routing/project.json @@ -12,7 +12,7 @@ "Microsoft.Framework.OptionsModel": "1.0.0-*" }, "frameworks": { - "net45": {}, + "aspnet50": {}, "aspnetcore50": { "dependencies": { "System.Collections": "4.0.10.0", diff --git a/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTest.cs b/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTest.cs index 3a88c816dc..34a168c8fa 100644 --- a/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTest.cs +++ b/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTest.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.AspNet.Http; using Microsoft.AspNet.Routing.Logging; -#if NET45 +#if ASPNET50 using Moq; #endif using Xunit; @@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Routing { public class ConstraintMatcherTest { -#if NET45 +#if ASPNET50 [Fact] public void MatchUrlGeneration_DoesNotLogData() { @@ -310,4 +310,4 @@ namespace Microsoft.AspNet.Routing } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs index d10772fc1c..33217838ab 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 NET45 +#if ASPNET50 using Microsoft.AspNet.Routing.Constraints; using Xunit; @@ -33,4 +33,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/BoolRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/BoolRouteConstraintTests.cs index d4212fa2c6..134ff6ae52 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 NET45 +#if ASPNET50 using System; using System.Collections.Generic; @@ -41,4 +41,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs index 26300a1b28..57f0483e0d 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 NET45 +#if ASPNET50 using System; using System.Collections.Generic; @@ -53,4 +53,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/ConstraintsTestHelper.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/ConstraintsTestHelper.cs index e59bf2b070..4a2361667d 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 NET45 +#if ASPNET50 using System; using System.Collections.Generic; @@ -31,4 +31,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs index 8fda375f82..b0c1185964 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 NET45 +#if ASPNET50 using System; using System.Collections.Generic; @@ -55,4 +55,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs index a3fd651194..f1b3c94d37 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 NET45 +#if ASPNET50 using System.Collections.Generic; using Microsoft.AspNet.Routing.Constraints; @@ -44,4 +44,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs index a0324f890d..c1b5994837 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 NET45 +#if ASPNET50 using Microsoft.AspNet.Routing.Constraints; using Xunit; @@ -31,4 +31,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/FloatRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/FloatRouteConstraintTests.cs index 5f1545e1b0..f13186f98f 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 NET45 +#if ASPNET50 using Microsoft.AspNet.Routing.Constraints; using Xunit; @@ -30,4 +30,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/GuidRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/GuidRouteConstraintTests.cs index b18c5b4957..62cb789214 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 NET45 +#if ASPNET50 using System; using System.Collections.Generic; @@ -38,4 +38,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/IntRouteConstraintsTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/IntRouteConstraintsTests.cs index 12a6863df1..9c540dc50a 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 NET45 +#if ASPNET50 using Microsoft.AspNet.Routing.Constraints; using Xunit; @@ -30,4 +30,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/LengthRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/LengthRouteConstraintTests.cs index 4df1584191..9ab134c6e4 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 NET45 +#if ASPNET50 using System; using Microsoft.AspNet.Routing.Constraints; @@ -87,4 +87,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/LongRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/LongRouteConstraintTests.cs index 98266fb71b..e2ce447c5a 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 NET45 +#if ASPNET50 using Microsoft.AspNet.Routing.Constraints; using Xunit; @@ -32,4 +32,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs index ae318d1221..4b18f8479e 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 NET45 +#if ASPNET50 using System; using Microsoft.AspNet.Routing.Constraints; @@ -40,4 +40,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/MaxRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/MaxRouteConstraintTests.cs index 9ca9d5518e..38df456c6e 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 NET45 +#if ASPNET50 using Microsoft.AspNet.Routing.Constraints; using Xunit; @@ -28,4 +28,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs index 6829bfb169..01c2faf761 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 NET45 +#if ASPNET50 using System; using Microsoft.AspNet.Routing.Constraints; @@ -40,4 +40,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/MinRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/MinRouteConstraintTests.cs index 6ee191fbb1..d56daf676b 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 NET45 +#if ASPNET50 using Microsoft.AspNet.Routing.Constraints; using Xunit; @@ -28,4 +28,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/RangeRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/RangeRouteConstraintTests.cs index f1b1fe589e..c78b2191a6 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 NET45 +#if ASPNET50 using System; using Microsoft.AspNet.Routing.Constraints; @@ -44,4 +44,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs index 39c36c4faf..d1ef0f2eb4 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NET45 +#if ASPNET50 using System.Globalization; using System.Threading; @@ -88,4 +88,4 @@ namespace Microsoft.AspNet.Routing.Tests } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/RegexRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/RegexRouteConstraintTests.cs index 7aa8e91377..e4a909ab74 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NET45 +#if ASPNET50 using System.Globalization; using System.Text.RegularExpressions; @@ -111,4 +111,4 @@ namespace Microsoft.AspNet.Routing.Tests } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs b/test/Microsoft.AspNet.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs index 818cb2f564..81c9593c40 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 NET45 +#if ASPNET50 using System; using Microsoft.AspNet.Http; @@ -95,4 +95,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/ConstraintsBuilderTests.cs b/test/Microsoft.AspNet.Routing.Tests/ConstraintsBuilderTests.cs index 0fd6a2636d..20b454f0a4 100644 --- a/test/Microsoft.AspNet.Routing.Tests/ConstraintsBuilderTests.cs +++ b/test/Microsoft.AspNet.Routing.Tests/ConstraintsBuilderTests.cs @@ -1,7 +1,7 @@ // 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 NET45 +#if ASPNET50 using System; using System.Collections.Generic; using System.Linq; @@ -139,4 +139,4 @@ namespace Microsoft.AspNet.Routing.Tests } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/DefaultInlineConstraintResolverTest.cs b/test/Microsoft.AspNet.Routing.Tests/DefaultInlineConstraintResolverTest.cs index b9908954e1..0c646b49f8 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 NET45 +#if ASPNET50 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 b2fbe40256..3aa670db62 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NET45 +#if ASPNET50 using System; using System.Collections.Generic; using System.Linq; @@ -334,4 +334,4 @@ namespace Microsoft.AspNet.Routing } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/RouterMiddlewareTest.cs b/test/Microsoft.AspNet.Routing.Tests/RouterMiddlewareTest.cs index 0482bbe6f1..f3a4b27198 100644 --- a/test/Microsoft.AspNet.Routing.Tests/RouterMiddlewareTest.cs +++ b/test/Microsoft.AspNet.Routing.Tests/RouterMiddlewareTest.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.Threading.Tasks; @@ -6,7 +6,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.AspNet.Routing.Logging; using Microsoft.Framework.Logging; -#if NET45 +#if ASPNET50 using Moq; #endif using Xunit; @@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Routing { public class RouterMiddlewareTest { -#if NET45 +#if ASPNET50 [Fact] public async void Invoke_LogsCorrectValuesWhenNotHandled() { @@ -136,4 +136,4 @@ namespace Microsoft.AspNet.Routing } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs index ac9c315663..102f73cdd5 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NET45 +#if ASPNET50 using System; using System.Collections.Generic; using System.Linq; @@ -1087,4 +1087,4 @@ namespace Microsoft.AspNet.Routing.Template.Tests } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs index 11c25b5478..247f5136d1 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NET45 +#if ASPNET50 using System.Collections.Generic; using Microsoft.AspNet.Routing.Constraints; using Microsoft.Framework.DependencyInjection; @@ -828,4 +828,4 @@ namespace Microsoft.AspNet.Routing.Template.Tests } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs index cdbb39b531..815cfd5132 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NET45 +#if ASPNET50 using System; using System.Collections.Generic; using Microsoft.AspNet.Testing; @@ -529,4 +529,4 @@ namespace Microsoft.AspNet.Routing.Template.Tests } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs index 3601bf29f9..909249e5ef 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NET45 +#if ASPNET50 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 feedcb40d9..00e82e4f5a 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 NET45 +#if ASPNET50 using System; using System.Collections.Generic; @@ -114,4 +114,4 @@ namespace Microsoft.AspNet.Routing.Tests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Routing.Tests/project.json b/test/Microsoft.AspNet.Routing.Tests/project.json index d10ace83ec..ceaf726d67 100644 --- a/test/Microsoft.AspNet.Routing.Tests/project.json +++ b/test/Microsoft.AspNet.Routing.Tests/project.json @@ -21,7 +21,7 @@ "System.Text.RegularExpressions": "4.0.0.0" } }, - "net45": { + "aspnet50": { "dependencies": { "Moq": "4.2.1312.1622", "System.Runtime": ""