diff options
| author | Alex de la Mare <alexdlm@alexdlm.org> | 2020-09-05 21:29:04 +1000 |
|---|---|---|
| committer | Alex de la Mare <alexdlm@alexdlm.org> | 2020-09-06 11:34:04 +1000 |
| commit | 8dbd7155b568925456e44f6faecb1f17664e49ca (patch) | |
| tree | ee80d9b960a94c2aeae386fa9b6711ee60346eb3 /modules/mono/editor | |
| parent | 52f6ac81be14fe3f7dacb2e2b75d9bf9a668b628 (diff) | |
Handle csproj "Remove" globs
MSBuild Item returns empty strings if an attribute isn't set (which
caused an IndexOutOfRangeException in NormalizePath).
We were treating Excludes incorrectly, Remove directives provide the
intended behaviour in the auto-including csproj format.
Diffstat (limited to 'modules/mono/editor')
| -rw-r--r-- | modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs | 3 | ||||
| -rw-r--r-- | modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs b/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs index ae2dbbf58d..05e06babd4 100644 --- a/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs +++ b/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs @@ -23,6 +23,9 @@ namespace GodotTools.Core public static string NormalizePath(this string path) { + if (string.IsNullOrEmpty(path)) + return path; + bool rooted = path.IsAbsolutePath(); path = path.Replace('\\', '/'); diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs index 4041c56597..4e2c0f17cc 100644 --- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs +++ b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs @@ -61,10 +61,9 @@ namespace GodotTools.ProjectEditor if (item.ItemType != itemType) continue; - string normalizedExclude = item.Exclude.NormalizePath(); - - var glob = MSBuildGlob.Parse(normalizedExclude); + string normalizedRemove = item.Remove.NormalizePath(); + var glob = MSBuildGlob.Parse(normalizedRemove); excluded.AddRange(includedFiles.Where(includedFile => glob.IsMatch(includedFile))); } |