Imported Upstream version 6.12.0.86

Former-commit-id: 7a84ce7d08c42c458ac8e74b27186ca863315d79
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2020-07-10 08:44:59 +00:00
parent 92747312ea
commit 0b380204a4
812 changed files with 26901 additions and 9053 deletions

View File

@@ -6,7 +6,7 @@ export __SECURITY_BOOTSTRAP_DB=$(topdir)/class/corlib
LIBRARY = corlib.dll
LIBRARY_NAME = mscorlib.dll
LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) $(RESOURCE_FILES:%=-resource:%)
LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) $(RESOURCE_FILES:%=-resource:%) $(UNICODECHARINFO:%=-resource:%)
USE_XTEST_REMOTE_EXECUTOR = YES
LIBRARY_WARN_AS_ERROR = yes
@@ -88,8 +88,13 @@ MANAGED_COLLATOR_RESOURCES_FILES = \
resources/collation.cjkKOlv2.bin
endif
ifdef MCS_MODE
UNICODECHARINFO = resources/charinfo.nlp
else
UNICODECHARINFO =
endif
RESOURCE_FILES = \
resources/charinfo.nlp \
$(MANAGED_COLLATOR_RESOURCES_FILES) \
LinkerDescriptor/mscorlib.xml
@@ -201,6 +206,7 @@ EXTRA_DISTFILES = \
$(RESOURCE_FILES) \
$(TEST_RESOURCE_FILES) \
$(TEST_RESOURCES:.resources=.resx) \
resources/charinfo.nlp \
LinkerDescriptor/mscorlib_test.xml
TEST_RESOURCE_FILES = \