diff options
| author | Eric St. John <ericstj@microsoft.com> | 2016-05-25 01:41:40 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2016-05-25 07:49:17 +0300 |
| commit | 7ba4d296e3e0a2445ffa708c1e918d90d2bac69c (patch) | |
| tree | 75de16409c31c2fce53d0cb5c4ca9486066ef9d3 | |
| parent | 6f53b750ad55f74091950b58b84320f9110ce24f (diff) | |
Update tests to use NETCoreApp1.0 moniker
Requires https://github.com/dotnet/buildtools/pull/751
This makes all the tests resolve using NETCoreApp1.0 instead of
DNXCore50. I've removed the netstandard1.6 import since that is no
longer needed. I've also removed the workarounds from tests that were
targeting netcoreapp1.0 on their own. For restore compat I've added an
DNXCore50 import to every test project. These can be removed once
test-runtime packages are updated to target NETCoreApp1.0.
I've updated all the test scripts which were assuming DNXCore50 as well
as docs which referred to this path.
186 files changed, 1021 insertions, 562 deletions
diff --git a/Documentation/building/windows-instructions.md b/Documentation/building/windows-instructions.md index b2bd9f3470..7a710990e5 100644 --- a/Documentation/building/windows-instructions.md +++ b/Documentation/building/windows-instructions.md @@ -135,7 +135,7 @@ xunit.console.netcore.exe *.dll -notrait category=nonosxtests -trait category=Ou xunit.console.netcore.exe *.dll -notrait category=nonlinuxtests -trait category=failing ``` -All the required dlls to run a test project can be found in `bin\tests\{Configration}\{Project}.Tests\dnxcore50\` which should be created when the test project is built. +All the required dlls to run a test project can be found in `bin\tests\{Configration}\{Project}.Tests\netcoreapp1.0\` which should be created when the test project is built. ### Running tests from Visual Studio diff --git a/Documentation/debugging/windows-instructions.md b/Documentation/debugging/windows-instructions.md index 20b17438b3..7e276d9796 100644 --- a/Documentation/debugging/windows-instructions.md +++ b/Documentation/debugging/windows-instructions.md @@ -41,15 +41,15 @@ To run a single test from command line: * Locate the test binary folder based on the CSPROJ name. -For example: `src\System.Net.Sockets\tests\Functional\System.Net.Sockets.Tests.csproj` will build and output binaries at `bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\dnxcore50`. +For example: `src\System.Net.Sockets\tests\Functional\System.Net.Sockets.Tests.csproj` will build and output binaries at `bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0`. * Execute the test Assuming that your repo is at `C:\corefx`: ``` -cd C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\dnxcore50 -C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\dnxcore50\CoreRun.exe xunit.console.netcore.exe System.Net.Sockets.Tests.dll -xml testResults.xml -notrait category=nonwindowstests -notrait category=OuterLoop -notrait category=failing +cd C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0 +C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0\CoreRun.exe xunit.console.netcore.exe System.Net.Sockets.Tests.dll -xml testResults.xml -notrait category=nonwindowstests -notrait category=OuterLoop -notrait category=failing ``` * If the test crashes or encounteres a `Debugger.Launch()` method call, WinDBG will automatically start and attach to the `CoreRun.exe` process diff --git a/Documentation/project-docs/performance-tests.md b/Documentation/project-docs/performance-tests.md index f4d5b1ab9f..36f612a106 100644 --- a/Documentation/project-docs/performance-tests.md +++ b/Documentation/project-docs/performance-tests.md @@ -1,4 +1,4 @@ -Performance Tests +Performance Tests ====================== This document contains instructions for building, running, and adding Performance tests. @@ -26,7 +26,7 @@ To build and run the tests using msbuild for a project, run ```msbuild /t:BuildA Note: Because build.cmd runs tests concurrently, it's not recommended that you execute the perf tests using it. -results will be in: corefx/bin/tests/Windows_NT.AnyCPU.Release/TESTNAME/dnxcore50 +results will be in: corefx/bin/tests/Windows_NT.AnyCPU.Release/TESTNAME/netcoreapp1.0 ### Linux From your tests directory, run: ``` diff --git a/run-test.cmd b/run-test.cmd index e36c462632..eda3708085 100644 --- a/run-test.cmd +++ b/run-test.cmd @@ -7,8 +7,8 @@ pushd %1 FOR /D %%F IN (*.Tests) DO ( - IF EXIST %%F\netstandard\dnxcore50 ( - pushd %%F\netstandard\dnxcore50 + IF EXIST %%F\netstandard\netcoreapp1.0 ( + pushd %%F\netstandard\netcoreapp1.0 CALL RunTests.cmd %2 popd ) diff --git a/run-test.sh b/run-test.sh index 1d35f359f7..1fdb686619 100755 --- a/run-test.sh +++ b/run-test.sh @@ -171,8 +171,7 @@ run_test() exit 0 fi - dirName="$1/netstandard/dnxcore50" - + dirName="$1/netstandard/netcoreapp1.0" copy_test_overlay $dirName pushd $dirName > /dev/null diff --git a/src/Common/test-runtime/project.json b/src/Common/test-runtime/project.json index 6c765fa545..1d08581c33 100644 --- a/src/Common/test-runtime/project.json +++ b/src/Common/test-runtime/project.json @@ -17,9 +17,9 @@ "xunit.runner.utility": "2.1.0" }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -34,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/project.json b/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/project.json index 249d6f7783..0dd30346ab 100644 --- a/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/project.json +++ b/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/project.json @@ -4,7 +4,7 @@ "Microsoft.NETCore.Platforms": "1.0.1-rc3-24117-00" }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "dependencies": { "System.Console": "4.0.0-rc3-24117-00", "System.Diagnostics.Process": "4.1.0-rc3-24117-00", @@ -12,7 +12,10 @@ "System.Reflection": "4.1.0-rc3-24117-00", "System.Threading.Tasks": "4.0.11-rc3-24117-00" }, - "imports": "portable-net45+win8" + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] }, "net46": { "dependencies": { @@ -20,4 +23,4 @@ } } } -} +}
\ No newline at end of file diff --git a/src/Common/tests/System/Xml/ModuleCore/project.json b/src/Common/tests/System/Xml/ModuleCore/project.json index 10af0e8404..6f08153237 100644 --- a/src/Common/tests/System/Xml/ModuleCore/project.json +++ b/src/Common/tests/System/Xml/ModuleCore/project.json @@ -9,7 +9,11 @@ "System.Text.Encoding": "4.0.11-rc3-24117-00" }, "frameworks": { - "dnxcore50": {} + "netcoreapp1.0": { + "imports": [ + "dnxcore50" + ] + } }, "runtimes": { "centos.7-x64": {}, @@ -21,4 +25,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/Common/tests/System/Xml/XmlCoreTest/project.json b/src/Common/tests/System/Xml/XmlCoreTest/project.json index 9611a47d52..b9694fbf1c 100644 --- a/src/Common/tests/System/Xml/XmlCoreTest/project.json +++ b/src/Common/tests/System/Xml/XmlCoreTest/project.json @@ -11,7 +11,11 @@ "System.Xml.ReaderWriter": "4.0.11-rc3-24117-00" }, "frameworks": { - "dnxcore50": {} + "netcoreapp1.0": { + "imports": [ + "dnxcore50" + ] + } }, "runtimes": { "centos.7-x64": {}, @@ -23,4 +27,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/Common/tests/System/Xml/XmlDiff/project.json b/src/Common/tests/System/Xml/XmlDiff/project.json index 8692d54c95..3aec97b404 100644 --- a/src/Common/tests/System/Xml/XmlDiff/project.json +++ b/src/Common/tests/System/Xml/XmlDiff/project.json @@ -8,7 +8,11 @@ "System.Xml.ReaderWriter": "4.0.11-rc3-24117-00" }, "frameworks": { - "dnxcore50": {} + "netcoreapp1.0": { + "imports": [ + "dnxcore50" + ] + } }, "runtimes": { "centos.7-x64": {}, @@ -20,4 +24,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/Common/tests/project.json b/src/Common/tests/project.json index 629757f7b2..0d70c8a54f 100644 --- a/src/Common/tests/project.json +++ b/src/Common/tests/project.json @@ -29,8 +29,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -43,4 +46,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/Microsoft.CSharp/tests/project.json b/src/Microsoft.CSharp/tests/project.json index 8e6470a531..b1e8879e96 100644 --- a/src/Microsoft.CSharp/tests/project.json +++ b/src/Microsoft.CSharp/tests/project.json @@ -28,8 +28,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -42,4 +45,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/Microsoft.VisualBasic/tests/project.json b/src/Microsoft.VisualBasic/tests/project.json index 303aec8769..4b0835702a 100644 --- a/src/Microsoft.VisualBasic/tests/project.json +++ b/src/Microsoft.VisualBasic/tests/project.json @@ -30,8 +30,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -44,4 +47,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/Microsoft.Win32.Primitives/tests/project.json b/src/Microsoft.Win32.Primitives/tests/project.json index c02c093725..9711669d77 100644 --- a/src/Microsoft.Win32.Primitives/tests/project.json +++ b/src/Microsoft.Win32.Primitives/tests/project.json @@ -14,8 +14,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -28,4 +31,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry.AccessControl/tests/project.json b/src/Microsoft.Win32.Registry.AccessControl/tests/project.json index d5b8a93a8f..df89027df2 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/tests/project.json +++ b/src/Microsoft.Win32.Registry.AccessControl/tests/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry/tests/project.json b/src/Microsoft.Win32.Registry/tests/project.json index 1f52aaf0e9..0365de1109 100644 --- a/src/Microsoft.Win32.Registry/tests/project.json +++ b/src/Microsoft.Win32.Registry/tests/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.AppContext/tests/project.json b/src/System.AppContext/tests/project.json index 74debb20f1..f493cffc24 100644 --- a/src/System.AppContext/tests/project.json +++ b/src/System.AppContext/tests/project.json @@ -14,8 +14,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -28,4 +31,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Buffers/tests/project.json b/src/System.Buffers/tests/project.json index 597f491bab..ef62b25b1e 100644 --- a/src/System.Buffers/tests/project.json +++ b/src/System.Buffers/tests/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Collections.Concurrent/tests/project.json b/src/System.Collections.Concurrent/tests/project.json index 07fdd017c9..6a3b0efb01 100644 --- a/src/System.Collections.Concurrent/tests/project.json +++ b/src/System.Collections.Concurrent/tests/project.json @@ -23,8 +23,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -37,4 +40,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Collections.Immutable/tests/project.json b/src/System.Collections.Immutable/tests/project.json index cd7a055e27..e151142817 100644 --- a/src/System.Collections.Immutable/tests/project.json +++ b/src/System.Collections.Immutable/tests/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Collections.NonGeneric/tests/project.json b/src/System.Collections.NonGeneric/tests/project.json index 445ee5dbd3..053df032c1 100644 --- a/src/System.Collections.NonGeneric/tests/project.json +++ b/src/System.Collections.NonGeneric/tests/project.json @@ -23,8 +23,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -37,4 +40,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Collections.Specialized/tests/project.json b/src/System.Collections.Specialized/tests/project.json index 32cea81944..0ea0073176 100644 --- a/src/System.Collections.Specialized/tests/project.json +++ b/src/System.Collections.Specialized/tests/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Collections/tests/project.json b/src/System.Collections/tests/project.json index 951cbe403a..e0508ee267 100644 --- a/src/System.Collections/tests/project.json +++ b/src/System.Collections/tests/project.json @@ -21,8 +21,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -35,4 +38,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.ComponentModel.Annotations/tests/project.json b/src/System.ComponentModel.Annotations/tests/project.json index c41e55fc63..bd7a7adede 100644 --- a/src/System.ComponentModel.Annotations/tests/project.json +++ b/src/System.ComponentModel.Annotations/tests/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.ComponentModel.EventBasedAsync/tests/project.json b/src/System.ComponentModel.EventBasedAsync/tests/project.json index e935b05da0..72d94d50ec 100644 --- a/src/System.ComponentModel.EventBasedAsync/tests/project.json +++ b/src/System.ComponentModel.EventBasedAsync/tests/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.ComponentModel.Primitives/tests/project.json b/src/System.ComponentModel.Primitives/tests/project.json index 19db226236..6a13b0171a 100644 --- a/src/System.ComponentModel.Primitives/tests/project.json +++ b/src/System.ComponentModel.Primitives/tests/project.json @@ -14,8 +14,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -28,4 +31,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.ComponentModel.TypeConverter/tests/project.json b/src/System.ComponentModel.TypeConverter/tests/project.json index 4f67cd358c..c0c39029e0 100644 --- a/src/System.ComponentModel.TypeConverter/tests/project.json +++ b/src/System.ComponentModel.TypeConverter/tests/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.ComponentModel/tests/project.json b/src/System.ComponentModel/tests/project.json index 5d8a40f4a2..e179f391bf 100644 --- a/src/System.ComponentModel/tests/project.json +++ b/src/System.ComponentModel/tests/project.json @@ -13,8 +13,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -27,4 +30,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Composition.Convention/tests/project.json b/src/System.Composition.Convention/tests/project.json index 5c7b50f7e0..3f4f47ca39 100644 --- a/src/System.Composition.Convention/tests/project.json +++ b/src/System.Composition.Convention/tests/project.json @@ -12,8 +12,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -26,4 +29,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/project.json b/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/project.json index 49186d9a19..4374ee00ea 100644 --- a/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/project.json +++ b/src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/project.json @@ -6,6 +6,10 @@ "System.Reflection": "4.0.0" }, "frameworks": { - "dnxcore50": {} + "netcoreapp1.0": { + "imports": [ + "dnxcore50" + ] + } } -} +}
\ No newline at end of file diff --git a/src/System.Composition/perftests/project.json b/src/System.Composition/perftests/project.json index d39ca72b55..b028b2d54f 100644 --- a/src/System.Composition/perftests/project.json +++ b/src/System.Composition/perftests/project.json @@ -14,7 +14,11 @@ "System.Threading.Thread": "4.0.0-rc3-24117-00" }, "frameworks": { - "dnxcore50": {} + "netcoreapp1.0": { + "imports": [ + "dnxcore50" + ] + } }, "runtimes": { "centos.7-x64": {}, @@ -26,4 +30,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Composition/scenarios/TestLibrary/project.json b/src/System.Composition/scenarios/TestLibrary/project.json index acf139836c..b4e6e445cd 100644 --- a/src/System.Composition/scenarios/TestLibrary/project.json +++ b/src/System.Composition/scenarios/TestLibrary/project.json @@ -4,6 +4,10 @@ "System.Runtime": "4.0.0" }, "frameworks": { - "dnxcore50": {} + "netcoreapp1.0": { + "imports": [ + "dnxcore50" + ] + } } -} +}
\ No newline at end of file diff --git a/src/System.Composition/tests/project.json b/src/System.Composition/tests/project.json index 5c7b50f7e0..3f4f47ca39 100644 --- a/src/System.Composition/tests/project.json +++ b/src/System.Composition/tests/project.json @@ -12,8 +12,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -26,4 +29,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Console/tests/project.json b/src/System.Console/tests/project.json index 5c92e4676b..60955e8215 100644 --- a/src/System.Console/tests/project.json +++ b/src/System.Console/tests/project.json @@ -24,8 +24,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -38,4 +41,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Data.Common/tests/project.json b/src/System.Data.Common/tests/project.json index 3f20c0188c..814893e7f9 100644 --- a/src/System.Data.Common/tests/project.json +++ b/src/System.Data.Common/tests/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Data.SqlClient/tests/FunctionalTests/project.json b/src/System.Data.SqlClient/tests/FunctionalTests/project.json index 819cc7e972..c9c9f2f375 100644 --- a/src/System.Data.SqlClient/tests/FunctionalTests/project.json +++ b/src/System.Data.SqlClient/tests/FunctionalTests/project.json @@ -16,8 +16,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -30,4 +33,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Data.SqlClient/tests/ManualTests/project.json b/src/System.Data.SqlClient/tests/ManualTests/project.json index 72e013b7c8..7f986a3729 100644 --- a/src/System.Data.SqlClient/tests/ManualTests/project.json +++ b/src/System.Data.SqlClient/tests/ManualTests/project.json @@ -1,8 +1,8 @@ { "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -69,4 +69,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Diagnostics.Contracts/tests/project.json b/src/System.Diagnostics.Contracts/tests/project.json index 504f54417d..ba6318f7f8 100644 --- a/src/System.Diagnostics.Contracts/tests/project.json +++ b/src/System.Diagnostics.Contracts/tests/project.json @@ -16,8 +16,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -30,4 +33,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Diagnostics.Debug/tests/project.json b/src/System.Diagnostics.Debug/tests/project.json index c487398ac4..0bb5064f67 100644 --- a/src/System.Diagnostics.Debug/tests/project.json +++ b/src/System.Diagnostics.Debug/tests/project.json @@ -13,8 +13,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -27,4 +30,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Diagnostics.DiagnosticSource/tests/project.json b/src/System.Diagnostics.DiagnosticSource/tests/project.json index 564f5015a2..f68e41173b 100644 --- a/src/System.Diagnostics.DiagnosticSource/tests/project.json +++ b/src/System.Diagnostics.DiagnosticSource/tests/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/project.json b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/project.json index 7b43071a70..3dd5521390 100644 --- a/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/project.json +++ b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Diagnostics.Process/tests/project.json b/src/System.Diagnostics.Process/tests/project.json index f3564be7c8..4d3524e555 100644 --- a/src/System.Diagnostics.Process/tests/project.json +++ b/src/System.Diagnostics.Process/tests/project.json @@ -32,8 +32,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -46,4 +49,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Diagnostics.TextWriterTraceListener/tests/project.json b/src/System.Diagnostics.TextWriterTraceListener/tests/project.json index 599c8ac58f..4283ab4217 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/tests/project.json +++ b/src/System.Diagnostics.TextWriterTraceListener/tests/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Diagnostics.Tools/tests/project.json b/src/System.Diagnostics.Tools/tests/project.json index 885d84695d..7e7c5495d4 100644 --- a/src/System.Diagnostics.Tools/tests/project.json +++ b/src/System.Diagnostics.Tools/tests/project.json @@ -13,8 +13,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -27,4 +30,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Diagnostics.TraceSource/tests/project.json b/src/System.Diagnostics.TraceSource/tests/project.json index 6ac78969eb..354ad0a779 100644 --- a/src/System.Diagnostics.TraceSource/tests/project.json +++ b/src/System.Diagnostics.TraceSource/tests/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/project.json b/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/project.json index cbf1f73b11..937f198faf 100644 --- a/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/project.json +++ b/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Diagnostics.Tracing/tests/project.json b/src/System.Diagnostics.Tracing/tests/project.json index 11a3f6123e..3cfb157f60 100644 --- a/src/System.Diagnostics.Tracing/tests/project.json +++ b/src/System.Diagnostics.Tracing/tests/project.json @@ -24,8 +24,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -38,4 +41,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Drawing.Primitives/tests/project.json b/src/System.Drawing.Primitives/tests/project.json index f6256872e4..7f18d55a2e 100644 --- a/src/System.Drawing.Primitives/tests/project.json +++ b/src/System.Drawing.Primitives/tests/project.json @@ -14,8 +14,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -28,4 +31,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Dynamic.Runtime/tests/project.json b/src/System.Dynamic.Runtime/tests/project.json index 8821df7ebf..811fb8f77d 100644 --- a/src/System.Dynamic.Runtime/tests/project.json +++ b/src/System.Dynamic.Runtime/tests/project.json @@ -26,8 +26,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -40,4 +43,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Globalization.Calendars/tests/project.json b/src/System.Globalization.Calendars/tests/project.json index 9175666f9c..257f6947bc 100644 --- a/src/System.Globalization.Calendars/tests/project.json +++ b/src/System.Globalization.Calendars/tests/project.json @@ -13,14 +13,17 @@ "xunit.netcore.extensions": "1.0.0-prerelease-00312-04" }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "dependencies": { "test-runtime": { "target": "project", "exclude": "compile" } }, - "imports": "portable-net45+win8" + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] }, "net46": { "dependencies": { @@ -42,4 +45,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Globalization.Extensions/tests/project.json b/src/System.Globalization.Extensions/tests/project.json index 2460d25281..223ff67eee 100644 --- a/src/System.Globalization.Extensions/tests/project.json +++ b/src/System.Globalization.Extensions/tests/project.json @@ -16,8 +16,11 @@ "xunit.netcore.extensions": "1.0.0-prerelease-00312-04" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8", + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ], "dependencies": { "test-runtime": { "target": "project", @@ -45,4 +48,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Globalization/tests/project.json b/src/System.Globalization/tests/project.json index fe00251099..091ec4cb63 100644 --- a/src/System.Globalization/tests/project.json +++ b/src/System.Globalization/tests/project.json @@ -7,7 +7,7 @@ "Microsoft.NETCore.Platforms": "1.0.1-rc3-24117-00" }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "dependencies": { "System.Diagnostics.Process": "4.1.0-rc3-24117-00", "System.Globalization": "4.0.11-rc3-24117-00", @@ -23,7 +23,10 @@ "exclude": "compile" } }, - "imports": "portable-net45+win8" + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] }, "net46": { "dependencies": { @@ -45,4 +48,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.IO.Compression.ZipFile/tests/project.json b/src/System.IO.Compression.ZipFile/tests/project.json index 5256ec225d..5acc265521 100644 --- a/src/System.IO.Compression.ZipFile/tests/project.json +++ b/src/System.IO.Compression.ZipFile/tests/project.json @@ -27,8 +27,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -41,4 +44,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.IO.Compression/tests/project.json b/src/System.IO.Compression/tests/project.json index 76d4bb306a..7a22ef8860 100644 --- a/src/System.IO.Compression/tests/project.json +++ b/src/System.IO.Compression/tests/project.json @@ -27,9 +27,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -44,4 +44,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.IO.FileSystem.AccessControl/tests/project.json b/src/System.IO.FileSystem.AccessControl/tests/project.json index ff7a4c0a86..262014e505 100644 --- a/src/System.IO.FileSystem.AccessControl/tests/project.json +++ b/src/System.IO.FileSystem.AccessControl/tests/project.json @@ -26,8 +26,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -40,4 +43,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.IO.FileSystem.DriveInfo/tests/project.json b/src/System.IO.FileSystem.DriveInfo/tests/project.json index 6babfeae37..e47a0e20f4 100644 --- a/src/System.IO.FileSystem.DriveInfo/tests/project.json +++ b/src/System.IO.FileSystem.DriveInfo/tests/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.IO.FileSystem.Primitives/tests/project.json b/src/System.IO.FileSystem.Primitives/tests/project.json index 5d8a40f4a2..e179f391bf 100644 --- a/src/System.IO.FileSystem.Primitives/tests/project.json +++ b/src/System.IO.FileSystem.Primitives/tests/project.json @@ -13,8 +13,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -27,4 +30,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.IO.FileSystem.Watcher/tests/project.json b/src/System.IO.FileSystem.Watcher/tests/project.json index 97336c89d7..2e3216238e 100644 --- a/src/System.IO.FileSystem.Watcher/tests/project.json +++ b/src/System.IO.FileSystem.Watcher/tests/project.json @@ -24,8 +24,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -38,4 +41,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.IO.FileSystem/tests/project.json b/src/System.IO.FileSystem/tests/project.json index 4423926105..906877a4f2 100644 --- a/src/System.IO.FileSystem/tests/project.json +++ b/src/System.IO.FileSystem/tests/project.json @@ -30,8 +30,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -44,4 +47,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.IO.MemoryMappedFiles/tests/project.json b/src/System.IO.MemoryMappedFiles/tests/project.json index fa53865faf..8eee250b7d 100644 --- a/src/System.IO.MemoryMappedFiles/tests/project.json +++ b/src/System.IO.MemoryMappedFiles/tests/project.json @@ -23,8 +23,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -37,4 +40,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.IO.Packaging/tests/project.json b/src/System.IO.Packaging/tests/project.json index 81d46fe25c..0625dd06c2 100644 --- a/src/System.IO.Packaging/tests/project.json +++ b/src/System.IO.Packaging/tests/project.json @@ -19,8 +19,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -33,4 +36,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.IO.Pipes/tests/project.json b/src/System.IO.Pipes/tests/project.json index 25755d1389..fef9873199 100644 --- a/src/System.IO.Pipes/tests/project.json +++ b/src/System.IO.Pipes/tests/project.json @@ -25,8 +25,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -39,4 +42,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.IO.UnmanagedMemoryStream/tests/project.json b/src/System.IO.UnmanagedMemoryStream/tests/project.json index dfebfe7d4f..432bc4f2cc 100644 --- a/src/System.IO.UnmanagedMemoryStream/tests/project.json +++ b/src/System.IO.UnmanagedMemoryStream/tests/project.json @@ -21,8 +21,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -35,4 +38,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.IO/tests/project.json b/src/System.IO/tests/project.json index a20f247e1e..b8fe6f2642 100644 --- a/src/System.IO/tests/project.json +++ b/src/System.IO/tests/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Linq.Expressions/tests/project.json b/src/System.Linq.Expressions/tests/project.json index a8124a59df..c9ca4d8f8e 100644 --- a/src/System.Linq.Expressions/tests/project.json +++ b/src/System.Linq.Expressions/tests/project.json @@ -22,8 +22,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -36,4 +39,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Linq.Parallel/tests/project.json b/src/System.Linq.Parallel/tests/project.json index 7cb63745e7..28b9753167 100644 --- a/src/System.Linq.Parallel/tests/project.json +++ b/src/System.Linq.Parallel/tests/project.json @@ -23,8 +23,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -37,4 +40,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Linq.Queryable/tests/project.json b/src/System.Linq.Queryable/tests/project.json index ece7f9c904..27027a8aa8 100644 --- a/src/System.Linq.Queryable/tests/project.json +++ b/src/System.Linq.Queryable/tests/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Linq/tests/project.json b/src/System.Linq/tests/project.json index 3125ee343e..bf55d47c9f 100644 --- a/src/System.Linq/tests/project.json +++ b/src/System.Linq/tests/project.json @@ -19,8 +19,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -33,4 +36,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/project.json b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/project.json index 0b4a228399..71529f3b3d 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/project.json +++ b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/project.json @@ -19,9 +19,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -36,4 +36,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/project.json b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/project.json index 2c559a54b4..af5ad981bf 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/project.json +++ b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/project.json @@ -28,9 +28,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -45,4 +45,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Http/tests/FunctionalTests/unix/project.json b/src/System.Net.Http/tests/FunctionalTests/unix/project.json index 5a849eb9cb..75a096ce31 100644 --- a/src/System.Net.Http/tests/FunctionalTests/unix/project.json +++ b/src/System.Net.Http/tests/FunctionalTests/unix/project.json @@ -28,9 +28,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -45,4 +45,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Http/tests/FunctionalTests/win/project.json b/src/System.Net.Http/tests/FunctionalTests/win/project.json index ff835a1d33..d025138c16 100644 --- a/src/System.Net.Http/tests/FunctionalTests/win/project.json +++ b/src/System.Net.Http/tests/FunctionalTests/win/project.json @@ -29,9 +29,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -46,4 +46,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Http/tests/UnitTests/project.json b/src/System.Net.Http/tests/UnitTests/project.json index 88adbb92dc..367794a0b6 100644 --- a/src/System.Net.Http/tests/UnitTests/project.json +++ b/src/System.Net.Http/tests/UnitTests/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.NameResolution/tests/FunctionalTests/project.json b/src/System.Net.NameResolution/tests/FunctionalTests/project.json index b76b9fe569..b85289219f 100644 --- a/src/System.Net.NameResolution/tests/FunctionalTests/project.json +++ b/src/System.Net.NameResolution/tests/FunctionalTests/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.NameResolution/tests/PalTests/project.json b/src/System.Net.NameResolution/tests/PalTests/project.json index aeb0bea771..b59519e232 100644 --- a/src/System.Net.NameResolution/tests/PalTests/project.json +++ b/src/System.Net.NameResolution/tests/PalTests/project.json @@ -32,8 +32,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -46,4 +49,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.NetworkInformation/tests/FunctionalTests/project.json b/src/System.Net.NetworkInformation/tests/FunctionalTests/project.json index 020ede223a..58f11c3a48 100644 --- a/src/System.Net.NetworkInformation/tests/FunctionalTests/project.json +++ b/src/System.Net.NetworkInformation/tests/FunctionalTests/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.NetworkInformation/tests/UnitTests/project.json b/src/System.Net.NetworkInformation/tests/UnitTests/project.json index 18b11c0d98..14e171b499 100644 --- a/src/System.Net.NetworkInformation/tests/UnitTests/project.json +++ b/src/System.Net.NetworkInformation/tests/UnitTests/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Ping/tests/FunctionalTests/project.json b/src/System.Net.Ping/tests/FunctionalTests/project.json index 21a54deb93..2327f3600e 100644 --- a/src/System.Net.Ping/tests/FunctionalTests/project.json +++ b/src/System.Net.Ping/tests/FunctionalTests/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Primitives/tests/FunctionalTests/project.json b/src/System.Net.Primitives/tests/FunctionalTests/project.json index 91c685dd63..5f09dfcd38 100644 --- a/src/System.Net.Primitives/tests/FunctionalTests/project.json +++ b/src/System.Net.Primitives/tests/FunctionalTests/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Primitives/tests/PalTests/project.json b/src/System.Net.Primitives/tests/PalTests/project.json index e82160695c..eea74f9f51 100644 --- a/src/System.Net.Primitives/tests/PalTests/project.json +++ b/src/System.Net.Primitives/tests/PalTests/project.json @@ -23,8 +23,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -37,4 +40,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Primitives/tests/UnitTests/project.json b/src/System.Net.Primitives/tests/UnitTests/project.json index a3c8f9ad7e..3abdfce566 100644 --- a/src/System.Net.Primitives/tests/UnitTests/project.json +++ b/src/System.Net.Primitives/tests/UnitTests/project.json @@ -24,8 +24,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -38,4 +41,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Requests/tests/project.json b/src/System.Net.Requests/tests/project.json index ccd7301622..d3f2c5b8ac 100644 --- a/src/System.Net.Requests/tests/project.json +++ b/src/System.Net.Requests/tests/project.json @@ -20,9 +20,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -37,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Security/tests/FunctionalTests/unix/project.json b/src/System.Net.Security/tests/FunctionalTests/unix/project.json index d2f399a908..10ffa21679 100644 --- a/src/System.Net.Security/tests/FunctionalTests/unix/project.json +++ b/src/System.Net.Security/tests/FunctionalTests/unix/project.json @@ -26,9 +26,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -43,4 +43,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Security/tests/FunctionalTests/win/project.json b/src/System.Net.Security/tests/FunctionalTests/win/project.json index 988c98bfc7..f833ae43fb 100644 --- a/src/System.Net.Security/tests/FunctionalTests/win/project.json +++ b/src/System.Net.Security/tests/FunctionalTests/win/project.json @@ -24,9 +24,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -41,4 +41,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Security/tests/UnitTests/project.json b/src/System.Net.Security/tests/UnitTests/project.json index 2cc0a2fe48..3221bcecd6 100644 --- a/src/System.Net.Security/tests/UnitTests/project.json +++ b/src/System.Net.Security/tests/UnitTests/project.json @@ -18,9 +18,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -35,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Sockets/tests/FunctionalTests/project.json b/src/System.Net.Sockets/tests/FunctionalTests/project.json index 6224a6f464..6634e6ccbb 100644 --- a/src/System.Net.Sockets/tests/FunctionalTests/project.json +++ b/src/System.Net.Sockets/tests/FunctionalTests/project.json @@ -23,8 +23,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -37,4 +40,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.Sockets/tests/PerformanceTests/project.json b/src/System.Net.Sockets/tests/PerformanceTests/project.json index 4018350638..d8a0f6289c 100644 --- a/src/System.Net.Sockets/tests/PerformanceTests/project.json +++ b/src/System.Net.Sockets/tests/PerformanceTests/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.WebHeaderCollection/tests/project.json b/src/System.Net.WebHeaderCollection/tests/project.json index da8904217d..7a5048710b 100644 --- a/src/System.Net.WebHeaderCollection/tests/project.json +++ b/src/System.Net.WebHeaderCollection/tests/project.json @@ -10,8 +10,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -24,4 +27,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.WebSockets.Client/tests/project.json b/src/System.Net.WebSockets.Client/tests/project.json index e93ac4ba5f..025c51781e 100644 --- a/src/System.Net.WebSockets.Client/tests/project.json +++ b/src/System.Net.WebSockets.Client/tests/project.json @@ -17,9 +17,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -34,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Net.WebSockets/tests/project.json b/src/System.Net.WebSockets/tests/project.json index e0e7e0f7bc..08dbd46358 100644 --- a/src/System.Net.WebSockets/tests/project.json +++ b/src/System.Net.WebSockets/tests/project.json @@ -14,8 +14,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -28,4 +31,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Numerics.Vectors/tests/project.json b/src/System.Numerics.Vectors/tests/project.json index 17784b183f..60c2633321 100644 --- a/src/System.Numerics.Vectors/tests/project.json +++ b/src/System.Numerics.Vectors/tests/project.json @@ -22,8 +22,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -36,4 +39,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.ObjectModel/tests/project.json b/src/System.ObjectModel/tests/project.json index 92ccd71de6..5229afb017 100644 --- a/src/System.ObjectModel/tests/project.json +++ b/src/System.ObjectModel/tests/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Private.Uri/tests/FunctionalTests/project.json b/src/System.Private.Uri/tests/FunctionalTests/project.json index c1acb1aacb..05477e7e18 100644 --- a/src/System.Private.Uri/tests/FunctionalTests/project.json +++ b/src/System.Private.Uri/tests/FunctionalTests/project.json @@ -14,8 +14,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -28,4 +31,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Private.Uri/tests/UnitTests/project.json b/src/System.Private.Uri/tests/UnitTests/project.json index 938c33e370..cb6d0aa2f9 100644 --- a/src/System.Private.Uri/tests/UnitTests/project.json +++ b/src/System.Private.Uri/tests/UnitTests/project.json @@ -12,8 +12,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -26,4 +29,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Reflection.Context/tests/project.json b/src/System.Reflection.Context/tests/project.json index b318d7f4f5..db278c6549 100644 --- a/src/System.Reflection.Context/tests/project.json +++ b/src/System.Reflection.Context/tests/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Reflection.DispatchProxy/tests/project.json b/src/System.Reflection.DispatchProxy/tests/project.json index 35a7ca291e..2e6d8ea9a3 100644 --- a/src/System.Reflection.DispatchProxy/tests/project.json +++ b/src/System.Reflection.DispatchProxy/tests/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Reflection.Emit.ILGeneration/tests/project.json b/src/System.Reflection.Emit.ILGeneration/tests/project.json index 788a129d6f..146b701293 100644 --- a/src/System.Reflection.Emit.ILGeneration/tests/project.json +++ b/src/System.Reflection.Emit.ILGeneration/tests/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Reflection.Emit.Lightweight/tests/project.json b/src/System.Reflection.Emit.Lightweight/tests/project.json index 38d0098686..f28b9630e6 100644 --- a/src/System.Reflection.Emit.Lightweight/tests/project.json +++ b/src/System.Reflection.Emit.Lightweight/tests/project.json @@ -16,8 +16,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -30,4 +33,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Reflection.Emit/tests/project.json b/src/System.Reflection.Emit/tests/project.json index e0d03bc6cb..6fcef9bd22 100644 --- a/src/System.Reflection.Emit/tests/project.json +++ b/src/System.Reflection.Emit/tests/project.json @@ -19,8 +19,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -33,4 +36,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Reflection.Extensions/tests/project.json b/src/System.Reflection.Extensions/tests/project.json index 26e7df99a9..b6637d2a8a 100644 --- a/src/System.Reflection.Extensions/tests/project.json +++ b/src/System.Reflection.Extensions/tests/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Reflection.Metadata/tests/project.json b/src/System.Reflection.Metadata/tests/project.json index 7b4f1fb814..dc35753bd5 100644 --- a/src/System.Reflection.Metadata/tests/project.json +++ b/src/System.Reflection.Metadata/tests/project.json @@ -29,9 +29,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -46,4 +46,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/tests/CoreCLR/project.json b/src/System.Reflection.TypeExtensions/tests/CoreCLR/project.json index d0049c37ce..5cce05c0ac 100644 --- a/src/System.Reflection.TypeExtensions/tests/CoreCLR/project.json +++ b/src/System.Reflection.TypeExtensions/tests/CoreCLR/project.json @@ -22,8 +22,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -36,4 +39,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/tests/project.json b/src/System.Reflection.TypeExtensions/tests/project.json index e7b7a66a82..1d6344ab0f 100644 --- a/src/System.Reflection.TypeExtensions/tests/project.json +++ b/src/System.Reflection.TypeExtensions/tests/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Reflection/tests/CoreCLR/project.json b/src/System.Reflection/tests/CoreCLR/project.json index 0fa5f3f74a..dd76843003 100644 --- a/src/System.Reflection/tests/CoreCLR/project.json +++ b/src/System.Reflection/tests/CoreCLR/project.json @@ -19,8 +19,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -33,4 +36,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Reflection/tests/TestExe/project.json b/src/System.Reflection/tests/TestExe/project.json index 9c4e988fe7..56fc136114 100644 --- a/src/System.Reflection/tests/TestExe/project.json +++ b/src/System.Reflection/tests/TestExe/project.json @@ -4,7 +4,11 @@ "System.Runtime": "4.1.0-rc3-24117-00" }, "frameworks": { - "dnxcore50": {} + "netcoreapp1.0": { + "imports": [ + "dnxcore50" + ] + } }, "runtimes": { "centos.7-x64": {}, @@ -16,4 +20,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Reflection/tests/project.json b/src/System.Reflection/tests/project.json index df97ac3df5..5541af618f 100644 --- a/src/System.Reflection/tests/project.json +++ b/src/System.Reflection/tests/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Resources.Reader/tests/project.json b/src/System.Resources.Reader/tests/project.json index 9bb14149e9..334d34994c 100644 --- a/src/System.Resources.Reader/tests/project.json +++ b/src/System.Resources.Reader/tests/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Resources.ResourceManager/tests/project.json b/src/System.Resources.ResourceManager/tests/project.json index d4ada16890..8d035873a4 100644 --- a/src/System.Resources.ResourceManager/tests/project.json +++ b/src/System.Resources.ResourceManager/tests/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Resources.Writer/tests/project.json b/src/System.Resources.Writer/tests/project.json index 9bb14149e9..334d34994c 100644 --- a/src/System.Resources.Writer/tests/project.json +++ b/src/System.Resources.Writer/tests/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.CompilerServices.Unsafe/tests/project.json b/src/System.Runtime.CompilerServices.Unsafe/tests/project.json index da8904217d..7a5048710b 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/tests/project.json +++ b/src/System.Runtime.CompilerServices.Unsafe/tests/project.json @@ -10,8 +10,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -24,4 +27,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/src/project.json b/src/System.Runtime.Extensions/src/project.json index a7f32dfdfc..f6ab615d77 100644 --- a/src/System.Runtime.Extensions/src/project.json +++ b/src/System.Runtime.Extensions/src/project.json @@ -1,9 +1,12 @@ { "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "dependencies": { "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-24117-00" - } + }, + "imports": [ + "dnxcore50" + ] }, "net462": { "dependencies": { @@ -25,4 +28,4 @@ } } } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/tests/project.json b/src/System.Runtime.Extensions/tests/project.json index 31de22c376..e0ff2c1729 100644 --- a/src/System.Runtime.Extensions/tests/project.json +++ b/src/System.Runtime.Extensions/tests/project.json @@ -22,8 +22,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -36,4 +39,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.Handles/tests/project.json b/src/System.Runtime.Handles/tests/project.json index d904d4bd09..245aa5a802 100644 --- a/src/System.Runtime.Handles/tests/project.json +++ b/src/System.Runtime.Handles/tests/project.json @@ -14,8 +14,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -28,4 +31,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/tests/project.json b/src/System.Runtime.InteropServices.RuntimeInformation/tests/project.json index a1b364b94f..422b70e1bb 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/tests/project.json +++ b/src/System.Runtime.InteropServices.RuntimeInformation/tests/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices/tests/project.json b/src/System.Runtime.InteropServices/tests/project.json index 34110092e4..d8b1df3611 100644 --- a/src/System.Runtime.InteropServices/tests/project.json +++ b/src/System.Runtime.InteropServices/tests/project.json @@ -13,8 +13,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -27,4 +30,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.Loader/tests/DefaultContext/project.json b/src/System.Runtime.Loader/tests/DefaultContext/project.json index ba4456f2ee..c966a0e859 100644 --- a/src/System.Runtime.Loader/tests/DefaultContext/project.json +++ b/src/System.Runtime.Loader/tests/DefaultContext/project.json @@ -22,8 +22,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -36,4 +39,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.Loader/tests/project.json b/src/System.Runtime.Loader/tests/project.json index ba4456f2ee..c966a0e859 100644 --- a/src/System.Runtime.Loader/tests/project.json +++ b/src/System.Runtime.Loader/tests/project.json @@ -22,8 +22,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -36,4 +39,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.Numerics/tests/project.json b/src/System.Runtime.Numerics/tests/project.json index b18c8e456c..39c5e24f43 100644 --- a/src/System.Runtime.Numerics/tests/project.json +++ b/src/System.Runtime.Numerics/tests/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Formatters/tests/project.json b/src/System.Runtime.Serialization.Formatters/tests/project.json index 69b388a82e..0ef76e6ba2 100644 --- a/src/System.Runtime.Serialization.Formatters/tests/project.json +++ b/src/System.Runtime.Serialization.Formatters/tests/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Json/tests/Performance/project.json b/src/System.Runtime.Serialization.Json/tests/Performance/project.json index d69d20d091..3b23a8fa03 100644 --- a/src/System.Runtime.Serialization.Json/tests/Performance/project.json +++ b/src/System.Runtime.Serialization.Json/tests/Performance/project.json @@ -32,8 +32,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -46,4 +49,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Json/tests/project.json b/src/System.Runtime.Serialization.Json/tests/project.json index 7642391e80..22e7094672 100644 --- a/src/System.Runtime.Serialization.Json/tests/project.json +++ b/src/System.Runtime.Serialization.Json/tests/project.json @@ -28,8 +28,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -42,4 +45,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Xml/tests/Performance/project.json b/src/System.Runtime.Serialization.Xml/tests/Performance/project.json index a9f557bc91..36f269b5c5 100644 --- a/src/System.Runtime.Serialization.Xml/tests/Performance/project.json +++ b/src/System.Runtime.Serialization.Xml/tests/Performance/project.json @@ -31,8 +31,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -45,4 +48,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Xml/tests/project.json b/src/System.Runtime.Serialization.Xml/tests/project.json index 19a812cc55..46caa23412 100644 --- a/src/System.Runtime.Serialization.Xml/tests/project.json +++ b/src/System.Runtime.Serialization.Xml/tests/project.json @@ -27,8 +27,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -41,4 +44,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Runtime/tests/project.json b/src/System.Runtime/tests/project.json index 8f923d4a3c..66eb7da92c 100644 --- a/src/System.Runtime/tests/project.json +++ b/src/System.Runtime/tests/project.json @@ -23,8 +23,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -37,4 +40,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Security.AccessControl/tests/project.json b/src/System.Security.AccessControl/tests/project.json index 36d4374f46..ec9958eb19 100644 --- a/src/System.Security.AccessControl/tests/project.json +++ b/src/System.Security.AccessControl/tests/project.json @@ -36,12 +36,15 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { "win7-x86": {}, "win7-x64": {} } -} +}
\ No newline at end of file diff --git a/src/System.Security.Claims/tests/project.json b/src/System.Security.Claims/tests/project.json index 64b6da5bd6..d9d7c89544 100644 --- a/src/System.Security.Claims/tests/project.json +++ b/src/System.Security.Claims/tests/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Algorithms/tests/project.json b/src/System.Security.Cryptography.Algorithms/tests/project.json index 7884cc70f9..2d324a87e3 100644 --- a/src/System.Security.Cryptography.Algorithms/tests/project.json +++ b/src/System.Security.Cryptography.Algorithms/tests/project.json @@ -20,9 +20,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -37,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj index 8320925160..0035ad66aa 100644 --- a/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj +++ b/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj @@ -10,7 +10,6 @@ <OutputType>Library</OutputType> <AssemblyName>System.Security.Cryptography.Cng.Tests</AssemblyName> <RootNamespace>System.Security.Cryptography.Cng.Tests</RootNamespace> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETCoreApp,Version=v1.0</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_NT_Debug|AnyCPU'" /> @@ -126,13 +125,5 @@ <ItemGroup> <None Include="project.json" /> </ItemGroup> - <Target Name="ChangeTestTargetFramework" BeforeTargets="BeforeBuild" > - <ItemGroup> - <TestTargetFramework Remove="@(TestTargetFramework)" /> - <TestTargetFramework Include=".NETCoreApp,Version=v1.0"> - <Folder>netcoreapp10</Folder> - </TestTargetFramework> - </ItemGroup> - </Target> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Security.Cryptography.Csp/tests/project.json b/src/System.Security.Cryptography.Csp/tests/project.json index 90329549a0..8145855596 100644 --- a/src/System.Security.Cryptography.Csp/tests/project.json +++ b/src/System.Security.Cryptography.Csp/tests/project.json @@ -17,9 +17,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -34,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Encoding/tests/project.json b/src/System.Security.Cryptography.Encoding/tests/project.json index f430faee66..314bfc3fb5 100644 --- a/src/System.Security.Cryptography.Encoding/tests/project.json +++ b/src/System.Security.Cryptography.Encoding/tests/project.json @@ -16,8 +16,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -30,4 +33,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj b/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj index 9fa4dd9ae8..b0fb090705 100644 --- a/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj +++ b/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj @@ -10,7 +10,6 @@ <OutputType>Library</OutputType> <AssemblyName>System.Security.Cryptography.OpenSsl.Tests</AssemblyName> <RootNamespace>System.Security.Cryptography.OpenSsl.Tests</RootNamespace> - <NuGetTargetMoniker>.NETCoreApp,Version=v1.0</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Release|AnyCPU'" /> @@ -83,14 +82,5 @@ <Name>System.Security.Cryptography.OpenSsl</Name> </ProjectReference> </ItemGroup> - <Target Name="ChangeTestTargetFramework" BeforeTargets="BeforeBuild" > - <ItemGroup> - <TestTargetFramework Remove="@(TestTargetFramework)" /> - <TestTargetFramework Include=".NETCoreApp,Version=v1.0"> - <!-- Folder should be netcoreapp10, but dnxcore50 hardcoded in runtest.sh --> - <Folder>dnxcore50</Folder> - </TestTargetFramework> - </ItemGroup> - </Target> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/System.Security.Cryptography.Pkcs/tests/project.json b/src/System.Security.Cryptography.Pkcs/tests/project.json index 08b53d4950..2ed89fe0c8 100644 --- a/src/System.Security.Cryptography.Pkcs/tests/project.json +++ b/src/System.Security.Cryptography.Pkcs/tests/project.json @@ -16,9 +16,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -33,4 +33,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Primitives/tests/project.json b/src/System.Security.Cryptography.Primitives/tests/project.json index 0f800ce1cd..7e6b8f2c06 100644 --- a/src/System.Security.Cryptography.Primitives/tests/project.json +++ b/src/System.Security.Cryptography.Primitives/tests/project.json @@ -14,8 +14,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -28,4 +31,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Security.Cryptography.ProtectedData/tests/project.json b/src/System.Security.Cryptography.ProtectedData/tests/project.json index 90329549a0..8145855596 100644 --- a/src/System.Security.Cryptography.ProtectedData/tests/project.json +++ b/src/System.Security.Cryptography.ProtectedData/tests/project.json @@ -17,9 +17,9 @@ } }, "frameworks": { - "dnxcore50": { + "netcoreapp1.0": { "imports": [ - "netstandard1.6", + "dnxcore50", "portable-net45+win8" ] } @@ -34,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj index 132deebad6..2930c52995 100644 --- a/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj +++ b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj @@ -72,15 +72,6 @@ <ItemGroup> <None Include="project.json" /> </ItemGroup> - <Target Name="ChangeTestTargetFramework" BeforeTargets="BeforeBuild" > - <ItemGroup> - <TestTargetFramework Remove="@(TestTargetFramework)" /> - <TestTargetFramework Include=".NETCoreApp,Version=v1.0"> - <!-- Folder should be netcoreapp10, but dnxcore50 hardcoded in runtest.sh --> - <Folder>dnxcore50</Folder> - </TestTargetFramework> - </ItemGroup> - </Target> <ItemGroup> <SupplementalTestData Include="$(PackagesDir)System.Security.Cryptography.X509Certificates.TestData\1.0.2-prerelease\content\**\*.*" /> </ItemGroup> diff --git a/src/System.Security.Principal.Windows/tests/project.json b/src/System.Security.Principal.Windows/tests/project.json index 19d2a3a8a7..65284e035c 100644 --- a/src/System.Security.Principal.Windows/tests/project.json +++ b/src/System.Security.Principal.Windows/tests/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Security.SecureString/tests/project.json b/src/System.Security.SecureString/tests/project.json index 6ddea19435..436440347c 100644 --- a/src/System.Security.SecureString/tests/project.json +++ b/src/System.Security.SecureString/tests/project.json @@ -11,8 +11,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -25,4 +28,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/project.json b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/project.json index c4d253d40c..70cbfaf8a0 100644 --- a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/project.json +++ b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Text.Encoding.CodePages/tests/project.json b/src/System.Text.Encoding.CodePages/tests/project.json index b50c7e1c47..9a7288e378 100644 --- a/src/System.Text.Encoding.CodePages/tests/project.json +++ b/src/System.Text.Encoding.CodePages/tests/project.json @@ -16,8 +16,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -30,4 +33,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Text.Encoding.Extensions/tests/project.json b/src/System.Text.Encoding.Extensions/tests/project.json index 5a2fe1cdc3..e433fd86b1 100644 --- a/src/System.Text.Encoding.Extensions/tests/project.json +++ b/src/System.Text.Encoding.Extensions/tests/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Text.Encoding/tests/project.json b/src/System.Text.Encoding/tests/project.json index a37ac7a77e..54763799a9 100644 --- a/src/System.Text.Encoding/tests/project.json +++ b/src/System.Text.Encoding/tests/project.json @@ -19,8 +19,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -33,4 +36,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Text.Encodings.Web/tests/project.json b/src/System.Text.Encodings.Web/tests/project.json index f4d20be46c..9d63f9729c 100644 --- a/src/System.Text.Encodings.Web/tests/project.json +++ b/src/System.Text.Encodings.Web/tests/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Text.RegularExpressions/tests/project.json b/src/System.Text.RegularExpressions/tests/project.json index b18c8e456c..39c5e24f43 100644 --- a/src/System.Text.RegularExpressions/tests/project.json +++ b/src/System.Text.RegularExpressions/tests/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Threading.AccessControl/tests/project.json b/src/System.Threading.AccessControl/tests/project.json index 072395f81e..581220cf9c 100644 --- a/src/System.Threading.AccessControl/tests/project.json +++ b/src/System.Threading.AccessControl/tests/project.json @@ -21,8 +21,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -35,4 +38,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Threading.Overlapped/tests/project.json b/src/System.Threading.Overlapped/tests/project.json index 58b1ce6e24..e186db3a60 100644 --- a/src/System.Threading.Overlapped/tests/project.json +++ b/src/System.Threading.Overlapped/tests/project.json @@ -13,8 +13,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -27,4 +30,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Dataflow/src/wp8/project.json b/src/System.Threading.Tasks.Dataflow/src/wp8/project.json index dd2618e166..68f55fd4e1 100644 --- a/src/System.Threading.Tasks.Dataflow/src/wp8/project.json +++ b/src/System.Threading.Tasks.Dataflow/src/wp8/project.json @@ -2,7 +2,7 @@ "frameworks": { "netstandard1.0": { "imports": [ - "dnxcore50" + "dotnet5.1" ], "dependencies": { "Microsoft.NETCore.Platforms": "1.0.1-rc3-24117-00", diff --git a/src/System.Threading.Tasks.Dataflow/tests/project.json b/src/System.Threading.Tasks.Dataflow/tests/project.json index 30064edc98..2768b90afb 100644 --- a/src/System.Threading.Tasks.Dataflow/tests/project.json +++ b/src/System.Threading.Tasks.Dataflow/tests/project.json @@ -23,8 +23,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -37,4 +40,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Extensions/src/project.json b/src/System.Threading.Tasks.Extensions/src/project.json index a1d5317bc4..4b4a21bd50 100644 --- a/src/System.Threading.Tasks.Extensions/src/project.json +++ b/src/System.Threading.Tasks.Extensions/src/project.json @@ -7,6 +7,10 @@ "System.Threading.Tasks": "4.0.0" }, "frameworks": { - "dnxcore50": {} + "netcoreapp1.0": { + "imports": [ + "dnxcore50" + ] + } } -} +}
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Extensions/tests/project.json b/src/System.Threading.Tasks.Extensions/tests/project.json index 8d37c1b119..b8a10cce0e 100644 --- a/src/System.Threading.Tasks.Extensions/tests/project.json +++ b/src/System.Threading.Tasks.Extensions/tests/project.json @@ -14,8 +14,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -28,4 +31,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Threading.Tasks.Parallel/tests/project.json b/src/System.Threading.Tasks.Parallel/tests/project.json index 95a4a3252c..3882c36bbd 100644 --- a/src/System.Threading.Tasks.Parallel/tests/project.json +++ b/src/System.Threading.Tasks.Parallel/tests/project.json @@ -21,8 +21,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -35,4 +38,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Threading.Tasks/tests/project.json b/src/System.Threading.Tasks/tests/project.json index 8e84e54604..25360304ae 100644 --- a/src/System.Threading.Tasks/tests/project.json +++ b/src/System.Threading.Tasks/tests/project.json @@ -21,8 +21,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -35,4 +38,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Threading.Timer/tests/project.json b/src/System.Threading.Timer/tests/project.json index be748b3897..b8133be34c 100644 --- a/src/System.Threading.Timer/tests/project.json +++ b/src/System.Threading.Timer/tests/project.json @@ -16,8 +16,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -30,4 +33,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Threading/tests/project.json b/src/System.Threading/tests/project.json index a6268732f6..d289654d2e 100644 --- a/src/System.Threading/tests/project.json +++ b/src/System.Threading/tests/project.json @@ -21,8 +21,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -35,4 +38,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.ValueTuple/tests/project.json b/src/System.ValueTuple/tests/project.json index 597f491bab..ef62b25b1e 100644 --- a/src/System.ValueTuple/tests/project.json +++ b/src/System.ValueTuple/tests/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/project.json index d11ae4c7a5..92d9a4a4db 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/project.json index d11ae4c7a5..92d9a4a4db 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/project.json index d11ae4c7a5..92d9a4a4db 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/Readers/NameTable/project.json b/src/System.Xml.ReaderWriter/tests/Readers/NameTable/project.json index 38e3c498f7..0eb0443d51 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/NameTable/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/NameTable/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/project.json b/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/project.json index 7416d8de59..888a651f9b 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/project.json index d11ae4c7a5..92d9a4a4db 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/project.json index 33ad76030c..1a0a3e130b 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/project.json @@ -14,8 +14,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -28,4 +31,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/project.json b/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/project.json index 186ec4d063..38cbf1701d 100644 --- a/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/project.json +++ b/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/project.json b/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/project.json index 186ec4d063..38cbf1701d 100644 --- a/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/project.json +++ b/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/XmlConvert/project.json b/src/System.Xml.ReaderWriter/tests/XmlConvert/project.json index d92aa08db1..1d76a6e796 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlConvert/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlConvert/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/XmlReader/ReadContentAs/project.json b/src/System.Xml.ReaderWriter/tests/XmlReader/ReadContentAs/project.json index 281fdab913..cfa6985508 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlReader/ReadContentAs/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlReader/ReadContentAs/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/project.json b/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/project.json index b9296b907c..e2b3684fdd 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/project.json b/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/project.json index 5ed3ce746f..b087bbf289 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/XmlReaderLib/project.json b/src/System.Xml.ReaderWriter/tests/XmlReaderLib/project.json index 8e3212ec83..e3e68a8d36 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlReaderLib/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlReaderLib/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.ReaderWriter/tests/XmlWriter/project.json b/src/System.Xml.ReaderWriter/tests/XmlWriter/project.json index b82f9cea05..0d67cc87b8 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlWriter/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlWriter/project.json @@ -19,8 +19,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -33,4 +36,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XDocument/tests/Properties/project.json b/src/System.Xml.XDocument/tests/Properties/project.json index f6614f34f1..02a2360e9d 100644 --- a/src/System.Xml.XDocument/tests/Properties/project.json +++ b/src/System.Xml.XDocument/tests/Properties/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XDocument/tests/SDMSample/project.json b/src/System.Xml.XDocument/tests/SDMSample/project.json index e469b727c4..eb12326af6 100644 --- a/src/System.Xml.XDocument/tests/SDMSample/project.json +++ b/src/System.Xml.XDocument/tests/SDMSample/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XDocument/tests/Streaming/project.json b/src/System.Xml.XDocument/tests/Streaming/project.json index 91fb672d92..f21fa7a966 100644 --- a/src/System.Xml.XDocument/tests/Streaming/project.json +++ b/src/System.Xml.XDocument/tests/Streaming/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XDocument/tests/TreeManipulation/project.json b/src/System.Xml.XDocument/tests/TreeManipulation/project.json index ef258f3d0e..e8f7fe13fa 100644 --- a/src/System.Xml.XDocument/tests/TreeManipulation/project.json +++ b/src/System.Xml.XDocument/tests/TreeManipulation/project.json @@ -19,8 +19,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -33,4 +36,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XDocument/tests/XDocument.Common/project.json b/src/System.Xml.XDocument/tests/XDocument.Common/project.json index 4638560b50..2fa3c81042 100644 --- a/src/System.Xml.XDocument/tests/XDocument.Common/project.json +++ b/src/System.Xml.XDocument/tests/XDocument.Common/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/project.json b/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/project.json index 5cbff1096c..6cdcb3d369 100644 --- a/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/project.json +++ b/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/project.json @@ -19,8 +19,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -33,4 +36,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XDocument/tests/axes/project.json b/src/System.Xml.XDocument/tests/axes/project.json index 2a5526e2e0..1a2e44315b 100644 --- a/src/System.Xml.XDocument/tests/axes/project.json +++ b/src/System.Xml.XDocument/tests/axes/project.json @@ -16,8 +16,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -30,4 +33,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XDocument/tests/events/project.json b/src/System.Xml.XDocument/tests/events/project.json index fe24a7a776..1c46422547 100644 --- a/src/System.Xml.XDocument/tests/events/project.json +++ b/src/System.Xml.XDocument/tests/events/project.json @@ -17,8 +17,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -31,4 +34,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XDocument/tests/misc/project.json b/src/System.Xml.XDocument/tests/misc/project.json index 91fb672d92..f21fa7a966 100644 --- a/src/System.Xml.XDocument/tests/misc/project.json +++ b/src/System.Xml.XDocument/tests/misc/project.json @@ -18,8 +18,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -32,4 +35,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XDocument/tests/xNodeBuilder/project.json b/src/System.Xml.XDocument/tests/xNodeBuilder/project.json index 81c7f7e022..e92855230b 100644 --- a/src/System.Xml.XDocument/tests/xNodeBuilder/project.json +++ b/src/System.Xml.XDocument/tests/xNodeBuilder/project.json @@ -21,8 +21,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -35,4 +38,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XDocument/tests/xNodeReader/project.json b/src/System.Xml.XDocument/tests/xNodeReader/project.json index ef258f3d0e..e8f7fe13fa 100644 --- a/src/System.Xml.XDocument/tests/xNodeReader/project.json +++ b/src/System.Xml.XDocument/tests/xNodeReader/project.json @@ -19,8 +19,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -33,4 +36,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XPath.XDocument/tests/project.json b/src/System.Xml.XPath.XDocument/tests/project.json index 66d3ab0409..0d476f09a6 100644 --- a/src/System.Xml.XPath.XDocument/tests/project.json +++ b/src/System.Xml.XPath.XDocument/tests/project.json @@ -22,8 +22,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -36,4 +39,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XPath.XmlDocument/tests/project.json b/src/System.Xml.XPath.XmlDocument/tests/project.json index 31bc135e5a..92a40c8a3e 100644 --- a/src/System.Xml.XPath.XmlDocument/tests/project.json +++ b/src/System.Xml.XPath.XmlDocument/tests/project.json @@ -22,8 +22,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -36,4 +39,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XPath/tests/project.json b/src/System.Xml.XPath/tests/project.json index 1aa313ca51..58fa7ccbd0 100644 --- a/src/System.Xml.XPath/tests/project.json +++ b/src/System.Xml.XPath/tests/project.json @@ -20,8 +20,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -34,4 +37,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XmlDocument/tests/project.json b/src/System.Xml.XmlDocument/tests/project.json index fbee2e02c6..1396dada12 100644 --- a/src/System.Xml.XmlDocument/tests/project.json +++ b/src/System.Xml.XmlDocument/tests/project.json @@ -15,8 +15,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -29,4 +32,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XmlSerializer/tests/Performance/project.json b/src/System.Xml.XmlSerializer/tests/Performance/project.json index 4f8e39ca08..9d7a9117c9 100644 --- a/src/System.Xml.XmlSerializer/tests/Performance/project.json +++ b/src/System.Xml.XmlSerializer/tests/Performance/project.json @@ -30,8 +30,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -44,4 +47,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file diff --git a/src/System.Xml.XmlSerializer/tests/project.json b/src/System.Xml.XmlSerializer/tests/project.json index 42bdfa8166..3fd9d73e5c 100644 --- a/src/System.Xml.XmlSerializer/tests/project.json +++ b/src/System.Xml.XmlSerializer/tests/project.json @@ -26,8 +26,11 @@ } }, "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } }, "runtimes": { @@ -40,4 +43,4 @@ "win7-x64": {}, "win7-x86": {} } -} +}
\ No newline at end of file |