From 6872e87c70cab65b282179ae54d3fc6abbce42e5 Mon Sep 17 00:00:00 2001
From: MaksimZhukov <v-mazhuk@microsoft.com>
Date: Tue, 13 Oct 2020 14:39:09 +0300
Subject: [PATCH 1/3] Remove mobile-center-cli

---
 images/macos/provision/core/node.sh | 11 ++---------
 images/macos/tests/Common.Tests.ps1 |  4 ----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh
index daf5ea40..393cb658 100644
--- a/images/macos/provision/core/node.sh
+++ b/images/macos/provision/core/node.sh
@@ -1,10 +1,5 @@
 source ~/utils/utils.sh
 
-node_common_modules=(
-  node-gyp
-  mobile-center-cli
-)
-
 node_catalina_modules=(
   appcenter-cli
   newman
@@ -40,8 +35,6 @@ echo Installing yarn...
 curl -o- -L https://yarnpkg.com/install.sh | bash
 
 if is_Less_BigSur; then
-    for module in ${node_common_modules[@]}; do
-        echo "Install $module"
-        npm install -g $module
-    done
+  echo "Install node-gyp"
+  npm install -g node-gyp
 fi
diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1
index 72a657e6..88d735bf 100644
--- a/images/macos/tests/Common.Tests.ps1
+++ b/images/macos/tests/Common.Tests.ps1
@@ -102,10 +102,6 @@ Describe "Common utilities" {
         "aliyun --version" | Should -ReturnZeroExitCode
     }
 
-    It "Mobile Center CLI" -Skip:($os.IsBigSur) {
-        "mobile-center --version" | Should -ReturnZeroExitCode
-    }
-
     Context "Nomad" -Skip:($os.IsBigSur) {
         It "Nomad CLI" {
             $result = Get-CommandResult "gem list"

From 71c6294c4fcb41fc8e18d4ecde7bf2b3b5a55842 Mon Sep 17 00:00:00 2001
From: MaksimZhukov <v-mazhuk@microsoft.com>
Date: Tue, 13 Oct 2020 15:08:07 +0300
Subject: [PATCH 2/3] Change name for the node modules

---
 images/macos/provision/core/node.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh
index 393cb658..d311b295 100644
--- a/images/macos/provision/core/node.sh
+++ b/images/macos/provision/core/node.sh
@@ -1,6 +1,6 @@
 source ~/utils/utils.sh
 
-node_catalina_modules=(
+node_modules=(
   appcenter-cli
   newman
 )
@@ -25,7 +25,7 @@ else
   brew install node@12
   brew link node@12 --force
 
-  for module in ${node_catalina_modules[@]}; do
+  for module in ${node_modules[@]}; do
     echo "Install $module"
     npm install -g $module
   done

From 2e283ae37fa0154b636790f0bdd78e7fe141f7a6 Mon Sep 17 00:00:00 2001
From: MaksimZhukov <v-mazhuk@microsoft.com>
Date: Wed, 14 Oct 2020 12:40:01 +0300
Subject: [PATCH 3/3] Add Omelette installation

---
 images/macos/provision/core/node.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh
index d311b295..840b433f 100644
--- a/images/macos/provision/core/node.sh
+++ b/images/macos/provision/core/node.sh
@@ -18,6 +18,10 @@ if is_Less_Catalina; then
   npm install -g npm@3
   npm config set prefix /usr/local
 
+  # This step is required to install App Center CLI
+  echo Installing Omelette...
+  npm install -g omelette@0.4.14
+
   echo Installing App Center CLI...
   npm install -g appcenter-cli@^1.0.0
 else