Skip to content

Commit 186036d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#40238)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 127c781 commit 186036d

File tree

8 files changed

+25
-25
lines changed

8 files changed

+25
-25
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -471,30 +471,30 @@
471471
</Dependency>
472472
</ProductDependencies>
473473
<ToolsetDependencies>
474-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24212.4">
474+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24217.1">
475475
<Uri>https://github.com/dotnet/arcade</Uri>
476-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
476+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
477477
</Dependency>
478-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24212.4">
478+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24217.1">
479479
<Uri>https://github.com/dotnet/arcade</Uri>
480-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
480+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
481481
</Dependency>
482-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24212.4">
482+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24217.1">
483483
<Uri>https://github.com/dotnet/arcade</Uri>
484-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
484+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
485485
</Dependency>
486-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24212.4">
486+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24217.1">
487487
<Uri>https://github.com/dotnet/arcade</Uri>
488-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
488+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
489489
</Dependency>
490-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24212.4">
490+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24217.1">
491491
<Uri>https://github.com/dotnet/arcade</Uri>
492-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
492+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
493493
</Dependency>
494494
<!-- Intermediate is necessary for source build. -->
495-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24212.4">
495+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24217.1">
496496
<Uri>https://github.com/dotnet/arcade</Uri>
497-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
497+
<Sha>8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3</Sha>
498498
<SourceBuild RepoName="arcade" ManagedOnly="true" />
499499
</Dependency>
500500
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-preview.4.24215.5">

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
</PropertyGroup>
168168
<PropertyGroup>
169169
<!-- Dependencies from https://github.com/dotnet/arcade -->
170-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24212.4</MicrosoftDotNetSignToolVersion>
171-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24212.4</MicrosoftDotNetXliffTasksVersion>
170+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24217.1</MicrosoftDotNetSignToolVersion>
171+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24217.1</MicrosoftDotNetXliffTasksVersion>
172172
</PropertyGroup>
173173
<PropertyGroup>
174174
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
@@ -187,7 +187,7 @@
187187
<PropertyGroup>
188188
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
189189
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
190-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24212.4</MicrosoftDotNetXUnitExtensionsVersion>
190+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24217.1</MicrosoftDotNetXUnitExtensionsVersion>
191191
<MoqPackageVersion>4.18.4</MoqPackageVersion>
192192
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
193193
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ jobs:
210210
- task: 1ES.PublishPipelineArtifact@1
211211
inputs:
212212
targetPath: 'artifacts/log'
213-
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
213+
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)_Attempt$(System.JobAttempt)') }}
214214
displayName: 'Publish logs'
215215
continueOnError: true
216216
condition: always()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# If it's not devdiv, it's dnceng
5757
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
5858
name: $(DncEngInternalBuildPool)
59-
image: 1es-windows-2022-pt
59+
image: 1es-windows-2022
6060
os: windows
6161

6262
steps:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
${{ if eq(variables['System.TeamProject'], 'internal') }}:
5454
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
55-
image: 1es-mariner-2-pt
55+
image: 1es-mariner-2
5656
os: linux
5757

5858
${{ if ne(parameters.platform.pool, '') }}:

‎eng/common/templates-official/post-build/post-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ stages:
110110
# If it's not devdiv, it's dnceng
111111
${{ else }}:
112112
name: $(DncEngInternalBuildPool)
113-
image: 1es-windows-2022-pt
113+
image: 1es-windows-2022
114114
os: windows
115115

116116
steps:
@@ -150,7 +150,7 @@ stages:
150150
# If it's not devdiv, it's dnceng
151151
${{ else }}:
152152
name: $(DncEngInternalBuildPool)
153-
image: 1es-windows-2022-pt
153+
image: 1es-windows-2022
154154
os: windows
155155
steps:
156156
- template: setup-maestro-vars.yml
@@ -208,7 +208,7 @@ stages:
208208
# If it's not devdiv, it's dnceng
209209
${{ else }}:
210210
name: $(DncEngInternalBuildPool)
211-
image: 1es-windows-2022-pt
211+
image: 1es-windows-2022
212212
os: windows
213213
steps:
214214
- template: setup-maestro-vars.yml

‎eng/common/templates-official/variables/pool-providers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# image: 1es-windows-2022-pt
26+
# image: 1es-windows-2022
2727

2828
variables:
2929
# Coalesce the target and source branches so we know when a PR targets a release branch

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.3.24175.24",
3+
"dotnet": "9.0.100-preview.3.24204.13",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24212.4",
18-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24212.4",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24217.1",
18+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24217.1",
1919
"Microsoft.Build.NoTargets": "3.7.0"
2020
}
2121
}

0 commit comments

Comments
 (0)