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

Fix Visual Studio project folder GUIDs randomization during regeneration

Browse Source
This commit is contained in:
Ari Vuollet
2023-09-30 03:25:58 +03:00
parent fd3f10864b
commit 6483f95450
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,12 +166,14 @@ namespace Flax.Build.Projects.VisualStudio
{ {
try try
{ {
Regex projectRegex = new Regex(@"Project\(.*\) = \""(\S+)\"", \""(\S+)\"", \""{(\S+)}\"""); Regex projectRegex = new Regex(@"Project\(""{(\S+)}""\) = \""(\S+)\"", \""(\S+)\"", \""{(\S+)}\""");
MatchCollection matches = projectRegex.Matches(File.ReadAllText(path)); MatchCollection matches = projectRegex.Matches(File.ReadAllText(path));
for (int i = 0; i < matches.Count; i++) for (int i = 0; i < matches.Count; i++)
{ {
if (matches[i].Groups[1].Value == projectName) if (matches[i].Groups[1].Value.Equals("2150E333-8FDC-42A3-9474-1A3956D46DE8", StringComparison.OrdinalIgnoreCase))
return Guid.ParseExact(matches[i].Groups[3].Value, "D"); continue;
if (matches[i].Groups[2].Value == projectName)
return Guid.ParseExact(matches[i].Groups[4].Value, "D");
} }
} }
catch catch
@@ -376,7 +378,8 @@ namespace Flax.Build.Projects.VisualStudio
{ {
if (!folderIds.TryGetValue(folderPath, out project.FolderGuid)) if (!folderIds.TryGetValue(folderPath, out project.FolderGuid))
{ {
project.FolderGuid = Guid.NewGuid(); if (!folderIds.TryGetValue(folderParents[i], out project.FolderGuid))
project.FolderGuid = Guid.NewGuid();
folderIds.Add(folderPath, project.FolderGuid); folderIds.Add(folderPath, project.FolderGuid);
} }
folderNames.Add(folderPath); folderNames.Add(folderPath);