[mono/monodevelop] 47a2505e: [Core] Fixed ProjectFile.ResourceId logic
| Newsgroups | gmane.comp.gnome.mono.patches |
|---|---|
| Message-ID | <0000014229cc8b25-3d6d6a9e-f75f-4880-b181-cffc3d263cca-000000@email.amazonses.com> |
Branch: refs/heads/license-sync
Home: https://github.com/mono/monodevelop
Compare: https://github.com/mono/monodevelop/compare/051e904cc5e1...47a2505ea07c
Commit: 47a2505ea07c65e6d69695d42346348bf65a86b5
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-05 19:43:42 GMT
URL: https://github.com/mono/monodevelop/commit/47a2505ea07c65e6d69695d42346348bf65a86b5
[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