Skip to content

Commit 2e618a6

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20260130.4 (#189)
[dotnet/release/10.0] Update dependencies from dotnet/arcade
1 parent 82618c7 commit 2e618a6

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25626.5">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26080.4">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>d8dca0b41b903e7182e64543773390b969dab96b</Sha>
8+
<Sha>b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25626.5">
10+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.26080.4">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>d8dca0b41b903e7182e64543773390b969dab96b</Sha>
12+
<Sha>b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25626.5</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.26080.4</MicrosoftDotNetBuildTasksPackagingVersion>
1010
</PropertyGroup>
1111
<PropertyGroup>
1212
<PythonHexVersion>0x030B04F0</PythonHexVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
# If it's not devdiv, it's dnceng
8181
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
8282
name: NetCore1ESPool-Publishing-Internal
83-
image: windows.vs2019.amd64
83+
image: windows.vs2022.amd64
8484
os: windows
8585
steps:
8686
- ${{ if eq(parameters.is1ESPipeline, '') }}:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,19 @@ jobs:
6060
pool:
6161
${{ if eq(variables['System.TeamProject'], 'public') }}:
6262
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
63-
demands: ImageOverride -equals build.ubuntu.2004.amd64
63+
demands: ImageOverride -equals Azure-Linux-3-Amd64-Public
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
66-
image: 1es-mariner-2
66+
image: Azure-Linux-3-Amd64
6767
os: linux
6868
${{ else }}:
6969
pool:
7070
${{ if eq(variables['System.TeamProject'], 'public') }}:
7171
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
72-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
72+
demands: ImageOverride -equals Azure-Linux-3-Amd64-Public
7373
${{ if eq(variables['System.TeamProject'], 'internal') }}:
7474
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
75-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
75+
demands: ImageOverride -equals Azure-Linux-3-Amd64
7676
${{ if ne(parameters.platform.pool, '') }}:
7777
pool: ${{ parameters.platform.pool }}
7878

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,11 @@ stages:
293293
${{ else }}:
294294
${{ if eq(parameters.is1ESPipeline, true) }}:
295295
name: NetCore1ESPool-Publishing-Internal
296-
image: windows.vs2019.amd64
296+
image: windows.vs2022.amd64
297297
os: windows
298298
${{ else }}:
299299
name: NetCore1ESPool-Publishing-Internal
300-
demands: ImageOverride -equals windows.vs2019.amd64
300+
demands: ImageOverride -equals windows.vs2022.amd64
301301
steps:
302302
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
303303
parameters:

‎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.vs2019.amd64
26+
# demands: ImageOverride -equals windows.vs2022.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.101"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25626.5",
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26080.4",
1717
"Microsoft.Build.NoTargets": "3.5.0",
1818
"Microsoft.Build.Traversal": "3.4.0"
1919
}

0 commit comments

Comments
 (0)