Always honor ProjectGuid, if provided (#615)

* Always honor ProjectGuid, if provided * Upgrade System.Text.Json (#616) Co-authored-by: Snorri Gislason <[email protected]> * Always honor ProjectGuid, if provided * Don't require ProjectGuid for legacy projects --------- Co-authored-by: Snorri Gislason <[email protected]>
microsoft · Oct 9, 2024 · a4a2396 · a4a2396
1 parent e322bb9
commit a4a2396
Showing 1 changed file with 20 additions and 17 deletions.
diff --git a/src/Microsoft.VisualStudio.SlnGen/SlnProject.cs b/src/Microsoft.VisualStudio.SlnGen/SlnProject.cs
@@ -293,25 +293,28 @@ internal static bool GetIsDeployable(Project project, string projectFileExtensio
         /// <returns>The GUID of the specified project.</returns>
         internal static Guid GetProjectGuid(Project project, bool isUsingMicrosoftNETSdk)
         {
-            Guid projectGuid = Guid.NewGuid();
+            Guid projectGuid;
 
-            if (!isUsingMicrosoftNETSdk && !Guid.TryParse(project.GetPropertyValueOrDefault(MSBuildPropertyNames.ProjectGuid, projectGuid.ToString()), out projectGuid))
-            {
-                string projectGuidValue = project.GetPropertyValueOrDefault(MSBuildPropertyNames.ProjectGuid, projectGuid.ToString());
+            string projectGuidValue = project.GetPropertyValue(MSBuildPropertyNames.ProjectGuid);
+            bool projectGuidIsEmpty = string.IsNullOrEmpty(projectGuidValue);
 
-                if (!Guid.TryParse(projectGuidValue, out projectGuid))
-                {
-                    throw new InvalidProjectFileException(
-                        projectFile: project.FullPath,
-                        lineNumber: 0,
-                        columnNumber: 0,
-                        endLineNumber: 0,
-                        endColumnNumber: 0,
-                        message: $"The {MSBuildPropertyNames.ProjectGuid} property value \"{projectGuidValue}\" is not a valid GUID.",
-                        errorSubcategory: null,
-                        errorCode: null,
-                        helpKeyword: null);
-                }
+            // If a ProjectGuid is provided it should be honored (regardless of project style) and must be valid
+            if (projectGuidIsEmpty)
+            {
+                projectGuid = Guid.NewGuid();
+            }
+            else if (!Guid.TryParse(projectGuidValue, out projectGuid))
+            {
+                throw new InvalidProjectFileException(
+                    projectFile: project.FullPath,
+                    lineNumber: 0,
+                    columnNumber: 0,
+                    endLineNumber: 0,
+                    endColumnNumber: 0,
+                    message: $"The {MSBuildPropertyNames.ProjectGuid} property value \"{projectGuidValue}\" is not a valid GUID.",
+                    errorSubcategory: null,
+                    errorCode: null,
+                    helpKeyword: null);
             }
 
             return projectGuid;