Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] Update dependencies from dotnet/arcade #4388

Merged
merged 2 commits into from
Oct 14, 2020
Merged

[master] Update dependencies from dotnet/arcade #4388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71780bc
Update dependencies from https://github.com/dotnet/arcade build 20201…
dotnet-maestro[bot] Oct 8, 2020
396aead
Update dependencies from https://github.com/dotnet/arcade build 20201…
dotnet-maestro[bot] Oct 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20478.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20509.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c8a7611e15656f45b039d46ec4e09f9f2a7edf99</Sha>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="5.0.0-beta.20478.3">
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.20509.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c8a7611e15656f45b039d46ec4e09f9f2a7edf99</Sha>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20478.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20509.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c8a7611e15656f45b039d46ec4e09f9f2a7edf99</Sha>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20478.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.20509.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c8a7611e15656f45b039d46ec4e09f9f2a7edf99</Sha>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20478.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20509.12">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c8a7611e15656f45b039d46ec4e09f9f2a7edf99</Sha>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
</PropertyGroup>
<!-- Arcade dependencies -->
<PropertyGroup>
<MicrosoftDotNetArcadeSdkPackageVersion>5.0.0-beta.20478.3</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>5.0.0-beta.20478.3</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>5.0.0-beta.20478.3</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>5.0.0-beta.20478.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetSignToolVersion>5.0.0-beta.20478.3</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>6.0.0-beta.20509.12</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>6.0.0-beta.20509.12</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>6.0.0-beta.20509.12</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>6.0.0-beta.20509.12</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetSignToolVersion>6.0.0-beta.20509.12</MicrosoftDotNetSignToolVersion>
</PropertyGroup>
<!-- CoreFx dependencies -->
<PropertyGroup>
Expand Down
15 changes: 8 additions & 7 deletions eng/common/post-build/sourcelink-validation.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,12 @@ $ValidatePackage = {
function CheckJobResult(
$result,
$packagePath,
[ref]$ValidationFailures) {
if ($jobResult.result -ne '0') {
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
[ref]$ValidationFailures,
[switch]$logErrors) {
if ($result -ne '0') {
if ($logError) {
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
}
$ValidationFailures.Value++
}
}
Expand Down Expand Up @@ -228,16 +231,14 @@ function ValidateSourceLinkLinks {

foreach ($Job in @(Get-Job -State 'Completed')) {
$jobResult = Wait-Job -Id $Job.Id | Receive-Job
CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures)
CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures) -LogErrors
Remove-Job -Id $Job.Id
}
}

foreach ($Job in @(Get-Job)) {
$jobResult = Wait-Job -Id $Job.Id | Receive-Job
if ($jobResult -ne '0') {
$ValidationFailures++
}
CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures)
Remove-Job -Id $Job.Id
}
if ($ValidationFailures -gt 0) {
Expand Down
12 changes: 11 additions & 1 deletion eng/common/templates/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ jobs:

- ${{ if eq(parameters.enablePublishTestResults, 'true') }}:
- task: PublishTestResults@2
displayName: Publish Test Results
displayName: Publish XUnit Test Results
inputs:
testResultsFormat: 'xUnit'
testResultsFiles: '*.xml'
Expand All @@ -213,6 +213,16 @@ jobs:
mergeTestResults: ${{ parameters.mergeTestResults }}
continueOnError: true
condition: always()
- task: PublishTestResults@2
displayName: Publish TRX Test Results
inputs:
testResultsFormat: 'VSTest'
testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
mergeTestResults: ${{ parameters.mergeTestResults }}
continueOnError: true
condition: always()

- ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: CopyFiles@2
Expand Down
Loading