Skip to content

Commit 9c9d62b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/7.0.x] Source code updates from dotnet/dotnet (#7243)
1 parent 9218d03 commit 9c9d62b

8 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎eng/Version.Details.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ This file should be imported by eng/Versions.props
1010
<!-- dotnet-corefx dependencies -->
1111
<SystemComponentModelCompositionPackageVersion>4.5.0</SystemComponentModelCompositionPackageVersion>
1212
<!-- dotnet-dotnet dependencies -->
13-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26172.102</MicrosoftDotNetArcadeSdkPackageVersion>
14-
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.26172.102</MicrosoftDotNetXliffTasksPackageVersion>
13+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26203.109</MicrosoftDotNetArcadeSdkPackageVersion>
14+
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.26203.109</MicrosoftDotNetXliffTasksPackageVersion>
1515
<!-- dotnet-msbuild dependencies -->
1616
<MicrosoftBuildPackageVersion>17.3.1</MicrosoftBuildPackageVersion>
1717
<!-- dotnet-runtime dependencies -->

‎eng/Version.Details.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="nuget-client" Sha="8aa2738d3bdb38df89821c66dd8a41b9b73dc174" BarId="307268" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="nuget-client" Sha="6165bd7ac3499cb712ca489f2ce44bb665174a1a" BarId="309217" />
44
<!--
55
Currently this file is required to publish builds to .NET build asset registry.
66
See https://github.com/dotnet/arcade/issues/2396 for details.
@@ -56,13 +56,13 @@
5656
</Dependency>
5757
</ProductDependencies>
5858
<ToolsetDependencies>
59-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26172.102">
59+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26203.109">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>8aa2738d3bdb38df89821c66dd8a41b9b73dc174</Sha>
61+
<Sha>6165bd7ac3499cb712ca489f2ce44bb665174a1a</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.26172.102">
63+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.26203.109">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>8aa2738d3bdb38df89821c66dd8a41b9b73dc174</Sha>
65+
<Sha>6165bd7ac3499cb712ca489f2ce44bb665174a1a</Sha>
6666
</Dependency>
6767
</ToolsetDependencies>
6868
</Dependencies>

‎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/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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"pinned": true
1010
},
1111
"msbuild-sdks": {
12-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26172.102",
12+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26203.109",
1313
"Microsoft.Build.NoTargets": "3.7.0"
1414
}
1515
}

0 commit comments

Comments
 (0)