From 5c83392762b6ee69bb6a90dc35c68ca0045da69f Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Wed, 3 Apr 2024 20:56:42 +0000
Subject: [PATCH] Update package.json and scripts

---
 eng/pipelines/templates/steps/npm-install.yml |  4 ++--
 eng/pipelines/typespec-validation-all.yml     |  3 +++
 eng/pipelines/typespec-validation.yml         |  5 ++++-
 package.json                                  | 22 +++++++++----------
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/eng/pipelines/templates/steps/npm-install.yml b/eng/pipelines/templates/steps/npm-install.yml
index 928e88ee9b31..3d9275c54852 100644
--- a/eng/pipelines/templates/steps/npm-install.yml
+++ b/eng/pipelines/templates/steps/npm-install.yml
@@ -11,8 +11,8 @@ steps:
   - script: npm --version --loglevel info
     displayName: npm --version
 
-  - script: npm ci
-    displayName: npm ci
+  - script: npm install --no-package-lock
+    displayName: npm install --no-package-lock
 
   - script: npm ls -a
     displayName: npm ls -a
diff --git a/eng/pipelines/typespec-validation-all.yml b/eng/pipelines/typespec-validation-all.yml
index 9354cc45d7f3..65f9abfeb180 100644
--- a/eng/pipelines/typespec-validation-all.yml
+++ b/eng/pipelines/typespec-validation-all.yml
@@ -53,6 +53,9 @@ jobs:
     vmImage: $(OSVmImage)
 
   steps:
+  - script: git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" merge -Xours origin/main
+    displayName: git merge origin/main
+
   - template: /eng/pipelines/templates/steps/npm-install.yml
 
   - pwsh: |
diff --git a/eng/pipelines/typespec-validation.yml b/eng/pipelines/typespec-validation.yml
index 59729ce5b1f8..03c5267d4df2 100644
--- a/eng/pipelines/typespec-validation.yml
+++ b/eng/pipelines/typespec-validation.yml
@@ -8,9 +8,12 @@ jobs:
     vmImage: ubuntu-22.04
 
   steps:
+  - script: git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" merge -Xours origin/main
+    displayName: git merge origin/main
+
   - template: /eng/pipelines/templates/steps/npm-install.yml
 
   - pwsh: |
-      $(Build.SourcesDirectory)/eng/scripts/TypeSpec-Validation.ps1 -GitClean -Verbose
+      $(Build.SourcesDirectory)/eng/scripts/TypeSpec-Validation.ps1 -GitClean -BaseCommitish HEAD~2 -Verbose
     displayName: Validate Impacted Specs
     ignoreLASTEXITCODE: true
diff --git a/package.json b/package.json
index 921021208b54..3f0790585107 100644
--- a/package.json
+++ b/package.json
@@ -1,19 +1,17 @@
 {
   "name": "azure-rest-api-specs",
   "devDependencies": {
-    "@azure-tools/typespec-apiview": "0.4.8",
-    "@azure-tools/typespec-autorest": "0.42.0",
-    "@azure-tools/typespec-azure-core": "0.42.0",
-    "@azure-tools/typespec-azure-portal-core": "0.42.0",
-    "@azure-tools/typespec-azure-resource-manager": "0.42.0",
-    "@azure-tools/typespec-client-generator-core": "0.42.0",
+    "@azure-tools/typespec-autorest": "next",
+    "@azure-tools/typespec-azure-core": "next",
+    "@azure-tools/typespec-azure-resource-manager": "next",
+    "@azure-tools/typespec-client-generator-core": "next",
     "@azure/avocado": "^0.8.4",
-    "@typespec/compiler": "0.56.0",
-    "@typespec/http": "0.56.0",
-    "@typespec/openapi": "0.56.0",
-    "@typespec/openapi3": "0.56.0",
-    "@typespec/rest": "0.56.0",
-    "@typespec/versioning": "0.56.0",
+    "@typespec/compiler": "next",
+    "@typespec/http": "next",
+    "@typespec/openapi": "next",
+    "@typespec/openapi3": "next",
+    "@typespec/rest": "next",
+    "@typespec/versioning": "next",
     "azure-rest-api-specs-eng-tools": "file:eng/tools",
     "prettier": "~3.2.5",
     "typescript": "~5.4.5"