From c5c121f6044c8864002649cd117e261789b91e01 Mon Sep 17 00:00:00 2001
From: "Gavin Barron (from Dev Box)" <gavinbarron@microsoft.com>
Date: Wed, 18 Mar 2026 13:42:52 -0700
Subject: [PATCH 1/4] ci: update rush installation

---
 .azure-pipelines/common-templates/install-tools.yml | 13 ++++++++-----
 autorest.powershell                                 |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.azure-pipelines/common-templates/install-tools.yml b/.azure-pipelines/common-templates/install-tools.yml
index 2dcdfbfdbe..99e0c95400 100644
--- a/.azure-pipelines/common-templates/install-tools.yml
+++ b/.azure-pipelines/common-templates/install-tools.yml
@@ -28,7 +28,7 @@ steps:
   - task: NodeTool@0
     displayName: Install NodeJs
     inputs:
-      versionSpec: 16.x
+      versionSpec: 18.x
       
   - task: Npm@1
     displayName: Install AutoRest
@@ -42,9 +42,12 @@ steps:
       command: custom
       customCommand: install -g @autorest/core@3.10.4
 
-  - task: Npm@1
+  - task: PowerShell@2
     displayName: Install Rush
     inputs:
-      command: custom
-      customCommand: install -g @microsoft/rush
-
+      targetType: inline
+      pwsh: true
+      script: |
+        cd autorest.powershell
+        node .\common\scripts\install-run-rush.js install
+        rush build
diff --git a/autorest.powershell b/autorest.powershell
index 4c07b35784..77bbb4b2f5 160000
--- a/autorest.powershell
+++ b/autorest.powershell
@@ -1 +1 @@
-Subproject commit 4c07b3578442ad6ad88e144e0b98b0210bacef71
+Subproject commit 77bbb4b2f583ce185f4dc3223db4453367a9f085

From 1f562c7074bfecb7e5167598d0618d1c7a41e741 Mon Sep 17 00:00:00 2001
From: "Gavin Barron (from Dev Box)" <gavinbarron@microsoft.com>
Date: Wed, 18 Mar 2026 13:56:30 -0700
Subject: [PATCH 2/4] use npm to install rush

---
 .../common-templates/install-tools.yml             | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.azure-pipelines/common-templates/install-tools.yml b/.azure-pipelines/common-templates/install-tools.yml
index 99e0c95400..587c4fdc5d 100644
--- a/.azure-pipelines/common-templates/install-tools.yml
+++ b/.azure-pipelines/common-templates/install-tools.yml
@@ -42,12 +42,16 @@ steps:
       command: custom
       customCommand: install -g @autorest/core@3.10.4
 
-  - task: PowerShell@2
+  - task: Npm@1
     displayName: Install Rush
+    inputs:
+      command: custom
+      customCommand: install -g @microsoft/rush
+  
+  - task: PowerShell@2
+    displayName: Rush Build
     inputs:
       targetType: inline
       pwsh: true
-      script: |
-        cd autorest.powershell
-        node .\common\scripts\install-run-rush.js install
-        rush build
+      workingDirectory: autorest.powershell
+      script: rush build
\ No newline at end of file

From 6e76e8c7137d2df4fffb7cd394300adeb6c6d5d3 Mon Sep 17 00:00:00 2001
From: "Gavin Barron (from Dev Box)" <gavinbarron@microsoft.com>
Date: Wed, 18 Mar 2026 14:46:03 -0700
Subject: [PATCH 3/4] add rush link

---
 .azure-pipelines/common-templates/install-tools.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/common-templates/install-tools.yml b/.azure-pipelines/common-templates/install-tools.yml
index 587c4fdc5d..9e7d475eac 100644
--- a/.azure-pipelines/common-templates/install-tools.yml
+++ b/.azure-pipelines/common-templates/install-tools.yml
@@ -53,5 +53,7 @@ steps:
     inputs:
       targetType: inline
       pwsh: true
-      workingDirectory: autorest.powershell
-      script: rush build
\ No newline at end of file
+      workingDirectory: "autorest.powershell"
+      script: |
+        rush link
+        rush build
\ No newline at end of file

From 81d1e2f9c2920ac6b0f4b65ba9971dad1bf6a6ad Mon Sep 17 00:00:00 2001
From: "Gavin Barron (from Dev Box)" <gavinbarron@microsoft.com>
Date: Wed, 18 Mar 2026 15:12:59 -0700
Subject: [PATCH 4/4] expanding rush build to install and link deps

---
 .azure-pipelines/common-templates/install-tools.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/common-templates/install-tools.yml b/.azure-pipelines/common-templates/install-tools.yml
index 9e7d475eac..7c024fb21a 100644
--- a/.azure-pipelines/common-templates/install-tools.yml
+++ b/.azure-pipelines/common-templates/install-tools.yml
@@ -55,5 +55,6 @@ steps:
       pwsh: true
       workingDirectory: "autorest.powershell"
       script: |
+        rush install
         rush link
-        rush build
\ No newline at end of file
+        rush rebuild
\ No newline at end of file