From fb97c71208ffdebc8527830f6ee183b4eb10692d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 27 Oct 2020 10:18:51 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20201025.1 (dotnet/linker#1593)

[master] Update dependencies from dotnet/arcade


Commit migrated from https://github.com/dotnet/linker/commit/efcf6819afac59bccf311fd2024c0ac156742eda
---
 src/tools/illink/eng/Version.Details.xml          | 8 ++++----
 src/tools/illink/eng/Versions.props               | 2 +-
 src/tools/illink/eng/common/templates/job/job.yml | 4 ++--
 src/tools/illink/global.json                      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/tools/illink/eng/Version.Details.xml b/src/tools/illink/eng/Version.Details.xml
index 619d1eb4eb77b..d5e3cf6747af4 100644
--- a/src/tools/illink/eng/Version.Details.xml
+++ b/src/tools/illink/eng/Version.Details.xml
@@ -3,13 +3,13 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20522.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20525.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c262e0121edb7df890528bb61589d4b6e440a1f6</Sha>
+      <Sha>a77062f9cdaf07cbaf8d19941d079837844f69ca</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20522.2">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20525.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c262e0121edb7df890528bb61589d4b6e440a1f6</Sha>
+      <Sha>a77062f9cdaf07cbaf8d19941d079837844f69ca</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-alpha.1.20525.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/src/tools/illink/eng/Versions.props b/src/tools/illink/eng/Versions.props
index 2a3d9bf683855..fdbfbba4ce5f8 100644
--- a/src/tools/illink/eng/Versions.props
+++ b/src/tools/illink/eng/Versions.props
@@ -20,7 +20,7 @@
     <SystemReflectionMetadataVersion>1.8.0</SystemReflectionMetadataVersion>
     <MicrosoftBuildFrameworkVersion>15.4.8</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildUtilitiesCoreVersion>15.4.8</MicrosoftBuildUtilitiesCoreVersion>
-    <MicrosoftDotNetApiCompatVersion>6.0.0-beta.20522.2</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetApiCompatVersion>6.0.0-beta.20525.1</MicrosoftDotNetApiCompatVersion>
     <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20471.1</MicrosoftDotNetCodeAnalysisVersion>
     <!-- This controls the version of the cecil package, or the version of cecil in the project graph
          when we build the cecil submodule. The reference assembly package will depend on this version of cecil.
diff --git a/src/tools/illink/eng/common/templates/job/job.yml b/src/tools/illink/eng/common/templates/job/job.yml
index 8e4ce2c28537d..06048c27907b2 100644
--- a/src/tools/illink/eng/common/templates/job/job.yml
+++ b/src/tools/illink/eng/common/templates/job/job.yml
@@ -203,7 +203,7 @@ jobs:
       continueOnError: true
       condition: always()
 
-  - ${{ if or(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, 'xunit')) }}:
+  - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
     - task: PublishTestResults@2
       displayName: Publish XUnit Test Results
       inputs:
@@ -214,7 +214,7 @@ jobs:
         mergeTestResults: ${{ parameters.mergeTestResults }}
       continueOnError: true
       condition: always()
-  - ${{ if or(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, 'vstest')) }}:
+  - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
     - task: PublishTestResults@2
       displayName: Publish TRX Test Results
       inputs:
diff --git a/src/tools/illink/global.json b/src/tools/illink/global.json
index c963ff50a6681..cc3b00a7426df 100644
--- a/src/tools/illink/global.json
+++ b/src/tools/illink/global.json
@@ -8,7 +8,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20522.2",
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20525.1",
     "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
     "Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.20525.3"
   }