Update packagejson and scripts

.github/workflows/_reusable-eng-tools-test.yaml

@@ -50,7 +50,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}.x
 
-      - run: npm ci
+      - run: npm install --no-package-lock
         shell: pwsh
 
       - run: npm ls -a

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

eng/pipelines/typespec-validation-all.yml

@@ -53,6 +53,9 @@ jobs:
     vmImage: $(OSVmImage)
 
   steps:
+  - script: git -c user.name="azure-sdk" -c user.email="[email protected]" merge -Xours origin/main
+    displayName: git merge origin/main
+
   - template: /eng/pipelines/templates/steps/npm-install.yml
 
   - pwsh: |

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="[email protected]" 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

package.json

@@ -1,22 +1,19 @@
 {
   "name": "azure-rest-api-specs",
   "devDependencies": {
-    "@azure-tools/typespec-apiview": "0.4.9",
-    "@azure-tools/typespec-autorest": "0.45.0",
-    "@azure-tools/typespec-azure-core": "0.45.0",
-    "@azure-tools/typespec-azure-portal-core": "0.45.0",
-    "@azure-tools/typespec-azure-resource-manager": "0.45.0",
-    "@azure-tools/typespec-azure-rulesets": "0.45.0",
-    "@azure-tools/typespec-client-generator-cli": "0.9.4",
-    "@azure-tools/typespec-client-generator-core": "0.45.0",
-    "@azure-tools/typespec-liftr-base": "0.4.0",
+    "@azure-tools/typespec-autorest": "next",
+    "@azure-tools/typespec-azure-core": "next",
+    "@azure-tools/typespec-azure-portal-core": "next",
+    "@azure-tools/typespec-azure-resource-manager": "next",
+    "@azure-tools/typespec-client-generator-core": "next",
+    "@azure-tools/typespec-azure-rulesets": "next",
     "@azure/avocado": "^0.8.4",
-    "@typespec/compiler": "0.59.0",
-    "@typespec/http": "0.59.0",
-    "@typespec/openapi": "0.59.0",
-    "@typespec/openapi3": "0.59.0",
-    "@typespec/rest": "0.59.0",
-    "@typespec/versioning": "0.59.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",
     "oav": "^3.3.7",
     "prettier": "~3.2.5",