diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-12-20 21:46:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 21:46:22 +0300 |
| commit | ddf6249c1d1879b386acfafd000334bdd5a0310d (patch) | |
| tree | 89f05e9a5b1d9c635b74ca9817e74e00725601e8 | |
| parent | ccd7b52ca8a70d6aed6667e2d2f0d496f596a941 (diff) | |
Update Helix SDK to latest version (#12156)
They added retry logic inside of the SDK to deal with some expected Helix API responses.
| m--------- | external/helix-binaries | 0 | ||||
| -rw-r--r-- | mcs/class/Facades/subdirs.make | 3 | ||||
| -rw-r--r-- | mcs/tools/mono-helix-client/Makefile | 2 | ||||
| -rwxr-xr-x | runtime/mono-test.sh | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/external/helix-binaries b/external/helix-binaries -Subproject b4f5d25eccbdd4a21b7edc512a690ad957497a3 +Subproject 7e893ea868deb06655931ef404e0f457fd655c0 diff --git a/mcs/class/Facades/subdirs.make b/mcs/class/Facades/subdirs.make index f75e9fb1ea5..1be737de76f 100644 --- a/mcs/class/Facades/subdirs.make +++ b/mcs/class/Facades/subdirs.make @@ -51,7 +51,8 @@ System.Linq.Expressions System.Dynamic.Runtime System.Linq System.Threading.Task System.Diagnostics.Tools System.Reflection.Primitives System.Runtime.Extensions System.Runtime.InteropServices System.Text.Encoding.Extensions \ System.Runtime.Numerics System.Xml.XDocument System.Reflection.Extensions System.IO.FileSystem.Primitives System.IO.FileSystem \ System.Diagnostics.FileVersionInfo System.Security.Cryptography.Primitives System.Security.Cryptography.Algorithms System.ValueTuple \ -System.Text.Encoding.CodePages System.Text.RegularExpressions System.Diagnostics.Contracts netstandard +System.Text.Encoding.CodePages System.Text.RegularExpressions System.Diagnostics.Contracts \ +System.Diagnostics.Tracing System.Net.Primitives netstandard xammac_SUBDIRS = $(monotouch_SUBDIRS) xammac_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS) diff --git a/mcs/tools/mono-helix-client/Makefile b/mcs/tools/mono-helix-client/Makefile index a5a3ae3cce0..97ea981de2b 100644 --- a/mcs/tools/mono-helix-client/Makefile +++ b/mcs/tools/mono-helix-client/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make PROGRAM = mono-helix-client.exe NO_INSTALL = yes -LIB_REFS = System System.Net.Http Facades/netstandard +LIB_REFS = System System.Net.Http Facades/netstandard Facades/System.Runtime Facades/System.Threading.Tasks helix_binaries = $(topdir)/../external/helix-binaries LOCAL_MCS_FLAGS = -r:$(helix_binaries)/Microsoft.DotNet.Helix.Client.dll -r:$(helix_binaries)/Microsoft.DotNet.Helix.JobSender.dll -r:$(helix_binaries)/Microsoft.Rest.ClientRuntime.dll diff --git a/runtime/mono-test.sh b/runtime/mono-test.sh index d07ce9c0b37..152608199ae 100755 --- a/runtime/mono-test.sh +++ b/runtime/mono-test.sh @@ -283,6 +283,6 @@ if [ "$test_suite" = "--runtime" ]; then cd tests/runtime || exit 1 # TODO: only ported runtest-managed for now - "${MONO_EXECUTABLE}" --config "$r/_tmpinst/etc/mono/config" --debug test-runner.exe --verbose --xunit "${xunit_results_path}" --config tests-config --runtime "${MONO_EXECUTABLE}" --mono-path "$r/net_4_x" -j a --testsuite-name "runtime" --timeout 300 --disabled "$DISABLED_TESTS" $(cat runtime-test-list.txt) + "${MONO_EXECUTABLE}" --config "$r/_tmpinst/etc/mono/config" --debug test-runner.exe --verbose --xunit "${xunit_results_path}" --config tests-config --runtime "${MONO_EXECUTABLE}" --mono-path "$r/net_4_x" -j a --testsuite-name "runtime" --timeout 300 --disabled "$DISABLED_TESTS" --input-file runtime-test-list.txt exit $? fi |