Re-enable gRPC-Web interop tests in CI build (#1034)

Author: JamesNK

build/dependencies.props

@@ -5,7 +5,7 @@
     <GrpcDotNetPackageVersion>2.30.0</GrpcDotNetPackageVersion>  <!-- Used by example projects -->
     <GrpcPackageVersion>2.32.0-dev202008271149</GrpcPackageVersion>
     <MicrosoftAspNetCoreAppPackageVersion>3.1.3</MicrosoftAspNetCoreAppPackageVersion>
-    <MicrosoftAspNetCoreBlazorPackageVersion>5.0.0-rc.1.20381.8</MicrosoftAspNetCoreBlazorPackageVersion>
+    <MicrosoftAspNetCoreBlazorPackageVersion>5.0.0-rc.1.20431.20</MicrosoftAspNetCoreBlazorPackageVersion>
     <MicrosoftAspNetCoreBlazor31PackageVersion>3.2.0</MicrosoftAspNetCoreBlazor31PackageVersion>
     <MicrosoftBuildLocatorPackageVersion>1.2.2</MicrosoftBuildLocatorPackageVersion>
     <MicrosoftBuildPackageVersion>16.0.461</MicrosoftBuildPackageVersion>

build_and_test.sh

@@ -42,5 +42,4 @@ done
 
 echo "Tests finished"
 
-# Temporarily disable while using nightly .NET SDK build
-# source grpcweb_interoptests.sh
+source grpcweb_interoptests.sh

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "5.0.100-rc.1.20425.3"
+    "version": "5.0.100-rc.1.20431.3"
   }
 }

testassets/Shared/InteropClient.cs

@@ -117,7 +117,6 @@ private async Task<IChannelWrapper> HttpClientCreateChannel()
             var httpClientHandler = new HttpClientHandler();
 #if !BLAZOR_WASM
             httpClientHandler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
-#endif
 
             if (options.UseTestCa)
             {
@@ -127,6 +126,7 @@ private async Task<IChannelWrapper> HttpClientCreateChannel()
 
                 httpClientHandler.ClientCertificates.Add(cert);
             }
+#endif
 
             HttpMessageHandler httpMessageHandler;
             if (options.GrpcWebMode != null)