Skip to content

Commit 165348c

Browse files
wiktorkwiktork
committed
Merged PR 59937: Update arcade
Update arcade ---- #### AI description (iteration 1) #### PR Classification Dependency and build infrastructure update to newer Arcade/Helix tooling and Windows build agent images. #### PR Summary Updates Arcade-related dependencies and aligns Azure Pipelines pool images to newer Windows/VS agent baselines. - `eng/Version.Details.xml`: Bumps Arcade SDK, Build.Tasks.Archives, CodeAnalysis, Helix SDK, and XUnitExtensions to `10.0.0-beta.26201.4` and switches source URI/SHA to `github.com/dotnet/arcade` (`2ad6e0a...`). - `global.json`: Updates `Microsoft.DotNet.Arcade.Sdk` and `Microsoft.DotNet.Helix.Sdk` MSBuild SDK versions to `10.0.0-beta.26201.4`. - `eng/Versions.props`: Updates referenced versions for Build.Tasks.Archives, CodeAnalysis, and XUnitExtensions to `10.0.0-beta.26201.4`. - `eng/common/core-templates/**`: Moves pipeline pool images from Windows 2022/VS2022 to Windows 2025 and `windows.vs2026.amd64` for publishing/post-build and related jobs. - `eng/common/templates*/variables/pool-providers.yml`: Updates commented pool image/demand examples to `windows.vs2026.amd64`. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
1 parent e225249 commit 165348c

9 files changed

Lines changed: 35 additions & 35 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@
2222
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
2323
<Sha>1e7d5a8ae309af8fad1826a5e968aae30719a281</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26180.118">
26-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
27-
<Sha>1e7d5a8ae309af8fad1826a5e968aae30719a281</Sha>
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26201.4">
26+
<Uri>https://github.com/dotnet/arcade</Uri>
27+
<Sha>2ad6e0a00c692279222642dbcd6e72eb21572d93</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.26180.118">
30-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
31-
<Sha>1e7d5a8ae309af8fad1826a5e968aae30719a281</Sha>
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.26201.4">
30+
<Uri>https://github.com/dotnet/arcade</Uri>
31+
<Sha>2ad6e0a00c692279222642dbcd6e72eb21572d93</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26180.118">
34-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
35-
<Sha>1e7d5a8ae309af8fad1826a5e968aae30719a281</Sha>
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26201.4">
34+
<Uri>https://github.com/dotnet/arcade</Uri>
35+
<Sha>2ad6e0a00c692279222642dbcd6e72eb21572d93</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26180.118">
38-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
39-
<Sha>1e7d5a8ae309af8fad1826a5e968aae30719a281</Sha>
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26201.4">
38+
<Uri>https://github.com/dotnet/arcade</Uri>
39+
<Sha>2ad6e0a00c692279222642dbcd6e72eb21572d93</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.26180.118">
42-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
43-
<Sha>1e7d5a8ae309af8fad1826a5e968aae30719a281</Sha>
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.26201.4">
42+
<Uri>https://github.com/dotnet/arcade</Uri>
43+
<Sha>2ad6e0a00c692279222642dbcd6e72eb21572d93</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.FileFormats" Version="1.0.707702">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
<!-- dotnet/dotnet references -->
5555
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0</MicrosoftAspNetCoreAppRuntimewinx64Version>
5656
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.202</MicrosoftCodeAnalysisNetAnalyzersVersion>
57-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.26180.118</MicrosoftDotNetBuildTasksArchivesVersion>
58-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.26180.118</MicrosoftDotNetCodeAnalysisVersion>
59-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.26180.118</MicrosoftDotNetXUnitExtensionsVersion>
57+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.26201.4</MicrosoftDotNetBuildTasksArchivesVersion>
58+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.26201.4</MicrosoftDotNetCodeAnalysisVersion>
59+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.26201.4</MicrosoftDotNetXUnitExtensionsVersion>
6060
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
6161
<SystemCommandLineVersion>2.0.0</SystemCommandLineVersion>
6262
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-rtm.25523.111</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ jobs:
5252
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
5353
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
5454
name: AzurePipelines-EO
55-
image: 1ESPT-Windows2022
55+
image: 1ESPT-Windows2025
5656
demands: Cmd
5757
os: windows
5858
# If it's not devdiv, it's dnceng
5959
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
6060
name: $(DncEngInternalBuildPool)
61-
image: 1es-windows-2022
61+
image: windows.vs2026.amd64
6262
os: windows
6363

6464
steps:

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ jobs:
7474
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
7575
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
7676
name: AzurePipelines-EO
77-
image: 1ESPT-Windows2022
77+
image: 1ESPT-Windows2025
7878
demands: Cmd
7979
os: windows
8080
# If it's not devdiv, it's dnceng
8181
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
8282
name: NetCore1ESPool-Publishing-Internal
83-
image: windows.vs2022.amd64
83+
image: windows.vs2026.amd64
8484
os: windows
8585
steps:
8686
- ${{ if eq(parameters.is1ESPipeline, '') }}:

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ stages:
120120
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
121121
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
122122
name: AzurePipelines-EO
123-
image: 1ESPT-Windows2022
123+
image: 1ESPT-Windows2025
124124
demands: Cmd
125125
os: windows
126126
# If it's not devdiv, it's dnceng
@@ -164,14 +164,14 @@ stages:
164164
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
165165
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
166166
name: AzurePipelines-EO
167-
image: 1ESPT-Windows2022
167+
image: 1ESPT-Windows2025
168168
demands: Cmd
169169
os: windows
170170
# If it's not devdiv, it's dnceng
171171
${{ else }}:
172172
${{ if eq(parameters.is1ESPipeline, true) }}:
173173
name: $(DncEngInternalBuildPool)
174-
image: 1es-windows-2022
174+
image: windows.vs2026.amd64
175175
os: windows
176176
${{ else }}:
177177
name: $(DncEngInternalBuildPool)
@@ -225,14 +225,14 @@ stages:
225225
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
226226
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
227227
name: AzurePipelines-EO
228-
image: 1ESPT-Windows2022
228+
image: 1ESPT-Windows2025
229229
demands: Cmd
230230
os: windows
231231
# If it's not devdiv, it's dnceng
232232
${{ else }}:
233233
${{ if eq(parameters.is1ESPipeline, true) }}:
234234
name: $(DncEngInternalBuildPool)
235-
image: 1es-windows-2022
235+
image: windows.vs2026.amd64
236236
os: windows
237237
${{ else }}:
238238
name: $(DncEngInternalBuildPool)
@@ -286,18 +286,18 @@ stages:
286286
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
287287
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
288288
name: AzurePipelines-EO
289-
image: 1ESPT-Windows2022
289+
image: 1ESPT-Windows2025
290290
demands: Cmd
291291
os: windows
292292
# If it's not devdiv, it's dnceng
293293
${{ else }}:
294294
${{ if eq(parameters.is1ESPipeline, true) }}:
295295
name: NetCore1ESPool-Publishing-Internal
296-
image: windows.vs2022.amd64
296+
image: windows.vs2026.amd64
297297
os: windows
298298
${{ else }}:
299299
name: NetCore1ESPool-Publishing-Internal
300-
demands: ImageOverride -equals windows.vs2022.amd64
300+
demands: ImageOverride -equals windows.vs2026.amd64
301301
steps:
302302
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
303303
parameters:

‎eng/common/sdl/NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<solution>
44
<add key="disableSourceControlIntegration" value="true" />

‎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
26+
# image: windows.vs2026.amd64
2727

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

‎eng/common/templates/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-
# demands: ImageOverride -equals windows.vs2022.amd64
26+
# demands: ImageOverride -equals windows.vs2026.amd64
2727
variables:
2828
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
2929
- template: /eng/common/templates-official/variables/pool-providers.yml

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"msbuild-sdks": {
2828
"Microsoft.Build.NoTargets": "3.7.0",
29-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26180.118",
30-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26180.118"
29+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26201.4",
30+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26201.4"
3131
}
3232
}

0 commit comments

Comments
 (0)