Skip to content

Commit c0fec5a

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 39801: [internal/release/6.0] Merge from public
Merge from public release/6.0 to internal/release/6.0 and resolve conflicts if necessary
2 parents 7e2bc9b + 27f77f0 commit c0fec5a

File tree

8 files changed

+26
-26
lines changed

8 files changed

+26
-26
lines changed

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ extends:
5656
autoBaseline: true
5757
pool:
5858
name: NetCore1ESPool-Internal
59-
image: 1es-windows-2022-pt
59+
image: 1es-windows-2022
6060
os: windows
6161
customBuildTags:
6262
- ES365AIMigrationTooling

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,25 +83,25 @@
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24204.4">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24266.4">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
88+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24204.4">
90+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24266.4">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
92+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24204.4">
94+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24266.4">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
96+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24204.4">
98+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24266.4">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
100+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24204.4">
102+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24266.4">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
104+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
105105
</Dependency>
106106
</ToolsetDependencies>
107107
</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
<!-- Packages that come from https://github.com/dotnet/arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24204.4</MicrosoftDotNetApiCompatVersion>
60-
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.24204.4</MicrosoftDotNetCodeAnalysisPackageVersion>
61-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24204.4</MicrosoftDotNetGenAPIVersion>
59+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24266.4</MicrosoftDotNetApiCompatVersion>
60+
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.24266.4</MicrosoftDotNetCodeAnalysisPackageVersion>
61+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24266.4</MicrosoftDotNetGenAPIVersion>
6262
</PropertyGroup>
6363
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
6464
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20210614.1
3+
sourceIndexPackageVersion: 1.0.1-20240320.1
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
66
preSteps: []
@@ -32,10 +32,10 @@ jobs:
3232
- ${{ preStep }}
3333

3434
- task: UseDotNet@2
35-
displayName: Use .NET Core sdk 3.1
35+
displayName: Use .NET 8 SDK
3636
inputs:
3737
packageType: sdk
38-
version: 3.1.x
38+
version: 8.0.x
3939
installationPath: $(Agent.TempDirectory)/dotnet
4040
workingDirectory: $(Agent.TempDirectory)
4141

‎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-7-3e800f1-20190501005343'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7'
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-index-stage1.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20210614.1
3+
sourceIndexPackageVersion: 1.0.1-20240320.1
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
66
preSteps: []
@@ -30,10 +30,10 @@ jobs:
3030
- ${{ preStep }}
3131

3232
- task: UseDotNet@2
33-
displayName: Use .NET Core sdk 3.1
33+
displayName: Use .NET 8 SDK
3434
inputs:
3535
packageType: sdk
36-
version: 3.1.x
36+
version: 8.0.x
3737
installationPath: $(Agent.TempDirectory)/dotnet
3838
workingDirectory: $(Agent.TempDirectory)
3939

‎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-7-3e800f1-20190501005343'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7'
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.128",
3+
"dotnet": "6.0.130",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4",
16-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24204.4"
15+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24266.4",
16+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24266.4"
1717
},
1818
"sdk": {
19-
"version": "6.0.128"
19+
"version": "6.0.130"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)