diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a78271f81..60b3aff04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -140,13 +140,13 @@ - + https://github.com/dotnet/arcade - c262e0121edb7df890528bb61589d4b6e440a1f6 + a77062f9cdaf07cbaf8d19941d079837844f69ca - + https://github.com/dotnet/arcade - c262e0121edb7df890528bb61589d4b6e440a1f6 + a77062f9cdaf07cbaf8d19941d079837844f69ca https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 534578a9a..4bd73447f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.20522.2 + 6.0.0-beta.20525.1 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 8e4ce2c28..06048c279 100644 --- 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 index 380171bf8..1e44fca71 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20522.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20525.1" } }