Prevent dnu restore logic from diving in nested project folder

Author: troydai

misc/NestProjectRestoreModel/global.json

@@ -0,0 +1,3 @@
+{
+  "projects": ["src"]
+}

misc/NestProjectRestoreModel/src/Main/Nest/project.json

@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "dnx451": { }
+  },
+  "dependencies": {
+    "Newtonsoft.Json": "6.0.8"
+  }
+}

misc/NestProjectRestoreModel/src/Main/project.json

@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "dnx451": { }
+  },
+  "dependencies": {
+    "Newtonsoft.Json": "6.0.8"
+  }
+}

src/Microsoft.Dnx.Tooling/Restore/RestoreCommand.cs

@@ -92,33 +92,8 @@ private async Task<bool> Execute(string restoreDirectory, PackageFeedCache packa
             {
                 var sw = Stopwatch.StartNew();
 
-                var projectJsonFiles = new List<string>();
-
-                if (string.Equals(
-                    Runtime.Project.ProjectFileName,
-                    Path.GetFileName(restoreDirectory),
-                    StringComparison.OrdinalIgnoreCase) && File.Exists(restoreDirectory))
-                {
-                    // If the path is a project.json file we don't do recursive search in subfolders
-                    projectJsonFiles.Add(restoreDirectory);
-                }
-                else if (Directory.Exists(restoreDirectory))
-                {
-                    var projectJsonFile = Path.Combine(restoreDirectory, Runtime.Project.ProjectFileName);
-                    if (File.Exists(projectJsonFile))
-                    {
-                        // If the path contains a project.json file we don't do recursive search in subfolders
-                        projectJsonFiles.Add(projectJsonFile);
-                    }
-                    else
-                    {
-                        projectJsonFiles.AddRange(Directory.EnumerateFiles(
-                            restoreDirectory,
-                            Runtime.Project.ProjectFileName,
-                            SearchOption.AllDirectories));
-                    }
-                }
-                else
+                IEnumerable<string> projectJsonFiles;
+                if (!RestoreProjectsCollector.Find(restoreDirectory, out projectJsonFiles))
                 {
                     var errorMessage = $"The given root {restoreDirectory.Red().Bold()} is invalid.";
                     summary.ErrorMessages.GetOrAdd(restoreDirectory, _ => new List<string>()).Add(errorMessage);

src/Microsoft.Dnx.Tooling/Restore/RestoreProjectsCollector.cs

@@ -0,0 +1,54 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Microsoft.Dnx.Tooling
+{
+    internal class RestoreProjectsCollector
+    {
+        public static bool Find(string restoreDirectory, out IEnumerable<string> projectJsonFiles)
+        {
+            if (string.Equals(Runtime.Project.ProjectFileName,
+                              Path.GetFileName(restoreDirectory),
+                              StringComparison.OrdinalIgnoreCase) && File.Exists(restoreDirectory))
+            {
+                // If the path is a project.json file we don't do recursive search in subfolders
+                projectJsonFiles = new List<string> { restoreDirectory };
+
+                return true;
+            }
+
+            if (!Directory.Exists(restoreDirectory))
+            {
+                projectJsonFiles = Enumerable.Empty<string>();
+                return false;
+            }
+
+            var result = new List<string>();
+            CollectProjectFiles(restoreDirectory, result);
+
+            projectJsonFiles = result;
+            return true;
+        }
+
+        private static void CollectProjectFiles(string directory, List<string> results)
+        {
+            var candidate = Path.Combine(directory, Runtime.Project.ProjectFileName);
+            if (File.Exists(candidate))
+            {
+                results.Add(candidate);
+            }
+            else
+            {
+                foreach (var subdirectory in Directory.EnumerateDirectories(directory))
+                {
+                    CollectProjectFiles(subdirectory, results);
+                }
+            }
+        }
+    }
+}

test/Microsoft.Dnx.Tooling.FunctionalTests/DnuRestoreTests.cs

@@ -70,5 +70,22 @@ public void Restore_ProjectOverPackageTarget(DnxSdk sdk)
 
             TestUtils.CleanUpTestDir<DnuPublishTests>(sdk);
         }
+
+        [Theory, TraceTest]
+        [MemberData(nameof(DnxSdks))]
+        public void Restore_DoNotRestoreNestProjects(DnxSdk sdk)
+        {
+            var solution = TestUtils.GetSolution<DnuRestoreTests>(sdk, "NestProjectRestoreModel");
+
+            // ensure there is no lock file before restore
+            Assert.Empty(Directory.GetFiles(solution.RootPath, "project.lock.json", SearchOption.AllDirectories));
+
+            sdk.Dnu.Restore(solution.GetProject("Main")).EnsureSuccess();
+
+            // only the project.json under Main folder is expected to be restored
+            var lockFiles = Directory.GetFiles(solution.RootPath, "project.lock.json", SearchOption.AllDirectories);
+            Assert.Equal(1, lockFiles.Length);
+            Assert.Equal("Main", Path.GetFileName(Path.GetDirectoryName(lockFiles[0])));
+        }
     }
 }