diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2021-04-21 00:14:33 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2021-04-21 00:14:33 +0300 |
| commit | 478b2f8c0e480665f6c52c95cd57830784dc9560 (patch) | |
| tree | 93b5e7baf213a9577235f6d4b5b769e6b11f957c | |
| parent | 85378ae613adcd0427e2edb1b7c06e555bc5f684 (diff) | |
| parent | 25d20e91c44ddc0b22e1c306d354057c2282b4f1 (diff) | |
Merge in 'release/5.0' changesv5.0.6
| -rw-r--r-- | eng/pipelines/runtime-official.yml | 23 | ||||
| -rw-r--r-- | eng/pipelines/runtime.yml | 24 | ||||
| -rw-r--r-- | src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs | 7 |
3 files changed, 32 insertions, 22 deletions
diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 3deef33444c..dc068e8b37c 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -90,22 +90,25 @@ stages: buildConfig: release runtimeFlavor: mono platforms: - - Android_x64 - - Android_x86 - - Android_arm - - Android_arm64 - - tvOS_x64 - - tvOS_arm64 - - iOS_x64 - - iOS_x86 - - iOS_arm - - iOS_arm64 - OSX_x64 - Linux_x64 - Linux_arm - Linux_arm64 - Linux_musl_x64 - Browser_wasm + + # https://github.com/dotnet/runtime/pull/50940 + # - Android_x64 + # - Android_x86 + # - Android_arm + # - Android_arm64 + # - tvOS_x64 + # - tvOS_arm64 + # - iOS_x64 + # - iOS_x86 + # - iOS_arm + # - iOS_arm64 + # - Linux_musl_arm # - Linux_musl_arm64 # - Windows_NT_x64 enable once coreclr.dll has a version header: https://github.com/dotnet/runtime/issues/37503 diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 5a023d9e4e8..3fac198b603 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -263,12 +263,14 @@ jobs: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} runtimeFlavor: mono platforms: - - Android_x86 - - Android_arm64 - - tvOS_x64 - - iOS_arm64 - - iOS_x86 - Linux_arm + + # https://github.com/dotnet/runtime/pull/50940 + # - Android_x86 + # - Android_arm64 + # - tvOS_x64 + # - iOS_x86 + # - iOS_arm64 jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -286,12 +288,14 @@ jobs: buildConfig: Release runtimeFlavor: mono platforms: - - Android_x64 - - Android_arm - - tvOS_arm64 - - iOS_arm - - iOS_x64 - Linux_musl_x64 + + # https://github.com/dotnet/runtime/pull/50940 + # - Android_x64 + # - Android_arm + # - tvOS_arm64 + # - iOS_x64 + # - iOS_arm jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs index f9c0f986f47..404ca4af84c 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs @@ -402,7 +402,7 @@ namespace System.Net.Security.Tests } } - [Fact] + [ConditionalFact] [ActiveIssue("https://github.com/dotnet/runtime/issues/46837", TestPlatforms.OSX)] public async Task SslStream_ClientCertificate_SendsChain() { @@ -434,7 +434,10 @@ namespace System.Net.Security.Tests } // Verify we can construct full chain - Assert.True(chain.ChainElements.Count > clientChain.Count, "chain cannot be built"); + if (chain.ChainElements.Count < clientChain.Count) + { + throw new SkipTestException($"chain cannot be built {chain.ChainElements.Count}"); + } } var clientOptions = new SslClientAuthenticationOptions() { TargetHost = "localhost", }; |