Merge pull request #565 from rneatherway/master

This is a possible fix for finding xml documentation files

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
index 730216cf8c12fa5e020ba7cf9cdab06214095098..7b386c2eddd9297f897d5bf79a426e0754ba2920 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
@@ -408,7 +408,7 @@ namespace Microsoft.Build.Tasks {
                                return;
 
                        foreach (string ext in allowedRelatedFileExtensions) {
-                               string rfile = filename + ext;
+                               string rfile = Path.ChangeExtension (filename, ext);
                                if (File.Exists (rfile)) {
                                        ITaskItem item = new TaskItem (rfile);
                                        SetCopyLocal (item, parent_copy_local);

diff --git a/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
index 2463225cca61f0bcedd1e36b21fd9bdf619a9a4b..53c27b05869794a0d48f31c4cf698ef84455679f 100644 (file)
--- a/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
@@ -134,7 +134,9 @@
                </AllowedReferenceAssemblyFileExtensions>
 
                <AllowedReferenceRelatedFileExtensions Condition=" '$(AllowedReferenceRelatedFileExtensions)' == '' ">
-                       .mdb
+                       .exe.mdb;
+                       .dll.mdb;
+                       .xml
                </AllowedReferenceRelatedFileExtensions>
 
                <AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">

diff --git a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
index 787af8580a410ae625221422a3612fb3d41b488f..bf686b06af2b0c4dadd49cc765fb0687f8475451 100644 (file)
--- a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
@@ -141,7 +141,9 @@
                </AllowedReferenceAssemblyFileExtensions>
 
                <AllowedReferenceRelatedFileExtensions Condition=" '$(AllowedReferenceRelatedFileExtensions)' == '' ">
-                       .mdb
+                       .exe.mdb;
+                       .dll.mdb;
+                       .xml
                </AllowedReferenceRelatedFileExtensions>
 
                <AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">

diff --git a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
index 722677de9324d8ca06ef51dda189ceb236bd99be..7bd9900af727cb470f0722f1f1a994fffc066ee3 100644 (file)
--- a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
@@ -198,7 +198,9 @@
                </AllowedReferenceAssemblyFileExtensions>
 
                <AllowedReferenceRelatedFileExtensions Condition=" '$(AllowedReferenceRelatedFileExtensions)' == '' ">
-                       .mdb
+                       .exe.mdb;
+                       .dll.mdb;
+                       .xml
                </AllowedReferenceRelatedFileExtensions>
 
                <AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">