Imported Upstream version 5.8.0.88

Former-commit-id: 4b7216ffda08448e562271ce733688e761120fc5
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-11-28 19:36:51 +00:00
parent 7d05485754
commit 6123a772ed
277 changed files with 4817 additions and 941 deletions

View File

@@ -101,7 +101,7 @@ endif
# System.IO/DirectoryInfoTest.cs needs Mono.Posix
TEST_MCS_FLAGS += -debug -nowarn:168,219,618,672 -unsafe \
-define:MONO_DATACONVERTER_STATIC_METHODS $(TEST_RESX_RESOURCES:%=-resource:%)
-define:MONO_DATACONVERTER_STATIC_METHODS $(TEST_RESX_RESOURCES:%=-resource:%) -resource:LinkerDescriptor/mscorlib_test.xml,$(test_lib:.dll=.xml)
CC_PROFILE := $(filter monotouch% xammac, $(PROFILE))
@@ -137,7 +137,8 @@ EXTRA_DISTFILES = \
Test/resources/Fergie.GED \
Test/resources/culture-*.cs \
$(RESOURCE_FILES) \
$(TEST_RESOURCES:.resources=.resx)
$(TEST_RESOURCES:.resources=.resx) \
LinkerDescriptor/mscorlib_test.xml
TEST_RESX_RESOURCES = \
Test/resources/Resources.resources