From bfc1f82d681cffbf8ff9366ff003a68222c6ad29 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Wed, 5 Oct 2016 15:27:30 -0700
Subject: [PATCH] Fixing the tools item name in csproj. Nuget used a different
 one then was originally at the spec.

---
 TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj  | 4 ++--
 .../Rules/MigratePackageDependenciesAndToolsRule.cs           | 2 +-
 src/dotnet/CommandResolution/MSBuildProject.cs                | 2 +-
 .../Rules/GivenThatIWantToMigratePackageDependencies.cs       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
index 76636daba..6b0d11806 100644
--- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
+++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
@@ -22,9 +22,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <DotNetCliToolsReference Include="dotnet-portable">
+    <DotNetCliToolReference Include="dotnet-portable">
       <Version>1.0.0</Version>
-    </DotNetCliToolsReference>
+    </DotNetCliToolReference>
   </ItemGroup>
 
   <Import Project="$(MSBuildExtensionsPath)\Microsoft.CSharp.targets" />
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs
index a637dcc5a..65dac4a93 100644
--- a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs
+++ b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs
@@ -233,7 +233,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
             .WithMetadata("Version", r => r.Version);
 
         private AddItemTransform<ProjectLibraryDependency> ToolTransform => new AddItemTransform<ProjectLibraryDependency>(
-            "DotNetCliToolsReference",
+            "DotNetCliToolReference",
             dep => dep.Name,
             dep => "",
             dep => true)
diff --git a/src/dotnet/CommandResolution/MSBuildProject.cs b/src/dotnet/CommandResolution/MSBuildProject.cs
index 94d4bf4d7..459dc4081 100644
--- a/src/dotnet/CommandResolution/MSBuildProject.cs
+++ b/src/dotnet/CommandResolution/MSBuildProject.cs
@@ -36,7 +36,7 @@ namespace Microsoft.DotNet.Cli.CommandResolution
 
         public IEnumerable<SingleProjectInfo> GetTools()
         {
-            var toolsReferences = _project.AllEvaluatedItems.Where(i => i.ItemType.Equals("DotNetCliToolsReference"));
+            var toolsReferences = _project.AllEvaluatedItems.Where(i => i.ItemType.Equals("DotNetCliToolReference"));
             var tools = toolsReferences.Select(t => new SingleProjectInfo(
                 t.EvaluatedInclude,
                 t.GetMetadataValue("Version"),
diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs
index a4562cbad..36ca01a99 100644
--- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs
+++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs
@@ -67,7 +67,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
                 var packageVersion = toolSpec.Item2;
 
                 var items = mockProj.Items
-                    .Where(i => i.ItemType == "DotNetCliToolsReference")
+                    .Where(i => i.ItemType == "DotNetCliToolReference")
                     .Where(i => i.Include == packageName)
                     .Where(i => i.GetMetadataWithName("Version").Value == packageVersion);