GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix invalid Visual Studio solution folder nesting

Browse Source 
Fixes fatal error when loading generated solution files with Rider, also
fixes folders with identical names getting mapped to same folder
(Plugins folders within plugin projects).
This commit is contained in:
Ari Vuollet
2024-01-08 20:45:10 +02:00
parent 0b7c187630
commit 9fd7a231ca
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs
View File

@@ -296,7 +296,7 @@ namespace Flax.Build.Projects.VisualStudio
var folderIdMatches = new Regex("Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"(.*?)\", \"(.*?)\", \"{(.*?)}\"").Matches(contents); var folderIdMatches = new Regex("Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"(.*?)\", \"(.*?)\", \"{(.*?)}\"").Matches(contents);
foreach (Match match in folderIdMatches) foreach (Match match in folderIdMatches)
{ {
var folder = match.Groups[1].Value; var folder = match.Groups[2].Value;
var folderId = Guid.ParseExact(match.Groups[3].Value, "D"); var folderId = Guid.ParseExact(match.Groups[3].Value, "D");
folderIds[folder] = folderId; folderIds[folder] = folderId;
} }
@@ -385,7 +385,6 @@ namespace Flax.Build.Projects.VisualStudio
{ {
if (!folderIds.TryGetValue(folderPath, out project.FolderGuid)) if (!folderIds.TryGetValue(folderPath, out project.FolderGuid))
{ {
if (!folderIds.TryGetValue(folderParents[i], out project.FolderGuid))
project.FolderGuid = Guid.NewGuid(); project.FolderGuid = Guid.NewGuid();
folderIds.Add(folderPath, project.FolderGuid); folderIds.Add(folderPath, project.FolderGuid);
} }
@@ -401,7 +400,7 @@ namespace Flax.Build.Projects.VisualStudio
var lastSplit = folder.LastIndexOf('\\'); var lastSplit = folder.LastIndexOf('\\');
var name = lastSplit != -1 ? folder.Substring(lastSplit + 1) : folder; var name = lastSplit != -1 ? folder.Substring(lastSplit + 1) : folder;
vcSolutionFileContent.AppendLine(string.Format("Project(\"{0}\") = \"{1}\", \"{2}\", \"{3}\"", typeGuid, name, name, folderGuid)); vcSolutionFileContent.AppendLine(string.Format("Project(\"{0}\") = \"{1}\", \"{2}\", \"{3}\"", typeGuid, name, folder, folderGuid));
vcSolutionFileContent.AppendLine("EndProject"); vcSolutionFileContent.AppendLine("EndProject");
} }
} }