Skip to content

Commit c69b794

Browse files
cincuranetcincuranet
authored
Merge pull request #36197 from dotnet/release/8.0
[release/8.0] Merge release/8.0 => release/8.0-staging
2 parents cda1db5 + 3343e40 commit c69b794

File tree

11 files changed

+36
-40
lines changed

11 files changed

+36
-40
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
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-50c4cb9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-runtime-50c4cb9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f-2/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-50c4cb9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f-1/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" />
108
<!-- End: Package sources from dotnet-runtime -->
119
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1210
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -21,9 +19,7 @@
2119
<clear />
2220
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2321
<!-- Begin: Package sources from dotnet-runtime -->
24-
<add key="darc-int-dotnet-runtime-50c4cb9-1" value="true" />
25-
<add key="darc-int-dotnet-runtime-50c4cb9-2" value="true" />
26-
<add key="darc-int-dotnet-runtime-50c4cb9" value="true" />
22+
<add key="darc-int-dotnet-runtime-efd5742" value="true" />
2723
<!-- End: Package sources from dotnet-runtime -->
2824
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2925
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
3030
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.15-servicing.25164.13">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.16-servicing.25215.6">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
34+
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
3535
</Dependency>
3636
<Dependency Name="Microsoft.Extensions.Logging" Version="8.0.1">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -45,32 +45,32 @@
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
4646
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15">
48+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.16">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
50+
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.15">
52+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.16">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
54-
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
54+
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
5555
</Dependency>
5656
<!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
57-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.15-servicing.25164.13">
57+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.16-servicing.25215.6">
5858
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
59-
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
59+
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
6060
</Dependency>
6161
</ProductDependencies>
6262
<ToolsetDependencies>
63-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
63+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25263.4">
6464
<Uri>https://github.com/dotnet/arcade</Uri>
65-
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
65+
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
6666
</Dependency>
67-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25208.7">
67+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25263.4">
6868
<Uri>https://github.com/dotnet/arcade</Uri>
69-
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
69+
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25208.7">
71+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25263.4">
7272
<Uri>https://github.com/dotnet/arcade</Uri>
73-
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
73+
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
7474
</Dependency>
7575
</ToolsetDependencies>
7676
</Dependencies>

‎eng/Versions.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup Label="Version settings">
3-
<VersionPrefix>8.0.17</VersionPrefix>
3+
<VersionPrefix>8.0.18</VersionPrefix>
44
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
55
<PreReleaseVersionIteration>
66
</PreReleaseVersionIteration>
@@ -24,16 +24,16 @@
2424
<MicrosoftExtensionsConfigurationJsonVersion>8.0.1</MicrosoftExtensionsConfigurationJsonVersion>
2525
<MicrosoftExtensionsDependencyInjectionVersion>8.0.1</MicrosoftExtensionsDependencyInjectionVersion>
2626
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
27-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.15-servicing.25164.13</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.16-servicing.25215.6</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
2828
<MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
2929
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
3030
<SystemFormatsAsn1Version>8.0.2</SystemFormatsAsn1Version>
31-
<MicrosoftNETCoreAppRefVersion>8.0.15</MicrosoftNETCoreAppRefVersion>
32-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.15</MicrosoftNETCoreAppRuntimewinx64Version>
33-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.15-servicing.25164.13</MicrosoftNETCoreBrowserDebugHostTransportVersion>
31+
<MicrosoftNETCoreAppRefVersion>8.0.16</MicrosoftNETCoreAppRefVersion>
32+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.16</MicrosoftNETCoreAppRuntimewinx64Version>
33+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.16-servicing.25215.6</MicrosoftNETCoreBrowserDebugHostTransportVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
36-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25208.7</MicrosoftDotNetBuildTasksTemplatingVersion>
36+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25263.4</MicrosoftDotNetBuildTasksTemplatingVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Label="Other dependencies">
3939
<!-- NB: This version affects Visual Studio compatibility. See https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support -->

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