[mono/mono] [2 commits] c26a40ee: Fix Bug 4811, xbuild should find xml documentation

   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/457a8453f7a0...b86af4848657

   Commit: c26a40eef7bb6e9ab7ad4b2136f5d78ce5659cd9
   Author: Robin Neatherway <[email protected]> (rneatherway)
     Date: 2013-07-02 16:26:15 GMT
      URL: https://github.com/mono/mono/commit/c26a40eef7bb6e9ab7ad4b2136f5d78ce5659cd9

Fix Bug 4811, xbuild should find xml documentation

Changed paths:
  M mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
  M mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
  M mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
  M mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets

Modified: mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
===================================================================
@@ -408,7 +408,7 @@ void FindAndAddRelatedFiles (string filename, string parent_copy_local)
 				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);

Modified: mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
===================================================================
@@ -132,7 +132,9 @@
 		</AllowedReferenceAssemblyFileExtensions>
 
 		<AllowedReferenceRelatedFileExtensions Condition=" '$(AllowedReferenceRelatedFileExtensions)' == '' ">
-			.mdb
+			.exe.mdb;
+			.dll.mdb;
+			.xml
 		</AllowedReferenceRelatedFileExtensions>
 
 		<AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">

Modified: mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
===================================================================
@@ -139,7 +139,9 @@
 		</AllowedReferenceAssemblyFileExtensions>
 
 		<AllowedReferenceRelatedFileExtensions Condition=" '$(AllowedReferenceRelatedFileExtensions)' == '' ">
-			.mdb
+			.exe.mdb;
+			.dll.mdb;
+			.xml
 		</AllowedReferenceRelatedFileExtensions>
 
 		<AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">

Modified: mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
===================================================================
@@ -196,7 +196,9 @@
 		</AllowedReferenceAssemblyFileExtensions>
 
 		<AllowedReferenceRelatedFileExtensions Condition=" '$(AllowedReferenceRelatedFileExtensions)' == '' ">
-			.mdb
+			.exe.mdb;
+			.dll.mdb;
+			.xml
 		</AllowedReferenceRelatedFileExtensions>
 
 		<AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">

   Commit: b86af4848657c5fa6041d0eefa47ac004dc54442
   Author: Michael Hutchinson <[email protected]> (mhutch)
     Date: 2013-10-21 18:09:23 GMT
      URL: https://github.com/mono/mono/commit/b86af4848657c5fa6041d0eefa47ac004dc54442

Merge pull request #565 from rneatherway/master

This is a possible fix for finding xml documentation files

Changed paths:
  M mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
  M mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
  M mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
  M mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets

Modified: mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
===================================================================
@@ -408,7 +408,7 @@ void FindAndAddRelatedFiles (string filename, string parent_copy_local)
 				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);

Modified: 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)' == ''">

Modified: 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)' == ''">

Modified: 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)' == ''">


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches