godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41800 from alexdlm/fix-csproj-read-3.2 

[3.2] Handle csproj "Remove" globs
This commit is contained in:
Rémi Verschelde 2020-09-06 08:42:51 +02:00 committed by GitHub
parent 41b9e1d7ea 6474e036ac
commit 13e2e487a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 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

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