Migrate tests, tools and samples to portable

This commit is contained in:
Pavel Krymets 2016-04-14 15:07:34 -07:00
parent 78c742c6ee
commit dfe83b6bac
8 changed files with 26 additions and 14 deletions

View File

@ -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

View File

@ -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;

View File

@ -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"

View File

@ -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;

View File

@ -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;

View File

@ -149,7 +149,7 @@ namespace Microsoft.AspNetCore.Razor.Test.Text
RunDisposeTest(r => r.Dispose());
}
#if !NETSTANDARDAPP1_5
#if !NETCOREAPP1_0
[Fact]
public void CloseDisposesSourceReader()
{

View File

@ -136,7 +136,7 @@ namespace Microsoft.AspNetCore.Razor.Test.Text
RunDisposeTest(r => r.Dispose());
}
#if !NETSTANDARDAPP1_5
#if !NETCOREAPP1_0
[Fact]
public void CloseDisposesSourceReader()
{

View File

@ -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": {