Skip to content

Commit da966c1

Browse files
[main] Update dependencies from dotnet/arcade (#458)
* Update dependencies from https://github.com/dotnet/arcade build 20240329.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24177.1 -> To Version 8.0.0-beta.24179.4 * Update dependencies from https://github.com/dotnet/arcade build 20240329.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24177.1 -> To Version 8.0.0-beta.24179.4 * Update dependencies from https://github.com/dotnet/arcade build 20240329.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24177.1 -> To Version 8.0.0-beta.24179.4 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 920ae4c commit da966c1

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
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="8.0.0-beta.24177.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24179.4">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>b17b2a1bb7da23253043dee059f374b00f3e321a</Sha>
8+
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24177.1">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24179.4">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>b17b2a1bb7da23253043dee059f374b00f3e321a</Sha>
12+
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# If it's not devdiv, it's dnceng
5757
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
5858
name: $(DncEngInternalBuildPool)
59-
image: 1es-windows-2022-pt
59+
image: 1es-windows-2022
6060
os: windows
6161

6262
steps:

eng/common/templates-official/job/publish-build-assets.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ jobs:
6060
os: windows
6161
# If it's not devdiv, it's dnceng
6262
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
63-
name: $(DncEngInternalBuildPool)
64-
image: 1es-windows-2022-pt
63+
name: NetCore1ESPool-Publishing-Internal
64+
image: windows.vs2019.amd64
6565
os: windows
6666
steps:
6767
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

eng/common/templates-official/job/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
${{ if eq(variables['System.TeamProject'], 'internal') }}:
5454
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')]
55-
image: 1es-mariner-2-pt
55+
image: 1es-mariner-2
5656
os: linux
5757

5858
${{ if ne(parameters.platform.pool, '') }}:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
demands: ImageOverride -equals windows.vs2019.amd64.open
3434
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3535
name: $(DncEngInternalBuildPool)
36-
image: 1es-windows-2022-pt
36+
image: windows.vs2022.amd64
3737
os: windows
3838

3939
steps:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ stages:
110110
# If it's not devdiv, it's dnceng
111111
${{ else }}:
112112
name: $(DncEngInternalBuildPool)
113-
image: 1es-windows-2022-pt
113+
image: 1es-windows-2022
114114
os: windows
115115

116116
steps:
@@ -150,7 +150,7 @@ stages:
150150
# If it's not devdiv, it's dnceng
151151
${{ else }}:
152152
name: $(DncEngInternalBuildPool)
153-
image: 1es-windows-2022-pt
153+
image: 1es-windows-2022
154154
os: windows
155155
steps:
156156
- template: setup-maestro-vars.yml
@@ -208,7 +208,7 @@ stages:
208208
# If it's not devdiv, it's dnceng
209209
${{ else }}:
210210
name: $(DncEngInternalBuildPool)
211-
image: 1es-windows-2022-pt
211+
image: 1es-windows-2022
212212
os: windows
213213
steps:
214214
- template: setup-maestro-vars.yml
@@ -261,8 +261,8 @@ stages:
261261
os: windows
262262
# If it's not devdiv, it's dnceng
263263
${{ else }}:
264-
name: $(DncEngInternalBuildPool)
265-
image: 1es-windows-2022-pt
264+
name: NetCore1ESPool-Publishing-Internal
265+
image: windows.vs2019.amd64
266266
os: windows
267267
steps:
268268
- template: setup-maestro-vars.yml

eng/common/templates-official/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-
# image: 1es-windows-2022-pt
26+
# image: 1es-windows-2022
2727

2828
variables:
2929
# Coalesce the target and source branches so we know when a PR targets a release branch

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "8.0.101"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24177.1",
7-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24177.1"
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24179.4",
7+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24179.4"
88
}
99
}

0 commit comments

Comments
 (0)