Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20201…
Browse files Browse the repository at this point in the history
…020.8 (#645)

[master] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] authored Oct 23, 2020
1 parent fd540c1 commit 3911382
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20516.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20520.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7a79ce64f0703c231e6da88b5279dd0bf681b3d</Sha>
<Sha>7fbf2a7703498067569d07a21776b91e599028e2</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
1 change: 1 addition & 0 deletions eng/common/cross/build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ elif [[ -n $__CodeName ]]; then
chroot $__RootfsDir apt-get -f -y install
chroot $__RootfsDir apt-get -y install $__UbuntuPackages
chroot $__RootfsDir symlinks -cr /usr
chroot $__RootfsDir apt clean

if [ $__SkipUnmount == 0 ]; then
umount $__RootfsDir/* || true
Expand Down
8 changes: 5 additions & 3 deletions eng/common/templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ parameters:
useBuildManifest: false
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
name: ''
preSteps: []
runAsPublic: false
Expand Down Expand Up @@ -131,8 +132,8 @@ jobs:
- task: RichCodeNavIndexer@0
displayName: RichCodeNav Upload
inputs:
languages: 'csharp'
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'prod') }}
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
continueOnError: true

Expand Down Expand Up @@ -202,7 +203,7 @@ jobs:
continueOnError: true
condition: always()

- ${{ if eq(parameters.enablePublishTestResults, 'true') }}:
- ${{ if or(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, 'xunit')) }}:
- task: PublishTestResults@2
displayName: Publish XUnit Test Results
inputs:
Expand All @@ -213,6 +214,7 @@ jobs:
mergeTestResults: ${{ parameters.mergeTestResults }}
continueOnError: true
condition: always()
- ${{ if or(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, 'vstest')) }}:
- task: PublishTestResults@2
displayName: Publish TRX Test Results
inputs:
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"xcopy-msbuild": "16.8.0-preview2.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20516.5"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20520.8"
}
}

0 comments on commit 3911382

Please sign in to comment.