[xbuild] Build & install MSBuild 12.0 assemblies

This commit is contained in:
Michael Hutchinson committed 2014-01-07 18:39:27 -05:00
1 parent c8a343cf30
commit 425fdc03fa
30 files changed
+149 -137

No files matched your search

+3 -1
View File
@@ -14,6 +14,7 @@ mobile_SUBDIRS := build class
net_3_5_SUBDIRS := build class tools/xbuild
net_4_0_SUBDIRS := build class
net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
xbuild_12_SUBDIRS := build class tools/xbuild
# List of test subdirs that should pass 100%
centum_tests := \
@@ -85,7 +86,7 @@ dir-check:
# fun specialty targets
PROFILES = net_2_0 net_3_5 net_4_0 net_4_5
PROFILES = net_2_0 net_3_5 net_4_0 net_4_5 xbuild_12
.PHONY: all-profiles $(STD_TARGETS:=-profiles)
all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -104,6 +105,7 @@ profiles-do--run-test:
# Orchestrate the bootstrap here.
_boot_ = all clean install
$(_boot_:%=profile-do--xbuild_12--%): profile-do--xbuild_12--%: profile-do--net_4_5--%
$(_boot_:%=profile-do--net_4_5--%): profile-do--net_4_5--%: profile-do--build--%
$(_boot_:%=profile-do--net_4_0--%): profile-do--net_4_0--%: profile-do--build--%
$(_boot_:%=profile-do--net_3_5--%): profile-do--net_3_5--%: profile-do--net_2_0--%
+2 -1
View File
@@ -21,7 +21,8 @@ PROFILES = \
net_2_0 \
net_3_5 \
net_4_0 \
net_4_5
net_4_5 \
xbuild_12
COMMON_SRCS = \
Consts.cs.in \
+1
View File
@@ -13,3 +13,4 @@ DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.0
XBUILD_VERSION = 2.0
+1
View File
@@ -13,6 +13,7 @@ DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) -lib:$(topdir)/class/lib/net_2_0 $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 3.5
XBUILD_VERSION = 3.5
TEST_HARNESS = $(topdir)/class/lib/net_2_0/nunit-console.exe
TEST_MONO_PATH = $(topdir)/class/lib/net_2_0
+1
View File
@@ -14,5 +14,6 @@ DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
FRAMEWORK_VERSION = 4.0
XBUILD_VERSION = 4.0
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
+1
View File
@@ -14,3 +14,4 @@ DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 4.5
XBUILD_VERSION = 4.0
+7
View File
@@ -0,0 +1,7 @@
# -*- makefile -*-
include $(topdir)/build/profiles/net_4_5.make
PROFILE_MCS_FLAGS := $(PROFILE_MCS_FLAGS) -d:XBUILD_12 -lib:$(topdir)/class/lib/net_4_5
XBUILD_VERSION = 12.0
+27 -21
View File
@@ -88,11 +88,6 @@ common_dirs := \
SystemWebTestShim
net_2_0_dirs := \
Microsoft.Build.Framework \
Microsoft.Build.Utilities \
Microsoft.Build.Engine \
Mono.XBuild.Tasks \
Microsoft.Build.Tasks \
System.Xml.Linq \
System.Runtime.Serialization \
System.Data.DataSetExtensions \
@@ -115,7 +110,6 @@ net_2_0_dirs := \
Mono.Tasklets \
System.Dynamic \
Mono.CSharp \
Moonlight.Build.Tasks \
System.Net \
System.Json
@@ -170,17 +164,9 @@ monodroid_dirs := \
monotouch_runtime_dirs := \
corlib
net_3_5_only_dirs := \
Microsoft.Build.Framework \
Microsoft.Build.Utilities \
Microsoft.Build.Engine \
Mono.XBuild.Tasks \
Microsoft.Build.Tasks
net_4_0_dirs := \
System.Numerics \
Microsoft.CSharp \
Microsoft.Build \
System.Windows.Forms.DataVisualization \
System.Xaml \
WindowsBase \
@@ -235,22 +221,42 @@ net_4_5_dirs := \
System.Windows \
System.Xml.Serialization \
$(pcl_facade_dirs)
net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) aot-compiler
xbuild_common_dirs := \
Microsoft.Build.Framework \
Microsoft.Build.Utilities \
Microsoft.Build.Engine \
Mono.XBuild.Tasks \
Microsoft.Build.Tasks
xbuild_2_0_dirs := \
$(xbuild_common_dirs) \
Moonlight.Build.Tasks
xbuild_4_0_dirs := \
$(xbuild_2_0_dirs) \
Microsoft.Build
xbuild_12_dirs := \
$(xbuild_common_dirs) \
Microsoft.Build
net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(xbuild_2_0_dirs) aot-compiler
monodroid_SUBDIRS := $(mobile_dirs) $(monodroid_dirs)
monotouch_SUBDIRS := $(mobile_dirs)
monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
mobile_static_SUBDIRS := $(mobile_dirs)
mobile_SUBDIRS := $(mobile_dirs)
net_3_5_SUBDIRS := $(net_3_5_only_dirs)
net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs)
net_4_5_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) aot-compiler
net_3_5_SUBDIRS := $(xbuild_2_0_dirs)
net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(xbuild_4_0_dirs)
net_4_5_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
xbuild_12_SUBDIRS := $(xbuild_12_dirs)
include ../build/rules.make
SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(net_3_5_only_dirs) $(mobile_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
DIST_ONLY_SUBDIRS = dlr aot-compiler
DIST_ONLY_SUBDIRS = dlr aot-compiler $(xbuild_dirs)
# No new makefiles for: System.Messaging, System.Web.Mobile,
# System.ServiceProcess
@@ -44,9 +44,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany (Consts.MonoCompany)]
[assembly: AssemblyProduct (Consts.MonoProduct)]
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: SatelliteContractVersion (Consts.FxVersion)]
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyVersion (XBuildConsts.AssemblyVersion)]
[assembly: SatelliteContractVersion (XBuildConsts.AssemblyVersion)]
[assembly: AssemblyInformationalVersion (XBuildConsts.FileVersion)]
[assembly: NeutralResourcesLanguage ("en-US")]
@@ -55,5 +55,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
+12 -21
View File
@@ -2,30 +2,22 @@ thisdir = class/Microsoft.Build.Engine
SUBDIRS =
include ../../build/rules.make
XBUILD_DIR=$(topdir)/tools/xbuild
include $(XBUILD_DIR)/xbuild.make
LIBRARY = Microsoft.Build.Engine.dll
BUILD_FRAMEWORK = Microsoft.Build.Framework.dll
ifeq (3.5, $(FRAMEWORK_VERSION))
NAME_SUFFIX = .v3.5
BUILD_FRAMEWORK := $(topdir)/class/lib/$(PROFILE)/$(BUILD_FRAMEWORK)
else
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
NAME_SUFFIX = .v4.0
endif
endif
LIB_MCS_FLAGS = \
/r:$(corlib) \
/r:System.dll \
/r:System.Core.dll \
/r:System.Xml.dll \
/r:$(BUILD_FRAMEWORK) \
/r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll
/r:$(corlib) \
/r:System.dll \
/r:System.Core.dll \
/r:System.Xml.dll \
/r:$(XBUILD_FRAMEWORK) \
/r:$(XBUILD_UTILITIES)
TEST_MCS_FLAGS = \
/r:$(BUILD_FRAMEWORK) \
/r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll \
/r:$(XBUILD_FRAMEWORK) \
/r:$(XBUILD_UTILITIES) \
/r:System.Xml.dll
EXTRA_DISTFILES = \
@@ -35,7 +27,7 @@ EXTRA_DISTFILES = \
Test/test-config-file*
Test/resources/TestTasks.dll: Test/resources/TestTasks.cs
$(CSCOMPILE) Test/resources/TestTasks.cs /r:Microsoft.Build.Framework.dll /r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll /target:library
$(CSCOMPILE) Test/resources/TestTasks.cs /r:$(XBUILD_FRAMEWORK) /r:$(XBUILD_UTILITIES) /target:library
clean-local: clean-test-tasks
@@ -57,7 +49,6 @@ endif
endif
export TESTING_MONO=a
XBUILD_DIR=../../tools/xbuild
include $(XBUILD_DIR)/xbuild_targets.make
test-local: Test/resources/TestTasks.dll
@@ -1,5 +1,6 @@
../../build/common/Consts.cs
../../build/common/MonoTODOAttribute.cs
../../tools/xbuild/XBuildConsts.cs
Assembly/AssemblyInfo.cs
../Microsoft.Build.Framework/Mono.XBuild.Framework/AssemblyLoadInfo.cs
../Microsoft.Build.Utilities/Mono.XBuild.Utilities/MSBuildUtils.cs
@@ -44,9 +44,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany (Consts.MonoCompany)]
[assembly: AssemblyProduct (Consts.MonoProduct)]
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: SatelliteContractVersion (Consts.FxVersion)]
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyVersion (XBuildConsts.AssemblyVersion)]
[assembly: SatelliteContractVersion (XBuildConsts.AssemblyVersion)]
[assembly: AssemblyInformationalVersion (XBuildConsts.FileVersion)]
[assembly: NeutralResourcesLanguage ("en-US")]
@@ -56,5 +56,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
+3 -8
View File
@@ -2,14 +2,10 @@ thisdir = class/Microsoft.Build.Framework
SUBDIRS =
include ../../build/rules.make
LIBRARY = Microsoft.Build.Framework.dll
XBUILD_DIR=$(topdir)/tools/xbuild
include $(XBUILD_DIR)/xbuild.make
ifeq (1.0, $(FRAMEWORK_VERSION))
LIBRARY_NAME = dummy-Microsoft.Build.Framework.dll
NO_INSTALL = yes
NO_TEST = yes
NO_SIGN_ASSEMBLY = yes
endif
LIBRARY = Microsoft.Build.Framework.dll
LIB_MCS_FLAGS = \
/r:$(corlib) \
@@ -18,7 +14,6 @@ LIB_MCS_FLAGS = \
include ../../build/library.make
export TESTING_MONO=a
XBUILD_DIR=../../tools/xbuild
include $(XBUILD_DIR)/xbuild_targets.make
EXTRA_DISTFILES = \
@@ -1,5 +1,6 @@
../../build/common/Consts.cs
../../build/common/MonoTODOAttribute.cs
../../tools/xbuild/XBuildConsts.cs
Assembly/AssemblyInfo.cs
Microsoft.Build.Framework/AnyEventHandler.cs
Microsoft.Build.Framework/BuildEngineResult.cs
@@ -44,9 +44,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany (Consts.MonoCompany)]
[assembly: AssemblyProduct (Consts.MonoProduct)]
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: SatelliteContractVersion (Consts.FxVersion)]
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyVersion (XBuildConsts.AssemblyVersion)]
[assembly: SatelliteContractVersion (XBuildConsts.AssemblyVersion)]
[assembly: AssemblyInformationalVersion (XBuildConsts.FileVersion)]
[assembly: NeutralResourcesLanguage ("en-US")]
@@ -56,4 +56,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
+11 -23
View File
@@ -1,22 +1,11 @@
thisdir = class/Microsoft.Build.Tasks
SUBDIRS =
SUBDIRS =
include ../../build/rules.make
LIBRARY = Microsoft.Build.Tasks.dll
BUILD_FRAMEWORK = Microsoft.Build.Framework.dll
BUILD_ENGINE = Microsoft.Build.Engine.dll
XBUILD_TASKS = Mono.XBuild.Tasks.dll
XBUILD_DIR=$(topdir)/tools/xbuild
include $(XBUILD_DIR)/xbuild.make
ifeq (3.5, $(FRAMEWORK_VERSION))
NAME_SUFFIX = .v3.5
BUILD_FRAMEWORK := $(topdir)/class/lib/$(PROFILE)/$(BUILD_FRAMEWORK)
BUILD_ENGINE := $(topdir)/class/lib/$(PROFILE)/$(BUILD_ENGINE)
XBUILD_TASKS := $(topdir)/class/lib/$(PROFILE)/$(XBUILD_TASKS)
else
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
NAME_SUFFIX = .v4.0
endif
endif
LIBRARY = Microsoft.Build.Tasks.dll
# Some tests are explicitly testing Microsoft.Build.Tasks.v3.5.dll
TEST_MONO_PATH = $(topdir)/class/lib/net_3_5$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_2_0
@@ -29,16 +18,16 @@ LIB_MCS_FLAGS = \
/r:System.Core.dll \
/r:System.Xml.dll \
/r:System.Windows.Forms.dll \
/r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll \
/r:$(BUILD_FRAMEWORK) \
/r:$(BUILD_ENGINE) \
/r:$(XBUILD_UTILITIES) \
/r:$(XBUILD_FRAMEWORK) \
/r:$(XBUILD_ENGINE) \
/r:$(XBUILD_TASKS)
TEST_MCS_FLAGS = \
/r:$(BUILD_ENGINE) \
/r:$(BUILD_FRAMEWORK) \
/r:$(XBUILD_TASKS) \
/r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll \
/r:$(XBUILD_ENGINE) \
/r:$(XBUILD_FRAMEWORK) \
/r:$(XBUILD_TASKS) \
/r:$(XBUILD_UTILITIES) \
/r:System.Core.dll
EXTRA_DISTFILES = \
@@ -78,7 +67,6 @@ endif
endif
export TESTING_MONO=a
XBUILD_DIR=../../tools/xbuild
include $(XBUILD_DIR)/xbuild_targets.make
include ../../build/library.make
@@ -1,6 +1,7 @@
Assembly/AssemblyInfo.cs
../../build/common/Consts.cs
../../build/common/MonoTODOAttribute.cs
../../tools/xbuild/XBuildConsts.cs
Microsoft.Build.Tasks/AL.cs
Microsoft.Build.Tasks/AppDomainIsolatedTaskExtension.cs
Microsoft.Build.Tasks/AspNetCompiler.cs
@@ -46,9 +46,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany (Consts.MonoCompany)]
[assembly: AssemblyProduct (Consts.MonoProduct)]
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: SatelliteContractVersion (Consts.FxVersion)]
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyVersion (XBuildConsts.AssemblyVersion)]
[assembly: SatelliteContractVersion (XBuildConsts.AssemblyVersion)]
[assembly: AssemblyInformationalVersion (XBuildConsts.FileVersion)]
[assembly: NeutralResourcesLanguage ("en-US")]
@@ -57,6 +57,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
#endif
+6 -13
View File
@@ -2,27 +2,20 @@ thisdir = class/Microsoft.Build.Utilities
SUBDIRS =
include ../../build/rules.make
LIBRARY = Microsoft.Build.Utilities.dll
BUILD_FRAMEWORK = Microsoft.Build.Framework.dll
XBUILD_DIR=$(topdir)/tools/xbuild
include $(XBUILD_DIR)/xbuild.make
ifeq (3.5, $(FRAMEWORK_VERSION))
LIBRARY_NAME = Microsoft.Build.Utilities.v3.5.dll
BUILD_FRAMEWORK := $(topdir)/class/lib/$(PROFILE)/$(BUILD_FRAMEWORK)
else
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
LIBRARY_NAME = Microsoft.Build.Utilities.v4.0.dll
endif
endif
LIBRARY = Microsoft.Build.Utilities.dll
LIBRARY_NAME = Microsoft.Build.Utilities$(NAME_SUFFIX).dll
LIB_MCS_FLAGS = \
/r:$(corlib) \
/r:System.dll \
/r:$(BUILD_FRAMEWORK)
/r:$(XBUILD_FRAMEWORK)
TEST_MCS_FLAGS = /r:$(BUILD_FRAMEWORK) -r:System.dll -r:System.Core.dll
TEST_MCS_FLAGS = /r:$(XBUILD_FRAMEWORK) -r:System.dll -r:System.Core.dll
export TESTING_MONO=a
XBUILD_DIR=../../tools/xbuild
include $(XBUILD_DIR)/xbuild_targets.make
include ../../build/library.make
@@ -1,5 +1,6 @@
../../build/common/Consts.cs
../../build/common/MonoTODOAttribute.cs
../../tools/xbuild/XBuildConsts.cs
Assembly/AssemblyInfo.cs
Microsoft.Build.Utilities/AppDomainIsolatedTask.cs
Microsoft.Build.Utilities/CommandLineBuilder.cs
@@ -46,9 +46,9 @@ using System.Runtime.Versioning;
[assembly: AssemblyCompany (Consts.MonoCompany)]
[assembly: AssemblyProduct (Consts.MonoProduct)]
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: SatelliteContractVersion (Consts.FxVersion)]
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyVersion (XBuildConsts.AssemblyVersion)]
[assembly: SatelliteContractVersion (XBuildConsts.AssemblyVersion)]
[assembly: AssemblyInformationalVersion (XBuildConsts.FileVersion)]
[assembly: NeutralResourcesLanguage ("en-US")]
@@ -57,6 +57,6 @@ using System.Runtime.Versioning;
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+3 -8
View File
@@ -2,14 +2,10 @@ thisdir = class/Microsoft.Build
SUBDIRS =
include ../../build/rules.make
LIBRARY = Microsoft.Build.dll
XBUILD_DIR=$(topdir)/tools/xbuild
include $(XBUILD_DIR)/xbuild.make
ifneq (4, $(FRAMEWORK_VERSION_MAJOR))
LIBRARY_NAME = dummy-Microsoft.Build.dll
NO_INSTALL = yes
NO_TEST = yes
NO_SIGN_ASSEMBLY = yes
endif
LIBRARY = Microsoft.Build.dll
LIB_MCS_FLAGS = \
/r:$(corlib) \
@@ -39,6 +35,5 @@ BUILT_SOURCES = $(EXPR_PARSER).cs
include ../../build/library.make
export TESTING_MONO=a
XBUILD_DIR=../../tools/xbuild
XBUILD_FRAMEWORK_FOLDERS_PATH=xbuild-testing
include $(XBUILD_DIR)/xbuild_targets.make
@@ -1,6 +1,7 @@
Assembly/AssemblyInfo.cs
../../build/common/Consts.cs
../../build/common/MonoTODOAttribute.cs
../../tools/xbuild/XBuildConsts.cs
../Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
../Microsoft.Build.Engine/Microsoft.Build.BuildEngine/EventSource.cs
../Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ColorSetter.cs
+3 -1
View File
@@ -2,6 +2,9 @@ thisdir = class/Mono.XBuild.Tasks
SUBDIRS =
include ../../build/rules.make
XBUILD_DIR=$(topdir)/tools/xbuild
include $(XBUILD_DIR)/xbuild.make
LIBRARY = Mono.XBuild.Tasks.dll
LIB_MCS_FLAGS = \
@@ -10,7 +13,6 @@ LIB_MCS_FLAGS = \
/r:System.Xml.dll
export TESTING_MONO=a
XBUILD_DIR=../../tools/xbuild
include $(XBUILD_DIR)/xbuild_targets.make
include ../../build/library.make
+4 -13
View File
@@ -3,24 +3,15 @@ SUBDIRS =
include ../../build/rules.make
NO_TESTS = yes
BUILD_FRAMEWORK = Microsoft.Build.Framework.dll
BUILD_ENGINE = Microsoft.Build.Engine.dll
include xbuild.make
INSTALL_FRAMEWORK_VERSION = $(FRAMEWORK_VERSION)
ifeq (3.5, $(FRAMEWORK_VERSION))
NAME_SUFFIX = .v3.5
ASSEMBLY_VERSION = 3.5.0.0
BUILD_FRAMEWORK := $(topdir)/class/lib/$(PROFILE)/$(BUILD_FRAMEWORK)
BUILD_ENGINE := $(topdir)/class/lib/$(PROFILE)/$(BUILD_ENGINE)
else
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
NAME_SUFFIX = .v4.0
ASSEMBLY_VERSION = 4.0.0.0
ifeq (4.5, $(FRAMEWORK_VERSION))
INSTALL_FRAMEWORK_VERSION = 4.0
endif
endif
LOCAL_MCS_FLAGS = -r:$(BUILD_FRAMEWORK) -r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll -r:$(BUILD_ENGINE)
LOCAL_MCS_FLAGS = -r:$(XBUILD_FRAMEWORK) -r:$(XBUILD_UTILITIES) -r:$(XBUILD_ENGINE)
PROGRAM = xbuild.exe
include ../../build/executable.make
+10
View File
@@ -0,0 +1,10 @@
class XBuildConsts
{
#if XBUILD_12
public const string AssemblyVersion = "12.0.0.0";
public const string FileVersion = "12.0.21005.1";
#else
public const string AssemblyVersion = Consts.FxVersion;
public const string FileVersion = Consts.FxFileVersion;
#endif
}
+1
View File
@@ -1,6 +1,7 @@
../../build/common/Consts.cs
../../class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/UnknownToolsVersionException.cs
../../class/Microsoft.Build.Framework/Mono.XBuild.Framework/AssemblyLoadInfo.cs
XBuildConsts.cs
AssemblyInfo.cs
CommandLineException.cs
ErrorUtilities.cs
+19
View File
@@ -0,0 +1,19 @@
ifneq (2.0, $(XBUILD_VERSION))
NAME_SUFFIX = .v$(XBUILD_VERSION)
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
ifneq (2.0, $(XBUILD_VERSION))
ifneq (3.5, $(XBUILD_VERSION))
ifneq (4.0, $(XBUILD_VERSION))
PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/xbuild/$(XBUILD_VERSION)/bin
LIBRARY_PACKAGE = xbuild/$(XBUILD_VERSION)/bin
endif
endif
endif
+8 -6
View File
@@ -1,14 +1,16 @@
XBUILD_TARGETS_DIR=$(topdir)/tools/xbuild/xbuild
test-local: copy-targets
copy-targets:
for p in net_2_0 net_3_5 net_4_0; do \
cp $(XBUILD_DIR)/xbuild/Microsoft.CSharp.targets $(topdir)/class/lib/$$p; \
cp $(XBUILD_DIR)/xbuild/Microsoft.VisualBasic.targets $(topdir)/class/lib/$$p; \
cp $(XBUILD_DIR)/xbuild/Microsoft.Silverlight*.targets $(topdir)/class/lib/$$p; \
cp $(XBUILD_TARGETS_DIR)/Microsoft.CSharp.targets $(topdir)/class/lib/$$p; \
cp $(XBUILD_TARGETS_DIR)/Microsoft.VisualBasic.targets $(topdir)/class/lib/$$p; \
cp $(XBUILD_TARGETS_DIR)/Microsoft.Silverlight*.targets $(topdir)/class/lib/$$p; \
done
cp $(XBUILD_DIR)/xbuild/2.0/Microsoft.Common.* $(topdir)/class/lib/net_2_0
cp $(XBUILD_DIR)/xbuild/3.5/Microsoft.Common.* $(topdir)/class/lib/net_3_5
cp $(XBUILD_DIR)/xbuild/4.0/Microsoft.Common.* $(topdir)/class/lib/net_4_0
cp $(XBUILD_TARGETS_DIR)/2.0/Microsoft.Common.* $(topdir)/class/lib/net_2_0
cp $(XBUILD_TARGETS_DIR)/3.5/Microsoft.Common.* $(topdir)/class/lib/net_3_5
cp $(XBUILD_TARGETS_DIR)/4.0/Microsoft.Common.* $(topdir)/class/lib/net_4_0
clean-local: clean-target-files
+1 -1
View File
@@ -41,7 +41,7 @@ al_profile = net_4_0
endif
if INSTALL_4_5
build_profiles += net_4_5
build_profiles += net_4_5 xbuild_12
al_profile = net_4_5
endif