From: Ankit Jain <radical@corewars.org>
Date: Mon, 21 Mar 2011 16:54:34 +0000 (+0530)
Subject: [xbuild] Allow skipping target framework moniker lookup.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=474285154910a419ec4609173beeadcb77474550

[xbuild] Allow skipping target framework moniker lookup.

* tools/xbuild/xbuild/4.0/Microsoft.Common.targets
(GetReferenceAssemblyPaths): Don't look up framework directories
for $(TargetFrameworkMoniker) is $(_TargetFrameworkDirectories) is
already defined. This can be used to override moniker lookups.
---

diff --git a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
index 9e3875e4150..c289a2716e4 100644
--- a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
@@ -151,7 +151,7 @@
 		</CreateProperty>
 
 		<GetReferenceAssemblyPaths
-			Condition="'$(TargetFrameworkMoniker)' != ''"
+			Condition="'$(TargetFrameworkMoniker)' != '' and '$(_TargetFrameworkDirectories)' == ''"
 			TargetFrameworkMoniker="$(TargetFrameworkMoniker)"
 			RootPath="$(TargetFrameworkRootPath)">