Skip to content

Commit ffface0

Browse files
authored
[release/8.0.1xx] Update dependencies from dotnet/arcade (#20801)
2 parents 5eebd7e + 83e592c commit ffface0

File tree

14 files changed

+34
-27
lines changed

14 files changed

+34
-27
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,18 +219,18 @@
219219
</Dependency>
220220
</ProductDependencies>
221221
<ToolsetDependencies>
222-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25611.2">
222+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26152.2">
223223
<Uri>https://github.com/dotnet/arcade</Uri>
224-
<Sha>4b01306353c43c151d713d152f48a4d523c41960</Sha>
224+
<Sha>ff8437c93170b57151c4dbf43671adeb9395d2c9</Sha>
225225
<SourceBuild RepoName="arcade" ManagedOnly="true" />
226226
</Dependency>
227-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25611.2">
227+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.26152.2">
228228
<Uri>https://github.com/dotnet/arcade</Uri>
229-
<Sha>4b01306353c43c151d713d152f48a4d523c41960</Sha>
229+
<Sha>ff8437c93170b57151c4dbf43671adeb9395d2c9</Sha>
230230
</Dependency>
231-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25611.2">
231+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.26152.2">
232232
<Uri>https://github.com/dotnet/arcade</Uri>
233-
<Sha>4b01306353c43c151d713d152f48a4d523c41960</Sha>
233+
<Sha>ff8437c93170b57151c4dbf43671adeb9395d2c9</Sha>
234234
</Dependency>
235235
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2">
236236
<Uri>https://github.com/dotnet/arcade-services</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</PropertyGroup>
4141
<PropertyGroup>
4242
<!-- Dependency from https://github.com/dotnet/arcade -->
43-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25611.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
43+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.26152.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4444
</PropertyGroup>
4545
<PropertyGroup>
4646
<!-- Dependency from https://github.com/dotnet/arcade-services -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
# If it's not devdiv, it's dnceng
7171
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
7272
name: NetCore1ESPool-Publishing-Internal
73-
image: windows.vs2019.amd64
73+
image: windows.vs2022.amd64
7474
os: windows
7575
steps:
7676
- ${{ 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
@@ -61,7 +61,7 @@ jobs:
6161

6262
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6363
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')]
64-
image: 1es-azurelinux-3
64+
image: build.azurelinux.3.amd64
6565
os: linux
6666

6767
${{ 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
@@ -31,7 +31,7 @@ jobs:
3131
pool:
3232
${{ if eq(variables['System.TeamProject'], 'public') }}:
3333
name: $(DncEngPublicBuildPool)
34-
demands: ImageOverride -equals windows.vs2019.amd64.open
34+
demands: ImageOverride -equals windows.vs2022.amd64.open
3535
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3636
name: $(DncEngInternalBuildPool)
3737
image: windows.vs2022.amd64

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ stages:
261261
# If it's not devdiv, it's dnceng
262262
${{ else }}:
263263
name: NetCore1ESPool-Publishing-Internal
264-
image: windows.vs2019.amd64
264+
image: windows.vs2022.amd64
265265
os: windows
266266
steps:
267267
- template: setup-maestro-vars.yml

eng/common/templates/job/execute-sdl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
# If it's not devdiv, it's dnceng
5656
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
5757
name: $(DncEngInternalBuildPool)
58-
demands: ImageOverride -equals windows.vs2019.amd64
58+
demands: ImageOverride -equals windows.vs2022.amd64
5959
steps:
6060
- checkout: self
6161
clean: true

eng/common/templates/job/onelocbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
# If it's not devdiv, it's dnceng
5555
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
5656
name: $(DncEngInternalBuildPool)
57-
demands: ImageOverride -equals windows.vs2019.amd64
57+
demands: ImageOverride -equals windows.vs2022.amd64
5858

5959
steps:
6060
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
# If it's not devdiv, it's dnceng
6969
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
7070
name: NetCore1ESPool-Publishing-Internal
71-
demands: ImageOverride -equals windows.vs2019.amd64
71+
demands: ImageOverride -equals windows.vs2022.amd64
7272

7373
steps:
7474
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
pool:
3232
${{ if eq(variables['System.TeamProject'], 'public') }}:
3333
name: $(DncEngPublicBuildPool)
34-
demands: ImageOverride -equals windows.vs2019.amd64.open
34+
demands: ImageOverride -equals windows.vs2022.amd64.open
3535
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3636
name: $(DncEngInternalBuildPool)
37-
demands: ImageOverride -equals windows.vs2019.amd64
37+
demands: ImageOverride -equals windows.vs2022.amd64
3838

3939
steps:
4040
- ${{ each preStep in parameters.preSteps }}:

0 commit comments

Comments
 (0)