Merge pull request #2646 from ludovic-henry/fix-processwatch-dispose

[mono.git] / mcs / tools / xbuild / xbuild.make

diff --git a/mcs/tools/xbuild/xbuild.make b/mcs/tools/xbuild/xbuild.make
index 7cb5065f2d01270753b5d9e11d6b0a711035f790..7247c7f8b0d1b04d7f52adefd0962d68fff07bc1 100644 (file)
--- a/mcs/tools/xbuild/xbuild.make
+++ b/mcs/tools/xbuild/xbuild.make
@@ -2,10 +2,18 @@ ifneq (2.0, $(XBUILD_VERSION))
 NAME_SUFFIX = .v$(XBUILD_VERSION)
 endif
 
+ifeq (14.0, $(XBUILD_VERSION))
+NAME_SUFFIX = .Core
+endif
+
 XBUILD_FRAMEWORK := $(topdir)/class/lib/$(PROFILE)/Microsoft.Build.Framework.dll
 XBUILD_ENGINE := $(topdir)/class/lib/$(PROFILE)/Microsoft.Build.Engine.dll
 XBUILD_UTILITIES := $(topdir)/class/lib/$(PROFILE)/Microsoft.Build.Utilities$(NAME_SUFFIX).dll
 XBUILD_TASKS := $(topdir)/class/lib/$(PROFILE)/Mono.XBuild.Tasks.dll
+XBUILD_MSTASKS := $(topdir)/class/lib/$(PROFILE)/Microsoft.Build.Tasks$(NAME_SUFFIX).dll
+ifeq (14.0, $(XBUILD_VERSION))
+XBUILD_MSTASKS := $(topdir)/class/lib/$(PROFILE)/Microsoft.Build.Tasks.Core.dll
+endif
 
 XBUILD_ASSEMBLY_VERSION = $(XBUILD_VERSION).0.0