Merge in 'release/5.0' changes

dotnet · Apr 20, 2021 · 478b2f8 · 478b2f8
2 parents 85378ae + 25d20e9
commit 478b2f8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 22 deletions.
diff --git 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
@@ -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
@@ -402,7 +402,7 @@ public async Task SslStream_UntrustedCaWithCustomCallback_Throws(bool customCall
             }
         }
 
-        [Fact]
+        [ConditionalFact]
         [ActiveIssue("https://github.com/dotnet/runtime/issues/46837", TestPlatforms.OSX)]
         public async Task SslStream_ClientCertificate_SendsChain()
         {
@@ -434,7 +434,10 @@ public async Task SslStream_ClientCertificate_SendsChain()
                 }
 
                 // 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",  };