asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #41790 from alexdlm/fix-csproj-read

Browse source 
Handle csproj "Remove" globs
This commit is contained in:
Rémi Verschelde 2020-09-06 08:42:08 +02:00 • committed by GitHub
commit da588226a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs
View file

@ -23,6 +23,9 @@ namespace GodotTools.Core
public static string NormalizePath(this string path) public static string NormalizePath(this string path)
{ {
if (string.IsNullOrEmpty(path))
return path;
bool rooted = path.IsAbsolutePath(); bool rooted = path.IsAbsolutePath();
path = path.Replace('\\', '/'); path = path.Replace('\\', '/');

5
modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs
View file

@ -61,10 +61,9 @@ namespace GodotTools.ProjectEditor
if (item.ItemType != itemType) if (item.ItemType != itemType)
continue; continue;
string normalizedExclude = item.Exclude.NormalizePath(); string normalizedRemove = item.Remove.NormalizePath();
var glob = MSBuildGlob.Parse(normalizedExclude);
var glob = MSBuildGlob.Parse(normalizedRemove);
excluded.AddRange(includedFiles.Where(includedFile => glob.IsMatch(includedFile))); excluded.AddRange(includedFiles.Where(includedFile => glob.IsMatch(includedFile)));
} }