[mono/monodevelop] 81b16c3a: [Core] Fixed ProjectFile.ResourceId logic
| Newsgroups | gmane.comp.gnome.mono.patches |
|---|---|
| Message-ID | <0000014229c8d95a-aa02795f-247f-4428-82db-d6f314991be8-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/monodevelop
Compare: https://github.com/mono/monodevelop/compare/aff162200b65...81b16c3a2ef8
Commit: 81b16c3a2ef8636593dd9c8e60f97b32a5e11e9e
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-05 19:40:26 GMT
URL: https://github.com/mono/monodevelop/commit/81b16c3a2ef8636593dd9c8e60f97b32a5e11e9e
[Core] Fixed ProjectFile.ResourceId logic
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs
===================================================================
@@ -397,12 +397,12 @@ internal bool ResolveParent ()
}
#endregion
+ // FIXME: rename this to LogicalName for a better mapping to the MSBuild property
public string ResourceId {
get {
- if (BuildAction != MonoDevelop.Projects.BuildAction.EmbeddedResource)
- return string.Empty;
- if (string.IsNullOrEmpty (resourceId) && project is DotNetProject)
+ if (BuildAction == MonoDevelop.Projects.BuildAction.EmbeddedResource && string.IsNullOrEmpty (resourceId) && project is DotNetProject)
return ((DotNetProject)project).ResourceHandler.GetDefaultResourceId (this);
+
return resourceId;
}
set {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches