Skip to content

Commit 02d6fe6

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#4973)
[main] Update dependencies from dotnet/arcade
1 parent 02a54e1 commit 02d6fe6

File tree

7 files changed

+33
-18
lines changed

7 files changed

+33
-18
lines changed

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,29 +152,29 @@
152152
</Dependency>
153153
</ProductDependencies>
154154
<ToolsetDependencies>
155-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25161.2">
155+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25162.4">
156156
<Uri>https://github.com/dotnet/arcade</Uri>
157-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
157+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25161.2">
159+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25162.4">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
161+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25161.2">
163+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25162.4">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
165+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25161.2">
167+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25162.4">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
169+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25161.2">
171+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25162.4">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
173+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25161.2">
175+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25162.4">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
177+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
178178
</Dependency>
179179
</ToolsetDependencies>
180180
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212
<PropertyGroup>
1313
<!-- arcade -->
14-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25161.2</MicrosoftDotNetBuildTasksArchivesVersion>
15-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25161.2</MicrosoftDotNetBuildTasksInstallersVersion>
14+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25162.4</MicrosoftDotNetBuildTasksArchivesVersion>
15+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25162.4</MicrosoftDotNetBuildTasksInstallersVersion>
1616
<!-- corefx -->
1717
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
1818
<!-- The SQL team had deprecated System.Data.SqlClient package and replaced it with Microsoft.Data.SqlClient.

‎eng/common/templates-official/job/job.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
3232
ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
3333
condition: always()
34+
retryCountOnTaskFailure: 10 # for any logs being locked
3435
continueOnError: true
3536
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
3637
- output: pipelineArtifact
@@ -39,6 +40,7 @@ jobs:
3940
displayName: 'Publish logs'
4041
continueOnError: true
4142
condition: always()
43+
retryCountOnTaskFailure: 10 # for any logs being locked
4244
sbomEnabled: false # we don't need SBOM for logs
4345

4446
- ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:

‎eng/common/templates-official/steps/publish-build-artifacts.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ parameters:
2424
- name: is1ESPipeline
2525
type: boolean
2626
default: true
27+
28+
- name: retryCountOnTaskFailure
29+
type: string
30+
default: 10
2731

2832
steps:
2933
- ${{ if ne(parameters.is1ESPipeline, true) }}:
@@ -38,4 +42,5 @@ steps:
3842
PathtoPublish: ${{ parameters.pathToPublish }}
3943
${{ if parameters.artifactName }}:
4044
ArtifactName: ${{ parameters.artifactName }}
41-
45+
${{ if parameters.retryCountOnTaskFailure }}:
46+
retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}

‎eng/common/templates/job/job.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
4747
continueOnError: true
4848
condition: always()
49+
retryCountOnTaskFailure: 10 # for any logs being locked
4950
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
5051
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
5152
parameters:
@@ -56,6 +57,7 @@ jobs:
5657
displayName: 'Publish logs'
5758
continueOnError: true
5859
condition: always()
60+
retryCountOnTaskFailure: 10 # for any logs being locked
5961
sbomEnabled: false # we don't need SBOM for logs
6062

6163
- ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:

‎eng/common/templates/steps/publish-build-artifacts.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ parameters:
2525
type: string
2626
default: 'Container'
2727

28+
- name: retryCountOnTaskFailure
29+
type: string
30+
default: 10
31+
2832
steps:
2933
- ${{ if eq(parameters.is1ESPipeline, true) }}:
3034
- 'eng/common/templates cannot be referenced from a 1ES managed template': error
@@ -37,4 +41,6 @@ steps:
3741
PublishLocation: ${{ parameters.publishLocation }}
3842
PathtoPublish: ${{ parameters.pathToPublish }}
3943
${{ if parameters.artifactName }}:
40-
ArtifactName: ${{ parameters.artifactName }}
44+
ArtifactName: ${{ parameters.artifactName }}
45+
${{ if parameters.retryCountOnTaskFailure }}:
46+
retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
}
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25161.2",
12-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25161.2",
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25162.4",
12+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25162.4",
1313
"Microsoft.Build.NoTargets": "3.7.0",
1414
"Microsoft.Build.Traversal": "3.4.0"
1515
}

0 commit comments

Comments
 (0)