Update EOL versions in release/6.0 (#14621)

Co-authored-by: Michael Simons <msimons@microsoft.com>
dotnet · Apr 16, 2024 · 532d156 · 532d156
1 parent e5482c3
commit 532d156
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 17 deletions.
diff --git a/azure-pipelines-pr.yml b/azure-pipelines-pr.yml
@@ -18,7 +18,7 @@ variables:
 resources:
  containers:
  - container: LinuxContainer
- image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-0cd4667-20170319080304
+ image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7
 
 stages:
 - stage: build

diff --git a/azure-pipelines-weekly.yaml b/azure-pipelines-weekly.yaml
@@ -23,12 +23,6 @@ stages:
  inputs:
  useGlobalJson: true
 
- - task: UseDotNet@2
- displayName: Install .NET 3.1 runtime
- inputs:
- packageType: runtime
- version: 3.1.x
-
  - script: dotnet tool restore
 
  - task: AzureCLI@2

diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml
@@ -1,6 +1,6 @@
 parameters:
  runAsPublic: false
- sourceIndexPackageVersion: 1.0.1-20210614.1
+ sourceIndexPackageVersion: 1.0.1-20240320.1
  sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
  sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
  preSteps: []
@@ -32,10 +32,10 @@ jobs:
  - ${{ preStep }}
 
  - task: UseDotNet@2
- displayName: Use .NET Core sdk 3.1
+ displayName: Use .NET 8 SDK
  inputs:
  packageType: sdk
- version: 3.1.x
+ version: 8.0.x
  installationPath: $(Agent.TempDirectory)/dotnet
  workingDirectory: $(Agent.TempDirectory)
 

diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml
@@ -14,7 +14,7 @@ parameters:
  # This is the default platform provided by Arcade, intended for use by a managed-only repo.
  defaultManagedPlatform:
  name: 'Managed'
- container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
+ container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7'
 
  # Defines the platforms on which to run build jobs. One job is created for each platform, and the
  # object in this array is sent to the job template as 'platform'. If no platforms are specified,

diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
@@ -1,6 +1,6 @@
 parameters:
  runAsPublic: false
- sourceIndexPackageVersion: 1.0.1-20210614.1
+ sourceIndexPackageVersion: 1.0.1-20240320.1
  sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
  sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
  preSteps: []
@@ -30,10 +30,10 @@ jobs:
  - ${{ preStep }}
 
  - task: UseDotNet@2
- displayName: Use .NET Core sdk 3.1
+ displayName: Use .NET 8 SDK
  inputs:
  packageType: sdk
- version: 3.1.x
+ version: 8.0.x
  installationPath: $(Agent.TempDirectory)/dotnet
  workingDirectory: $(Agent.TempDirectory)
 

diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml
@@ -14,7 +14,7 @@ parameters:
  # This is the default platform provided by Arcade, intended for use by a managed-only repo.
  defaultManagedPlatform:
  name: 'Managed'
- container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
+ container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7'
 
  # Defines the platforms on which to run build jobs. One job is created for each platform, and the
  # object in this array is sent to the job template as 'platform'. If no platforms are specified,

diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj
@@ -65,7 +65,7 @@
  <ItemGroup Condition=" '$(HelixAccessToken)' != '' ">
  <HelixTargetQueue Include="RedHat.7.Amd64"/>
  <HelixTargetQueue Include="Windows.10.Amd64"/>
- <HelixTargetQueue Include="(Debian.10.Amd64)ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20210304164434-56c6673"/>
+ <HelixTargetQueue Include="(Debian.11.Amd64)ubuntu.2204.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64"/>
  </ItemGroup>
 
  <PropertyGroup Condition=" '$(HelixAccessToken)' == '' ">
@@ -77,7 +77,7 @@
  <ItemGroup Condition=" '$(HelixAccessToken)' == '' ">
  <HelixTargetQueue Include="RedHat.7.Amd64.Open"/>
  <HelixTargetQueue Include="Windows.10.Amd64.Open"/>
- <HelixTargetQueue Include="(Debian.10.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20210304164434-56c6673"/>
+ <HelixTargetQueue Include="(Debian.11.Amd64.Open)ubuntu.2204.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64"/>
  </ItemGroup>
 
  <PropertyGroup Condition="!$(HelixTargetQueue.StartsWith('Windows'))">