From dfe83b6bac4b53507f3e06d05cd9eb50d8f8d992 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 14 Apr 2016 15:07:34 -0700 Subject: [PATCH] Migrate tests, tools and samples to portable --- .../TagHelperDescriptorFactoryTest.cs | 2 +- .../TagHelpers/XmlDocumentationProviderTest.cs | 2 +- .../project.json | 18 +++++++++++++----- .../CSharpTagHelperRenderingTest.cs | 2 +- .../TagHelperAttributeValueCodeRendererTest.cs | 2 +- .../Text/BufferingTextReaderTest.cs | 2 +- .../Text/TextBufferReaderTest.cs | 2 +- .../project.json | 10 +++++++--- 8 files changed, 26 insertions(+), 14 deletions(-) diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs index b3418e4eee..02ab2a2de0 100644 --- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs @@ -2173,7 +2173,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers } // TagHelperDesignTimeDescriptors are not created in CoreCLR. -#if !NETSTANDARDAPP1_5 +#if !NETCOREAPP1_0 public static TheoryData OutputElementHintData { get diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs index b643f3590d..0c8ec8a835 100644 --- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if !NETSTANDARDAPP1_5 +#if !NETCOREAPP1_0 using System; using System.Globalization; using System.IO; diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json b/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json index b5951f29ba..e23c987fa1 100644 --- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json +++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json @@ -16,22 +16,30 @@ }, "testRunner": "xunit", "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "dnxcore50", "portable-net451+win8" ], "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + }, "dotnet-test-xunit": "1.0.0-dev-*", "moq.netcore": "4.4.0-beta8", - "NETStandard.Library": "1.5.0-*", - "System.Diagnostics.Process": "4.1.0-*" + "System.Diagnostics.Process": "4.1.0-*", + "System.Diagnostics.TraceSource": "4.0.0-*" } }, "net451": { "frameworkAssemblies": { - "System.Runtime": { "type": "build" }, - "System.IO": { "type": "build" }, + "System.Runtime": { + "type": "build" + }, + "System.IO": { + "type": "build" + }, "System.Threading.Tasks": "", "System.Xml": "4.0.0.0", "System.Xml.Linq": "4.0.0.0" diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs index 3072cb0a96..06236544ba 100644 --- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -#if NETSTANDARDAPP1_5 +#if NETCOREAPP1_0 using System.Reflection; #endif using Microsoft.AspNetCore.Razor.CodeGenerators; diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs index 4e1deea1a0..794bfab060 100644 --- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/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 NETSTANDARDAPP1_5 +#if NETCOREAPP1_0 using System.Reflection; #endif using Microsoft.AspNetCore.Razor.CodeGenerators; diff --git a/test/Microsoft.AspNetCore.Razor.Test/Text/BufferingTextReaderTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/BufferingTextReaderTest.cs index c63b60e4a3..42c963f530 100644 --- a/test/Microsoft.AspNetCore.Razor.Test/Text/BufferingTextReaderTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Test/Text/BufferingTextReaderTest.cs @@ -149,7 +149,7 @@ namespace Microsoft.AspNetCore.Razor.Test.Text RunDisposeTest(r => r.Dispose()); } -#if !NETSTANDARDAPP1_5 +#if !NETCOREAPP1_0 [Fact] public void CloseDisposesSourceReader() { diff --git a/test/Microsoft.AspNetCore.Razor.Test/Text/TextBufferReaderTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/TextBufferReaderTest.cs index 614cb8f412..621da30588 100644 --- a/test/Microsoft.AspNetCore.Razor.Test/Text/TextBufferReaderTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Test/Text/TextBufferReaderTest.cs @@ -136,7 +136,7 @@ namespace Microsoft.AspNetCore.Razor.Test.Text RunDisposeTest(r => r.Dispose()); } -#if !NETSTANDARDAPP1_5 +#if !NETCOREAPP1_0 [Fact] public void CloseDisposesSourceReader() { diff --git a/test/Microsoft.AspNetCore.Razor.Test/project.json b/test/Microsoft.AspNetCore.Razor.Test/project.json index e1bf40be38..c108310b93 100644 --- a/test/Microsoft.AspNetCore.Razor.Test/project.json +++ b/test/Microsoft.AspNetCore.Razor.Test/project.json @@ -13,16 +13,20 @@ }, "testRunner": "xunit", "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "dnxcore50", "portable-net451+win8" ], "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + }, "moq.netcore": "4.4.0-beta8", "dotnet-test-xunit": "1.0.0-dev-*", - "NETStandard.Library": "1.5.0-*", - "System.Diagnostics.Process": "4.1.0-*" + "System.Diagnostics.Process": "4.1.0-*", + "System.Diagnostics.TraceSource": "4.0.0-*" } }, "net451": {