Imported Upstream version 6.0.0.212

Former-commit-id: 6799385be92e727475f2ebc65c4ef6e623ed0ae0
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-05-07 08:52:05 +00:00
parent 61312eea06
commit bf8c8e164f
50 changed files with 53 additions and 41 deletions

View File

@ -1 +1 @@
ea28d6aca9d465bc7effe75ae533d43e870ab79f
e7fecd6d85ed09c4d778ce5894a150a3e6beefe5

View File

@ -1 +1 @@
d0620cf39e646d091f9b3368daecb235b86c8ccd
a5e0e1a64c1b34fc4724de8b8462484c137861c4

View File

@ -22,8 +22,10 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryHandle))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryManager<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryPool<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.OperationStatus))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.ReadOnlySequence<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.ReadOnlySequenceSegment<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.StandardFormat))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Text.Base64))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Text.Utf8Formatter))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Text.Utf8Parser))]

View File

@ -22,8 +22,10 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryHandle))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryManager<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.MemoryPool<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.OperationStatus))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.ReadOnlySequence<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.ReadOnlySequenceSegment<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.StandardFormat))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Text.Base64))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Text.Utf8Formatter))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Buffers.Text.Utf8Parser))]

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.0.0.209";
public const string MonoVersion = "6.0.0.212";
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

@ -134,7 +134,7 @@ ifdef HAVE_CS_TESTS
test_assemblies += $(test_lib_output)
check: run-test
test-local: $(test_assemblies)
test-local: $(test_assemblies) $(test_lib_dir)/nunit-excludes.txt
run-test-local: run-test-lib
run-test-ondotnet-local: run-test-ondotnet-lib
@ -233,6 +233,9 @@ else
TEST_HARNESS_EXEC=$(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(TEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(TEST_HARNESS)
endif
$(test_lib_dir)/nunit-excludes.txt: $(topdir)/build/tests.make | $(test_lib_dir)
@echo "$(TEST_HARNESS_EXCLUDES)" > $@
## FIXME: i18n problem in the 'sed' command below
run-test-lib: test-local test-local-aot-compile copy-nunitlite-appconfig
ok=:; \
@ -326,9 +329,12 @@ XTEST_COVERAGE_FLAGS = -O=-aot --profile=coverage:output=$(topdir)/class/lib/$(P
endif
check: run-xunit-test-local
xunit-test-local: $(xtest_lib_output)
xunit-test-local: $(xtest_lib_output) $(test_lib_dir)/xunit-excludes.txt
run-xunit-test-local: run-xunit-test-lib
$(test_lib_dir)/xunit-excludes.txt: $(topdir)/build/tests.make | $(test_lib_dir)
@echo "$(XTEST_TRAIT) $(XTEST_TRAIT_PLATFORM)" > $@
# cp -rf is a HACK for xunit runner to require xunit.execution.dOTNET.dll file in local folder on .net only
run-xunit-test-lib: xunit-test-local
@cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.dotnet.dll $(test_lib_dir)/xunit.execution.dotnet.dll

View File

@ -33,8 +33,10 @@
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryManager<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryHandle))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryPool<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.OperationStatus))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequenceSegment<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequence<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.StandardFormat))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Binary.BinaryPrimitives))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Base64))]
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Formatter))]

View File

@ -1 +1 @@
98b02d7d0729482000041615c9b862196841d967
2d1623bd0afcb8fcd9b19d36c4a64f15b3fde741

View File

@ -1 +1 @@
f8f6dd535cb3839dd9c04fee3b4ec55d26915314
10c40a59765779eeaa521488281ce00518cfc3b9

View File

@ -1 +1 @@
ba7e59068c8ec816e5b0fee1eacb463e20762d33
a1d1b6cca3aa53d7ffc6473ce62e00b5daf2a932

View File

@ -1 +1 @@
c025a10da21ea4cb58bf2f8bf07584ff420445e4
94a5a7ecc25d19a43cd71a0ee2f19b882fb9b4d2

View File

@ -1 +1 @@
73a332928499b84fe731c680a19fed0ebbbeb98d
13ecf5118972c8d51928ca10b71e95ecf0fe2c52

View File

@ -1 +1 @@
d9087fc58f93a57a59ac9cabbe64673c30dd3dbd
2dccaa4f95aeed4146b89669c5a0ec2fe195e27b

View File

@ -1 +1 @@
7ee1ae602eeea1ec6dc6c15a1447deab1e140ad2
a713f62d6e80e20574a35e8147516fd728016dd7

View File

@ -1 +1 @@
98b02d7d0729482000041615c9b862196841d967
2d1623bd0afcb8fcd9b19d36c4a64f15b3fde741

View File

@ -1 +1 @@
f8f6dd535cb3839dd9c04fee3b4ec55d26915314
10c40a59765779eeaa521488281ce00518cfc3b9

View File

@ -1 +1 @@
ba7e59068c8ec816e5b0fee1eacb463e20762d33
a1d1b6cca3aa53d7ffc6473ce62e00b5daf2a932

View File

@ -1 +1 @@
c025a10da21ea4cb58bf2f8bf07584ff420445e4
94a5a7ecc25d19a43cd71a0ee2f19b882fb9b4d2

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