Skip to content

[main] Update dependencies from dotnet/arcade #8829

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

Merged
merged 1 commit into from
Mar 13, 2025
Merged

[main] Update dependencies from dotnet/arcade #8829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25161.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25162.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25161.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25162.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<!-- Dependencies required for source build. We'll still update manually -->
Expand Down
2 changes: 2 additions & 0 deletions eng/common/templates-official/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
condition: always()
retryCountOnTaskFailure: 10 # for any logs being locked
continueOnError: true
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
- output: pipelineArtifact
Expand All @@ -39,6 +40,7 @@ jobs:
displayName: 'Publish logs'
continueOnError: true
condition: always()
retryCountOnTaskFailure: 10 # for any logs being locked
sbomEnabled: false # we don't need SBOM for logs

- ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
Expand Down
7 changes: 6 additions & 1 deletion eng/common/templates-official/steps/publish-build-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ parameters:
- name: is1ESPipeline
type: boolean
default: true

- name: retryCountOnTaskFailure
type: string
default: 10

steps:
- ${{ if ne(parameters.is1ESPipeline, true) }}:
Expand All @@ -38,4 +42,5 @@ steps:
PathtoPublish: ${{ parameters.pathToPublish }}
${{ if parameters.artifactName }}:
ArtifactName: ${{ parameters.artifactName }}

${{ if parameters.retryCountOnTaskFailure }}:
retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}
2 changes: 2 additions & 0 deletions eng/common/templates/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ jobs:
artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
continueOnError: true
condition: always()
retryCountOnTaskFailure: 10 # for any logs being locked
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
parameters:
Expand All @@ -56,6 +57,7 @@ jobs:
displayName: 'Publish logs'
continueOnError: true
condition: always()
retryCountOnTaskFailure: 10 # for any logs being locked
sbomEnabled: false # we don't need SBOM for logs

- ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
Expand Down
8 changes: 7 additions & 1 deletion eng/common/templates/steps/publish-build-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ parameters:
type: string
default: 'Container'

- name: retryCountOnTaskFailure
type: string
default: 10

steps:
- ${{ if eq(parameters.is1ESPipeline, true) }}:
- 'eng/common/templates cannot be referenced from a 1ES managed template': error
Expand All @@ -37,4 +41,6 @@ steps:
PublishLocation: ${{ parameters.publishLocation }}
PathtoPublish: ${{ parameters.pathToPublish }}
${{ if parameters.artifactName }}:
ArtifactName: ${{ parameters.artifactName }}
ArtifactName: ${{ parameters.artifactName }}
${{ if parameters.retryCountOnTaskFailure }}:
retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"dotnet": "10.0.100-preview.3.25125.5"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25161.2"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25162.4"
}
}
Loading