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

Fix Visual Studio project GUIDs getting randomized during regeneration

Browse Source
This commit is contained in:
Ari Vuollet
2023-09-27 20:16:46 +03:00
parent 0c00dc20a2
commit 22e5afdb6f
10 changed files with 59 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ namespace Flax.Build.Projects.VisualStudio
public override Guid ProjectTypeGuid => ProjectTypeGuids.Android;
/// <inheritdoc />
public override void Generate()
public override void Generate(string solutionPath)
{
var gen = (VisualStudioProjectGenerator)Generator;
var projectFileToolVersion = gen.ProjectFileToolVersion;
@@ -141,9 +141,10 @@ namespace Flax.Build.Projects.VisualStudio
/// </summary>
/// <param name="path">The path.</param>
/// <returns>The project ID.</returns>
public static Guid GetProjectGuid(string path)
public static Guid GetProjectGuid(string path, string projectName)
{
if (File.Exists(path))
// Look up for the guid in VC++-project file
if (File.Exists(path) && Path.GetExtension(path).Equals(".vcxproj", StringComparison.OrdinalIgnoreCase))
{
try
{
@@ -161,8 +162,25 @@ namespace Flax.Build.Projects.VisualStudio
// Hide errors
}
}
if (File.Exists(path) && Path.GetExtension(path).Equals(".sln", StringComparison.OrdinalIgnoreCase))
{
try
{
Regex projectRegex = new Regex(@"Project\(.*\) = \""(\S+)\"", \""(\S+)\"", \""{(\S+)}\""");
MatchCollection matches = projectRegex.Matches(File.ReadAllText(path));
for (int i = 0; i < matches.Count; i++)
{
if (matches[i].Groups[1].Value == projectName)
return Guid.ParseExact(matches[i].Groups[3].Value, "D");
}
}
catch
{
// Hide errors
}
}
return Guid.NewGuid();
return Guid.Empty;
}
/// <inheritdoc />
@@ -250,7 +268,7 @@ namespace Flax.Build.Projects.VisualStudio
}
}
// Try to extract info from the existing solution file to make random IDs stable
// Try to extract solution folder info from the existing solution file to make random IDs stable
var solutionId = Guid.NewGuid();
var folderIds = new Dictionary<string, Guid>();
if (File.Exists(solution.Path))
@@ -266,16 +284,12 @@ namespace Flax.Build.Projects.VisualStudio
solutionId = Guid.ParseExact(value.Substring(15), "B");
}
var folderIdsMatch = Regex.Match(contents, "Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"(.*?)\", \"(.*?)\", \"{(.*?)}\"");
if (folderIdsMatch.Success)
var folderIdMatches = new Regex("Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"(.*?)\", \"(.*?)\", \"{(.*?)}\"").Matches(contents);
foreach (Match match in folderIdMatches)
{
foreach (Capture capture in folderIdsMatch.Captures)
{
var value = capture.Value.Substring("Project(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\") = \"".Length);
var folder = value.Substring(0, value.IndexOf('\"'));
var folderId = Guid.ParseExact(value.Substring(folder.Length * 2 + "\", \"".Length + "\", \"".Length, 38), "B");
folderIds["Source\\" + folder] = folderId;
}
var folder = match.Groups[1].Value;
var folderId = Guid.ParseExact(match.Groups[3].Value, "D");
folderIds[folder] = folderId;
}
}
catch (Exception ex)