Skip to content

Commit ddef017

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#410)
* Backflow from https://github.com/dotnet/dotnet / 1a405c7 build 309188 [[ commit created by automation ]] * Update dependencies from build 309188 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.26179.102 -> 11.0.0-beta.26203.108) [[ commit created by automation ]] * Update dependencies from build 309919 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.26203.108 -> 11.0.0-beta.26210.111) [[ commit created by automation ]] --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent a701640 commit ddef017

16 files changed

Lines changed: 185 additions & 68 deletions

File tree

‎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>11.0.0-beta.26179.102</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26210.111</MicrosoftDotNetArcadeSdkPackageVersion>
1010
</PropertyGroup>
1111
<!--Property group for alternate package version names-->
1212
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="symreader" Sha="d70206844a95b337601237466bfc6cbb7d52d6d4" BarId="308297" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="symreader" Sha="5bed4499b04cbbaec57ac4209ae993acca3648cc" BarId="309919" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26179.102">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26210.111">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>d70206844a95b337601237466bfc6cbb7d52d6d4</Sha>
9+
<Sha>5bed4499b04cbbaec57ac4209ae993acca3648cc</Sha>
1010
</Dependency>
1111
</ToolsetDependencies>
1212
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<VersionPrefix>3.0.0</VersionPrefix>
77
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
8-
<PreReleaseVersionIteration>3</PreReleaseVersionIteration>
8+
<PreReleaseVersionIteration>4</PreReleaseVersionIteration>
99
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
1010
<DotNetFinalVersionKind></DotNetFinalVersionKind>
1111

‎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
@@ -110,7 +110,7 @@ stages:
110110
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
111111
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
112112
name: AzurePipelines-EO
113-
image: 1ESPT-Windows2022
113+
image: 1ESPT-Windows2025
114114
demands: Cmd
115115
os: windows
116116
# If it's not devdiv, it's dnceng
@@ -154,14 +154,14 @@ stages:
154154
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
155155
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
156156
name: AzurePipelines-EO
157-
image: 1ESPT-Windows2022
157+
image: 1ESPT-Windows2025
158158
demands: Cmd
159159
os: windows
160160
# If it's not devdiv, it's dnceng
161161
${{ else }}:
162162
${{ if eq(parameters.is1ESPipeline, true) }}:
163163
name: $(DncEngInternalBuildPool)
164-
image: 1es-windows-2022
164+
image: windows.vs2026.amd64
165165
os: windows
166166
${{ else }}:
167167
name: $(DncEngInternalBuildPool)
@@ -215,14 +215,14 @@ stages:
215215
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
216216
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
217217
name: AzurePipelines-EO
218-
image: 1ESPT-Windows2022
218+
image: 1ESPT-Windows2025
219219
demands: Cmd
220220
os: windows
221221
# If it's not devdiv, it's dnceng
222222
${{ else }}:
223223
${{ if eq(parameters.is1ESPipeline, true) }}:
224224
name: $(DncEngInternalBuildPool)
225-
image: 1es-windows-2022
225+
image: windows.vs2026.amd64
226226
os: windows
227227
${{ else }}:
228228
name: $(DncEngInternalBuildPool)
@@ -276,18 +276,18 @@ stages:
276276
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
277277
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
278278
name: AzurePipelines-EO
279-
image: 1ESPT-Windows2022
279+
image: 1ESPT-Windows2025
280280
demands: Cmd
281281
os: windows
282282
# If it's not devdiv, it's dnceng
283283
${{ else }}:
284284
${{ if eq(parameters.is1ESPipeline, true) }}:
285285
name: NetCore1ESPool-Publishing-Internal
286-
image: windows.vs2022.amd64
286+
image: windows.vs2026.amd64
287287
os: windows
288288
${{ else }}:
289289
name: NetCore1ESPool-Publishing-Internal
290-
demands: ImageOverride -equals windows.vs2022.amd64
290+
demands: ImageOverride -equals windows.vs2026.amd64
291291
steps:
292292
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
293293
parameters:

‎eng/common/core-templates/stages/renovate.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ parameters:
6868
type: object
6969
default:
7070
name: NetCore1ESPool-Internal
71-
image: 1es-windows-2022
71+
image: windows.vs2026.amd64
7272
os: windows
7373

7474
resources:

‎eng/common/sdk-task.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $warnAsError = if ($noWarnAsError) { $false } else { $true }
2222

2323
function Print-Usage() {
2424
Write-Host "Common settings:"
25-
Write-Host " -task <value> Name of Arcade task (name of a project in SdkTasks directory of the Arcade SDK package)"
25+
Write-Host " -task <value> Name of Arcade task (name of a project in toolset directory of the Arcade SDK package)"
2626
Write-Host " -restore Restore dependencies"
2727
Write-Host " -verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
2828
Write-Host " -help Print help and exit"

‎eng/common/sdk-task.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
show_usage() {
44
echo "Common settings:"
5-
echo " --task <value> Name of Arcade task (name of a project in SdkTasks directory of the Arcade SDK package)"
5+
echo " --task <value> Name of Arcade task (name of a project in toolset directory of the Arcade SDK package)"
66
echo " --restore Restore dependencies"
77
echo " --verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
88
echo " --help Print help and exit"

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,10 @@ jobs:
4444
sbomEnabled: false # we don't need SBOM for logs
4545

4646
- ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
47-
- output: buildArtifacts
47+
- output: pipelineArtifact
4848
displayName: Publish Logs
49-
PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
50-
publishLocation: Container
51-
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
49+
targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
50+
artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
5251
continueOnError: true
5352
condition: always()
5453
sbomEnabled: false # we don't need SBOM for logs

0 commit comments

Comments
 (0)