[master] Update dependencies from dotnet/arcade (#477)

* Update dependencies from https://github.com/dotnet/arcade build 20201015.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 5.0.0-beta.20506.7 -> To Version 6.0.0-beta.20515.7

* React to #if changes

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Chris R <Tratcher@outlook.com>

eng/Version.Details.xml

@@ -7,13 +7,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20506.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20515.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ee39cd1573dbb8011f343e1037af51d4fc00a747</Sha>
+      <Sha>d4de3ce701c2ba697d71cc70e2db69d7568913dc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20506.7">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20515.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ee39cd1573dbb8011f343e1037af51d4fc00a747</Sha>
+      <Sha>d4de3ce701c2ba697d71cc70e2db69d7568913dc</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/common/cross/toolchain.cmake

@@ -139,6 +139,10 @@ function(add_toolchain_linker_flag Flag)
   set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
 endfunction()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib/${TOOLCHAIN}")
+  add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}")
+endif()
 
 if(TARGET_ARCH_NAME STREQUAL "armel")
   if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only

eng/common/performance/performance-setup.sh

@@ -201,6 +201,7 @@ if [[ "$internal" == true ]]; then
 fi
 
 if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then
+    configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot"
     extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoMono"
 fi
 

eng/common/post-build/sourcelink-validation.ps1

@@ -161,9 +161,12 @@ $ValidatePackage = {
 function CheckJobResult(
     $result, 
     $packagePath,
-    [ref]$ValidationFailures) {
-  if ($jobResult.result -ne '0') {
-    Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
+    [ref]$ValidationFailures,
+    [switch]$logErrors) {
+  if ($result -ne '0') {
+    if ($logError) {
+      Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
+    }
     $ValidationFailures.Value++
   }
 }
@@ -228,16 +231,14 @@ function ValidateSourceLinkLinks {
 
       foreach ($Job in @(Get-Job -State 'Completed')) {
         $jobResult = Wait-Job -Id $Job.Id | Receive-Job
-        CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures)
+        CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures) -LogErrors
         Remove-Job -Id $Job.Id
       }
     }
 
   foreach ($Job in @(Get-Job)) {
     $jobResult = Wait-Job -Id $Job.Id | Receive-Job
-    if ($jobResult -ne '0') {
-      $ValidationFailures++
-    }
+    CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures)
     Remove-Job -Id $Job.Id
   }
   if ($ValidationFailures -gt 0) {

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "5.0.100-rc.1.20452.10"
+    "version": "5.0.100-rc.2.20479.15"
   },
   "tools": {
-    "dotnet": "5.0.100-rc.1.20452.10",
+    "dotnet": "5.0.100-rc.2.20479.15",
     "runtimes": {
       "dotnet/x64": [
         "$(MicrosoftNETCoreAppPackageVersion)",
@@ -22,7 +22,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20506.7",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20506.7"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20515.7",
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20515.7"
   }
 }

src/ReverseProxy/Configuration/CertificateConfigLoader.cs

@@ -43,7 +43,7 @@ public X509Certificate2 LoadCertificate(CertificateConfigData certificateConfig)
                 }
                 else
                 {
-#if NETCOREAPP5_0
+#if NET5_0
                     return LoadPEMCertificate(certificateConfig, certificatePath);
 #elif NETCOREAPP3_1
                     throw new NotSupportedException("PEM certificate format is only supported on .NET 5 or higher.");
@@ -60,7 +60,7 @@ public X509Certificate2 LoadCertificate(CertificateConfigData certificateConfig)
             throw new ArgumentException($"Passed {nameof(CertificateConfigData)} doesn't define a certificate in any known format.");
         }
 
-#if NETCOREAPP5_0
+#if NET5_0
         private X509Certificate2 LoadPEMCertificate(CertificateConfigData certificateConfig, string certificatePath)
         {
             var certificateKeyPath = Path.Combine(_hostEnvironment.ContentRootPath, certificateConfig.KeyPath);

src/ReverseProxy/Service/RuntimeModel/Transforms/HttpMethodTransform.cs

@@ -28,7 +28,7 @@ public override void Apply(RequestParametersTransformContext context)
 
         private static string GetCanonicalizedValue(string method)
         {
-#if NET5_0 || NETCOREAPP5_0
+#if NET5_0
             return HttpMethods.GetCanonicalizedValue(method);
 #elif NETCOREAPP3_1
             return method switch
@@ -51,7 +51,7 @@ string _ when HttpMethods.IsConnect(method) => HttpMethods.Connect,
 
         private static bool HttpMethodEquals(string methodA, string methodB)
         {
-#if NET5_0 || NETCOREAPP5_0
+#if NET5_0
             return HttpMethods.Equals(methodA, methodB);
 #elif NETCOREAPP3_1
             return object.ReferenceEquals(methodA, methodB) || StringComparer.OrdinalIgnoreCase.Equals(methodA, methodB);

src/ReverseProxy/Utilities/ProtocolHelper.cs

@@ -8,7 +8,7 @@ namespace Microsoft.ReverseProxy
 {
     internal static class ProtocolHelper
     {
-#if NETCOREAPP5_0
+#if NET5_0
         internal static readonly Version Http2Version = HttpVersion.Version20;
         internal static readonly Version Http11Version = HttpVersion.Version11;
 #elif NETCOREAPP3_1
@@ -22,7 +22,7 @@ internal static class ProtocolHelper
 
         public static bool IsHttp2(string protocol)
         {
-#if NETCOREAPP5_0
+#if NET5_0
             return Microsoft.AspNetCore.Http.HttpProtocol.IsHttp2(protocol);
 #elif NETCOREAPP3_1
             return StringComparer.OrdinalIgnoreCase.Equals("HTTP/2", protocol);
@@ -33,7 +33,7 @@ public static bool IsHttp2(string protocol)
 
         public static bool IsHttp2OrGreater(string protocol)
         {
-#if NETCOREAPP5_0
+#if NET5_0
             return Microsoft.AspNetCore.Http.HttpProtocol.IsHttp2(protocol) || Microsoft.AspNetCore.Http.HttpProtocol.IsHttp3(protocol);
 #elif NETCOREAPP3_1
             return StringComparer.OrdinalIgnoreCase.Equals("HTTP/2", protocol) || StringComparer.OrdinalIgnoreCase.Equals("HTTP/3", protocol);

test/ReverseProxy.FunctionalTests/WebSocketTests.cs

@@ -100,7 +100,7 @@ public async Task RawUpgradeTest()
 
 #if NETCOREAPP3_1
             using var rawStream = await response.Content.ReadAsStreamAsync();
-#elif NETCOREAPP5_0
+#elif NET5_0
             using var rawStream = await response.Content.ReadAsStreamAsync(cts.Token);
 #else
 #error A target framework was added to the project and needs to be added to this condition.
@@ -154,7 +154,7 @@ public async Task FalseUpgradeTest()
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
 #if NETCOREAPP3_1
             Assert.Equal("Hello World", await response.Content.ReadAsStringAsync());
-#elif NETCOREAPP5_0
+#elif NET5_0
             Assert.Equal("Hello World", await response.Content.ReadAsStringAsync(cts.Token));
 #else
 #error A target framework was added to the project and needs to be added to this condition.