Skip to content

Commit cd1e731

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/5.0] Update dependencies from dotnet/arcade (#7564)
* Update dependencies from https://github.com/dotnet/arcade build 20251205.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25555.6 -> To Version 10.0.0-beta.25605.3 * Update dependencies from https://github.com/dotnet/arcade build 20251212.5 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25555.6 -> To Version 10.0.0-beta.25612.5 * Update dependencies from https://github.com/dotnet/arcade build 20251226.5 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25555.6 -> To Version 10.0.0-beta.25626.5 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 51ed6b0 commit cd1e731

15 files changed

Lines changed: 105 additions & 49 deletions

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25555.6">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25626.5">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>987d1a73ea67d323c0fc7537bce8ec65d87eb43f</Sha>
12+
<Sha>d8dca0b41b903e7182e64543773390b969dab96b</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25555.6">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25626.5">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>987d1a73ea67d323c0fc7537bce8ec65d87eb43f</Sha>
16+
<Sha>d8dca0b41b903e7182e64543773390b969dab96b</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25555.6">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25626.5">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>987d1a73ea67d323c0fc7537bce8ec65d87eb43f</Sha>
20+
<Sha>d8dca0b41b903e7182e64543773390b969dab96b</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25555.6">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25626.5">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>987d1a73ea67d323c0fc7537bce8ec65d87eb43f</Sha>
24+
<Sha>d8dca0b41b903e7182e64543773390b969dab96b</Sha>
2525
</Dependency>
2626
<!-- Stay on package 8.0 until we stop testing for net6.0
2727
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
2929
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
3030
</Dependency> -->
31-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25555.6">
31+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25626.5">
3232
<Uri>https://github.com/dotnet/arcade</Uri>
33-
<Sha>987d1a73ea67d323c0fc7537bce8ec65d87eb43f</Sha>
33+
<Sha>d8dca0b41b903e7182e64543773390b969dab96b</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25555.6">
35+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25626.5">
3636
<Uri>https://github.com/dotnet/arcade</Uri>
37-
<Sha>987d1a73ea67d323c0fc7537bce8ec65d87eb43f</Sha>
37+
<Sha>d8dca0b41b903e7182e64543773390b969dab96b</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25555.6">
39+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25626.5">
4040
<Uri>https://github.com/dotnet/arcade</Uri>
41-
<Sha>987d1a73ea67d323c0fc7537bce8ec65d87eb43f</Sha>
41+
<Sha>d8dca0b41b903e7182e64543773390b969dab96b</Sha>
4242
</Dependency>
4343
</ToolsetDependencies>
4444
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
9999
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
100100
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
101-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25555.6</MicrosoftDotNetXUnitExtensionsVersion>
101+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25626.5</MicrosoftDotNetXUnitExtensionsVersion>
102102
<MicrosoftExtensionsDependencyModelVersion>9.0.4</MicrosoftExtensionsDependencyModelVersion>
103103
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
104104
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,14 @@ jobs:
120120

121121
- task: NuGetAuthenticate@1
122122

123+
# Populate internal runtime variables.
124+
- template: /eng/common/templates/steps/enable-internal-sources.yml
125+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
126+
parameters:
127+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
128+
129+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
130+
123131
- task: AzureCLI@2
124132
displayName: Publish Build Assets
125133
inputs:
@@ -132,6 +140,9 @@ jobs:
132140
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
133141
/p:MaestroApiEndpoint=https://maestro.dot.net
134142
/p:OfficialBuildId=$(OfficialBuildId)
143+
-runtimeSourceFeed https://ci.dot.net/internal
144+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
145+
135146
condition: ${{ parameters.condition }}
136147
continueOnError: ${{ parameters.continueOnError }}
137148

@@ -200,6 +211,8 @@ jobs:
200211
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
201212
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
202213
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
214+
-runtimeSourceFeed https://ci.dot.net/internal
215+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
203216
204217
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
205218
- template: /eng/common/core-templates/steps/publish-logs.yml

‎eng/common/core-templates/job/source-index-stage1.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
44
preSteps: []
55
binlogPath: artifacts/log/Debug/Build.binlog
6-
condition: ''
6+
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
77
dependsOn: ''
88
pool: ''
99
is1ESPipeline: ''
@@ -25,10 +25,10 @@ jobs:
2525
pool:
2626
${{ if eq(variables['System.TeamProject'], 'public') }}:
2727
name: $(DncEngPublicBuildPool)
28-
image: windows.vs2022.amd64.open
28+
image: windows.vs2026preview.scout.amd64.open
2929
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3030
name: $(DncEngInternalBuildPool)
31-
image: windows.vs2022.amd64
31+
image: windows.vs2026preview.scout.amd64
3232

3333
steps:
3434
- ${{ if eq(parameters.is1ESPipeline, '') }}:
@@ -41,4 +41,4 @@ jobs:
4141

4242
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
4343
parameters:
44-
binLogPath: ${{ parameters.binLogPath }}
44+
binLogPath: ${{ parameters.binLogPath }}

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ stages:
127127
${{ else }}:
128128
${{ if eq(parameters.is1ESPipeline, true) }}:
129129
name: $(DncEngInternalBuildPool)
130-
image: windows.vs2022.amd64
130+
image: windows.vs2026preview.scout.amd64
131131
os: windows
132132
${{ else }}:
133133
name: $(DncEngInternalBuildPool)
134-
demands: ImageOverride -equals windows.vs2022.amd64
134+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
135135

136136
steps:
137137
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
@@ -175,7 +175,7 @@ stages:
175175
os: windows
176176
${{ else }}:
177177
name: $(DncEngInternalBuildPool)
178-
demands: ImageOverride -equals windows.vs2022.amd64
178+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
179179
steps:
180180
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
181181
parameters:
@@ -236,7 +236,7 @@ stages:
236236
os: windows
237237
${{ else }}:
238238
name: $(DncEngInternalBuildPool)
239-
demands: ImageOverride -equals windows.vs2022.amd64
239+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
240240
steps:
241241
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
242242
parameters:
@@ -307,6 +307,13 @@ stages:
307307

308308
- task: NuGetAuthenticate@1
309309

310+
# Populate internal runtime variables.
311+
- template: /eng/common/templates/steps/enable-internal-sources.yml
312+
parameters:
313+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
314+
315+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
316+
310317
# Darc is targeting 8.0, so make sure it's installed
311318
- task: UseDotNet@2
312319
inputs:
@@ -328,3 +335,5 @@ stages:
328335
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
329336
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
330337
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
338+
-runtimeSourceFeed https://ci.dot.net/internal
339+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'

‎eng/common/core-templates/steps/install-microbuild.yml‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,41 @@ parameters:
1111
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
1212
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
1313
microbuildUseESRP: true
14+
# Microbuild installation directory
15+
microBuildOutputFolder: $(Agent.TempDirectory)/MicroBuild
1416

1517
continueOnError: false
1618

1719
steps:
1820
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
1921
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
20-
# Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
22+
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
2123
- task: UseDotNet@2
2224
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
2325
inputs:
2426
packageType: sdk
2527
version: 8.0.x
26-
# Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
27-
# See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
28-
# Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
29-
installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
28+
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild
29+
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
30+
31+
- script: |
32+
set -euo pipefail
33+
34+
# UseDotNet@2 prepends the dotnet executable path to the PATH variable, so we can call dotnet directly
35+
version=$(dotnet --version)
36+
cat << 'EOF' > ${{ parameters.microBuildOutputFolder }}/global.json
37+
{
38+
"sdk": {
39+
"version": "$version",
40+
"paths": [
41+
"${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild"
42+
],
43+
"errorMessage": "The .NET SDK version $version is required to install the MicroBuild signing plugin."
44+
}
45+
}
46+
EOF
47+
displayName: 'Add global.json to MicroBuild Installation path'
48+
workingDirectory: ${{ parameters.microBuildOutputFolder }}
3049
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
3150
3251
- script: |
@@ -64,7 +83,7 @@ steps:
6483
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
6584
env:
6685
TeamName: $(_TeamName)
67-
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
86+
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
6887
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6988
continueOnError: ${{ parameters.continueOnError }}
7089
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
@@ -76,6 +95,7 @@ steps:
7695
signType: $(_SignType)
7796
zipSources: false
7897
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
98+
workingDirectory: ${{ parameters.microBuildOutputFolder }}
7999
${{ if eq(parameters.microbuildUseESRP, true) }}:
80100
ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)'
81101
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
@@ -84,7 +104,7 @@ steps:
84104
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
85105
env:
86106
TeamName: $(_TeamName)
87-
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
107+
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
88108
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
89109
continueOnError: ${{ parameters.continueOnError }}
90110
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))

‎eng/common/core-templates/steps/publish-logs.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ steps:
2626
# If the file exists - sensitive data for redaction will be sourced from it
2727
# (single entry per line, lines starting with '# ' are considered comments and skipped)
2828
arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs'
29-
-BinlogToolVersion ${{parameters.BinlogToolVersion}}
29+
-BinlogToolVersion '${{parameters.BinlogToolVersion}}'
3030
-TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
31+
-runtimeSourceFeed https://ci.dot.net/internal
32+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
3133
'$(publishing-dnceng-devdiv-code-r-build-re)'
3234
'$(MaestroAccessToken)'
3335
'$(dn-bot-all-orgs-artifact-feeds-rw)'

‎eng/common/core-templates/steps/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ steps:
2424
# in the default public locations.
2525
internalRuntimeDownloadArgs=
2626
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
27-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
27+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey '$(dotnetbuilds-internal-container-read-token-base64)''
2828
fi
2929
3030
buildConfig=Release

‎eng/common/internal-feed-operations.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function SetupCredProvider {
2626
$url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1'
2727

2828
Write-Host "Writing the contents of 'installcredprovider.ps1' locally..."
29-
Invoke-WebRequest $url -OutFile installcredprovider.ps1
29+
Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1
3030

3131
Write-Host 'Installing plugin...'
3232
.\installcredprovider.ps1 -Force

‎eng/common/post-build/nuget-verification.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ if ($NuGetExePath) {
6565
Write-Host "Downloading nuget.exe from $nugetExeUrl..."
6666
$ProgressPreference = 'SilentlyContinue'
6767
try {
68-
Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe
68+
Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe
6969
$ProgressPreference = 'Continue'
7070
} catch {
7171
$ProgressPreference = 'Continue'

0 commit comments

Comments
 (0)