Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20201020.8 (#712)

[master] Update dependencies from dotnet/arcade
pull/722/head
dotnet-maestro[bot] 6 years ago
committed by GitHub
parent
commit
76c4ff26e2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      eng/Version.Details.xml
  2. 1
      eng/common/cross/build-rootfs.sh
  3. 8
      eng/common/templates/job/job.yml
  4. 2
      global.json

20
eng/Version.Details.xml

@ -3,25 +3,25 @@
<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>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20516.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20520.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7a79ce64f0703c231e6da88b5279dd0bf681b3d</Sha>
<Sha>7fbf2a7703498067569d07a21776b91e599028e2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.20516.5">
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.20520.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7a79ce64f0703c231e6da88b5279dd0bf681b3d</Sha>
<Sha>7fbf2a7703498067569d07a21776b91e599028e2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20516.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20520.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7a79ce64f0703c231e6da88b5279dd0bf681b3d</Sha>
<Sha>7fbf2a7703498067569d07a21776b91e599028e2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.20516.5">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.20520.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7a79ce64f0703c231e6da88b5279dd0bf681b3d</Sha>
<Sha>7fbf2a7703498067569d07a21776b91e599028e2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri>

1
eng/common/cross/build-rootfs.sh

@ -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

8
eng/common/templates/job/job.yml

@ -27,6 +27,7 @@ parameters:
useBuildManifest: false
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
name: ''
preSteps: []
runAsPublic: false
@ -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
@ -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:
@ -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:

2
global.json

@ -11,6 +11,6 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20516.5"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20520.8"
}
}

Loading…
Cancel
Save