Merge branch 'rel/1.0.0' into localization

TestAssets/TestProjects/AppWithPackageNamedAfterFolder/App.Tests/EntityFramework/Program.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace App.Tests
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            Console.WriteLine("Hello World!");
+        }
+    }
+}

TestAssets/TestProjects/AppWithPackageNamedAfterFolder/App.Tests/project.json

@@ -0,0 +1,19 @@
+{
+  "frameworks": {
+    "netcoreapp1.0": {
+      "imports": [
+        "portable-net451+win8",
+        "dnxcore50"
+      ],
+      "buildOptions": {
+        "define": [ "ASYNC", "COREFX", "XUNIT2", "SQLITE" ]
+      },
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0",
+          "type": "platform"
+        }
+      }
+    }
+  }
+}

TestAssets/TestProjects/AppWithPackageNamedAfterFolder/App/project.json

@@ -0,0 +1,31 @@
+{
+  "frameworks": {
+    "net40": {
+      "frameworkAssemblies": {
+        "System.Configuration": "4.0.0.0",
+        "System.Data": "4.0.0.0",
+        "System.Data.Linq": "4.0.0.0",
+        "System.Xml": "4.0.0.0"
+      },
+      "dependencies": {
+        "EntityFramework": "6.1.3",
+        "Microsoft.SqlServer.Types": "11.0.2"
+      }
+    },
+    "net45": {
+      "buildOptions": {
+        "define": [ "ASYNC" ]
+      },
+      "frameworkAssemblies": {
+        "System.Configuration": "4.0.0.0",
+        "System.Data": "4.0.0.0",
+        "System.Data.Linq": "4.0.0.0",
+        "System.Xml": "4.0.0.0"
+      },
+      "dependencies": {
+        "EntityFramework": "6.1.3",
+        "Microsoft.SqlServer.Types": "11.0.2"
+      }
+    }
+  }
+}

TestAssets/TestProjects/AppWithPackageNamedAfterFolder/global.json

@@ -0,0 +1,6 @@
+{
+  "projects": [
+    "App",
+    "App.Tests"
+  ]
+}

src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs

@@ -316,24 +316,25 @@ namespace Microsoft.DotNet.ProjectJsonMigration
                 foreach (var projectDirectory in
                     Enumerable.Repeat(directory, 1).Union(directory.GetDirectories()))
                 {
-                    // Create the path to the project.json file.
+                    AddIfProjectExists(projects, projectDirectory);
-                    var projectFilePath = Path.Combine(projectDirectory.FullName, "project.json");
-
-                    // We INTENTIONALLY do not do an exists check here because it requires disk I/O
-                    // Instead, we'll do an exists check when we try to resolve
-
-                    // Check if we've already added this, just in case it was pre-loaded into the cache
-                    var project = new ProjectDependency(
-                        projectDirectory.Name,
-                        projectFilePath);
-
-                    projects.Add(project);
                 }
             }
 
             return projects;
         }
 
+        private static void AddIfProjectExists(List<ProjectDependency> projects, DirectoryInfo projectDirectory)
+        {
+            var projectJSONFilePath = Path.Combine(projectDirectory.FullName, "project.json");
+            var csProjFilePath = Path.Combine(projectDirectory.FullName, $"{projectDirectory.Name}.csproj");
+
+            if (File.Exists(projectJSONFilePath) || File.Exists(csProjFilePath))
+            {
+                var project = new ProjectDependency(projectDirectory.Name, projectJSONFilePath);
+                projects.Add(project);
+            }
+        }
+
         internal static List<string> GetGlobalPaths(string rootPath)
         {
             var paths = new List<string>();

test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs

@@ -163,6 +163,21 @@ namespace Microsoft.DotNet.Migration.Tests
             PublishMSBuild(projectDirectory, projectName);
         }
 
+        [Fact]
+        public void ItMigratesAPackageReferenceAsSuchEvenIfAFolderWithTheSameNameExistsInTheRepo()
+        {
+            var solutionDirectory =
+                TestAssetsManager.CreateTestInstance("AppWithPackageNamedAfterFolder").Path;
+            var appProject = Path.Combine(solutionDirectory, "App", "App.csproj");
+
+            MigrateProject(solutionDirectory);
+
+            var projectRootElement = ProjectRootElement.Open(appProject);
+            projectRootElement.Items.Where(
+                i => i.Include == "EntityFramework" && i.ItemType == "PackageReference")
+                .Should().HaveCount(2);
+        }
+
         [Fact]
         public void ItAddsMicrosoftNetWebSdkToTheSdkAttributeOfAWebApp()
         {