Skip to content

Commit a063623

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0.1xx] Source code updates from dotnet/dotnet (#1640)
* Update dependencies from build 308175 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26173.116 -> 10.0.0-beta.26177.113) System.CommandLine (Version 2.0.6 -> 2.0.6) [[ commit created by automation ]] * Update dependencies from build 308777 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26177.113 -> 10.0.0-beta.26201.102) System.CommandLine (Version 2.0.6 -> 2.0.6) [[ commit created by automation ]] * Update dependencies from build 309217 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26201.102 -> 10.0.0-beta.26203.109) System.CommandLine (Version 2.0.6 -> 2.0.6) [[ commit created by automation ]] --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 7616f66 commit a063623

9 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-5d8e1da" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-5d8e1dab/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-6165bd7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-6165bd7a/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1010
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />

‎eng/Version.Details.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26173.116</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26203.109</MicrosoftDotNetArcadeSdkPackageVersion>
1010
<SystemCommandLinePackageVersion>2.0.6</SystemCommandLinePackageVersion>
1111
</PropertyGroup>
1212
<!--Property group for alternate package version names-->

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="5d8e1dab0ad36dd7a893a544523ecde4a647fe09" BarId="307443" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="6165bd7ac3499cb712ca489f2ce44bb665174a1a" BarId="309217" />
44
<ProductDependencies>
55
<Dependency Name="System.CommandLine" Version="2.0.6">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>5d8e1dab0ad36dd7a893a544523ecde4a647fe09</Sha>
7+
<Sha>6165bd7ac3499cb712ca489f2ce44bb665174a1a</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26173.116">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26203.109">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>5d8e1dab0ad36dd7a893a544523ecde4a647fe09</Sha>
13+
<Sha>6165bd7ac3499cb712ca489f2ce44bb665174a1a</Sha>
1414
</Dependency>
1515
</ToolsetDependencies>
1616
</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
@@ -13,7 +13,7 @@
1313
"dotnet": "10.0.105"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26173.116",
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26203.109",
1717
"Microsoft.Build.NoTargets": "3.7.0"
1818
}
1919
}

0 commit comments

Comments
 (0)