Imported Upstream version 5.14.0.78

Former-commit-id: 3494343bcc9ddb42b36b82dd9ae7b69e85e0229f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-05-10 08:37:03 +00:00
parent 74b74abd9f
commit 19234507ba
1776 changed files with 67755 additions and 31107 deletions

View File

@@ -30,14 +30,9 @@ endif
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
ifndef NO_SYSTEM_SERVICEMODEL_ACTIVATION_DEPENDENCY
activation = $(the_libdir_base)System.ServiceModel.Activation.dll
servicemodel_deps = $(activation)
ifneq (plainservice/,$(intermediate))
LIB_REFS += System.ServiceModel.Activation
LIB_MCS_FLAGS += -define:HAS_ACTIVATION
endif
endif # NO_SYSTEM_SERVICEMODEL_ACTIVATION_DEPENDENCY
API_BIN_REFS := System.ServiceModel.Activation
LIB_MCS_FLAGS += /d:SERVICEMODEL_ACTIVATION_DEPENDENCY
endif
ifndef NO_SYSTEM_WEB_APPSERVICES_DEPENDENCY
LIB_REFS += System.Web.ApplicationServices
@@ -73,22 +68,3 @@ NO_TEST = yes
endif
include ../../build/library.make
$(the_libdir_base)System.ServiceModel.dll: $(servicemodel_deps)
$(activation):
(cd ../System.ServiceModel.Activation; $(MAKE) $@)
ifneq (plainservice/,$(intermediate))
$(the_libdir_base)plainservice/System.ServiceModel.dll:
$(MAKE) intermediate=plainservice/ $(the_libdir_base)plainservice/System.ServiceModel.dll
endif
.NOTPARALLEL: $(servicemodel_deps)
CLEAN_FILES = $(the_libdir_base)plainservice/System.ServiceModel.dll
ifndef intermediate
csproj-local:
$(MAKE) csproj-local intermediate=plainservice/
endif