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

Update aspnet50/aspnetcore50 => dnx451/dnxcore50.

This commit is contained in:
N. Taylor Mullen 2015-03-08 12:55:34 -07:00
parent 3e99d38dbb
commit da775351e2
32 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Kestrel": "1.0.0-*", "Kestrel": "1.0.0-*",
"Microsoft.AspNet.Server.IIS": "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" "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000"
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { } "dnxcore50": { }
}, },
"webroot": "wwwroot" "webroot": "wwwroot"
} }

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

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

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

@ -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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
#if ASPNET50 #if DNX451
using Microsoft.AspNet.Routing.Logging; using Microsoft.AspNet.Routing.Logging;
using Microsoft.Framework.Logging.Testing; using Microsoft.Framework.Logging.Testing;
using Moq; using Moq;
@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Routing
{ {
public class ConstraintMatcherTest public class ConstraintMatcherTest
{ {
#if ASPNET50 #if DNX451
private const string _name = "name"; private const string _name = "name";
[Fact] [Fact]

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. // 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 Microsoft.AspNet.Routing.Constraints;
using Xunit; 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. // 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;
using System.Collections.Generic; 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. // 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;
using System.Collections.Generic; 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. // 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;
using System.Collections.Generic; 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. // 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;
using System.Collections.Generic; 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. // 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 System.Collections.Generic;
using Microsoft.AspNet.Routing.Constraints; 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. // 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 Microsoft.AspNet.Routing.Constraints;
using Xunit; 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. // 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 Microsoft.AspNet.Routing.Constraints;
using Xunit; 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. // 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;
using System.Collections.Generic; 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. // 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 Microsoft.AspNet.Routing.Constraints;
using Xunit; 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. // 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;
using Microsoft.AspNet.Routing.Constraints; 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. // 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 Microsoft.AspNet.Routing.Constraints;
using Xunit; 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. // 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;
using Microsoft.AspNet.Routing.Constraints; 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. // 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 Microsoft.AspNet.Routing.Constraints;
using Xunit; 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. // 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;
using Microsoft.AspNet.Routing.Constraints; 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. // 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 Microsoft.AspNet.Routing.Constraints;
using Xunit; 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. // 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;
using Microsoft.AspNet.Routing.Constraints; using Microsoft.AspNet.Routing.Constraints;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.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. // 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.Globalization;
using System.Threading; using System.Threading;

4
test/Microsoft.AspNet.Routing.Tests/Constraints/RegexRouteConstraintTests.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. // 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.Globalization;
using System.Text.RegularExpressions; 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. // 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;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;

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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;

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

4
test/Microsoft.AspNet.Routing.Tests/RouteConstraintBuilderTest.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. // 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;
using System.Linq; using System.Linq;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;

4
test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;

4
test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.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. // 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 System.Collections.Generic;
using Microsoft.AspNet.Routing.Constraints; using Microsoft.AspNet.Routing.Constraints;
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;

4
test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;

4
test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; 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. // 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;
using Microsoft.AspNet.Builder; using Microsoft.AspNet.Builder;

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

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