From 102fb9f98a7aa5e091811928681a772b2b0bba4c Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Sat, 15 Nov 2025 01:05:06 +0100 Subject: [PATCH 1/4] Update from Ubuntu 20.04 to 22.04 --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bee7392a2..1444de624 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -84,7 +84,7 @@ stages: installAdditionalLinuxDependencies: true pool: name: NetCore-Public - demands: ImageOverride -equals 1es-ubuntu-2004-open + demands: ImageOverride -equals 1es-ubuntu-2204-open containerName: mcr.microsoft.com/dotnet/sdk:8.0-noble - stage: @@ -102,7 +102,7 @@ stages: installAdditionalLinuxDependencies: true pool: name: NetCore-Public - demands: ImageOverride -equals 1es-ubuntu-2004-open + demands: ImageOverride -equals 1es-ubuntu-2204-open containerName: mcr.microsoft.com/dotnet/sdk:9.0-noble - stage: @@ -118,7 +118,7 @@ stages: installAdditionalLinuxDependencies: true pool: name: NetCore-Public - demands: ImageOverride -equals 1es-ubuntu-2004-open + demands: ImageOverride -equals 1es-ubuntu-2204-open containerName: mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2-noble - stage: Test_Windows_Stage @@ -159,7 +159,7 @@ stages: strategy: matrix: linux: - demandsName: 1es-ubuntu-2004-open + demandsName: 1es-ubuntu-2204-open windows: demandsName: 1es-windows-2022-open pool: From 071bd333157025087614b9563802c347cd0dab11 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 14 Nov 2025 16:47:37 -0800 Subject: [PATCH 2/4] Use `image` --- azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1444de624..4e27dc467 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -84,7 +84,7 @@ stages: installAdditionalLinuxDependencies: true pool: name: NetCore-Public - demands: ImageOverride -equals 1es-ubuntu-2204-open + image: 1es-ubuntu-2204-open containerName: mcr.microsoft.com/dotnet/sdk:8.0-noble - stage: @@ -102,7 +102,7 @@ stages: installAdditionalLinuxDependencies: true pool: name: NetCore-Public - demands: ImageOverride -equals 1es-ubuntu-2204-open + image: 1es-ubuntu-2204-open containerName: mcr.microsoft.com/dotnet/sdk:9.0-noble - stage: @@ -118,7 +118,7 @@ stages: installAdditionalLinuxDependencies: true pool: name: NetCore-Public - demands: ImageOverride -equals 1es-ubuntu-2204-open + image: 1es-ubuntu-2204-open containerName: mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2-noble - stage: Test_Windows_Stage @@ -159,12 +159,12 @@ stages: strategy: matrix: linux: - demandsName: 1es-ubuntu-2204-open + imageName: 1es-ubuntu-2204-open windows: - demandsName: 1es-windows-2022-open + imageName: 1es-windows-2022-open pool: name: NetCore-Public - demands: ImageOverride -equals $(demandsName) + image: $(imageName) steps: - template: azure-pipelines/test-omnisharp.yml parameters: From f9e7c6df5d3ff9589aed602df6e90c80001c9c6a Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 14 Nov 2025 17:02:34 -0800 Subject: [PATCH 3/4] Set `os` --- azure-pipelines.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4e27dc467..5a480c7ef 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -85,6 +85,7 @@ stages: pool: name: NetCore-Public image: 1es-ubuntu-2204-open + os: linux containerName: mcr.microsoft.com/dotnet/sdk:8.0-noble - stage: @@ -103,6 +104,7 @@ stages: pool: name: NetCore-Public image: 1es-ubuntu-2204-open + os: linux containerName: mcr.microsoft.com/dotnet/sdk:9.0-noble - stage: @@ -119,6 +121,7 @@ stages: pool: name: NetCore-Public image: 1es-ubuntu-2204-open + os: linux containerName: mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2-noble - stage: Test_Windows_Stage @@ -160,11 +163,14 @@ stages: matrix: linux: imageName: 1es-ubuntu-2204-open + osName: linux windows: imageName: 1es-windows-2022-open + osName: windows pool: name: NetCore-Public image: $(imageName) + os: $(osName) steps: - template: azure-pipelines/test-omnisharp.yml parameters: From 149cbec9a0c0dfeefbd5cb0d0e027c8457af9bf0 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 17 Nov 2025 18:37:17 -0800 Subject: [PATCH 4/4] Revert all my changes --- azure-pipelines.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5a480c7ef..1444de624 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -84,8 +84,7 @@ stages: installAdditionalLinuxDependencies: true pool: name: NetCore-Public - image: 1es-ubuntu-2204-open - os: linux + demands: ImageOverride -equals 1es-ubuntu-2204-open containerName: mcr.microsoft.com/dotnet/sdk:8.0-noble - stage: @@ -103,8 +102,7 @@ stages: installAdditionalLinuxDependencies: true pool: name: NetCore-Public - image: 1es-ubuntu-2204-open - os: linux + demands: ImageOverride -equals 1es-ubuntu-2204-open containerName: mcr.microsoft.com/dotnet/sdk:9.0-noble - stage: @@ -120,8 +118,7 @@ stages: installAdditionalLinuxDependencies: true pool: name: NetCore-Public - image: 1es-ubuntu-2204-open - os: linux + demands: ImageOverride -equals 1es-ubuntu-2204-open containerName: mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2-noble - stage: Test_Windows_Stage @@ -162,15 +159,12 @@ stages: strategy: matrix: linux: - imageName: 1es-ubuntu-2204-open - osName: linux + demandsName: 1es-ubuntu-2204-open windows: - imageName: 1es-windows-2022-open - osName: windows + demandsName: 1es-windows-2022-open pool: name: NetCore-Public - image: $(imageName) - os: $(osName) + demands: ImageOverride -equals $(demandsName) steps: - template: azure-pipelines/test-omnisharp.yml parameters: