Tsp azure/3138

.github/actions/setup-node-install-deps/action.yaml

@@ -1,3 +1,3 @@
 name: Setup Node and install dependencies
 description: Uses specified Node version and installs dependencies (typically using "npm")
 
@@ -20,6 +20,15 @@
       with:
         node-version: ${{ inputs.node-version }}
 
+    - name: Regenerate package-lock.json with latest "next" versions
+      run: |
+        rm package-lock.json
+        npm install --package-lock-only
+        echo "::group::echo package-lock.json"
+        cat package-lock.json
+        echo "::endgroup::"
+      shell: bash
+
     - run: |
         echo "::group::$INSTALL_COMMAND"
         $INSTALL_COMMAND

.github/workflows/typespec-validation-all.yaml

@@ -1,3 +1,3 @@
 name: TypeSpec Validation - All
 
 on:
@@ -69,6 +69,13 @@
         with:
           # Convert placeholder string 'default' to '', which tells the action to checkout the default ref.
           ref: ${{ matrix.ref == 'next' && 'typespec-next' || '' }}
+          # Checkout all history for all branches.  Required to merge origin/main.
+          fetch-depth: 0
+
+      - name: git merge origin/main
+        run: |
+          git merge --no-commit -Xours origin/main
+          git -c user.name="azure-sdk" -c user.email="[email protected]" commit --allow-empty -m "Merge origin/main"
 
       - name: Setup Node and install deps
         uses: ./.github/actions/setup-node-install-deps

.github/workflows/typespec-validation.yaml

@@ -1,3 +1,3 @@
 name: TypeSpec Validation
 
 on: pull_request
@@ -13,7 +13,13 @@
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 2
+          # Checkout all history for all branches.  Required to merge origin/main.
+          fetch-depth: 0
+
+      - name: git merge origin/main
+        run: |
+          git merge --no-commit -Xours origin/main
+          git -c user.name="azure-sdk" -c user.email="[email protected]" commit --allow-empty -m "Merge origin/main"
 
       - name: Setup Node and install deps
         uses: ./.github/actions/setup-node-install-deps
@@ -27,5 +33,5 @@
           # Only "main" and "RPSaaSMaster" should validate all specs if core files change
           $ignoreCoreFiles = -not (@('main', 'RPSaaSMaster') -contains $Env:GITHUB_BASE_REF)
 
-          ./eng/scripts/TypeSpec-Validation.ps1 -GitClean -Verbose -IgnoreCoreFiles:$ignoreCoreFiles
+          ./eng/scripts/TypeSpec-Validation.ps1 -GitClean -Verbose -IgnoreCoreFiles:$ignoreCoreFiles -BaseCommitish:HEAD~1 -HeadCommitish:HEAD~2
         shell: pwsh

eng/pipelines/templates/steps/npm-install.yml

@@ -1,3 +1,3 @@
 parameters:
   - name: NodeVersion
     type: string
@@ -11,8 +11,8 @@
     parameters:
       NodeVersion: ${{ parameters.NodeVersion }}
 
-  - script: npm ci
-    displayName: npm ci
+  - script: npm install --no-package-lock --force
+    displayName: npm install --no-package-lock --force
     workingDirectory: ${{ parameters.WorkingDirectory }}
 
   - script: npm ls -a || true

package.json

@@ -1,37 +1,54 @@
 {
   "name": "azure-rest-api-specs",
   "devDependencies": {
     "@azure-tools/spec-gen-sdk": "~0.9.1",
     "@azure-tools/specs-shared": "file:.github/shared",
     "@azure-tools/typespec-apiview": "0.7.2",
-    "@azure-tools/typespec-autorest": "0.59.0",
-    "@azure-tools/typespec-azure-core": "0.59.0",
-    "@azure-tools/typespec-azure-portal-core": "0.59.0",
-    "@azure-tools/typespec-azure-resource-manager": "0.59.0",
-    "@azure-tools/typespec-azure-rulesets": "0.59.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": "https://pkg.pr.new/Azure/typespec-azure/@azure-tools/typespec-azure-resource-manager@2921",
+    "@azure-tools/typespec-azure-rulesets": "next",
     "@azure-tools/typespec-client-generator-cli": "0.27.0",
-    "@azure-tools/typespec-client-generator-core": "0.59.0",
+    "@azure-tools/typespec-client-generator-core": "next",
     "@azure-tools/typespec-liftr-base": "0.8.0",
     "@autorest/openapi-to-typespec": "0.11.5",
     "@azure/avocado": "^0.9.1",
-    "@typespec/compiler": "1.3.0",
-    "@typespec/http": "1.3.0",
-    "@typespec/sse": "0.73.0",
-    "@typespec/events": "0.73.0",
-    "@typespec/openapi": "1.3.0",
-    "@typespec/openapi3": "1.3.0",
-    "@typespec/prettier-plugin-typespec": "1.3.0",
-    "@typespec/rest": "0.73.0",
-    "@typespec/streams": "0.73.0",
-    "@typespec/versioning": "0.73.0",
-    "@typespec/xml": "0.73.0",
+    "@typespec/compiler": "next",
+    "@typespec/http": "next",
+    "@typespec/sse": "next",
+    "@typespec/events": "next",
+    "@typespec/openapi": "next",
+    "@typespec/openapi3": "next",
+    "@typespec/prettier-plugin-typespec": "next",
+    "@typespec/rest": "next",
+    "@typespec/streams": "next",
+    "@typespec/versioning": "next",
+    "@typespec/xml": "next",
     "azure-rest-api-specs-eng-tools": "file:eng/tools",
     "oav": "^3.6.4",
     "prettier": "~3.5.3",
     "typescript": "~5.8.2"
   },
   "overrides": {
-    "@typespec/asset-emitter": "0.73.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": "https://pkg.pr.new/Azure/typespec-azure/@azure-tools/typespec-azure-resource-manager@2921",
+    "@azure-tools/typespec-client-generator-core": "next",
+    "@azure-tools/typespec-azure-rulesets": "next",
+    "@typespec/asset-emitter": "next",
+    "@typespec/compiler": "next",
+    "@typespec/http": "next",
+    "@typespec/sse": "next",
+    "@typespec/events": "next",
+    "@typespec/openapi": "next",
+    "@typespec/openapi3": "next",
+    "@typespec/prettier-plugin-typespec": "next",
+    "@typespec/rest": "next",
+    "@typespec/streams": "next",
+    "@typespec/versioning": "next",
+    "@typespec/xml": "next",
     "jsonpath-plus": "^10.3.0"
   },
   "engines": {

specification/azuredatatransfer/resource-manager/Microsoft.AzureDataTransfer/preview/2025-04-11-preview/azuredatatransfer.json

@@ -2809,6 +2809,10 @@
       "type": "string",
       "description": "Represents an Azure Resource Type."
     },
+    "Azure.Core.azureLocation": {
+      "type": "string",
+      "description": "Represents an Azure geography region where supported resource providers live."
+    },
     "Connection": {
       "type": "object",
       "description": "The connection resource definition.",
@@ -3811,7 +3815,7 @@
           }
         },
         "location": {
-          "type": "string",
+          "$ref": "#/definitions/Azure.Core.azureLocation",
           "description": "The geo-location where the resource lives",
           "x-ms-mutability": [
             "read",
@@ -4047,7 +4051,7 @@
           }
         },
         "location": {
-          "type": "string",
+          "$ref": "#/definitions/Azure.Core.azureLocation",
           "description": "The geo-location where the resource lives",
           "x-ms-mutability": [
             "read",

specification/azuredatatransfer/resource-manager/Microsoft.AzureDataTransfer/stable/2025-05-21/azuredatatransfer.json

@@ -2809,6 +2809,10 @@
       "type": "string",
       "description": "Represents an Azure Resource Type."
     },
+    "Azure.Core.azureLocation": {
+      "type": "string",
+      "description": "Represents an Azure geography region where supported resource providers live."
+    },
     "Connection": {
       "type": "object",
       "description": "The connection resource definition.",
@@ -3811,7 +3815,7 @@
           }
         },
         "location": {
-          "type": "string",
+          "$ref": "#/definitions/Azure.Core.azureLocation",
           "description": "The geo-location where the resource lives",
           "x-ms-mutability": [
             "read",
@@ -4047,7 +4051,7 @@
           }
         },
         "location": {
-          "type": "string",
+          "$ref": "#/definitions/Azure.Core.azureLocation",
           "description": "The geo-location where the resource lives",
           "x-ms-mutability": [
             "read",