Skip to content

Commit b3a51e9

Browse files
LeafShi1Shyam-Gupta
LeafShi1
authored and
Shyam-Gupta
committed
Merged PR 50101: merge release/8.0 into internal/release/8.0
Github bug: #13462 #### AI description (iteration 1) #### PR Classification This pull request merges the release/8.0 branch into internal/release/8.0 to update dependency versions and adjust build configurations. #### PR Summary The changes update dependency and tooling versions and modify build infrastructure settings to align internal builds with the latest release. Key changes include: - **`eng/Version.Details.xml` and `eng/Versions.props`**: Upgraded Arcade SDK and related dependencies (GenFacades, CMake, Helix, RemoteExecutor, XUnitExtensions) from 8.0.0-beta.25208.7 to 8.0.0-beta.25263.4 with new SHA values. - **`global.json`**: Bumped the .NET SDK and tool version from 8.0.115 to 8.0.116. - **`eng/common/templates/job/source-build.yml` and related build templates**: Updated build pool demands from Ubuntu 1804 to Ubuntu 2204 and changed container images from centos-stream8 to centos-stream-9-amd64. - **`NuGet.config`**: Added additional internal package sources for dotnet-runtime. - **`eng/common/templates-official/job/source-index-stage1.yml` and `eng/common/sdl/packages.config`**: Updated source index package versions and upgraded the `Microsoft.Guardian.Cli` package from 0.109.0 to 0.199.0. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
2 parents 48a12d4 + 5ab8c66 commit b3a51e9

File tree

11 files changed

+40
-32
lines changed

11 files changed

+40
-32
lines changed

‎NuGet.config

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-77545d6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-runtime-efd5742" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-efd5742-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b-7/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-efd5742-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b-6/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-efd5742-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b-5/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-runtime-efd5742-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b-4/nuget/v3/index.json" />
812
<!-- End: Package sources from dotnet-runtime -->
913
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1014
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,7 +27,11 @@
2327
<clear />
2428
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2529
<!-- Begin: Package sources from dotnet-runtime -->
26-
<add key="darc-int-dotnet-runtime-77545d6" value="true" />
30+
<add key="darc-int-dotnet-runtime-efd5742-4" value="true" />
31+
<add key="darc-int-dotnet-runtime-efd5742-5" value="true" />
32+
<add key="darc-int-dotnet-runtime-efd5742-6" value="true" />
33+
<add key="darc-int-dotnet-runtime-efd5742-7" value="true" />
34+
<add key="darc-int-dotnet-runtime-efd5742" value="true" />
2735
<!-- End: Package sources from dotnet-runtime -->
2836
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2937
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -179,29 +179,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
179179
</ProductDependencies>
180180
<ToolsetDependencies>
181181
<!-- Arcade -->
182-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
182+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25263.4">
183183
<Uri>https://github.com/dotnet/arcade</Uri>
184-
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
184+
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
185185
</Dependency>
186-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25208.7">
186+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25263.4">
187187
<Uri>https://github.com/dotnet/arcade</Uri>
188-
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
188+
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
189189
</Dependency>
190-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25208.7">
190+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25263.4">
191191
<Uri>https://github.com/dotnet/arcade</Uri>
192-
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
192+
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
193193
</Dependency>
194-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25208.7">
194+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25263.4">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
196+
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25208.7">
198+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25263.4">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
200+
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25208.7">
202+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25263.4">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
204+
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
205205
</Dependency>
206206
</ToolsetDependencies>
207207
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.25208.7</MicrosoftDotNetGenFacadesPackageVersion>
60-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25208.7</MicrosoftDotNetRemoteExecutorVersion>
61-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.25208.7</MicrosoftDotNetXUnitExtensionsPackageVersion>
59+
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.25263.4</MicrosoftDotNetGenFacadesPackageVersion>
60+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25263.4</MicrosoftDotNetRemoteExecutorVersion>
61+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.25263.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
6262
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
6363
</PropertyGroup>
6464
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

‎eng/common/sdl/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.199.0"/>
44
</packages>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
pool:
5555
${{ if eq(variables['System.TeamProject'], 'public') }}:
5656
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')]
57-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
57+
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
5858

5959
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6060
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')]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexUploadPackageVersion: 2.0.0-20240502.12
4-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
3+
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
55
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
66
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
77
preSteps: []

‎eng/common/templates-official/jobs/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
1515
defaultManagedPlatform:
1616
name: 'Managed'
17-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-9-amd64'
1818

1919
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
2020
# object in this array is sent to the job template as 'platform'. If no platforms are specified,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ jobs:
5454
pool:
5555
${{ if eq(variables['System.TeamProject'], 'public') }}:
5656
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')]
57-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
57+
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
5858

5959
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6060
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')]
61-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
61+
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
6262

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexUploadPackageVersion: 2.0.0-20240502.12
4-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
3+
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
55
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
66
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
77
preSteps: []

‎eng/common/templates/jobs/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
1515
defaultManagedPlatform:
1616
name: 'Managed'
17-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-9-amd64'
1818

1919
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
2020
# object in this array is sent to the job template as 'platform'. If no platforms are specified,

0 commit comments

Comments
 (0)