Imported Upstream version 5.20.0.180

Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions

View File

@@ -25,6 +25,12 @@ ifdef MONO_FEATURE_APPLETLS
LIB_MCS_FLAGS += -d:MONO_FEATURE_APPLETLS
endif
ifdef ENABLE_GSS
ifndef NO_GSS
LIB_MCS_FLAGS += -d:ENABLE_GSS
endif
endif
ifndef PROFILE_DISABLE_BTLS
ifdef HAVE_BTLS
LIB_MCS_FLAGS += -d:MONO_FEATURE_BTLS
@@ -37,8 +43,20 @@ RESX_RESOURCE_STRING = \
../../../external/corefx/src/System.Data.SqlClient/src/Resources/Strings.resx \
../../../external/corefx/src/System.Data.Odbc/src/Resources/Strings.resx
TEST_RESOURCE_FILES = \
$(wildcard Test/System.Data/*.xml) \
$(wildcard Test/System.Data/*.xsd) \
$(wildcard Test/System.Xml/*.xml) \
$(wildcard Test/System.Xml/*.xsd) \
$(wildcard Test/System.Data/schemas/*.xml) \
$(wildcard Test/System.Data/schemas/*.xsd) \
$(wildcard Test/System.Data/binserialize/*.bin) \
$(wildcard Test/ProviderTests/sql/*.sql) \
Test/Mono.Data.SqlExpressions/dateComparisonTest.xml \
Test/System.Data.Common/SqliteTest.db
TEST_LIB_REFS = System.Core Mono.Data.Sqlite
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618,169,612,219,168
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618,169,612,219,168 $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r))
TEST_NUNITLITE_APP_CONFIG_GLOBAL=Test/test-config-file
@@ -46,14 +64,7 @@ USE_XTEST_REMOTE_EXECUTOR = YES
XTEST_LIB_REFS = System System.Core System.Xml Facades/System.Text.Encoding.CodePages Facades/System.Threading.Tasks Facades/System.Runtime.InteropServices.RuntimeInformation Facades/System.Text.RegularExpressions
EXTRA_DISTFILES = \
$(wildcard Test/System.Data/*.xml) \
$(wildcard Test/System.Data/*.xsd) \
$(wildcard Test/System.Xml/*.xml) \
$(wildcard Test/System.Xml/*.xsd) \
$(wildcard Test/System.Data/schemas/*.xsd) \
Test/test-config-file \
Test/System.Data/binserialize/*.bin \
Test/ProviderTests/sql/*.sql \
SqliteTest.db
$(TEST_RESOURCE_FILES) \
Test/test-config-file
include ../../build/library.make