Add support to migrate folders specified in global.json

Sridhar-MS · Sridhar-MS · commit 56b0e38512c5 · 2016-10-04T22:13:52.000-07:00
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/global.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/global.json
@@ -0,0 +1,4 @@
+
+{
+    "projects": [ "src", "src with spaces", "src without projects" ]
+}
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/.noautobuild
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/Program.cs b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/Program.cs
@@ -0,0 +1,19 @@
+﻿// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+
+namespace TestApp
+{
+    public class Program
+    {
+        public static int Main(string[] args)
+        {
+            Console.WriteLine("This string came from ProjectJ");
+            string helperStr = TestLibrary.ProjectI.GetMessage();
+            Console.WriteLine(helperStr);
+            return 0;
+        }
+    }
+}
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json
@@ -0,0 +1,20 @@
+{
+  "version": "1.0.0-*",
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
+  },
+  "dependencies": {
+    "ProjectI": {
+      "target": "project",
+      "version": "1.0.0-*"
+    },
+    "Microsoft.NETCore.App": {
+      "type": "platform",
+      "version": "1.0.1"
+    }
+  },
+  "frameworks": {
+    "netcoreapp1.0": {}
+  }
+}
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/.noautobuild
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/Program.cs b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/Program.cs
@@ -0,0 +1,19 @@
+﻿// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+
+namespace TestApp
+{
+    public class Program
+    {
+        public static int Main(string[] args)
+        {
+            Console.WriteLine("This string came from ProjectH");
+            string helperStr = TestLibrary.ProjectI.GetMessage();
+            Console.WriteLine(helperStr);
+            return 0;
+        }
+    }
+}
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json
@@ -0,0 +1,20 @@
+{
+  "version": "1.0.0-*",
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
+  },
+  "dependencies": {
+    "ProjectI": {
+      "target": "project",
+      "version": "1.0.0-*"
+    },
+    "Microsoft.NETCore.App": {
+      "type": "platform",
+      "version": "1.0.1"
+    }
+  },
+  "frameworks": {
+    "netcoreapp1.0": {}
+  }
+}
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/.noautobuild
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/Helper.cs b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/Helper.cs
@@ -0,0 +1,15 @@
+﻿// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace TestLibrary
+{
+    public static class ProjectI
+    {
+        public static string GetMessage()
+        {
+            return "This string came from ProjectI";
+        }
+    }
+}
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/project.json
@@ -0,0 +1,18 @@
+{
+  "version": "1.0.0-*",
+  "buildOptions": {
+    "nowarn": [
+      "CS1591"
+    ],
+    "xmlDoc": true,
+    "additionalArguments": [
+      "-highentropyva+"
+    ]
+  },
+  "dependencies": {
+    "NETStandard.Library": "1.6.0"
+  },
+  "frameworks": {
+    "netstandard1.5": {}
+  }
+}
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs b/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs
@@ -269,7 +269,7 @@ private static List<ProjectDependency> GetPotentialProjects(IEnumerable<string>
             return projects;
         }
 
-        private static List<string> GetGlobalPaths(string rootPath)
+        public static List<string> GetGlobalPaths(string rootPath)
         {
             var paths = new List<string>();
 
diff --git a/src/dotnet/commands/dotnet-migrate/MigrateCommand.cs b/src/dotnet/commands/dotnet-migrate/MigrateCommand.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using Microsoft.Build.Construction;
 using Microsoft.DotNet.ProjectJsonMigration;
 using Microsoft.DotNet.ProjectModel;
@@ -46,7 +47,7 @@ public int Execute()
                 Console.WriteLine($"Migrating project {project}..");
                 var projectDirectory = Path.GetDirectoryName(project);
                 var outputDirectory = projectDirectory;
-                var migrationSettings = new MigrationSettings(projectDirectory, outputDirectory, sdkVersion, msBuildTemplate, _xprojFilePath);
+                var migrationSettings = new MigrationSettings(projectDirectory, outputDirectory, sdkVersion, msBuildTemplate.DeepClone(), _xprojFilePath);
                 new ProjectMigrator().Migrate(migrationSettings, _skipProjectReferences);
             }
 
@@ -55,22 +56,33 @@ public int Execute()
 
         private IEnumerable<string> GetProjectsToMigrate(string projectArg)
         {
-            if (projectArg.EndsWith(Project.FileName))
+            IEnumerable<string> projects = null;
+
+            if (projectArg.EndsWith(Project.FileName, StringComparison.OrdinalIgnoreCase))
+            {
+                projects = Enumerable.Repeat(projectArg, 1);
+            }
+            else if (projectArg.EndsWith(GlobalSettings.FileName, StringComparison.OrdinalIgnoreCase))
             {
-                yield return GetProjectJsonPath(projectArg);
+                projects =  GetProjectsFromGlobalJson(projectArg);
             }
             else if (Directory.Exists(projectArg))
             {
-                var projects = Directory.EnumerateFiles(projectArg, Project.FileName, SearchOption.AllDirectories);
-
-                foreach(var project in projects)
-                {
-                    yield return GetProjectJsonPath(project);
-                }
+                projects = Directory.EnumerateFiles(projectArg, Project.FileName, SearchOption.AllDirectories);
             }
             else
             {
-                throw new Exception($"Invalid project argument - '{projectArg}' is not a project.json file and a directory named '{projectArg}' doesn't exist.");
+                throw new Exception($"Invalid project argument - '{projectArg}' is not a project.json or a global.json file and a directory named '{projectArg}' doesn't exist.");
+            }
+
+            if (!projects.Any())
+            {
+                throw new Exception($"Invalid project argument - Unable to find any projects in global.json or directory '{projectArg}'");
+            }
+
+            foreach(var project in projects)
+            {
+                yield return GetProjectJsonPath(project);
             }
         }
 
@@ -93,5 +105,35 @@ private string GetProjectJsonPath(string projectJson)
 
             throw new Exception($"Unable to find project file at {projectJson}");
         }
+
+        private IEnumerable<string> GetProjectsFromGlobalJson(string globalJson)
+        {
+            if (!File.Exists(globalJson))
+            {
+                throw new Exception($"Unable to find global settings file at {globalJson}");
+            }
+
+            var searchPaths = ProjectDependencyFinder.GetGlobalPaths(Path.GetDirectoryName(globalJson));
+
+            foreach (var searchPath in searchPaths)
+            {
+                var directory = new DirectoryInfo(searchPath);
+
+                if (!directory.Exists)
+                {
+                    continue;
+                }
+
+                foreach (var projectDirectory in directory.EnumerateDirectories())
+                {
+                    var projectFilePath = Path.Combine(projectDirectory.FullName, "project.json");
+
+                    if (File.Exists(projectFilePath))
+                    {
+                        yield return projectFilePath;
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/src/dotnet/commands/dotnet-migrate/Program.cs b/src/dotnet/commands/dotnet-migrate/Program.cs
@@ -20,10 +20,14 @@ public static int Run(string[] args)
             app.HandleResponseFiles = true;
             app.HelpOption("-h|--help");
 
-            CommandArgument projectArgument = app.Argument("<PROJECT_JSON/PROJECT_DIR>",
-                "The path to project.json file or a directory to migrate." +
-                " If a directory is specified, then it will recursively search for project.json files to migrate." +
-                " Defaults to current directory if nothing is specified.");
+            CommandArgument projectArgument = app.Argument("<PROJECT_JSON/GLOBAL_JSON/PROJECT_DIR>",
+                "The path to " + Environment.NewLine +
+                " - a project.json file to migrate." + Environment.NewLine +
+                "or" + Environment.NewLine +
+                " - a global.json file, it will migrate the folders specified in global.json." + Environment.NewLine +
+                "or" + Environment.NewLine +
+                " - a directory to migrate, it will recursively search for project.json files to migrate." + Environment.NewLine +
+                "Defaults to current directory if nothing is specified.");
 
             CommandOption template = app.Option("-t|--template-file", "Base MSBuild template to use for migrated app. The default is the project included in dotnet new -t msbuild", CommandOptionType.SingleValue);
             CommandOption sdkVersion = app.Option("-v|--sdk-package-version", "The version of the sdk package that will be referenced in the migrated app. The default is the version of the sdk in dotnet new -t msbuild", CommandOptionType.SingleValue);
diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +{
 +    "projects": [ "src", "src with spaces", "src without projects" ]
 +}