projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for ToolsVersion and correctly build msbuild+xbuild assemblies
[mono.git]
/
mcs
/
class
/
Microsoft.Build.Utilities
/
Makefile
diff --git
a/mcs/class/Microsoft.Build.Utilities/Makefile
b/mcs/class/Microsoft.Build.Utilities/Makefile
index bbfc0a9f1ae93282b0d27fc6d117bad4550fef78..a600ff9b67e5baba9cc206e50f00cb5285364bd8 100644
(file)
--- a/
mcs/class/Microsoft.Build.Utilities/Makefile
+++ b/
mcs/class/Microsoft.Build.Utilities/Makefile
@@
-12,6
+12,10
@@
endif
ifeq (3.5, $(FRAMEWORK_VERSION))
LIBRARY_NAME = Microsoft.Build.Utilities.v3.5.dll
ifeq (3.5, $(FRAMEWORK_VERSION))
LIBRARY_NAME = Microsoft.Build.Utilities.v3.5.dll
+else
+ifeq (4.0, $(FRAMEWORK_VERSION))
+LIBRARY_NAME = Microsoft.Build.Utilities.v4.0.dll
+endif
endif
LIB_MCS_FLAGS = \
endif
LIB_MCS_FLAGS = \
@@
-21,4
+25,8
@@
LIB_MCS_FLAGS = \
TEST_MCS_FLAGS = /r:Microsoft.Build.Framework.dll
TEST_MCS_FLAGS = /r:Microsoft.Build.Framework.dll
+export TESTING_MONO=a
+XBUILD_DIR=../../tools/xbuild
+include $(XBUILD_DIR)/xbuild_targets.make
+
include ../../build/library.make
include ../../build/library.make