Imported Upstream version 6.0.0.250

Former-commit-id: 5714a42f93f9d49aeeedf87fc564c71ae96e3fcf
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-05-23 08:29:11 +00:00
parent 77efe974ba
commit 08f368abd7
47 changed files with 44 additions and 41 deletions

View File

@ -1 +1 @@
f1c183fb7f8b76c043f55c90704c85b235a38326
b7a19436bc6ba92737945e204fbddc95ba281d6e

View File

@ -1 +1 @@
0fee87b6c8ce426a7ea9f81b89941ad94b0a779a
2fb685bad934e0f5daf1a4afa62c5447831979d1

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

@ -329,12 +329,15 @@ XTEST_COVERAGE_FLAGS = -O=-aot --profile=coverage:output=$(topdir)/class/lib/$(P
endif
check: run-xunit-test-local
xunit-test-local: $(xtest_lib_output) $(test_lib_dir)/xunit-excludes.txt
xunit-test-local: $(xtest_lib_output) $(test_lib_dir)/xunit-excludes.txt $(test_lib_dir)/Xunit.NetCore.Extensions.dll
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)" > $@
$(test_lib_dir)/Xunit.NetCore.Extensions.dll: $(topdir)/build/tests.make $(topdir)/../external/xunit-binaries/Xunit.NetCore.Extensions.dll | $(test_lib_dir)
@cp -f $(topdir)/../external/xunit-binaries/Xunit.NetCore.Extensions.dll $@
# 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

@ -1 +1 @@
4ed1d4c18aa07f6cdaee373009a6c03f48cea22d
bba1f46f4aa1a182adb7fae0ad835d43103205be

View File

@ -1 +1 @@
d675c598999641a5e47459b85a7fe5438113644a
9c57ec0f725aa176ef4cf96f981fad5a05dea602

View File

@ -1 +1 @@
ac7e21940c270bfb766389f27de0416ccfae942a
e3114509056352eca32bb98052f87ff63ed78cfc

View File

@ -1 +1 @@
53437cc79d82ea34e4f864a1e17def7b6b3d8341
7609b7638cf30c5dc14ac3a4d3219393d5660cd9

View File

@ -1 +1 @@
22e7ca7c619c75a86c2df747b83a459cba8b176b
d4608bcc96e9e2117d3f4ecc19bb20af4826f17e

View File

@ -1 +1 @@
acc7f5e0c758908791e55561c05b40571a0248d0
ab7ea80519c4dbad0c6366395afdd14302f6eb3b

View File

@ -1 +1 @@
ad616fde20b844a5a6e3f492a7b5e78ef61a5cf3
c46338c204644399b8e25c5f868445c74c51965c

View File

@ -1 +1 @@
4ed1d4c18aa07f6cdaee373009a6c03f48cea22d
bba1f46f4aa1a182adb7fae0ad835d43103205be

View File

@ -1 +1 @@
d675c598999641a5e47459b85a7fe5438113644a
9c57ec0f725aa176ef4cf96f981fad5a05dea602

View File

@ -1 +1 @@
ac7e21940c270bfb766389f27de0416ccfae942a
e3114509056352eca32bb98052f87ff63ed78cfc

View File

@ -1 +1 @@
53437cc79d82ea34e4f864a1e17def7b6b3d8341
7609b7638cf30c5dc14ac3a4d3219393d5660cd9

View File

@ -1 +1 @@
22e7ca7c619c75a86c2df747b83a459cba8b176b
d4608bcc96e9e2117d3f4ecc19bb20af4826f17e

View File

@ -1 +1 @@
acc7f5e0c758908791e55561c05b40571a0248d0
ab7ea80519c4dbad0c6366395afdd14302f6eb3b

View File

@ -1 +1 @@
ad616fde20b844a5a6e3f492a7b5e78ef61a5cf3
c46338c204644399b8e25c5f868445c74c51965c

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