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

View File

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

View File

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

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()
{
@ -310,4 +310,4 @@ namespace Microsoft.AspNet.Routing
}
}
}
}
}

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;
@ -33,4 +33,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -41,4 +41,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -53,4 +53,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -31,4 +31,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -55,4 +55,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -44,4 +44,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -31,4 +31,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -30,4 +30,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -38,4 +38,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -30,4 +30,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -87,4 +87,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -32,4 +32,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -40,4 +40,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -28,4 +28,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -40,4 +40,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -28,4 +28,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -44,4 +44,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -88,4 +88,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
}
#endif
#endif

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;
@ -111,4 +111,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
}
#endif
#endif

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;
@ -95,4 +95,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

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;
@ -139,4 +139,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
}
#endif
#endif

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;

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;
@ -334,4 +334,4 @@ namespace Microsoft.AspNet.Routing
}
}
}
#endif
#endif

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()
{
@ -136,4 +136,4 @@ namespace Microsoft.AspNet.Routing
}
}
}
}
}

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;
@ -1087,4 +1087,4 @@ namespace Microsoft.AspNet.Routing.Template.Tests
}
}
}
#endif
#endif

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;
@ -828,4 +828,4 @@ namespace Microsoft.AspNet.Routing.Template.Tests
}
}
}
#endif
#endif

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;
@ -529,4 +529,4 @@ namespace Microsoft.AspNet.Routing.Template.Tests
}
}
}
#endif
#endif

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;

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;
@ -114,4 +114,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
#endif
#endif

View File

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