Skip to content

Commit fdb16a3

Browse files
author
Mirroring
committed
Merge commit '273d65be2e5eb8b6d5958ab164a6ef6fb9eb5fa6'
2 parents dff01fa + 273d65b commit fdb16a3

14 files changed

Lines changed: 47 additions & 40 deletions

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@
189189
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
190190
<Sha>b753199016332cbf257e70c417aa5d1d02202dc7</Sha>
191191
</Dependency>
192-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.26056.1">
192+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.26152.1">
193193
<Uri>https://github.com/dotnet/source-build-externals</Uri>
194-
<Sha>5f4a123a49dd5480065c8d6182536cf86b4f4410</Sha>
194+
<Sha>563783c7169399c27faa8864a307490e9606358d</Sha>
195195
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
196196
</Dependency>
197197
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.0.0-beta-23228-03">
@@ -338,9 +338,9 @@
338338
<Sha>9a1c3e1b7f0c8763d4c96e593961a61a72679a7b</Sha>
339339
<SourceBuild RepoName="xdt" ManagedOnly="true" />
340340
</Dependency>
341-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25615.3">
341+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.26152.2">
342342
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
343-
<Sha>44b5b62182b48c34c4b6aef28943ec3f3e82f214</Sha>
343+
<Sha>ac35a502714f4867b0386a5bd392868024e7495c</Sha>
344344
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
345345
</Dependency>
346346
<!-- Not updated automatically -->
@@ -376,26 +376,26 @@
376376
<Uri>https://github.com/dotnet/winforms</Uri>
377377
<Sha>abda8e3bfa78319363526b5a5f86863ec979940e</Sha>
378378
</Dependency>
379-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25611.2">
379+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.26117.2">
380380
<Uri>https://github.com/dotnet/arcade</Uri>
381-
<Sha>4b01306353c43c151d713d152f48a4d523c41960</Sha>
381+
<Sha>53f3357c00780a514a5b7b69e6f58880b3ada28e</Sha>
382382
<SourceBuild RepoName="arcade" ManagedOnly="true" />
383383
</Dependency>
384-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25611.2">
384+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.26117.2">
385385
<Uri>https://github.com/dotnet/arcade</Uri>
386-
<Sha>4b01306353c43c151d713d152f48a4d523c41960</Sha>
386+
<Sha>53f3357c00780a514a5b7b69e6f58880b3ada28e</Sha>
387387
</Dependency>
388-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25611.2">
388+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.26117.2">
389389
<Uri>https://github.com/dotnet/arcade</Uri>
390-
<Sha>4b01306353c43c151d713d152f48a4d523c41960</Sha>
390+
<Sha>53f3357c00780a514a5b7b69e6f58880b3ada28e</Sha>
391391
</Dependency>
392-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25611.2">
392+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.26117.2">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>4b01306353c43c151d713d152f48a4d523c41960</Sha>
394+
<Sha>53f3357c00780a514a5b7b69e6f58880b3ada28e</Sha>
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25611.2">
396+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.26117.2">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>4b01306353c43c151d713d152f48a4d523c41960</Sha>
398+
<Sha>53f3357c00780a514a5b7b69e6f58880b3ada28e</Sha>
399399
</Dependency>
400400
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.9.24518.1">
401401
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,13 @@
161161
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
162162
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
163163
<!-- Packages from dotnet/arcade -->
164-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25611.2</MicrosoftDotNetBuildTasksInstallersVersion>
165-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25611.2</MicrosoftDotNetBuildTasksTemplatingVersion>
166-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25611.2</MicrosoftDotNetRemoteExecutorVersion>
164+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.26117.2</MicrosoftDotNetBuildTasksInstallersVersion>
165+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.26117.2</MicrosoftDotNetBuildTasksTemplatingVersion>
166+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.26117.2</MicrosoftDotNetRemoteExecutorVersion>
167167
<!-- Packages from dotnet/source-build-externals -->
168-
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.26056.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
168+
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.26152.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
169169
<!-- Packages from dotnet/source-build-reference-packages -->
170-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.25615.3</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
170+
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.26152.2</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
171171
<!-- Packages from dotnet/symreader -->
172172
<MicrosoftSourceBuildIntermediatesymreaderVersion>2.0.0-beta-23228-03</MicrosoftSourceBuildIntermediatesymreaderVersion>
173173
<!-- Packages from dotnet/runtime -->

‎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)