* xbuild/*/Microsoft.Common.targets (AssemblySearchPaths): Add

$(ReferencePath) to the search paths. This can be used to add or
override assembly search paths.

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

diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog
index a4fc65f3b30ae3324e6eb3fffb214b9cc68b5c47..5b8f8255d3ba7274785a0937c34c0816b96e5853 100644 (file)
--- a/mcs/tools/xbuild/ChangeLog
+++ b/mcs/tools/xbuild/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-15  Ankit Jain  <jankit@novell.com>
+
+       * xbuild/*/Microsoft.Common.targets (AssemblySearchPaths): Add
+       $(ReferencePath) to the search paths. This can be used to add or
+       override assembly search paths.
+
 2010-05-28  Ankit Jain  <jankit@novell.com>
 
        * SolutionParser.cs (ParseSolution): Ignore GlobalSection

diff --git a/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
index 44e8b01d9e3235f14a6d20d7eba6137864edfa31..f17abf6f44afeda4509429188f5ae886800a5951 100644 (file)
--- a/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
@@ -119,6 +119,7 @@
 
                <AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">
                        {CandidateAssemblyFiles};
+                       $(ReferencePath);
                        {HintPathFromItem};
                        {TargetFrameworkDirectory};
                        {PkgConfig};

diff --git a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
index 44e8b01d9e3235f14a6d20d7eba6137864edfa31..f17abf6f44afeda4509429188f5ae886800a5951 100644 (file)
--- a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
@@ -119,6 +119,7 @@
 
                <AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">
                        {CandidateAssemblyFiles};
+                       $(ReferencePath);
                        {HintPathFromItem};
                        {TargetFrameworkDirectory};
                        {PkgConfig};

diff --git a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
index 369109c92573f18fa43618a505d032ce8c91eb40..3b1849d25669a3f71b704901b09c66f9419f96b6 100644 (file)
--- a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
@@ -122,6 +122,7 @@
 
                <AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">
                        {CandidateAssemblyFiles};
+                       $(ReferencePath);
                        {HintPathFromItem};
                        {TargetFrameworkDirectory};
                        {PkgConfig};