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

normalize slashes and casing when comparing includes

Browse source
This commit is contained in:
Krzysztof Wicher 2016-11-29 12:47:27 -08:00
parent 4e3c73e778
commit 6a703ffa73
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/dotnet/MsbuildProjectExtensions.cs
View file

@ -66,7 +66,16 @@ namespace Microsoft.DotNet.Tools
public static bool HasInclude(this ProjectItemElement el, string include)
{
return el.Includes().Contains(include);
include = NormalizeIncludeForComparison(include);
foreach (var i in el.Includes())
{
if (include == NormalizeIncludeForComparison(i))
{
return true;
}
}
return false;
}
private static bool TryGetFrameworkConditionString(string framework, out string condition)
@ -80,5 +89,10 @@ namespace Microsoft.DotNet.Tools
condition = $"'$(TargetFramework)' == '{framework}'";
return true;
}
private static string NormalizeIncludeForComparison(string include)
{
return P2PHelpers.NormalizeSlashesForMsbuild(include.ToLower());
}
}
}

3
src/dotnet/commands/dotnet-add-p2p/Program.cs
View file

@ -3,10 +3,7 @@
using Microsoft.DotNet.Cli.CommandLine;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.Build.Construction;
using Microsoft.DotNet.Tools.Common;
using System.Collections.Generic;
using System.IO;
namespace Microsoft.DotNet.Tools.Add.ProjectToProjectReference
{

3
src/dotnet/commands/dotnet-remove-p2p/Program.cs
View file

@ -3,10 +3,7 @@
using Microsoft.DotNet.Cli.CommandLine;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.Build.Construction;
using Microsoft.DotNet.Tools.Common;
using System.Collections.Generic;
using System.IO;
namespace Microsoft.DotNet.Tools.Remove.ProjectToProjectReference
{