From 10b6191b3eec756fe8aee271482f90f3f9f90c91 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 9 Feb 2016 16:51:02 -0600 Subject: [PATCH] Move OutputStandardOutputAndError test project with the other test projects. Partial #1250 --- .../OutputStandardOutputAndError.xproj | 0 .../TestProjects/OutputStandardOutputAndError/Program.cs | 0 .../TestProjects/OutputStandardOutputAndError/project.json | 0 test/StreamForwarderTests/StreamForwarderTests.cs | 2 +- test/StreamForwarderTests/project.json | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) rename {test => TestAssets}/TestProjects/OutputStandardOutputAndError/OutputStandardOutputAndError.xproj (100%) rename {test => TestAssets}/TestProjects/OutputStandardOutputAndError/Program.cs (100%) rename {test => TestAssets}/TestProjects/OutputStandardOutputAndError/project.json (100%) diff --git a/test/TestProjects/OutputStandardOutputAndError/OutputStandardOutputAndError.xproj b/TestAssets/TestProjects/OutputStandardOutputAndError/OutputStandardOutputAndError.xproj similarity index 100% rename from test/TestProjects/OutputStandardOutputAndError/OutputStandardOutputAndError.xproj rename to TestAssets/TestProjects/OutputStandardOutputAndError/OutputStandardOutputAndError.xproj diff --git a/test/TestProjects/OutputStandardOutputAndError/Program.cs b/TestAssets/TestProjects/OutputStandardOutputAndError/Program.cs similarity index 100% rename from test/TestProjects/OutputStandardOutputAndError/Program.cs rename to TestAssets/TestProjects/OutputStandardOutputAndError/Program.cs diff --git a/test/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json similarity index 100% rename from test/TestProjects/OutputStandardOutputAndError/project.json rename to TestAssets/TestProjects/OutputStandardOutputAndError/project.json diff --git a/test/StreamForwarderTests/StreamForwarderTests.cs b/test/StreamForwarderTests/StreamForwarderTests.cs index 313b1ad70..7bdc5184a 100644 --- a/test/StreamForwarderTests/StreamForwarderTests.cs +++ b/test/StreamForwarderTests/StreamForwarderTests.cs @@ -18,7 +18,7 @@ namespace StreamForwarderTests public class StreamForwarderTests : TestBase { private static readonly string s_rid = PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier(); - private static readonly string s_testProjectRoot = Path.Combine(AppContext.BaseDirectory, "TestProjects"); + private static readonly string s_testProjectRoot = Path.Combine(AppContext.BaseDirectory, "TestAssets", "TestProjects"); private TempDirectory _root; diff --git a/test/StreamForwarderTests/project.json b/test/StreamForwarderTests/project.json index f49c2b0bd..ff95b1d88 100644 --- a/test/StreamForwarderTests/project.json +++ b/test/StreamForwarderTests/project.json @@ -23,7 +23,7 @@ }, "content": [ - "../TestProjects/OutputStandardOutputAndError/*" + "../../TestAssets/TestProjects/OutputStandardOutputAndError/*" ], "testRunner": "xunit"