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

Fixing the tools item name in csproj. Nuget used a different one then was originally at the spec.

Browse source
This commit is contained in:
Livar Cunha 2016-10-05 15:27:30 -07:00
parent 6ad5a185cb
commit bfc1f82d68
4 changed files with 5 additions and 5 deletions
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>
<ItemGroup> <ItemGroup>
<DotNetCliToolsReference Include="dotnet-portable"> <DotNetCliToolReference Include="dotnet-portable">
<Version>1.0.0</Version> <Version>1.0.0</Version>
</DotNetCliToolsReference> </DotNetCliToolReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft.CSharp.targets" /> <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); .WithMetadata("Version", r => r.Version);
private AddItemTransform<ProjectLibraryDependency> ToolTransform => new AddItemTransform<ProjectLibraryDependency>( private AddItemTransform<ProjectLibraryDependency> ToolTransform => new AddItemTransform<ProjectLibraryDependency>(
"DotNetCliToolsReference", "DotNetCliToolReference",
dep => dep.Name, dep => dep.Name,
dep => "", dep => "",
dep => true) dep => true)

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

@ -36,7 +36,7 @@ namespace Microsoft.DotNet.Cli.CommandResolution
public IEnumerable<SingleProjectInfo> GetTools() 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( var tools = toolsReferences.Select(t => new SingleProjectInfo(
t.EvaluatedInclude, t.EvaluatedInclude,
t.GetMetadataValue("Version"), 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 packageVersion = toolSpec.Item2;
var items = mockProj.Items var items = mockProj.Items
.Where(i => i.ItemType == "DotNetCliToolsReference") .Where(i => i.ItemType == "DotNetCliToolReference")
.Where(i => i.Include == packageName) .Where(i => i.Include == packageName)
.Where(i => i.GetMetadataWithName("Version").Value == packageVersion); .Where(i => i.GetMetadataWithName("Version").Value == packageVersion);