[Core] Serialize LogicalName for non-EmbeddedResource items

BXC19470 - Resource ID changes made in the Properties pad not reflected
in the csproj

1 files changed, 11 insertions, 5 deletions

diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
index 5031c8b036..a9c519ef31 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
@@ -1514,11 +1514,17 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 			} else {
 				buildItem.UnsetMetadata ("Visible");
 			}
-			
-			if (file.BuildAction == BuildAction.EmbeddedResource) {
-				//Emit LogicalName only when it does not match the default Id
-				if (GetDefaultResourceId (file) != file.ResourceId)
-					buildItem.SetMetadata ("LogicalName", file.ResourceId);
+
+			var resId = file.ResourceId;
+
+			//For EmbeddedResource, emit LogicalName only when it does not match the default Id
+			if (file.BuildAction == BuildAction.EmbeddedResource && GetDefaultResourceId (file) == resId)
+				resId = null;
+
+			if (!string.IsNullOrEmpty (resId)) {
+				buildItem.SetMetadata ("LogicalName", resId);
+			} else {
+				buildItem.UnsetMetadata ("LogicalName");
 			}
 		}