Skip to content

Commit e7408cb

Browse files
authored
[main] Update dependencies from dotnet/arcade (#12559)
This pull request updates the following dependencies [marker]: <> (Begin:2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d) ## From https://github.com/dotnet/arcade - **Subscription**: [2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d](https://maestro.dot.net/subscriptions?search=2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d) - **Build**: [20251205.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2854947) ([293600](https://maestro.dot.net/channel/8394/github:dotnet:arcade/build/293600)) - **Date Produced**: December 6, 2025 12:55:25 AM UTC - **Commit**: [774a2ef8d2777c50d047d6776ced33260822cad6](dotnet/arcade@774a2ef) - **Branch**: [release/10.0](https://github.com/dotnet/arcade/tree/release/10.0) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [10.0.0-beta.25603.3 to 10.0.0-beta.25605.3][1] - Microsoft.DotNet.Arcade.Sdk [1]: dotnet/arcade@93a17c7...774a2ef [DependencyUpdate]: <> (End) [marker]: <> (End:2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d)
2 parents 4f425c8 + 406ec4c commit e7408cb

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

azure-pipelines-official.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,12 @@ extends:
211211
- powershell: eng\SetupVSHive.ps1
212212
displayName: Setup VS Hive
213213

214+
# We additionally restore during the build because the Microsoft.DotNet.Build.Tasks.Feed package only restores when we pass `-publish`. See https://github.com/dotnet/arcade/blob/37ccfd66358af6a37a0ec385ec31d1d71bdd8723/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj#L61-L66
214215
- script: eng\cibuild.cmd
215216
-configuration $(_BuildConfig)
216217
-msbuildEngine vs
217218
-prepareMachine
219+
-restore
218220
-build
219221
-pack
220222
-publish
@@ -333,7 +335,6 @@ extends:
333335
--restore
334336
--build
335337
--pack
336-
--publish
337338
--configuration $(_BuildConfig)
338339
--prepareMachine
339340
--test
@@ -377,7 +378,6 @@ extends:
377378
--restore
378379
--build
379380
--pack
380-
--publish
381381
--configuration $(_BuildConfig)
382382
--prepareMachine
383383
--test

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This file should be imported by eng/Versions.props
2828
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.25601.4</MicrosoftNetCompilersToolsetPackageVersion>
2929
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.3.0-2.25601.4</MicrosoftVisualStudioLanguageServicesPackageVersion>
3030
<!-- dotnet/arcade dependencies -->
31-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25603.3</MicrosoftDotNetArcadeSdkPackageVersion>
31+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25605.3</MicrosoftDotNetArcadeSdkPackageVersion>
3232
<!-- dotnet/aspnetcore dependencies -->
3333
<MicrosoftExtensionsObjectPoolPackageVersion>8.0.0</MicrosoftExtensionsObjectPoolPackageVersion>
3434
<!-- dotnet/runtime dependencies -->

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@
8888
</Dependency>
8989
</ProductDependencies>
9090
<ToolsetDependencies>
91-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25603.3">
91+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25605.3">
9292
<Uri>https://github.com/dotnet/arcade</Uri>
93-
<Sha>93a17c71536d794e248c077bb66ad6cee000eada</Sha>
93+
<Sha>774a2ef8d2777c50d047d6776ced33260822cad6</Sha>
9494
</Dependency>
9595
<!-- Necessary for source-build. This allows Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages
9696
to be retrieved from live source-build and their content consumed by packages produced by razor.

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

Lines changed: 2 additions & 2 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: ''
@@ -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/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ try {
7070
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
7171
}
7272
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
73-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
73+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty
7474
}
7575
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7676
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
394394

395395
# If the version of msbuild is going to be xcopied,
396396
# use this version. Version matches a package here:
397-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
398-
$defaultXCopyMSBuildVersion = '17.13.0'
397+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0
398+
$defaultXCopyMSBuildVersion = '18.0.0'
399399

400400
if (!$vsRequirements) {
401401
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"rollForward": "latestPatch"
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25603.3",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25605.3",
2525
"Microsoft.Build.NoTargets": "3.7.0"
2626
}
2727
}

0 commit comments

Comments
 (0)