From 3d14caceff08f8279b5a33c0ba31f1393f328b28 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 5 Feb 2016 17:43:50 -0600 Subject: [PATCH] Test directory refactoring step 1. Moving TestProjects and TestPackages under root 'TestAssets' folder. Partial fix #1250 --- Microsoft.DotNet.Cli.sln | 25 +++++++++---------- .../dotnet-hello/v1/dotnet-hello/Program.cs | 0 .../v1/dotnet-hello/dotnet-hello.xproj | 0 .../dotnet-hello/v1/dotnet-hello/project.json | 0 .../dotnet-hello/v2/dotnet-hello/Program.cs | 0 .../v2/dotnet-hello/dotnet-hello.xproj | 0 .../dotnet-hello/v2/dotnet-hello/project.json | 0 .../TestProjects/CompileFail/Program.cs | 0 .../TestProjects/CompileFail/project.json | 0 .../TestProjects/TestApp/Program.cs | 0 .../TestProjects/TestApp/TestApp.xproj | 0 .../TestProjects/TestApp/project.json | 0 .../TestAppCompilationContext/Program.cs | 0 .../TestAppCompilationContext/project.json | 0 .../TestProjects/TestAppWithArgs/Program.cs | 0 .../TestAppWithArgs/TestAppWithArgs.xproj | 0 .../TestProjects/TestAppWithArgs/project.json | 0 .../TestAppWithContents/Program.cs | 0 .../TestAppWithContents.xproj | 0 .../TestAppWithContents/project.json | 0 .../TestAppWithContents/testcontentfile.txt | 0 .../TestLibraryGreater/Program.cs | 0 .../TestLibraryGreater.xproj | 0 .../TestLibraryGreater/project.json | 0 .../TestLibraryLesser/Program.cs | 0 .../TestLibraryLesser/TestLibraryLesser.xproj | 0 .../TestLibraryLesser/project.json | 0 .../TestBindingRedirectGeneration/global.json | 0 .../TestProjects/TestLibrary/Helper.cs | 0 .../TestLibrary/TestLibrary.xproj | 0 .../TestProjects/TestLibrary/project.json | 0 .../TestLibraryWithAnalyzer/NuGet.Config | 0 .../TestLibraryWithAnalyzer/Program.cs | 0 .../TestLibraryWithAnalyzer/project.json | 0 .../TestLibraryWithRunner/Test.cs | 0 .../TestProjectToProjectDependencies.xproj | 0 .../global.json | 0 .../src/L0/NuGet.Config | 0 .../src/L0/Program.cs | 0 .../src/L0/project.json | 0 .../src/L11/NuGet.Config | 0 .../src/L11/Program.cs | 0 .../src/L11/project.json | 0 .../src/L12/NuGet.Config | 0 .../src/L12/Program.cs | 0 .../src/L12/project.json | 0 .../src/L21/NuGet.Config | 0 .../src/L21/Program.cs | 0 .../src/L21/project.json | 0 .../src/L22/NuGet.Config | 0 .../src/L22/Program.cs | 0 .../src/L22/project.json | 0 .../TestSimpleIncrementalApp/NuGet.Config | 0 .../TestSimpleIncrementalApp/Program.cs | 0 .../TestSimpleIncrementalApp/TestApp.xproj | 0 .../TestSimpleIncrementalApp/project.json | 0 {test => TestAssets}/TestProjects/global.json | 0 scripts/test/argument-forwarding-tests.ps1 | 2 -- scripts/test/run-tests.ps1 | 2 +- scripts/test/run-tests.sh | 2 +- .../test/setup/build-test-prerequisites.ps1 | 2 +- .../test/setup/build-test-prerequisites.sh | 2 +- .../test/setup/restore-test-prerequisites.ps1 | 4 +-- .../test/setup/restore-test-prerequisites.sh | 4 +-- .../BuildProjectToProjectTests.cs | 2 +- test/dotnet-build.Tests/IncrementalTests.cs | 2 +- test/dotnet-build.Tests/project.json | 6 ++--- test/dotnet-compile.Tests/CompilerTests.cs | 2 +- test/dotnet-compile.Tests/project.json | 6 ++--- .../Microsoft.DotNet.Tools.Publish.Tests.cs | 2 +- test/dotnet-publish.Tests/project.json | 12 ++++----- 71 files changed, 36 insertions(+), 39 deletions(-) rename {test => TestAssets}/TestPackages/dotnet-hello/v1/dotnet-hello/Program.cs (100%) rename {test => TestAssets}/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.xproj (100%) rename {test => TestAssets}/TestPackages/dotnet-hello/v1/dotnet-hello/project.json (100%) rename {test => TestAssets}/TestPackages/dotnet-hello/v2/dotnet-hello/Program.cs (100%) rename {test => TestAssets}/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.xproj (100%) rename {test => TestAssets}/TestPackages/dotnet-hello/v2/dotnet-hello/project.json (100%) rename {test => TestAssets}/TestProjects/CompileFail/Program.cs (100%) rename {test => TestAssets}/TestProjects/CompileFail/project.json (100%) rename {test => TestAssets}/TestProjects/TestApp/Program.cs (100%) rename {test => TestAssets}/TestProjects/TestApp/TestApp.xproj (100%) rename {test => TestAssets}/TestProjects/TestApp/project.json (100%) rename {test => TestAssets}/TestProjects/TestAppCompilationContext/Program.cs (100%) rename {test => TestAssets}/TestProjects/TestAppCompilationContext/project.json (100%) rename {test => TestAssets}/TestProjects/TestAppWithArgs/Program.cs (100%) rename {test => TestAssets}/TestProjects/TestAppWithArgs/TestAppWithArgs.xproj (100%) rename {test => TestAssets}/TestProjects/TestAppWithArgs/project.json (100%) rename {test => TestAssets}/TestProjects/TestAppWithContents/Program.cs (100%) rename {test => TestAssets}/TestProjects/TestAppWithContents/TestAppWithContents.xproj (100%) rename {test => TestAssets}/TestProjects/TestAppWithContents/project.json (100%) rename {test => TestAssets}/TestProjects/TestAppWithContents/testcontentfile.txt (100%) rename {test => TestAssets}/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/Program.cs (100%) rename {test => TestAssets}/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/TestLibraryGreater.xproj (100%) rename {test => TestAssets}/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json (100%) rename {test => TestAssets}/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/Program.cs (100%) rename {test => TestAssets}/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/TestLibraryLesser.xproj (100%) rename {test => TestAssets}/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json (100%) rename {test => TestAssets}/TestProjects/TestBindingRedirectGeneration/global.json (100%) rename {test => TestAssets}/TestProjects/TestLibrary/Helper.cs (100%) rename {test => TestAssets}/TestProjects/TestLibrary/TestLibrary.xproj (100%) rename {test => TestAssets}/TestProjects/TestLibrary/project.json (100%) rename {test => TestAssets}/TestProjects/TestLibraryWithAnalyzer/NuGet.Config (100%) mode change 100755 => 100644 rename {test => TestAssets}/TestProjects/TestLibraryWithAnalyzer/Program.cs (100%) mode change 100755 => 100644 rename {test => TestAssets}/TestProjects/TestLibraryWithAnalyzer/project.json (100%) mode change 100755 => 100644 rename {test => TestAssets}/TestProjects/TestLibraryWithRunner/Test.cs (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/TestProjectToProjectDependencies.xproj (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/global.json (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L0/NuGet.Config (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L0/Program.cs (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L0/project.json (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L11/NuGet.Config (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L11/Program.cs (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L11/project.json (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L12/NuGet.Config (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L12/Program.cs (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L12/project.json (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L21/NuGet.Config (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L21/Program.cs (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L21/project.json (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L22/NuGet.Config (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L22/Program.cs (100%) rename {test => TestAssets}/TestProjects/TestProjectToProjectDependencies/src/L22/project.json (100%) rename {test => TestAssets}/TestProjects/TestSimpleIncrementalApp/NuGet.Config (100%) rename {test => TestAssets}/TestProjects/TestSimpleIncrementalApp/Program.cs (100%) rename {test => TestAssets}/TestProjects/TestSimpleIncrementalApp/TestApp.xproj (100%) rename {test => TestAssets}/TestProjects/TestSimpleIncrementalApp/project.json (100%) rename {test => TestAssets}/TestProjects/global.json (100%) diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index 4498a4435..2d92e2245 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -39,17 +39,15 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "E2E", "test\E2E\E2E.xproj", EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Test.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Test.Utilities.xproj", "{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestProjects", "TestProjects", "{713CBFBB-5392-438D-B766-A9A585EF1BB8}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestApp", "TestAssets\TestProjects\TestApp\TestApp.xproj", "{58808BBC-371E-47D6-A3D0-4902145EDA4E}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestApp", "test\TestProjects\TestApp\TestApp.xproj", "{58808BBC-371E-47D6-A3D0-4902145EDA4E}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestAppWithArgs", "TestAssets\TestProjects\TestAppWithArgs\TestAppWithArgs.xproj", "{DA8E0E9E-A6D6-4583-864C-8F40465E3A48}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestAppWithArgs", "test\TestProjects\TestAppWithArgs\TestAppWithArgs.xproj", "{DA8E0E9E-A6D6-4583-864C-8F40465E3A48}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestAppWithContents", "TestAssets\TestProjects\TestAppWithContents\TestAppWithContents.xproj", "{0138CB8F-4AA9-4029-A21E-C07C30F425BA}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestAppWithContents", "test\TestProjects\TestAppWithContents\TestAppWithContents.xproj", "{0138CB8F-4AA9-4029-A21E-C07C30F425BA}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestLibrary", "TestAssets\TestProjects\TestLibrary\TestLibrary.xproj", "{947DD232-8D9B-4B78-9C6A-94F807D2DD58}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestLibrary", "test\TestProjects\TestLibrary\TestLibrary.xproj", "{947DD232-8D9B-4B78-9C6A-94F807D2DD58}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestProjectToProjectDependencies", "test\TestProjects\TestProjectToProjectDependencies\TestProjectToProjectDependencies.xproj", "{947DD232-8D9B-4B78-9C6A-94F807D22222}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestProjectToProjectDependencies", "TestAssets\TestProjects\TestProjectToProjectDependencies\TestProjectToProjectDependencies.xproj", "{947DD232-8D9B-4B78-9C6A-94F807D22222}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet", "src\dotnet\dotnet.xproj", "{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}" EndProject @@ -63,6 +61,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-projectmodel-server. EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Files", "src\Microsoft.DotNet.Files\Microsoft.DotNet.Files.xproj", "{D521DD9F-0614-4929-93B4-D8FA5682C174}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAssets", "TestAssets", "{82BD2E61-326D-4EA4-A1C1-93A565573C81}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -460,12 +460,11 @@ Global {688870C8-9843-4F9E-8576-D39290AD0F25} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {65741CB1-8AEE-4C66-8198-10A7EA0E4258} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} - {713CBFBB-5392-438D-B766-A9A585EF1BB8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} - {58808BBC-371E-47D6-A3D0-4902145EDA4E} = {713CBFBB-5392-438D-B766-A9A585EF1BB8} - {DA8E0E9E-A6D6-4583-864C-8F40465E3A48} = {713CBFBB-5392-438D-B766-A9A585EF1BB8} - {0138CB8F-4AA9-4029-A21E-C07C30F425BA} = {713CBFBB-5392-438D-B766-A9A585EF1BB8} - {947DD232-8D9B-4B78-9C6A-94F807D2DD58} = {713CBFBB-5392-438D-B766-A9A585EF1BB8} - {947DD232-8D9B-4B78-9C6A-94F807D22222} = {713CBFBB-5392-438D-B766-A9A585EF1BB8} + {58808BBC-371E-47D6-A3D0-4902145EDA4E} = {82BD2E61-326D-4EA4-A1C1-93A565573C81} + {DA8E0E9E-A6D6-4583-864C-8F40465E3A48} = {82BD2E61-326D-4EA4-A1C1-93A565573C81} + {0138CB8F-4AA9-4029-A21E-C07C30F425BA} = {82BD2E61-326D-4EA4-A1C1-93A565573C81} + {947DD232-8D9B-4B78-9C6A-94F807D2DD58} = {82BD2E61-326D-4EA4-A1C1-93A565573C81} + {947DD232-8D9B-4B78-9C6A-94F807D22222} = {82BD2E61-326D-4EA4-A1C1-93A565573C81} {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {833FFEE1-7EED-4F51-8DFD-946D48833333} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {833FFEE1-7EED-4F51-8DFD-946D48893D6E} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} diff --git a/test/TestPackages/dotnet-hello/v1/dotnet-hello/Program.cs b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/Program.cs similarity index 100% rename from test/TestPackages/dotnet-hello/v1/dotnet-hello/Program.cs rename to TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/Program.cs diff --git a/test/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.xproj b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.xproj similarity index 100% rename from test/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.xproj rename to TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.xproj diff --git a/test/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json similarity index 100% rename from test/TestPackages/dotnet-hello/v1/dotnet-hello/project.json rename to TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json diff --git a/test/TestPackages/dotnet-hello/v2/dotnet-hello/Program.cs b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/Program.cs similarity index 100% rename from test/TestPackages/dotnet-hello/v2/dotnet-hello/Program.cs rename to TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/Program.cs diff --git a/test/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.xproj b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.xproj similarity index 100% rename from test/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.xproj rename to TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.xproj diff --git a/test/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json similarity index 100% rename from test/TestPackages/dotnet-hello/v2/dotnet-hello/project.json rename to TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json diff --git a/test/TestProjects/CompileFail/Program.cs b/TestAssets/TestProjects/CompileFail/Program.cs similarity index 100% rename from test/TestProjects/CompileFail/Program.cs rename to TestAssets/TestProjects/CompileFail/Program.cs diff --git a/test/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json similarity index 100% rename from test/TestProjects/CompileFail/project.json rename to TestAssets/TestProjects/CompileFail/project.json diff --git a/test/TestProjects/TestApp/Program.cs b/TestAssets/TestProjects/TestApp/Program.cs similarity index 100% rename from test/TestProjects/TestApp/Program.cs rename to TestAssets/TestProjects/TestApp/Program.cs diff --git a/test/TestProjects/TestApp/TestApp.xproj b/TestAssets/TestProjects/TestApp/TestApp.xproj similarity index 100% rename from test/TestProjects/TestApp/TestApp.xproj rename to TestAssets/TestProjects/TestApp/TestApp.xproj diff --git a/test/TestProjects/TestApp/project.json b/TestAssets/TestProjects/TestApp/project.json similarity index 100% rename from test/TestProjects/TestApp/project.json rename to TestAssets/TestProjects/TestApp/project.json diff --git a/test/TestProjects/TestAppCompilationContext/Program.cs b/TestAssets/TestProjects/TestAppCompilationContext/Program.cs similarity index 100% rename from test/TestProjects/TestAppCompilationContext/Program.cs rename to TestAssets/TestProjects/TestAppCompilationContext/Program.cs diff --git a/test/TestProjects/TestAppCompilationContext/project.json b/TestAssets/TestProjects/TestAppCompilationContext/project.json similarity index 100% rename from test/TestProjects/TestAppCompilationContext/project.json rename to TestAssets/TestProjects/TestAppCompilationContext/project.json diff --git a/test/TestProjects/TestAppWithArgs/Program.cs b/TestAssets/TestProjects/TestAppWithArgs/Program.cs similarity index 100% rename from test/TestProjects/TestAppWithArgs/Program.cs rename to TestAssets/TestProjects/TestAppWithArgs/Program.cs diff --git a/test/TestProjects/TestAppWithArgs/TestAppWithArgs.xproj b/TestAssets/TestProjects/TestAppWithArgs/TestAppWithArgs.xproj similarity index 100% rename from test/TestProjects/TestAppWithArgs/TestAppWithArgs.xproj rename to TestAssets/TestProjects/TestAppWithArgs/TestAppWithArgs.xproj diff --git a/test/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json similarity index 100% rename from test/TestProjects/TestAppWithArgs/project.json rename to TestAssets/TestProjects/TestAppWithArgs/project.json diff --git a/test/TestProjects/TestAppWithContents/Program.cs b/TestAssets/TestProjects/TestAppWithContents/Program.cs similarity index 100% rename from test/TestProjects/TestAppWithContents/Program.cs rename to TestAssets/TestProjects/TestAppWithContents/Program.cs diff --git a/test/TestProjects/TestAppWithContents/TestAppWithContents.xproj b/TestAssets/TestProjects/TestAppWithContents/TestAppWithContents.xproj similarity index 100% rename from test/TestProjects/TestAppWithContents/TestAppWithContents.xproj rename to TestAssets/TestProjects/TestAppWithContents/TestAppWithContents.xproj diff --git a/test/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json similarity index 100% rename from test/TestProjects/TestAppWithContents/project.json rename to TestAssets/TestProjects/TestAppWithContents/project.json diff --git a/test/TestProjects/TestAppWithContents/testcontentfile.txt b/TestAssets/TestProjects/TestAppWithContents/testcontentfile.txt similarity index 100% rename from test/TestProjects/TestAppWithContents/testcontentfile.txt rename to TestAssets/TestProjects/TestAppWithContents/testcontentfile.txt diff --git a/test/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/Program.cs b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/Program.cs similarity index 100% rename from test/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/Program.cs rename to TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/Program.cs diff --git a/test/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/TestLibraryGreater.xproj b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/TestLibraryGreater.xproj similarity index 100% rename from test/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/TestLibraryGreater.xproj rename to TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/TestLibraryGreater.xproj diff --git a/test/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json similarity index 100% rename from test/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json rename to TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json diff --git a/test/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/Program.cs b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/Program.cs similarity index 100% rename from test/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/Program.cs rename to TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/Program.cs diff --git a/test/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/TestLibraryLesser.xproj b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/TestLibraryLesser.xproj similarity index 100% rename from test/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/TestLibraryLesser.xproj rename to TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/TestLibraryLesser.xproj diff --git a/test/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json similarity index 100% rename from test/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json rename to TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json diff --git a/test/TestProjects/TestBindingRedirectGeneration/global.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/global.json similarity index 100% rename from test/TestProjects/TestBindingRedirectGeneration/global.json rename to TestAssets/TestProjects/TestBindingRedirectGeneration/global.json diff --git a/test/TestProjects/TestLibrary/Helper.cs b/TestAssets/TestProjects/TestLibrary/Helper.cs similarity index 100% rename from test/TestProjects/TestLibrary/Helper.cs rename to TestAssets/TestProjects/TestLibrary/Helper.cs diff --git a/test/TestProjects/TestLibrary/TestLibrary.xproj b/TestAssets/TestProjects/TestLibrary/TestLibrary.xproj similarity index 100% rename from test/TestProjects/TestLibrary/TestLibrary.xproj rename to TestAssets/TestProjects/TestLibrary/TestLibrary.xproj diff --git a/test/TestProjects/TestLibrary/project.json b/TestAssets/TestProjects/TestLibrary/project.json similarity index 100% rename from test/TestProjects/TestLibrary/project.json rename to TestAssets/TestProjects/TestLibrary/project.json diff --git a/test/TestProjects/TestLibraryWithAnalyzer/NuGet.Config b/TestAssets/TestProjects/TestLibraryWithAnalyzer/NuGet.Config old mode 100755 new mode 100644 similarity index 100% rename from test/TestProjects/TestLibraryWithAnalyzer/NuGet.Config rename to TestAssets/TestProjects/TestLibraryWithAnalyzer/NuGet.Config diff --git a/test/TestProjects/TestLibraryWithAnalyzer/Program.cs b/TestAssets/TestProjects/TestLibraryWithAnalyzer/Program.cs old mode 100755 new mode 100644 similarity index 100% rename from test/TestProjects/TestLibraryWithAnalyzer/Program.cs rename to TestAssets/TestProjects/TestLibraryWithAnalyzer/Program.cs diff --git a/test/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json old mode 100755 new mode 100644 similarity index 100% rename from test/TestProjects/TestLibraryWithAnalyzer/project.json rename to TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json diff --git a/test/TestProjects/TestLibraryWithRunner/Test.cs b/TestAssets/TestProjects/TestLibraryWithRunner/Test.cs similarity index 100% rename from test/TestProjects/TestLibraryWithRunner/Test.cs rename to TestAssets/TestProjects/TestLibraryWithRunner/Test.cs diff --git a/test/TestProjects/TestProjectToProjectDependencies/TestProjectToProjectDependencies.xproj b/TestAssets/TestProjects/TestProjectToProjectDependencies/TestProjectToProjectDependencies.xproj similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/TestProjectToProjectDependencies.xproj rename to TestAssets/TestProjects/TestProjectToProjectDependencies/TestProjectToProjectDependencies.xproj diff --git a/test/TestProjects/TestProjectToProjectDependencies/global.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/global.json similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/global.json rename to TestAssets/TestProjects/TestProjectToProjectDependencies/global.json diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L0/NuGet.Config b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/NuGet.Config similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L0/NuGet.Config rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/NuGet.Config diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L0/Program.cs b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/Program.cs similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L0/Program.cs rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/Program.cs diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L0/project.json rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L11/NuGet.Config b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/NuGet.Config similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L11/NuGet.Config rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/NuGet.Config diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L11/Program.cs b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/Program.cs similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L11/Program.cs rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/Program.cs diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L11/project.json rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L12/NuGet.Config b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/NuGet.Config similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L12/NuGet.Config rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/NuGet.Config diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L12/Program.cs b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/Program.cs similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L12/Program.cs rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/Program.cs diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L12/project.json rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L21/NuGet.Config b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/NuGet.Config similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L21/NuGet.Config rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/NuGet.Config diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L21/Program.cs b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/Program.cs similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L21/Program.cs rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/Program.cs diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L21/project.json rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L22/NuGet.Config b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/NuGet.Config similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L22/NuGet.Config rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/NuGet.Config diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L22/Program.cs b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/Program.cs similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L22/Program.cs rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/Program.cs diff --git a/test/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json similarity index 100% rename from test/TestProjects/TestProjectToProjectDependencies/src/L22/project.json rename to TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json diff --git a/test/TestProjects/TestSimpleIncrementalApp/NuGet.Config b/TestAssets/TestProjects/TestSimpleIncrementalApp/NuGet.Config similarity index 100% rename from test/TestProjects/TestSimpleIncrementalApp/NuGet.Config rename to TestAssets/TestProjects/TestSimpleIncrementalApp/NuGet.Config diff --git a/test/TestProjects/TestSimpleIncrementalApp/Program.cs b/TestAssets/TestProjects/TestSimpleIncrementalApp/Program.cs similarity index 100% rename from test/TestProjects/TestSimpleIncrementalApp/Program.cs rename to TestAssets/TestProjects/TestSimpleIncrementalApp/Program.cs diff --git a/test/TestProjects/TestSimpleIncrementalApp/TestApp.xproj b/TestAssets/TestProjects/TestSimpleIncrementalApp/TestApp.xproj similarity index 100% rename from test/TestProjects/TestSimpleIncrementalApp/TestApp.xproj rename to TestAssets/TestProjects/TestSimpleIncrementalApp/TestApp.xproj diff --git a/test/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json similarity index 100% rename from test/TestProjects/TestSimpleIncrementalApp/project.json rename to TestAssets/TestProjects/TestSimpleIncrementalApp/project.json diff --git a/test/TestProjects/global.json b/TestAssets/TestProjects/global.json similarity index 100% rename from test/TestProjects/global.json rename to TestAssets/TestProjects/global.json diff --git a/scripts/test/argument-forwarding-tests.ps1 b/scripts/test/argument-forwarding-tests.ps1 index 5a93d50dc..8461f2ac8 100644 --- a/scripts/test/argument-forwarding-tests.ps1 +++ b/scripts/test/argument-forwarding-tests.ps1 @@ -5,8 +5,6 @@ . "$PSScriptRoot\..\common\_common.ps1" -$TestPackagesPath = "$RepoRoot\tests\packages" - $ArgTestRoot = "$RepoRoot\test\ArgumentForwardingTests" $ArgTestOutputRoot = "$RepoRoot\artifacts\tests\arg-forwarding" diff --git a/scripts/test/run-tests.ps1 b/scripts/test/run-tests.ps1 index 10b320127..31dcc70cb 100644 --- a/scripts/test/run-tests.ps1 +++ b/scripts/test/run-tests.ps1 @@ -27,7 +27,7 @@ popd # copy TestProjects to $TestBinRoot mkdir -Force "$TestBinRoot\TestProjects" -cp -rec -Force "$RepoRoot\test\TestProjects\*" "$TestBinRoot\TestProjects" +cp -rec -Force "$RepoRoot\TestAssets\TestProjects\*" "$TestBinRoot\TestProjects" # Run each test project $TestProjects | foreach { diff --git a/scripts/test/run-tests.sh b/scripts/test/run-tests.sh index 57cb9126c..fdf089426 100755 --- a/scripts/test/run-tests.sh +++ b/scripts/test/run-tests.sh @@ -24,7 +24,7 @@ failCount=0 # Copy TestProjects to $TEST_BIN_ROOT mkdir -p "$TEST_BIN_ROOT/TestProjects" -cp -a $REPOROOT/test/TestProjects/* $TEST_BIN_ROOT/TestProjects +cp -a $REPOROOT/TestAssets/TestProjects/* $TEST_BIN_ROOT/TestProjects pushd "$TEST_BIN_ROOT" set +e diff --git a/scripts/test/setup/build-test-prerequisites.ps1 b/scripts/test/setup/build-test-prerequisites.ps1 index 8a80aba9c..1873a08c7 100644 --- a/scripts/test/setup/build-test-prerequisites.ps1 +++ b/scripts/test/setup/build-test-prerequisites.ps1 @@ -8,7 +8,7 @@ mkdir -Force $TestPackageDir loadTestPackageList | foreach { - dotnet pack "$RepoRoot\test\TestPackages\$($_.ProjectName)" --output "$TestPackageDir" + dotnet pack "$RepoRoot\TestAssets\TestPackages\$($_.ProjectName)" --output "$TestPackageDir" if (!$?) { error "Command failed: dotnet pack" diff --git a/scripts/test/setup/build-test-prerequisites.sh b/scripts/test/setup/build-test-prerequisites.sh index a7d5bdbb4..edced11eb 100755 --- a/scripts/test/setup/build-test-prerequisites.sh +++ b/scripts/test/setup/build-test-prerequisites.sh @@ -23,5 +23,5 @@ PROJECTS=$(loadTestPackageList) for project in $PROJECTS do - dotnet pack "$REPOROOT/test/TestPackages/$project" --output "$TEST_PACKAGE_DIR" + dotnet pack "$REPOROOT/TestAssets/TestPackages/$project" --output "$TEST_PACKAGE_DIR" done diff --git a/scripts/test/setup/restore-test-prerequisites.ps1 b/scripts/test/setup/restore-test-prerequisites.ps1 index 158220e4b..6bfb8242f 100644 --- a/scripts/test/setup/restore-test-prerequisites.ps1 +++ b/scripts/test/setup/restore-test-prerequisites.ps1 @@ -5,8 +5,8 @@ ". $PSScriptRoot\..\..\common\_common.ps1" -header "Restoring packages" -& dotnet restore "$RepoRoot\test\TestPackages" --quiet --runtime "$Rid" +header "Restoring TestAssets" +& dotnet restore "$RepoRoot\TestAssets" --quiet --runtime "$Rid" $oldErrorAction=$ErrorActionPreference $ErrorActionPreference="SilentlyContinue" diff --git a/scripts/test/setup/restore-test-prerequisites.sh b/scripts/test/setup/restore-test-prerequisites.sh index 76d01a581..1ade59817 100755 --- a/scripts/test/setup/restore-test-prerequisites.sh +++ b/scripts/test/setup/restore-test-prerequisites.sh @@ -16,8 +16,8 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" source "$DIR/../../common/_common.sh" -header "Restoring packages" -dotnet restore "$REPOROOT/test/TestPackages" --runtime $RID --quiet $DISABLE_PARALLEL +header "Restoring TestAssets" +dotnet restore "$REPOROOT/TestAssets" --runtime $RID --quiet $DISABLE_PARALLEL set +e dotnet restore "$REPOROOT/testapp" --runtime $RID $DISABLE_PARALLEL >/dev/null 2>&1 diff --git a/test/dotnet-build.Tests/BuildProjectToProjectTests.cs b/test/dotnet-build.Tests/BuildProjectToProjectTests.cs index 7c4f967e4..75784c4f3 100644 --- a/test/dotnet-build.Tests/BuildProjectToProjectTests.cs +++ b/test/dotnet-build.Tests/BuildProjectToProjectTests.cs @@ -16,7 +16,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests private string[] _projects = new[] { "L0", "L11", "L12", "L21", "L22" }; public ProjectToProjectDependenciesIncrementalTest() : base( - Path.Combine(AppContext.BaseDirectory, "TestProjects", "TestProjectToProjectDependencies"), + Path.Combine(AppContext.BaseDirectory, "TestAssets", "TestProjects", "TestProjectToProjectDependencies"), "L0", "L0 L11 L12 L22 L21 L12 L22 " + Environment.NewLine) { diff --git a/test/dotnet-build.Tests/IncrementalTests.cs b/test/dotnet-build.Tests/IncrementalTests.cs index f8fea4065..e6245d5e6 100644 --- a/test/dotnet-build.Tests/IncrementalTests.cs +++ b/test/dotnet-build.Tests/IncrementalTests.cs @@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests { public IncrementalTests() : base( - Path.Combine(AppContext.BaseDirectory, "TestProjects", "TestSimpleIncrementalApp"), + Path.Combine(AppContext.BaseDirectory, "TestAssets", "TestProjects", "TestSimpleIncrementalApp"), "TestSimpleIncrementalApp", "Hello World!" + Environment.NewLine) { diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 6e76f2a16..bd6764fee 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -21,9 +21,9 @@ }, "content": [ - "../TestProjects/TestSimpleIncrementalApp/*", - "../TestProjects/TestProjectToProjectDependencies/**/*", - "../TestProjects/global.json" + "../../TestAssets/TestProjects/TestSimpleIncrementalApp/*", + "../../TestAssets/TestProjects/TestProjectToProjectDependencies/**/*", + "../../TestAssets/TestProjects/global.json" ], "testRunner": "xunit" diff --git a/test/dotnet-compile.Tests/CompilerTests.cs b/test/dotnet-compile.Tests/CompilerTests.cs index 33036389c..aa140cb27 100644 --- a/test/dotnet-compile.Tests/CompilerTests.cs +++ b/test/dotnet-compile.Tests/CompilerTests.cs @@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests public CompilerTests() { - _testProjectsRoot = Path.Combine(AppContext.BaseDirectory, @"TestProjects"); + _testProjectsRoot = Path.Combine(AppContext.BaseDirectory, "TestAssets", "TestProjects"); } [Fact] diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 84c14e291..3acf043a2 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -21,9 +21,9 @@ }, "content": [ - "../TestProjects/TestLibraryWithAnalyzer/*", - "../TestProjects/TestLibrary/*", - "../TestProjects/global.json" + "../../TestAssets/TestProjects/TestLibraryWithAnalyzer/*", + "../../TestAssets/TestProjects/TestLibrary/*", + "../../TestAssets/TestProjects/global.json" ], "testRunner": "xunit" diff --git a/test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs b/test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs index 81efdceeb..a9d465ee5 100644 --- a/test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs +++ b/test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs @@ -17,7 +17,7 @@ namespace Microsoft.DotNet.Tools.Publish.Tests public PublishTests() { - _testProjectsRoot = Path.Combine(AppContext.BaseDirectory, @"TestProjects"); + _testProjectsRoot = Path.Combine(AppContext.BaseDirectory, "TestAssets", "TestProjects"); } public static IEnumerable PublishOptions diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 96c902eac..98ee231b1 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -22,12 +22,12 @@ }, "content": [ - "../TestProjects/TestApp/**/*", - "../TestProjects/TestLibrary/**/*", - "../TestProjects/CompileFail/**/*", - "../TestProjects/TestBindingRedirectGeneration/**/*", - "../TestProjects/TestAppCompilationContext/**/*", - "../TestProjects/TestAppWithContents/**/*" + "../../TestAssets/TestProjects/TestApp/**/*", + "../../TestAssets/TestProjects/TestLibrary/**/*", + "../../TestAssets/TestProjects/CompileFail/**/*", + "../../TestAssets/TestProjects/TestBindingRedirectGeneration/**/*", + "../../TestAssets/TestProjects/TestAppCompilationContext/**/*", + "../../TestAssets/TestProjects/TestAppWithContents/**/*" ], "testRunner": "xunit"