From 532d156d21796c4a894d08fcfa3258eb2cc86680 Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Tue, 16 Apr 2024 08:00:57 -0700 Subject: [PATCH] Update EOL versions in `release/6.0` (#14621) Co-authored-by: Michael Simons --- azure-pipelines-pr.yml | 2 +- azure-pipelines-weekly.yaml | 6 ------ eng/common/templates-official/job/source-index-stage1.yml | 6 +++--- eng/common/templates-official/jobs/source-build.yml | 2 +- eng/common/templates/job/source-index-stage1.yml | 6 +++--- eng/common/templates/jobs/source-build.yml | 2 +- tests/UnitTests.proj | 4 ++-- 7 files changed, 11 insertions(+), 17 deletions(-) diff --git a/azure-pipelines-pr.yml b/azure-pipelines-pr.yml index 6588e1fe158..60d1385ad92 100644 --- 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 index ba28ecdbf27..d41c242e989 100644 --- 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 index e96ec3cbe0e..f04ad04c2b1 100644 --- 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 index 2159009dc8e..b9a1f67b9a9 100644 --- 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 index d8990549e80..b710698eb4d 100644 --- 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 index 00aa98eb3bf..7c240e65447 100644 --- 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 index 8bdc5767182..0aab52b188e 100644 --- a/tests/UnitTests.proj +++ b/tests/UnitTests.proj @@ -65,7 +65,7 @@ - + @@ -77,7 +77,7 @@ - +