huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated to use the new target framework in project.json

This commit is contained in:
David Fowler 2014-09-04 01:50:07 -07:00
parent 81e905cfa9
commit 4a8de5dad4
33 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/RoutingSample.Web/project.json
View File

@ -6,7 +6,7 @@
"Microsoft.Framework.OptionsModel": "1.0.0-*"
},
"frameworks": {
"net45": { },
"aspnet50": { },
"aspnetcore50": {
"dependencies": {
"System.Diagnostics.Debug": "4.0.10.0",

2
src/Microsoft.AspNet.Routing/project.json
View File

@ -12,7 +12,7 @@
"Microsoft.Framework.OptionsModel": "1.0.0-*"
},
"frameworks": {
"net45": {},
"aspnet50": {},
"aspnetcore50": {
"dependencies": {
"System.Collections": "4.0.10.0",

4
test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTest.cs
View File

@ -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()
{

4
test/Microsoft.AspNet.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/BoolRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/ConstraintsTestHelper.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/FloatRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/GuidRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/IntRouteConstraintsTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/LengthRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/LongRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/MaxRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/MinRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/RangeRouteConstraintTests.cs
View File

@ -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;

2
test/Microsoft.AspNet.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs
View File

@ -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;

2
test/Microsoft.AspNet.Routing.Tests/Constraints/RegexRouteConstraintTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs
View File

@ -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;

2
test/Microsoft.AspNet.Routing.Tests/ConstraintsBuilderTests.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/DefaultInlineConstraintResolverTest.cs
View File

@ -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;

2
test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs
View File

@ -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;

6
test/Microsoft.AspNet.Routing.Tests/RouterMiddlewareTest.cs
View File

@ -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()
{

2
test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs
View File

@ -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;

2
test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs
View File

@ -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;

2
test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs
View File

@ -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;

2
test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs
View File

@ -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;

4
test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs
View File

@ -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;

2
test/Microsoft.AspNet.Routing.Tests/project.json
View File

@ -21,7 +21,7 @@
"System.Text.RegularExpressions": "4.0.0.0"
}
},
"net45": {
"aspnet50": {
"dependencies": {
"Moq": "4.2.1312.1622",
"System.Runtime": ""