Skip to content

Commit c8acb8c

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250312.4
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25161.2 -> To Version 10.0.0-beta.25162.4
1 parent f69cc9c commit c8acb8c

File tree

7 files changed

+37
-22
lines changed

7 files changed

+37
-22
lines changed

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -640,34 +640,34 @@
640640
</Dependency>
641641
</ProductDependencies>
642642
<ToolsetDependencies>
643-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25161.2">
643+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25162.4">
644644
<Uri>https://github.com/dotnet/arcade</Uri>
645-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
645+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
646646
</Dependency>
647-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25161.2">
647+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25162.4">
648648
<Uri>https://github.com/dotnet/arcade</Uri>
649-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
649+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
650650
</Dependency>
651-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25161.2">
651+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25162.4">
652652
<Uri>https://github.com/dotnet/arcade</Uri>
653-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
653+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
654654
</Dependency>
655-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25161.2">
655+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25162.4">
656656
<Uri>https://github.com/dotnet/arcade</Uri>
657-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
657+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
658658
</Dependency>
659-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25161.2">
659+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25162.4">
660660
<Uri>https://github.com/dotnet/arcade</Uri>
661-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
661+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
662662
</Dependency>
663-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25161.2">
663+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25162.4">
664664
<Uri>https://github.com/dotnet/arcade</Uri>
665-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
665+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
666666
</Dependency>
667667
<!-- Intermediate is necessary for source build. -->
668-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25161.2">
668+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25162.4">
669669
<Uri>https://github.com/dotnet/arcade</Uri>
670-
<Sha>dbb4142ebc34d0a4b9f26136f86065c037dc4b80</Sha>
670+
<Sha>f5a7c5d5c56197b09715dece7541ca06beb94eb0</Sha>
671671
<SourceBuild RepoName="arcade" ManagedOnly="true" />
672672
</Dependency>
673673
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.3.25155.15">

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,10 @@
275275
</PropertyGroup>
276276
<PropertyGroup>
277277
<!-- Dependencies from https://github.com/dotnet/arcade -->
278-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25161.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
279-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25161.2</MicrosoftDotNetSignToolVersion>
280-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25161.2</MicrosoftDotNetXliffTasksVersion>
281-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25161.2</MicrosoftDotNetXUnitExtensionsVersion>
278+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25162.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
279+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25162.4</MicrosoftDotNetSignToolVersion>
280+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25162.4</MicrosoftDotNetXliffTasksVersion>
281+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25162.4</MicrosoftDotNetXUnitExtensionsVersion>
282282
</PropertyGroup>
283283
<PropertyGroup>
284284
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

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
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25161.2",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25161.2",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25162.4",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25162.4",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)