From 04276b5ddf9d5f841c68abe68b900ff0573d9dce Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Sun, 8 Mar 2015 12:54:58 -0700 Subject: [PATCH] Update aspnet50/aspnetcore50 => dnx451/dnxcore50. --- src/Microsoft.AspNet.Razor.Runtime/project.json | 6 +++--- src/Microsoft.AspNet.Razor/Editor/BackgroundParser.cs | 6 +++--- src/Microsoft.AspNet.Razor/project.json | 6 +++--- .../TagHelpers/DefaultTagHelperContentTest.cs | 6 +++--- .../TagHelpers/TagHelperTypeResolverTest.cs | 4 ++-- test/Microsoft.AspNet.Razor.Runtime.Test/project.json | 6 +++--- .../Generator/CSharpTagHelperRenderingTest.cs | 4 ++-- .../Generator/CodeTree/CSharpCodeBuilderTests.cs | 6 +++--- .../Generator/CodeTree/ChunkVisitorTests.cs | 4 ++-- .../Generator/TagHelperAttributeValueCodeRendererTest.cs | 4 ++-- .../Parser/CallbackParserListenerTest.cs | 6 +++--- .../Microsoft.AspNet.Razor.Test/Parser/ParserContextTest.cs | 6 +++--- .../Parser/ParserVisitorExtensionsTest.cs | 6 +++--- test/Microsoft.AspNet.Razor.Test/Parser/RazorParserTest.cs | 6 +++--- test/Microsoft.AspNet.Razor.Test/RazorTemplateEngineTest.cs | 6 +++--- .../TagHelpers/TagHelperDirectiveSpanVisitorTest.cs | 6 +++--- .../Text/BufferingTextReaderTest.cs | 4 ++-- .../Text/TextBufferReaderTest.cs | 4 ++-- test/Microsoft.AspNet.Razor.Test/Text/TextChangeTest.cs | 6 +++--- test/Microsoft.AspNet.Razor.Test/project.json | 6 +++--- 20 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/Microsoft.AspNet.Razor.Runtime/project.json b/src/Microsoft.AspNet.Razor.Runtime/project.json index 83b441b982..909e59523f 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/project.json +++ b/src/Microsoft.AspNet.Razor.Runtime/project.json @@ -1,4 +1,4 @@ -{ +{ "description": "Runtime components for rendering Razor pages.", "version": "4.0.0-*", "dependencies": { @@ -10,8 +10,8 @@ }, "frameworks": { "net45": { }, - "aspnet50": { }, - "aspnetcore50": { + "dnx451": { }, + "dnxcore50": { "dependencies": { "System.Reflection.Extensions": "4.0.0-beta-*", "System.Text.RegularExpressions": "4.0.10-beta-*" diff --git a/src/Microsoft.AspNet.Razor/Editor/BackgroundParser.cs b/src/Microsoft.AspNet.Razor/Editor/BackgroundParser.cs index 944343ba9e..dca86a8127 100644 --- a/src/Microsoft.AspNet.Razor/Editor/BackgroundParser.cs +++ b/src/Microsoft.AspNet.Razor/Editor/BackgroundParser.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; @@ -309,7 +309,7 @@ namespace Microsoft.AspNet.Razor.Editor RazorEditorTrace.TraceLine(RazorResources.FormatTrace_BackgroundThreadStart(fileNameOnly)); EnsureOnThread(); -#if ASPNETCORE50 +#if DNXCORE50 var spinWait = new SpinWait(); #endif @@ -427,7 +427,7 @@ namespace Microsoft.AspNet.Razor.Editor else { RazorEditorTrace.TraceLine(RazorResources.FormatTrace_NoChangesArrived(fileNameOnly)); -#if ASPNETCORE50 +#if DNXCORE50 // This does the equivalent of thread.yield under the covers. spinWait.SpinOnce(); #else diff --git a/src/Microsoft.AspNet.Razor/project.json b/src/Microsoft.AspNet.Razor/project.json index 43284e0cfa..e20d087936 100644 --- a/src/Microsoft.AspNet.Razor/project.json +++ b/src/Microsoft.AspNet.Razor/project.json @@ -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.", "version": "4.0.0-*", "frameworks": { "net45": { }, - "aspnet50": { }, - "aspnetcore50": { + "dnx451": { }, + "dnxcore50": { "dependencies": { "System.Collections": "4.0.10-beta-*", "System.Diagnostics.Debug": "4.0.10-beta-*", diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs index d36ae0f22a..c28df3d595 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs @@ -4,7 +4,7 @@ using System; using System.IO; using System.Linq; -#if !ASPNETCORE50 +#if !DNXCORE50 using Moq; #endif using Xunit; @@ -333,7 +333,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers Assert.Equal(expected, writer.ToString()); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void CanWriteToTextWriter_MultipleAppends() { @@ -432,4 +432,4 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers Assert.Equal(expected, tagHelperContent.GetContent()); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperTypeResolverTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperTypeResolverTest.cs index 7ec6d9c867..0d624bbe05 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperTypeResolverTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperTypeResolverTest.cs @@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers var documentLocation = new SourceLocation(1, 2, 3); var expectedErrorMessage = "Cannot resolve TagHelper containing assembly 'abcd'. Error: " + "Could not load file or assembly '" + -#if ASPNET50 +#if DNX451 "abcd' or one of its dependencies. The system cannot find the file specified."; #else "abcd, Culture=neutral, PublicKeyToken=null' or one of its dependencies. Could not find or load a " + @@ -199,4 +199,4 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers return Task.FromResult(result: true); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/project.json b/test/Microsoft.AspNet.Razor.Runtime.Test/project.json index dce9e8a34f..d9278659ae 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/project.json +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "1.0.0", "dependencies": { "Microsoft.AspNet.Razor.Runtime": "4.0.0-*", @@ -9,12 +9,12 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { + "dnx451": { "dependencies": { "Moq": "4.2.1312.1622" } }, - "aspnetcore50": { + "dnxcore50": { "dependencies": { "System.Reflection.TypeExtensions": "4.0.0-beta-*", "System.Runtime.Extensions": "4.0.10-beta-*" diff --git a/test/Microsoft.AspNet.Razor.Test/Generator/CSharpTagHelperRenderingTest.cs b/test/Microsoft.AspNet.Razor.Test/Generator/CSharpTagHelperRenderingTest.cs index a43b0cabd9..317301c0c0 100644 --- a/test/Microsoft.AspNet.Razor.Test/Generator/CSharpTagHelperRenderingTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Generator/CSharpTagHelperRenderingTest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; -#if ASPNETCORE50 +#if DNXCORE50 using System.Reflection; #endif using Microsoft.AspNet.Razor.Generator.Compiler; @@ -455,4 +455,4 @@ namespace Microsoft.AspNet.Razor.Test.Generator public string BoundProperty { get; set; } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpCodeBuilderTests.cs b/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpCodeBuilderTests.cs index a47d1cb13f..caedddb0ba 100644 --- a/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpCodeBuilderTests.cs +++ b/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpCodeBuilderTests.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 !ASPNETCORE50 +#if !DNXCORE50 using Microsoft.AspNet.Razor.Generator; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; @@ -44,4 +44,4 @@ namespace Microsoft.AspNet.Razor.Test.Generator.CodeTree } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/ChunkVisitorTests.cs b/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/ChunkVisitorTests.cs index b7244cb208..cced027a1f 100644 --- a/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/ChunkVisitorTests.cs +++ b/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/ChunkVisitorTests.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 !ASPNETCORE50 +#if !DNXCORE50 using Microsoft.AspNet.Razor.Generator; using Microsoft.AspNet.Razor.Generator.Compiler; using Microsoft.AspNet.Razor.Parser; @@ -46,4 +46,4 @@ namespace Microsoft.AspNet.Razor } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Razor.Test/Generator/TagHelperAttributeValueCodeRendererTest.cs b/test/Microsoft.AspNet.Razor.Test/Generator/TagHelperAttributeValueCodeRendererTest.cs index 5269ee8a7a..26fb2ac1cc 100644 --- a/test/Microsoft.AspNet.Razor.Test/Generator/TagHelperAttributeValueCodeRendererTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Generator/TagHelperAttributeValueCodeRendererTest.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -#if ASPNETCORE50 +#if DNXCORE50 using System.Reflection; #endif using Microsoft.AspNet.Razor.Generator; @@ -102,4 +102,4 @@ namespace Microsoft.AspNet.Razor.Test.Generator public bool Checked { get; set; } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CallbackParserListenerTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/CallbackParserListenerTest.cs index 1c8e60fcde..fdce6f4a8f 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/CallbackParserListenerTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/CallbackParserListenerTest.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; @@ -7,7 +7,7 @@ using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Test.Framework; using Microsoft.AspNet.Razor.Text; -#if !ASPNETCORE50 +#if !DNXCORE50 using Moq; #endif using Xunit; @@ -71,7 +71,7 @@ namespace Microsoft.AspNet.Razor.Test.Parser RunOnEndBlockTest(endBlockCallback => new CallbackVisitor(_ => { }, _ => { }, _ => { }, endBlockCallback)); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void ListenerCallsOnEndSpanCallbackUsingSynchronizationContextIfSpecified() { diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/ParserContextTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/ParserContextTest.cs index 0fe69e71d2..22dbdbae21 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/ParserContextTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/ParserContextTest.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; @@ -8,7 +8,7 @@ using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Test.Framework; using Microsoft.AspNet.Razor.Text; using Microsoft.AspNet.Razor.Tokenizer.Symbols; -#if !ASPNETCORE50 +#if !DNXCORE50 using Moq; #endif using Xunit; @@ -125,7 +125,7 @@ namespace Microsoft.AspNet.Razor.Test.Parser Assert.Equal(BlockType.Expression, context.BlockStack.Peek().Type); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void EndBlockAddsCurrentBlockToParentBlock() { diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/ParserVisitorExtensionsTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/ParserVisitorExtensionsTest.cs index 9e6dcc44dd..4b36064380 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/ParserVisitorExtensionsTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/ParserVisitorExtensionsTest.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 !ASPNETCORE50 +#if !DNXCORE50 using System; using System.Collections.Generic; using System.Linq; @@ -97,4 +97,4 @@ namespace Microsoft.AspNet.Razor.Test.Parser } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/RazorParserTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/RazorParserTest.cs index 28f1eb594e..011952e4f7 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/RazorParserTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/RazorParserTest.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; @@ -9,7 +9,7 @@ using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Test.Framework; -#if !ASPNETCORE50 +#if !DNXCORE50 using Moq; using Moq.Protected; #endif @@ -66,7 +66,7 @@ namespace Microsoft.AspNet.Razor.Test.Parser factory.Markup(" baz"))); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void GetTagHelperDescriptors_IsInvokedToLocateTagHelperDescriptors() { diff --git a/test/Microsoft.AspNet.Razor.Test/RazorTemplateEngineTest.cs b/test/Microsoft.AspNet.Razor.Test/RazorTemplateEngineTest.cs index fdc88f124f..7f49318dfa 100644 --- a/test/Microsoft.AspNet.Razor.Test/RazorTemplateEngineTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/RazorTemplateEngineTest.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 !ASPNETCORE50 +#if !DNXCORE50 using System; using System.Collections.Generic; using System.IO; @@ -331,4 +331,4 @@ namespace Microsoft.AspNet.Razor.Test } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs index 48af054303..163f41f61c 100644 --- a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Parser.TagHelpers; using Microsoft.AspNet.Razor.Test.Framework; using Microsoft.Internal.Web.Utils; -#if !ASPNETCORE50 +#if !DNXCORE50 using Moq; #endif using Xunit; @@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers { private static readonly SpanFactory Factory = SpanFactory.CreateCsHtml(); -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void GetDescriptors_InvokesResolveOnceForAllDirectives() { @@ -277,4 +277,4 @@ namespace Microsoft.AspNet.Razor.TagHelpers } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Razor.Test/Text/BufferingTextReaderTest.cs b/test/Microsoft.AspNet.Razor.Test/Text/BufferingTextReaderTest.cs index e680343666..18a935b254 100644 --- a/test/Microsoft.AspNet.Razor.Test/Text/BufferingTextReaderTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Text/BufferingTextReaderTest.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; @@ -155,7 +155,7 @@ namespace Microsoft.AspNet.Razor.Test.Text RunDisposeTest(r => r.Dispose()); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void CloseDisposesSourceReader() { diff --git a/test/Microsoft.AspNet.Razor.Test/Text/TextBufferReaderTest.cs b/test/Microsoft.AspNet.Razor.Test/Text/TextBufferReaderTest.cs index ddbf6cdb16..21f9a71c20 100644 --- a/test/Microsoft.AspNet.Razor.Test/Text/TextBufferReaderTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Text/TextBufferReaderTest.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; @@ -142,7 +142,7 @@ namespace Microsoft.AspNet.Razor.Test.Text RunDisposeTest(r => r.Dispose()); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void CloseDisposesSourceReader() { diff --git a/test/Microsoft.AspNet.Razor.Test/Text/TextChangeTest.cs b/test/Microsoft.AspNet.Razor.Test/Text/TextChangeTest.cs index fc6ab3839b..05aaae0569 100644 --- a/test/Microsoft.AspNet.Razor.Test/Text/TextChangeTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Text/TextChangeTest.cs @@ -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. using System; using System.Web.WebPages.TestUtils; using Microsoft.AspNet.Razor.Text; -#if !ASPNETCORE50 +#if !DNXCORE50 using Moq; #endif using Xunit; @@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Razor.Test.Text { public class TextChangeTest { -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void ConstructorRequiresNonNegativeOldPosition() { diff --git a/test/Microsoft.AspNet.Razor.Test/project.json b/test/Microsoft.AspNet.Razor.Test/project.json index cc96a8b09d..5a9b7d2435 100644 --- a/test/Microsoft.AspNet.Razor.Test/project.json +++ b/test/Microsoft.AspNet.Razor.Test/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "1.0.0", "resources": "TestFiles/**/*", "dependencies": { @@ -11,8 +11,8 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { + "dnx451": { }, + "dnxcore50": { "dependencies": { "System.Diagnostics.TraceSource": "4.0.0-beta-*", "System.Reflection.TypeExtensions": "4.0.0-beta-*"