Fix P2P migration and migrate folders in global.json

TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj

@@ -0,0 +1,17 @@
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v1.5</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
+    <EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
+    <None Include="project.json" />
+  </ItemGroup>
+
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/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 ProjectC
+    {
+        public static string GetMessage()
+        {
+            return "This string came from CsprojLibrary1";
+        }
+    }
+}

TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json

@@ -0,0 +1,11 @@
+{
+  "dependencies": {},
+  "frameworks": {
+    "netstandard1.5": {
+      "dependencies": {
+        "Microsoft.NETCore.Sdk": "1.0.0-alpha-20160923-4",
+        "NETStandard.Library": "1.6.0"
+      }
+    }
+  }
+}

TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj

@@ -0,0 +1,17 @@
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v1.5</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
+    <EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
+    <None Include="project.json" />
+  </ItemGroup>
+
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/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 ProjectC
+    {
+        public static string GetMessage()
+        {
+            return "This string came from CsprojLibrary2";
+        }
+    }
+}

TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json

@@ -0,0 +1,11 @@
+{
+  "dependencies": {},
+  "frameworks": {
+    "netstandard1.5": {
+      "dependencies": {
+        "Microsoft.NETCore.Sdk": "1.0.0-alpha-20160923-4",
+        "NETStandard.Library": "1.6.0"
+      }
+    }
+  }
+}

TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj

@@ -0,0 +1,17 @@
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v1.5</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
+    <EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
+    <None Include="project.json" />
+  </ItemGroup>
+
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/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 ProjectC
+    {
+        public static string GetMessage()
+        {
+            return "This string came from CsprojLibrary3";
+        }
+    }
+}

TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json

@@ -0,0 +1,11 @@
+{
+  "dependencies": {},
+  "frameworks": {
+    "netstandard1.5": {
+      "dependencies": {
+        "Microsoft.NETCore.Sdk": "1.0.0-alpha-20160923-4",
+        "NETStandard.Library": "1.6.0"
+      }
+    }
+  }
+}

TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/Program.cs

@@ -11,7 +11,7 @@ public class Program
         public static int Main(string[] args)
         {
             Console.WriteLine("This string came from ProjectA");
-            return 100;
+            return 0;
         }
     }
 }

TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/ProjectC.xproj

@@ -16,8 +16,8 @@
    <SchemaVersion>2.0</SchemaVersion>
  </PropertyGroup>
  <ItemGroup>
-   <ProjectReference Include="..\..\ClassLibrary1\ClassLibrary1.csproj" />
-   <ProjectReference Include="..\..\ClassLibrary2\ClassLibrary2.csproj" />
+   <ProjectReference Include="..\CsprojLibrary1\CsprojLibrary1.csproj" />
+   <ProjectReference Include="..\CsprojLibrary2\CsprojLibrary2.csproj" />
  </ItemGroup>
  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/project.json.1 → TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/project.json

@@ -18,10 +18,10 @@
       "target": "project",
       "version": "1.0.0-*"
     },
-    "ClassLibrary1": {
+    "CsprojLibrary1": {
       "target": "project"
     },
-    "ClassLibrary2": {
+    "CsprojLibrary2": {
       "target": "project"
     },
     "NETStandard.Library": "1.6.0"

TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/ProjectE.xproj

@@ -16,8 +16,8 @@
    <SchemaVersion>2.0</SchemaVersion>
  </PropertyGroup>
  <ItemGroup>
-   <ProjectReference Include="..\..\ClassLibrary2\ClassLibrary2.csproj" />
-   <ProjectReference Include="..\..\ClassLibrary3\ClassLibrary3.csproj" />
+   <ProjectReference Include="..\CsprojLibrary2\CsprojLibrary2.csproj" />
+   <ProjectReference Include="..\CsprojLibrary3\CsprojLibrary3.csproj" />
  </ItemGroup>
  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/project.json.1 → TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/project.json

@@ -10,10 +10,10 @@
     ]
   },
   "dependencies": {
-    "ClassLibrary2": {
+    "CsprojLibrary2": {
       "target": "project"
     },
-    "ClassLibrary3": {
+    "CsprojLibrary3": {
       "target": "project"
     },
     "NETStandard.Library": "1.6.0"

TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/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 ProjectF");
+            string helperStr = TestLibrary.ProjectG.GetMessage();
+            Console.WriteLine(helperStr);
+            return 0;
+        }
+    }
+}

TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json

@@ -0,0 +1,20 @@
+{
+  "version": "1.0.0-*",
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
+  },
+  "dependencies": {
+    "ProjectG": {
+      "target": "project",
+      "version": "1.0.0-*"
+    },
+    "Microsoft.NETCore.App": {
+      "type": "platform",
+      "version": "1.0.1"
+    }
+  },
+  "frameworks": {
+    "netcoreapp1.0": {}
+  }
+}

TestAssets/TestProjects/TestAppDependencyGraph/ProjectG/Helper.cs

@@ -5,7 +5,7 @@
 
 namespace TestLibrary
 {
-    public static class ProjectE
+    public static class ProjectG
     {
         public static string GetMessage()
         {

TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/global.json

@@ -0,0 +1,4 @@
+
+{
+    "projects": [ "src", "src with spaces", "src without projects" ]
+}

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;
+        }
+    }
+}

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": {}
+  }
+}

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;
+        }
+    }
+}

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": {}
+  }
+}

TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/Helper.cs → TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/Helper.cs

@@ -5,11 +5,11 @@
 
 namespace TestLibrary
 {
-    public static class ProjectE
+    public static class ProjectI
     {
         public static string GetMessage()
         {
-            return "This string came from ProjectF";
+            return "This string came from ProjectI";
         }
     }
 }

TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json.1 → TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/project.json

@@ -10,10 +10,6 @@
     ]
   },
   "dependencies": {
-    "ProjectG": {
-      "target": "project",
-      "version": "1.0.0-*"
-    },
     "NETStandard.Library": "1.6.0"
   },
   "frameworks": {

src/Microsoft.DotNet.ProjectJsonMigration/MigrationSettings.cs

@@ -23,7 +23,7 @@ public MigrationSettings(
             ProjectDirectory = projectDirectory;
             OutputDirectory = outputDirectory;
             SdkPackageVersion = sdkPackageVersion;
-            MSBuildProjectTemplate = msBuildProjectTemplate;
+            MSBuildProjectTemplate = msBuildProjectTemplate != null ? msBuildProjectTemplate.DeepClone() : null;
             ProjectXProjFilePath = projectXprojFilePath;
         }
     }