Imported Upstream version 6.10.0.65

Former-commit-id: e5cb7a4ca4dde494baae4251cd9d7d852457fec8
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2020-02-05 08:39:55 +00:00
parent 1263e4b035
commit e0a10bca36
59 changed files with 593 additions and 522 deletions

View File

@@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "6.10.0.54";
public const string MonoVersion = "6.10.0.65";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@@ -147,7 +147,7 @@ ifdef HAVE_CS_TESTS
test_assemblies += $(test_lib_output)
ifdef TEST_SPLIT_ASSEMBLIES
test_assemblies += $(test_lib_output:.dll=.part1.dll) $(test_lib_output:.dll=.part2.dll)
test_assemblies += $(test_lib_output:.dll=.part1.dll) $(test_lib_output:.dll=.part2.dll) $(test_lib_output:.dll=.part3.dll)
endif
check: run-test
@@ -288,7 +288,15 @@ $(test_lib_output:.dll=.part1.dll): $(test_lib_output) $(test_response).part1
$(test_lib_output:.dll=.part2.dll): $(test_lib_output) $(test_response).part2
$(TEST_COMPILE) $(LIBRARY_FLAGS) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response).part2
tests_CLEAN_FILES += $(test_response).part1 $(test_response).part2
$(test_lib_output:.dll=.part3.dll): $(test_lib_output) $(test_response).part3
ifneq ($(wildcard $(test_response).part3),)
$(TEST_COMPILE) $(LIBRARY_FLAGS) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response).part3
endif
# part3 is optional so we need this empty target to silence make if it doesn't exist
$(test_response).part3: ;
tests_CLEAN_FILES += $(test_response).part1 $(test_response).part2 $(test_response).part3
endif
$(test_response): $(test_sourcefile_base) $(wildcard *_test.dll.sources) $(wildcard *_test.dll.exclude.sources) $(topdir)/build/tests.make $(depsdir)/.stamp
@@ -296,7 +304,7 @@ $(test_response): $(test_sourcefile_base) $(wildcard *_test.dll.sources) $(wildc
$(test_makefrag): $(test_response)
@echo Creating $@ ...
@sed 's,^,$(test_lib_output) $(test_lib_output:.dll=.part1.dll) $(test_lib_output:.dll=.part2.dll): ,' $< >$@
@sed 's,^,$(test_lib_output) $(test_lib_output:.dll=.part1.dll) $(test_lib_output:.dll=.part2.dll) $(test_lib_output:.dll=.part3.dll): ,' $< >$@
-include $(test_makefrag)
@@ -339,7 +347,7 @@ endif
xtest_assemblies += $(xtest_lib_output)
ifdef XTEST_SPLIT_ASSEMBLIES
xtest_assemblies += $(xtest_lib_output:.dll=.part1.dll) $(xtest_lib_output:.dll=.part2.dll)
xtest_assemblies += $(xtest_lib_output:.dll=.part1.dll) $(xtest_lib_output:.dll=.part2.dll) $(xtest_lib_output:.dll=.part3.dll)
endif
@@ -377,7 +385,15 @@ $(xtest_lib_output:.dll=.part1.dll): $(xtest_lib_output) $(xtest_response).part1
$(xtest_lib_output:.dll=.part2.dll): $(xtest_lib_output) $(xtest_response).part2
$(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response).part2 $(xunit_src)
xtests_CLEAN_FILES += $(xtest_response).part1 $(xtest_response).part2
$(xtest_lib_output:.dll=.part3.dll): $(xtest_lib_output) $(xtest_response).part3
ifneq ($(wildcard $(xtest_response).part3),)
$(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response).part3 $(xunit_src)
endif
# part3 is optional so we need this empty target to silence make if it doesn't exist
$(xtest_response).part3: ;
xtests_CLEAN_FILES += $(xtest_response).part1 $(xtest_response).part2 $(xtest_response).part3
endif
# This handles .excludes/.sources pairs, as well as resolving the
@@ -385,9 +401,9 @@ endif
$(xtest_response): $(xtest_sourcefile_base) $(wildcard *_xtest.dll.sources) $(wildcard *_xtest.dll.exclude.sources) $(topdir)/build/tests.make $(depsdir)/.stamp
$(GENSOURCES) --strict --platformsdir:$(topdir)/build "$@" "$(xtest_library)" "$(PROFILE_PLATFORM)" "$(PROFILE)"
$(xtest_makefrag): $(xtest_response) $(xtest_response_parts)
$(xtest_makefrag): $(xtest_response)
@echo Creating $@ ...
@sed 's,^,$(xtest_lib_output) $(xtest_lib_output:.dll=.part1.dll) $(xtest_lib_output:.dll=.part2.dll): ,' $< >$@
@sed 's,^,$(xtest_lib_output) $(xtest_lib_output:.dll=.part1.dll) $(xtest_lib_output:.dll=.part2.dll) $(xtest_lib_output:.dll=.part3.dll): ,' $< >$@
-include $(xtest_makefrag)

View File

@@ -294,8 +294,6 @@ corefx/GlobalizationMode.cs
../../../external/corefx/src/System.Runtime/tests/System/TimeZoneNotFoundExceptionTests.cs
../../../external/corefx/src/System.Runtime/tests/System/TimeSpanTests.cs
../../../external/corefx/src/System.Runtime/tests/System/TimeSpanTests.netcoreapp.cs
../../../external/corefx/src/System.Runtime/tests/System/ArraySegmentTests.cs
../../../external/corefx/src/System.Runtime/tests/System/ArraySegmentTests.netcoreapp.cs
../../../external/corefx/src/System.Runtime/tests/System/BooleanTests.cs
../../../external/corefx/src/System.Runtime/tests/System/BooleanTests.netcoreapp.cs
../../../external/corefx/src/System.Runtime/tests/System/ByteTests.cs
@@ -366,6 +364,15 @@ corefx/GlobalizationMode.cs
../../../external/corefx/src/System.Runtime/tests/System/Text/*.cs
../../../external/corefx/src/System.Runtime/tests/System/Runtime/CompilerServices/*.cs:RuntimeHelpersTests.netcoreapp.cs,ConditionalWeakTableTests.netcoreapp.cs,ConditionalWeakTableTests.cs
#split monotouch
#split monotouch_tv
#split monotouch_watch
../../../external/corefx/src/System.Runtime/tests/System/ArraySegmentTests.cs
../../../external/corefx/src/System.Runtime/tests/System/ArraySegmentTests.netcoreapp.cs
# System.Collections
../../../external/corefx/src/Common/tests/System/Collections/CollectionAsserts.cs
../../../external/corefx/src/Common/tests/System/Collections/TestBase.NonGeneric.cs

View File

@@ -1 +1 @@
999bec834a1f2063106c554a9afadee99f3bc574
11a1a4fdc8ae20d0fc949e85d91156c4e3a9b332

View File

@@ -1 +1 @@
c957daa98ec878dded022b0017e2f89a0d6bca05
25ec47b18d159f0ba53ed2f87bd5f4b24f626011

View File

@@ -1 +1 @@
594320db03c0562f23eaaeb4c8982cda139e21a8
6404e05bab46e3b7f6cfa1d9658a1f5c3b4634d7

View File

@@ -1 +1 @@
25ee1fcc3972bff3d63d1fc2885df87f877f946b
52d5edda8db8f4b3c5ac2bbdea56fed73b14eaf3

View File

@@ -1 +1 @@
30e03ba4dbb6fbc631cfbc64b03a859baa02e78d
1a9e9451784eec71ba222e8b26e8b9b8296f1c32

View File

@@ -1 +1 @@
148ee5ba7292b65b6ffd181c6a6a479680ac8b6d
aae3bd6de76f6ede30d48302d3e3829baa889013

View File

@@ -1 +1 @@
bfb3759593b516f62ee7d91a6d238efed8e62f8a
1edf1934f2298f20e5036a0bb2ddf17c2e8a127d

View File

@@ -1 +1 @@
2ae99b3855d0f1368a6277fc2fc8a1aad76902ff
053793b3e3bed81ef7eb8aafeddf49a5d85bd0b0

View File

@@ -1 +1 @@
999bec834a1f2063106c554a9afadee99f3bc574
11a1a4fdc8ae20d0fc949e85d91156c4e3a9b332

View File

@@ -1 +1 @@
c957daa98ec878dded022b0017e2f89a0d6bca05
25ec47b18d159f0ba53ed2f87bd5f4b24f626011

View File

@@ -1 +1 @@
594320db03c0562f23eaaeb4c8982cda139e21a8
6404e05bab46e3b7f6cfa1d9658a1f5c3b4634d7

View File

@@ -1 +1 @@
25ee1fcc3972bff3d63d1fc2885df87f877f946b
52d5edda8db8f4b3c5ac2bbdea56fed73b14eaf3

View File

@@ -1 +1 @@
30e03ba4dbb6fbc631cfbc64b03a859baa02e78d
1a9e9451784eec71ba222e8b26e8b9b8296f1c32

View File

@@ -1 +1 @@
148ee5ba7292b65b6ffd181c6a6a479680ac8b6d
aae3bd6de76f6ede30d48302d3e3829baa889013

View File

@@ -1 +1 @@
bfb3759593b516f62ee7d91a6d238efed8e62f8a
1edf1934f2298f20e5036a0bb2ddf17c2e8a127d

View File

@@ -1 +1 @@
2ae99b3855d0f1368a6277fc2fc8a1aad76902ff
053793b3e3bed81ef7eb8aafeddf49a5d85bd0b0

View File

@@ -1 +1 @@
999bec834a1f2063106c554a9afadee99f3bc574
11a1a4fdc8ae20d0fc949e85d91156c4e3a9b332

Some files were not shown because too many files have changed in this diff Show More