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

Merge pull request #59521 from raulsntos/csproj-globbing-3.x

Browse Source
This commit is contained in:
Rémi Verschelde 2022-03-25 20:40:11 +01:00 committed by GitHub
commit c18df50eb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs
View File

@ -108,8 +108,22 @@ namespace GodotTools.ProjectEditor
var normalizedInclude = include.NormalizePath(); var normalizedInclude = include.NormalizePath();
if (root.RemoveItemChecked(itemType, normalizedInclude)) var item = root.FindItemOrNullAbs(itemType, normalizedInclude);
root.Save();
// Couldn't find an existing item that matches to remove
if (item == null)
return;
var glob = MSBuildGlob.Parse(item.Include);
// If the item include uses globbing don't remove it
if (!string.IsNullOrEmpty(glob.WildcardDirectoryPart) || glob.FilenamePart.Contains("*"))
{
return;
}
item.Parent.RemoveChild(item);
root.Save();
} }
public static void RenameItemsToNewFolderInProjectChecked(string projectPath, string itemType, string oldFolder, string newFolder) public static void RenameItemsToNewFolderInProjectChecked(string projectPath, string itemType, string oldFolder, string newFolder)