2009-03-22 Daniel Nauck <dna@mono-project.de>

        * GenerateResource.cs: Set BasePath property of
                ResXResourceReader class.
                See: http://lists.ximian.com/pipermail/mono-devel-list/2009-March/031459.html

svn path=/trunk/mcs/; revision=129966

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
index a9fcca1d1dc0ef43a64a1ce18400f8f19fb3a55f..c700c874368007ad3c0cedbd5b4b53492a6a27ed 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-22  Daniel Nauck  <dna@mono-project.de>
+
+       * GenerateResource.cs: Set BasePath property of
+               ResXResourceReader class.
+               See: http://lists.ximian.com/pipermail/mono-devel-list/2009-March/031459.html
+
 2009-03-19  Ankit Jain  <jankit@novell.com>
 
        Fix bugs #323833 and #484384.

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
index 9c6c9c0e8471e0a7a57ed67821a14011fdff7599..1a70b1d76d36167d9a3b5d555050161a69e17097 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GenerateResource.cs
@@ -108,7 +108,13 @@ namespace Microsoft.Build.Tasks {
                        case ".resources":
                                return new ResourceReader (stream);
                        case ".resx":
-                               return new System.Resources.ResXResourceReader (stream);
+                               ResXResourceReader reader = new ResXResourceReader (stream);
+
+                               // set correct basepath to resolve relative paths in file refs
+                               if (useSourcePath)
+                                       reader.BasePath = Path.GetDirectoryName (Path.GetFullPath (name));
+
+                               return reader;
                        default:
                                throw new Exception ("Unknown format in file " + name);
                        }