From a8efa42d6885212627f0e4e3bd251caedc6a8d7c Mon Sep 17 00:00:00 2001
From: Yufeng Li <liyufeng1987@gmail.com>
Date: Wed, 19 Feb 2020 20:42:57 -0800
Subject: [PATCH] Fix build break in macos (#3046)

---
 .../github/azure-pipelines/azure-pipelines-py-packaging.yml | 2 +-
 .../github/azure-pipelines/c-api-packaging-pipelines.yml    | 2 +-
 tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml   | 1 -
 .../github/azure-pipelines/mac-nocontribops-ci-pipeline.yml | 2 +-
 .../github/azure-pipelines/nuget/cpu-esrp-pipeline.yml      | 6 ------
 .../azure-pipelines/nuget/cpu-mklml-esrp-pipeline.yml       | 6 ------
 .../github/azure-pipelines/nuget/cpu-mklml-pipeline.yml     | 6 ------
 .../nuget/cpu-nocontribops-arm64-esrp-pipeline.yml          | 6 ------
 .../nuget/cpu-nocontribops-arm64-pipeline.yml               | 6 ------
 .../ci_build/github/azure-pipelines/nuget/cpu-pipeline.yml  | 6 ------
 .../github/azure-pipelines/nuget/gpu-esrp-pipeline.yml      | 6 ------
 .../ci_build/github/azure-pipelines/nuget/gpu-pipeline.yml  | 6 ------
 .../github/azure-pipelines/nuget/templates/cpu-mklml.yml    | 6 ------
 .../nuget/templates/cpu-nocontribops-arm64.yml              | 6 ------
 .../ci_build/github/azure-pipelines/nuget/templates/cpu.yml | 6 ------
 .../ci_build/github/azure-pipelines/nuget/templates/gpu.yml | 6 ------
 .../github/azure-pipelines/nuget/templates/test_macos.yml   | 3 ++-
 tools/ci_build/github/azure-pipelines/templates/mac-ci.yml  | 3 ++-
 18 files changed, 7 insertions(+), 78 deletions(-)

diff --git a/tools/ci_build/github/azure-pipelines/azure-pipelines-py-packaging.yml b/tools/ci_build/github/azure-pipelines/azure-pipelines-py-packaging.yml
index d11c9d24c304a..0cf47572572aa 100644
--- a/tools/ci_build/github/azure-pipelines/azure-pipelines-py-packaging.yml
+++ b/tools/ci_build/github/azure-pipelines/azure-pipelines-py-packaging.yml
@@ -238,7 +238,7 @@ jobs:
   workspace:
     clean: all
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.14'
   strategy:
     matrix:
       Python35:
diff --git a/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml b/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml
index 2671762fc337a..e208e9ac4e01b 100644
--- a/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml
+++ b/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml
@@ -54,7 +54,7 @@ jobs:
   workspace:
     clean: all
   pool: 
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.14'
   steps:
     - template: templates/mac-set-variables-and-download.yml
     - template: templates/set-version-number-variables-step.yml
diff --git a/tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml
index 72626a0022777..c3592c189ecaf 100644
--- a/tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml
@@ -1,6 +1,5 @@
 jobs:
 - template: templates/mac-ci.yml
   parameters:
-    AgentPool : 'Hosted macOS High Sierra'
     DoNugetPack: 'false'
     BuildCommand: 'python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --use_openmp --build_dir $(Build.BinariesDirectory) --build_wheel --skip_submodule_sync --use_automl --parallel --build_shared_lib --build_java --enable_language_interop_ops --enable_onnx_tests --config Debug RelWithDebInfo'
diff --git a/tools/ci_build/github/azure-pipelines/mac-nocontribops-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-nocontribops-ci-pipeline.yml
index 39aca7ec08596..25f4dee6995bb 100644
--- a/tools/ci_build/github/azure-pipelines/mac-nocontribops-ci-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/mac-nocontribops-ci-pipeline.yml
@@ -5,7 +5,7 @@ variables:
 jobs:
 - job: MacOS_CI_Dev
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.14'
   steps:
     - template: templates/set-test-data-variables-step.yml
     - task: CmdLine@2
diff --git a/tools/ci_build/github/azure-pipelines/nuget/cpu-esrp-pipeline.yml b/tools/ci_build/github/azure-pipelines/nuget/cpu-esrp-pipeline.yml
index 2bd66515dc072..ad084e6f46416 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/cpu-esrp-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/cpu-esrp-pipeline.yml
@@ -1,9 +1,3 @@
-# Defined as pipeline variables
-# variables:
-#   AgentPoolWin : 'Win-CPU'
-#   AgentPoolLinux : 'Linux-CPU'
-#   AgentPoolMacOS : 'macOS-10.13'
-
 schedules:
 - cron: "0 8 * * *"
   displayName: Daily Build
diff --git a/tools/ci_build/github/azure-pipelines/nuget/cpu-mklml-esrp-pipeline.yml b/tools/ci_build/github/azure-pipelines/nuget/cpu-mklml-esrp-pipeline.yml
index aac065f365019..de942acc8de4f 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/cpu-mklml-esrp-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/cpu-mklml-esrp-pipeline.yml
@@ -1,9 +1,3 @@
-# Defined as pipeline variables
-# variables:
-#   AgentPoolWin : 'Win-CPU'
-#   AgentPoolLinux : 'Linux-CPU'
-#   AgentPoolMacOS : 'macOS-10.13'
-
 schedules:
 - cron: "0 10 * * *"
   displayName: Daily Build
diff --git a/tools/ci_build/github/azure-pipelines/nuget/cpu-mklml-pipeline.yml b/tools/ci_build/github/azure-pipelines/nuget/cpu-mklml-pipeline.yml
index 135469669c7ed..6614106844419 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/cpu-mklml-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/cpu-mklml-pipeline.yml
@@ -1,9 +1,3 @@
-# Defined as pipeline variables
-# variables:
-#   AgentPoolWin : 'Win-CPU'
-#   AgentPoolLinux : 'Linux-CPU'
-#   AgentPoolMacOS : 'macOS-10.13'
-
 variables:
   PackageName: 'Microsoft.ML.OnnxRuntime.MKLML'
 
diff --git a/tools/ci_build/github/azure-pipelines/nuget/cpu-nocontribops-arm64-esrp-pipeline.yml b/tools/ci_build/github/azure-pipelines/nuget/cpu-nocontribops-arm64-esrp-pipeline.yml
index 56c9a86167b74..0d806d1b0d1fb 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/cpu-nocontribops-arm64-esrp-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/cpu-nocontribops-arm64-esrp-pipeline.yml
@@ -1,9 +1,3 @@
-# Defined as pipeline variables
-# variables:
-#   AgentPoolWin : 'Win-CPU'
-#   AgentPoolLinux : 'Linux-CPU'
-#   AgentPoolMacOS : 'macOS-10.13'
-
 schedules:
 - cron: "0 14 * * *"
   displayName: Daily Build
diff --git a/tools/ci_build/github/azure-pipelines/nuget/cpu-nocontribops-arm64-pipeline.yml b/tools/ci_build/github/azure-pipelines/nuget/cpu-nocontribops-arm64-pipeline.yml
index b09b21ef1ca44..210196f72ccdb 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/cpu-nocontribops-arm64-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/cpu-nocontribops-arm64-pipeline.yml
@@ -1,9 +1,3 @@
-# Defined as pipeline variables
-# variables:
-#   AgentPoolWin : 'Win-CPU'
-#   AgentPoolLinux : 'Linux-CPU'
-#   AgentPoolMacOS : 'macOS-10.13'
-
 variables:
   DisableContribOps: 'ON'
 
diff --git a/tools/ci_build/github/azure-pipelines/nuget/cpu-pipeline.yml b/tools/ci_build/github/azure-pipelines/nuget/cpu-pipeline.yml
index a1baef74398d8..59752b377d404 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/cpu-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/cpu-pipeline.yml
@@ -1,9 +1,3 @@
-# Defined as pipeline variables
-# variables:
-#   AgentPoolWin : 'Win-CPU'
-#   AgentPoolLinux : 'Linux-CPU'
-#   AgentPoolMacOS : 'macOS-10.13'
-
 jobs: 
 - template: templates/cpu.yml
   parameters:
diff --git a/tools/ci_build/github/azure-pipelines/nuget/gpu-esrp-pipeline.yml b/tools/ci_build/github/azure-pipelines/nuget/gpu-esrp-pipeline.yml
index 82b795c05fcc4..711b64e36ec9b 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/gpu-esrp-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/gpu-esrp-pipeline.yml
@@ -1,9 +1,3 @@
-# Defined as pipeline variables
-# variables:
-#   AgentPoolWin : 'Win-CPU-CUDA10'
-#   AgentPoolLinux : 'Linux-CPU'
-#   AgentPoolMacOS : 'macOS-10.13'
-
 schedules:
 - cron: "0 8 * * *"
   displayName: Daily Build
diff --git a/tools/ci_build/github/azure-pipelines/nuget/gpu-pipeline.yml b/tools/ci_build/github/azure-pipelines/nuget/gpu-pipeline.yml
index ef040845eefe1..0d8d57c362ab9 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/gpu-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/gpu-pipeline.yml
@@ -1,9 +1,3 @@
-# Defined as pipeline variables
-# variables:
-#   AgentPoolWin : 'Win-CPU-CUDA10'
-#   AgentPoolLinux : 'Linux-CPU'
-#   AgentPoolMacOS : 'macOS-10.13'
-
 variables:
   PackageName: 'Microsoft.ML.OnnxRuntime.Gpu'
   TESTONGPU: 'ON'
diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-mklml.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-mklml.yml
index cfec712e79b82..baf9701294ac7 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-mklml.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-mklml.yml
@@ -1,9 +1,3 @@
-# Defined as pipeline variables
-# variables:
-#   AgentPoolWin : 'Win-CPU'
-#   AgentPoolLinux : 'Linux-CPU'
-#   AgentPoolMacOS : 'macOS-10.13'
-
 parameters:
   DoEsrp: 'false'
 
diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-nocontribops-arm64.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-nocontribops-arm64.yml
index b08d18602ec4e..219bf98739cc2 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-nocontribops-arm64.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu-nocontribops-arm64.yml
@@ -1,9 +1,3 @@
-# Defined as pipeline variables
-# variables:
-#   AgentPoolWin : 'Win-CPU'
-#   AgentPoolLinux : 'Linux-CPU'
-#   AgentPoolMacOS : 'macOS-10.13'
-
 parameters:
   DoEsrp: 'false'
 
diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
index 7a58bc99947b2..c528ad667f5cb 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
@@ -1,9 +1,3 @@
-# Defined as pipeline variables
-# variables:
-#   AgentPoolWin : 'Win-CPU'
-#   AgentPoolLinux : 'Linux-CPU'
-#   AgentPoolMacOS : 'macOS-10.13'
-
 parameters:
   DoEsrp: 'false'
   DoCompliance: 'false'
diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/gpu.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/gpu.yml
index 81914ad074c85..e4bef2e4f5035 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/templates/gpu.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/templates/gpu.yml
@@ -1,9 +1,3 @@
-# Defined as pipeline variables
-# variables:
-#   AgentPoolWin : 'Win-CPU-CUDA10'
-#   AgentPoolLinux : 'Linux-CPU'
-#   AgentPoolMacOS : 'macOS-10.13'
-
 parameters:
   DoEsrp: 'false'
   PackageName: 'Microsoft.ML.OnnxRuntime.Gpu'
diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml
index 920a2e52d8948..3dfaa3663ce06 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml
@@ -6,7 +6,8 @@ jobs:
 - job: NuGet_Test_MacOS
   workspace:
     clean: all
-  pool: ${{ parameters.AgentPool }}
+  pool:
+    vmImage: 'macOS-10.14'
   dependsOn:
   - NuGet_Packaging
   condition: succeeded()
diff --git a/tools/ci_build/github/azure-pipelines/templates/mac-ci.yml b/tools/ci_build/github/azure-pipelines/templates/mac-ci.yml
index 8440146a351b8..42c70313e8969 100644
--- a/tools/ci_build/github/azure-pipelines/templates/mac-ci.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/mac-ci.yml
@@ -10,7 +10,8 @@ jobs:
   workspace:
     clean: all
   timeoutInMinutes:  120
-  pool: ${{ parameters.AgentPool }}
+  pool:
+    vmImage: 'macOS-10.14'
   variables:
     BuildCommand: ${{ parameters.BuildCommand }}
   steps: