From e454ca2fbc8a9d64b4cc606711195200a039d62f Mon Sep 17 00:00:00 2001
From: Sean McManus <seanmcm@microsoft.com>
Date: Mon, 16 Mar 2026 03:49:34 -0700
Subject: [PATCH 1/2] Update.

---
 Extension/package.json |  4 +++-
 Extension/yarn.lock    | 23 ++++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Extension/package.json b/Extension/package.json
index 76b57ad96..db5dd9c9c 100644
--- a/Extension/package.json
+++ b/Extension/package.json
@@ -6881,6 +6881,8 @@
     "resolutions": {
         "postcss": "^8.4.31",
         "gulp-typescript/**/glob-parent": "^5.1.2",
-        "serialize-javascript": "^7.0.4"
+        "serialize-javascript": "^7.0.4",
+        "@azure/msal-browser": "^4.29.1",
+        "flatted": "^3.4.1"
     }
 }
\ No newline at end of file
diff --git a/Extension/yarn.lock b/Extension/yarn.lock
index 6e74863fe..7a848acc6 100644
--- a/Extension/yarn.lock
+++ b/Extension/yarn.lock
@@ -97,18 +97,23 @@
     "@typespec/ts-http-runtime" "^0.3.0"
     tslib "^2.6.2"
 
-"@azure/msal-browser@^4.2.0":
-  version "4.29.0"
-  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@azure/msal-browser/-/msal-browser-4.29.0.tgz#6d711acd3b463b46bdae05445b83547816fb8f5c"
-  integrity sha1-bXEazTtGO0a9rgVEW4NUeBb7j1w=
+"@azure/msal-browser@^4.2.0", "@azure/msal-browser@^4.29.1":
+  version "4.29.1"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@azure/msal-browser/-/msal-browser-4.29.1.tgz#01dc1d2f6ed325e32c03d3939c171f4f4d20a56d"
+  integrity sha1-AdwdL27TJeMsA9OTnBcfT00gpW0=
   dependencies:
-    "@azure/msal-common" "15.15.0"
+    "@azure/msal-common" "15.16.1"
 
 "@azure/msal-common@15.15.0":
   version "15.15.0"
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@azure/msal-common/-/msal-common-15.15.0.tgz#05e758b41923499af7ca0965edaafc28a2acf615"
   integrity sha1-BedYtBkjSZr3ygll7ar8KKKs9hU=
 
+"@azure/msal-common@15.16.1":
+  version "15.16.1"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@azure/msal-common/-/msal-common-15.16.1.tgz#5df3697ec0d53d08278f2536d53bd52214e52c39"
+  integrity sha1-XfNpfsDVPQgnjyU21TvVIhTlLDk=
+
 "@azure/msal-node@^3.5.0":
   version "3.8.8"
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@azure/msal-node/-/msal-node-3.8.8.tgz#e7f161ceea81ea41b4ea6eaeadb5bfda35f8d0ba"
@@ -3031,10 +3036,10 @@ flat@^5.0.2:
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
   integrity sha1-jKb+MyBp/6nTJMMnGYxZglnOskE=
 
-flatted@^3.2.9:
-  version "3.3.3"
-  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
-  integrity sha1-Z8j62VRUp8er6/dLt47nSkQCM1g=
+flatted@^3.2.9, flatted@^3.4.0:
+  version "3.4.1"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/flatted/-/flatted-3.4.1.tgz#84ccd9579e76e9cc0d246c11d8be0beb019143e6"
+  integrity sha1-hMzZV5526cwNJGwR2L4L6wGRQ+Y=
 
 flush-write-stream@^1.0.2:
   version "1.1.1"

From a00fd8dd54f7b732622ae140f9cabeb899d08b7e Mon Sep 17 00:00:00 2001
From: Sean McManus <seanmcm@microsoft.com>
Date: Mon, 16 Mar 2026 04:10:26 -0700
Subject: [PATCH 2/2] Use npm instead of yarn for the extension package vsix.

---
 Build/package/jobs_package_vsix.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Build/package/jobs_package_vsix.yml b/Build/package/jobs_package_vsix.yml
index c2a4b17fa..95d65b430 100644
--- a/Build/package/jobs_package_vsix.yml
+++ b/Build/package/jobs_package_vsix.yml
@@ -38,9 +38,6 @@ jobs:
     inputs:
       version: 22.x
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
-    displayName: Use Yarn 1.x
-
   - script: IF EXIST %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc del %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc
     displayName: Delete .npmrc if it exists
 
@@ -51,9 +48,9 @@ jobs:
       script: |
         export SRC_DIR=$(echo $BUILD_SOURCESDIRECTORY | sed 's|\\|/|g')
         cd "$SRC_DIR/${{ parameters.srcDir }}"
-        yarn install
+        npm install
         if [ $? -ne 0 ]; then
-          echo "yarn install failed, sleeping for 30s before retrying..."
+          echo "npm install failed, sleeping for 30s before retrying..."
           sleep 30
           exit 1
         fi