Update dependencies from https://github.com/dotnet/arcade build 20201…

…025.1 (dotnet#1593) [master] Update dependencies from dotnet/arcade
sbomer · Oct 27, 2020 · efcf681 · efcf681
1 parent 2a4eb66
commit efcf681
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/eng/Version.Details.xml b/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/eng/Versions.props b/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/eng/common/templates/job/job.yml b/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/global.json b/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"
   }