Skip to content

Commit b295ae6

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#13129)
[main] Update dependencies from dotnet/arcade
1 parent 8158b01 commit b295ae6

File tree

7 files changed

+35
-20
lines changed

7 files changed

+35
-20
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
191191
</ProductDependencies>
192192
<ToolsetDependencies>
193193
<!-- Arcade -->
194-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25161.2">
194+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25162.4">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
196+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25161.2">
198+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25162.4">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
200+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25161.2">
202+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25162.4">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
204+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
205205
</Dependency>
206-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25161.2">
206+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25162.4">
207207
<Uri>https://github.com/dotnet/arcade</Uri>
208-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
208+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
209209
</Dependency>
210-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25161.2">
210+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25162.4">
211211
<Uri>https://github.com/dotnet/arcade</Uri>
212-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
212+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
213213
</Dependency>
214-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25161.2">
214+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25162.4">
215215
<Uri>https://github.com/dotnet/arcade</Uri>
216-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
216+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
217217
</Dependency>
218218
</ToolsetDependencies>
219219
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25161.2</MicrosoftDotNetGenFacadesPackageVersion>
60-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25161.2</MicrosoftDotNetRemoteExecutorVersion>
61-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25161.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
59+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25162.4</MicrosoftDotNetGenFacadesPackageVersion>
60+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25162.4</MicrosoftDotNetRemoteExecutorVersion>
61+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25162.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
6262
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
6363
</PropertyGroup>
6464
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"version": "10.0.100-preview.3.25125.5"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25161.2",
18-
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25161.2",
19-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25161.2",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25162.4",
18+
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25162.4",
19+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25162.4",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "10.0.0-preview.3.25155.12"
2222
},

0 commit comments

Comments
 (0)