Skip to content

Commit e04fc5a

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20251128.1 (dotnet#2980)
[main] Update dependencies from dotnet/arcade
1 parent 43f7bae commit e04fc5a

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25571.8">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25578.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01</Sha>
8+
<Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25571.8">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25578.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01</Sha>
12+
<Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25571.8">
14+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25578.1">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01</Sha>
16+
<Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
1616
<MicrosoftAspNetCoreTestHostVersion>6.0.36</MicrosoftAspNetCoreTestHostVersion>
1717
<MicrosoftCrankEventSourcesVersion>0.2.0-alpha.24576.2</MicrosoftCrankEventSourcesVersion>
18-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.25571.8</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
18+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.25578.1</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
1919
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
2020
<MoqVersion>4.18.4</MoqVersion>
2121
<AutofacVersion>4.9.4</AutofacVersion>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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, '') }}:

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

Lines changed: 4 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:

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.14.16" -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.14.16
398-
$defaultXCopyMSBuildVersion = '17.14.16'
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"runner": "Microsoft.Testing.Platform"
2020
},
2121
"msbuild-sdks": {
22-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25571.8",
23-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25571.8"
22+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25578.1",
23+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25578.1"
2424
}
2525
}

0 commit comments

Comments
 (0)