Test directory refactoring step 1.

Moving TestProjects and TestPackages under root 'TestAssets' folder.

Partial fix #1250

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}

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"
 

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 {

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

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"

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

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"

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

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)
         {

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)
         {

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"

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]

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"

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<object[]> PublishOptions

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"