Skip to content

Commit 99e7c7c

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into darc-release/8.0.1xx-30e75f85-4fe7-4641-841c-7a9905271d99
2 parents 4daa391 + b2dd68a commit 99e7c7c

File tree

10 files changed

+27
-22
lines changed

10 files changed

+27
-22
lines changed

‎NuGet.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
<!-- End: Package sources from dotnet-runtime -->
1919
<!-- Begin: Package sources from dotnet-templating -->
2020
<add key="darc-pub-dotnet-templating-dde824a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-dde824a1/nuget/v3/index.json" />
21+
<add key="darc-pub-dotnet-templating-c0c76f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d/nuget/v3/index.json" />
22+
<add key="darc-pub-dotnet-templating-c0c76f0-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-7/nuget/v3/index.json" />
23+
<add key="darc-pub-dotnet-templating-c0c76f0-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-6/nuget/v3/index.json" />
24+
<add key="darc-pub-dotnet-templating-c0c76f0-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-5/nuget/v3/index.json" />
25+
<add key="darc-pub-dotnet-templating-c0c76f0-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c0c76f0d-4/nuget/v3/index.json" />
2126
<!-- End: Package sources from dotnet-templating -->
2227
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2328
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25214.7">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25230.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
496+
<Sha>4246a31e5de9de87f760218c4f588cebf4661f45</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25214.7">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25230.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
501+
<Sha>4246a31e5de9de87f760218c4f588cebf4661f45</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25214.7">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25230.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
505+
<Sha>4246a31e5de9de87f760218c4f588cebf4661f45</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25214.7">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25230.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
509+
<Sha>4246a31e5de9de87f760218c4f588cebf4661f45</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212
<!-- Repo Version Information -->
1313
<PropertyGroup>
14-
<VersionPrefix>8.0.116</VersionPrefix>
14+
<VersionPrefix>8.0.117</VersionPrefix>
1515
<!-- Enable to remove prerelease label. -->
1616
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
1717
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25214.7</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25230.1</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -209,7 +209,7 @@
209209
<PropertyGroup>
210210
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
211211
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
212-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25214.7</MicrosoftDotNetXUnitExtensionsVersion>
212+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25230.1</MicrosoftDotNetXUnitExtensionsVersion>
213213
<MoqPackageVersion>4.18.4</MoqPackageVersion>
214214
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
215215
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

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

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25214.7",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25214.7"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25230.1",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25230.1"
1919
}
2020
}

0 commit comments

Comments
 (0)