mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #4327 from livarcocc/update_toolsref

Browse source 
Fixing the tools item name in csproj. Nuget used a different one then…
This commit is contained in:
Livar 2016-10-05 16:12:13 -07:00 • committed by GitHub
commit 09e8877bd4
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
View file

@ -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" />

2
src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs
View file

@ -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)

2
src/dotnet/CommandResolution/MSBuildProject.cs
View file

@ -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"),

2
test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs
View file

@ -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);