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:54:58 -07:00
parent ecd468b166
commit 04276b5ddf
20 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNet.Razor.Runtime/project.json
View File

@ -1,4 +1,4 @@
{ {
"description": "Runtime components for rendering Razor pages.", "description": "Runtime components for rendering Razor pages.",
"version": "4.0.0-*", "version": "4.0.0-*",
"dependencies": { "dependencies": {
@ -10,8 +10,8 @@
}, },
"frameworks": { "frameworks": {
"net45": { }, "net45": { },
"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
src/Microsoft.AspNet.Razor/Editor/BackgroundParser.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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -309,7 +309,7 @@ namespace Microsoft.AspNet.Razor.Editor
RazorEditorTrace.TraceLine(RazorResources.FormatTrace_BackgroundThreadStart(fileNameOnly)); RazorEditorTrace.TraceLine(RazorResources.FormatTrace_BackgroundThreadStart(fileNameOnly));
EnsureOnThread(); EnsureOnThread();
#if ASPNETCORE50 #if DNXCORE50
var spinWait = new SpinWait(); var spinWait = new SpinWait();
#endif #endif
@ -427,7 +427,7 @@ namespace Microsoft.AspNet.Razor.Editor
else else
{ {
RazorEditorTrace.TraceLine(RazorResources.FormatTrace_NoChangesArrived(fileNameOnly)); RazorEditorTrace.TraceLine(RazorResources.FormatTrace_NoChangesArrived(fileNameOnly));
#if ASPNETCORE50 #if DNXCORE50
// This does the equivalent of thread.yield under the covers. // This does the equivalent of thread.yield under the covers.
spinWait.SpinOnce(); spinWait.SpinOnce();
#else #else

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

@ -1,10 +1,10 @@
{ {
"description": "Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor parser and code generation infrastructure.", "description": "Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor parser and code generation infrastructure.",
"version": "4.0.0-*", "version": "4.0.0-*",
"frameworks": { "frameworks": {
"net45": { }, "net45": { },
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.10-beta-*", "System.Collections": "4.0.10-beta-*",
"System.Diagnostics.Debug": "4.0.10-beta-*", "System.Diagnostics.Debug": "4.0.10-beta-*",

4
test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs
View File

@ -4,7 +4,7 @@
using System; using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
#if !ASPNETCORE50 #if !DNXCORE50
using Moq; using Moq;
#endif #endif
using Xunit; using Xunit;
@ -333,7 +333,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
Assert.Equal(expected, writer.ToString()); Assert.Equal(expected, writer.ToString());
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void CanWriteToTextWriter_MultipleAppends() public void CanWriteToTextWriter_MultipleAppends()
{ {

2
test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperTypeResolverTest.cs
View File

@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
var documentLocation = new SourceLocation(1, 2, 3); var documentLocation = new SourceLocation(1, 2, 3);
var expectedErrorMessage = "Cannot resolve TagHelper containing assembly 'abcd'. Error: " + var expectedErrorMessage = "Cannot resolve TagHelper containing assembly 'abcd'. Error: " +
"Could not load file or assembly '" + "Could not load file or assembly '" +
#if ASPNET50 #if DNX451
"abcd' or one of its dependencies. The system cannot find the file specified."; "abcd' or one of its dependencies. The system cannot find the file specified.";
#else #else
"abcd, Culture=neutral, PublicKeyToken=null' or one of its dependencies. Could not find or load a " + "abcd, Culture=neutral, PublicKeyToken=null' or one of its dependencies. Could not find or load a " +

6
test/Microsoft.AspNet.Razor.Runtime.Test/project.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.0.0", "version": "1.0.0",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Razor.Runtime": "4.0.0-*", "Microsoft.AspNet.Razor.Runtime": "4.0.0-*",
@ -9,12 +9,12 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Moq": "4.2.1312.1622" "Moq": "4.2.1312.1622"
} }
}, },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Reflection.TypeExtensions": "4.0.0-beta-*", "System.Reflection.TypeExtensions": "4.0.0-beta-*",
"System.Runtime.Extensions": "4.0.10-beta-*" "System.Runtime.Extensions": "4.0.10-beta-*"

2
test/Microsoft.AspNet.Razor.Test/Generator/CSharpTagHelperRenderingTest.cs
View File

@ -3,7 +3,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
#if ASPNETCORE50 #if DNXCORE50
using System.Reflection; using System.Reflection;
#endif #endif
using Microsoft.AspNet.Razor.Generator.Compiler; using Microsoft.AspNet.Razor.Generator.Compiler;

4
test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpCodeBuilderTests.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 !ASPNETCORE50 #if !DNXCORE50
using Microsoft.AspNet.Razor.Generator; using Microsoft.AspNet.Razor.Generator;
using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser;
using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Parser.SyntaxTree;

2
test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/ChunkVisitorTests.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 !ASPNETCORE50 #if !DNXCORE50
using Microsoft.AspNet.Razor.Generator; using Microsoft.AspNet.Razor.Generator;
using Microsoft.AspNet.Razor.Generator.Compiler; using Microsoft.AspNet.Razor.Generator.Compiler;
using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser;

2
test/Microsoft.AspNet.Razor.Test/Generator/TagHelperAttributeValueCodeRendererTest.cs
View File

@ -2,7 +2,7 @@
// 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; using System;
#if ASPNETCORE50 #if DNXCORE50
using System.Reflection; using System.Reflection;
#endif #endif
using Microsoft.AspNet.Razor.Generator; using Microsoft.AspNet.Razor.Generator;

6
test/Microsoft.AspNet.Razor.Test/Parser/CallbackParserListenerTest.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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -7,7 +7,7 @@ using Microsoft.AspNet.Razor.Parser;
using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Parser.SyntaxTree;
using Microsoft.AspNet.Razor.Test.Framework; using Microsoft.AspNet.Razor.Test.Framework;
using Microsoft.AspNet.Razor.Text; using Microsoft.AspNet.Razor.Text;
#if !ASPNETCORE50 #if !DNXCORE50
using Moq; using Moq;
#endif #endif
using Xunit; using Xunit;
@ -71,7 +71,7 @@ namespace Microsoft.AspNet.Razor.Test.Parser
RunOnEndBlockTest(endBlockCallback => new CallbackVisitor(_ => { }, _ => { }, _ => { }, endBlockCallback)); RunOnEndBlockTest(endBlockCallback => new CallbackVisitor(_ => { }, _ => { }, _ => { }, endBlockCallback));
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void ListenerCallsOnEndSpanCallbackUsingSynchronizationContextIfSpecified() public void ListenerCallsOnEndSpanCallbackUsingSynchronizationContextIfSpecified()
{ {

6
test/Microsoft.AspNet.Razor.Test/Parser/ParserContextTest.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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -8,7 +8,7 @@ using Microsoft.AspNet.Razor.Parser.SyntaxTree;
using Microsoft.AspNet.Razor.Test.Framework; using Microsoft.AspNet.Razor.Test.Framework;
using Microsoft.AspNet.Razor.Text; using Microsoft.AspNet.Razor.Text;
using Microsoft.AspNet.Razor.Tokenizer.Symbols; using Microsoft.AspNet.Razor.Tokenizer.Symbols;
#if !ASPNETCORE50 #if !DNXCORE50
using Moq; using Moq;
#endif #endif
using Xunit; using Xunit;
@ -125,7 +125,7 @@ namespace Microsoft.AspNet.Razor.Test.Parser
Assert.Equal(BlockType.Expression, context.BlockStack.Peek().Type); Assert.Equal(BlockType.Expression, context.BlockStack.Peek().Type);
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void EndBlockAddsCurrentBlockToParentBlock() public void EndBlockAddsCurrentBlockToParentBlock()
{ {

4
test/Microsoft.AspNet.Razor.Test/Parser/ParserVisitorExtensionsTest.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 !ASPNETCORE50 #if !DNXCORE50
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;

6
test/Microsoft.AspNet.Razor.Test/Parser/RazorParserTest.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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -9,7 +9,7 @@ using Microsoft.AspNet.Razor.Parser;
using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Parser.SyntaxTree;
using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.TagHelpers;
using Microsoft.AspNet.Razor.Test.Framework; using Microsoft.AspNet.Razor.Test.Framework;
#if !ASPNETCORE50 #if !DNXCORE50
using Moq; using Moq;
using Moq.Protected; using Moq.Protected;
#endif #endif
@ -66,7 +66,7 @@ namespace Microsoft.AspNet.Razor.Test.Parser
factory.Markup(" baz"))); factory.Markup(" baz")));
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void GetTagHelperDescriptors_IsInvokedToLocateTagHelperDescriptors() public void GetTagHelperDescriptors_IsInvokedToLocateTagHelperDescriptors()
{ {

4
test/Microsoft.AspNet.Razor.Test/RazorTemplateEngineTest.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 !ASPNETCORE50 #if !DNXCORE50
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;

4
test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs
View File

@ -9,7 +9,7 @@ using Microsoft.AspNet.Razor.Parser.SyntaxTree;
using Microsoft.AspNet.Razor.Parser.TagHelpers; using Microsoft.AspNet.Razor.Parser.TagHelpers;
using Microsoft.AspNet.Razor.Test.Framework; using Microsoft.AspNet.Razor.Test.Framework;
using Microsoft.Internal.Web.Utils; using Microsoft.Internal.Web.Utils;
#if !ASPNETCORE50 #if !DNXCORE50
using Moq; using Moq;
#endif #endif
using Xunit; using Xunit;
@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers
{ {
private static readonly SpanFactory Factory = SpanFactory.CreateCsHtml(); private static readonly SpanFactory Factory = SpanFactory.CreateCsHtml();
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void GetDescriptors_InvokesResolveOnceForAllDirectives() public void GetDescriptors_InvokesResolveOnceForAllDirectives()
{ {

4
test/Microsoft.AspNet.Razor.Test/Text/BufferingTextReaderTest.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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -155,7 +155,7 @@ namespace Microsoft.AspNet.Razor.Test.Text
RunDisposeTest(r => r.Dispose()); RunDisposeTest(r => r.Dispose());
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void CloseDisposesSourceReader() public void CloseDisposesSourceReader()
{ {

4
test/Microsoft.AspNet.Razor.Test/Text/TextBufferReaderTest.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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -142,7 +142,7 @@ namespace Microsoft.AspNet.Razor.Test.Text
RunDisposeTest(r => r.Dispose()); RunDisposeTest(r => r.Dispose());
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void CloseDisposesSourceReader() public void CloseDisposesSourceReader()
{ {

6
test/Microsoft.AspNet.Razor.Test/Text/TextChangeTest.cs
View File

@ -1,10 +1,10 @@
// 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; using System;
using System.Web.WebPages.TestUtils; using System.Web.WebPages.TestUtils;
using Microsoft.AspNet.Razor.Text; using Microsoft.AspNet.Razor.Text;
#if !ASPNETCORE50 #if !DNXCORE50
using Moq; using Moq;
#endif #endif
using Xunit; using Xunit;
@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Razor.Test.Text
{ {
public class TextChangeTest public class TextChangeTest
{ {
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void ConstructorRequiresNonNegativeOldPosition() public void ConstructorRequiresNonNegativeOldPosition()
{ {

6
test/Microsoft.AspNet.Razor.Test/project.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.0.0", "version": "1.0.0",
"resources": "TestFiles/**/*", "resources": "TestFiles/**/*",
"dependencies": { "dependencies": {
@ -11,8 +11,8 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Diagnostics.TraceSource": "4.0.0-beta-*", "System.Diagnostics.TraceSource": "4.0.0-beta-*",
"System.Reflection.TypeExtensions": "4.0.0-beta-*" "System.Reflection.TypeExtensions": "4.0.0-beta-*"