From 0f7162ccf51a79ce78afdc4a7843019b80b58574 Mon Sep 17 00:00:00 2001
From: Deep Choudhery <54324771+deepchoudhery@users.noreply.github.com>
Date: Fri, 7 Apr 2023 12:34:37 -0700
Subject: [PATCH] fixed ubuntu version and azure-pipelines.yml (#2371)

* fixed ubuntu version

* fixed azure-pipelines.yml

* azure-pipelines.yml fix 2
---
 azure-pipelines.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b4dddfe4c..66d007f5c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,6 +17,7 @@ variables:
     value: true
   - name: _DotNetArtifactsCategory
     value: .NETCore
+  - template: /eng/common/templates/variables/pool-providers.yml
 
   # used for post-build phases, internal builds only
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -43,10 +44,10 @@ stages:
           # For public or PR jobs, use the hosted pool.  For internal jobs use the internal pool.
           # Will eventually change this to two BYOC pools.
           ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
-            name: NetCore-Public
+            name: $(DncEngPublicBuildPool)
             demands: ImageOverride -equals 1es-windows-2019-open
           ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-            name: NetCore1ESPool-Internal
+            name: $(DncEngInternalBuildPool)
             demands: ImageOverride -equals 1es-windows-2019
 
         variables:
@@ -99,7 +100,7 @@ stages:
           clean: true
         # Use utility script to run script command dependent on agent OS.
         - script: $(_Script)
-            -configuration $(_BuildConfig) 
+            -configuration $(_BuildConfig)
             -prepareMachine
             $(_InternalBuildArgs)
             $(_ValidateSdkArgs)
@@ -131,10 +132,10 @@ stages:
           timeoutInMinutes: 180
           pool:
             ${{ if or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule')) }}:
-              vmImage: ubuntu-18.04
+              vmImage: ubuntu-22.04
             ${{ if and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule')) }}:
-              name: NetCore1ESPool-Internal
-              demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+              name: $(DncEngInternalBuildPool)
+              demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
           strategy:
             matrix:
               release_configuration: