Update for PATCH change

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

@@ -33,7 +33,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 --force
+    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,20 +1,19 @@
 {
   "name": "azure-rest-api-specs",
   "devDependencies": {
-    "@azure-tools/typespec-apiview": "0.4.8",
-    "@azure-tools/typespec-autorest": "0.43.0",
-    "@azure-tools/typespec-azure-core": "0.43.0",
-    "@azure-tools/typespec-azure-portal-core": "0.43.0",
-    "@azure-tools/typespec-azure-resource-manager": "0.43.0",
-    "@azure-tools/typespec-client-generator-core": "0.43.0",
-    "@azure-tools/typespec-azure-rulesets": "0.43.0",
+    "@azure-tools/typespec-autorest": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvMzkxNjYyMC9hcnRpZmFjdE5hbWUvcGFja2FnZXM1/content?format=file&subPath=%2Fazure-tools-typespec-autorest-0.44.0-pr-1081.20240627.11.tgz",
+    "@azure-tools/typespec-azure-core": "next",
+    "@azure-tools/typespec-azure-portal-core": "next",
+    "@azure-tools/typespec-azure-resource-manager": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvMzkxNjYyMC9hcnRpZmFjdE5hbWUvcGFja2FnZXM1/content?format=file&subPath=%2Fazure-tools-typespec-azure-resource-manager-0.44.0-pr-1081.20240627.11.tgz",
+    "@azure-tools/typespec-client-generator-core": "next",
+    "@azure-tools/typespec-azure-rulesets": "next",
     "@azure/avocado": "^0.8.4",
-    "@typespec/compiler": "0.57.0",
-    "@typespec/http": "0.57.0",
-    "@typespec/openapi": "0.57.0",
-    "@typespec/openapi3": "0.57.0",
-    "@typespec/rest": "0.57.0",
-    "@typespec/versioning": "0.57.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",

specification/apicenter/ApiCenter.Management/Service.tsp

@@ -29,7 +29,13 @@ interface Services {
   @doc("Creates new or updates existing API.")
   createOrUpdate is Azure.ResourceManager.ArmResourceCreateOrReplaceSync<Service>;
   @doc("Updates existing service.")
-  update is ArmResourcePatchSync<Service, ServiceProperties>;
+  update is ArmCustomPatchSync<
+    Service,
+    Azure.ResourceManager.Foundations.ResourceUpdateModel<
+      Service,
+      ServiceProperties
+    >
+  >;
   @doc("Deletes specified service.")
   delete is ArmResourceDeleteSync<Service>;
   @doc("Returns a collection of services within the resource group.")

specification/apicenter/ApiCenter.Management/tspconfig.yaml

@@ -4,6 +4,7 @@ options:
   "@azure-tools/typespec-autorest":
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/apicenter.json"
     examples-directory: "{project-root}/examples"
     use-read-only-status-schema: true

specification/appcomplianceautomation/AppComplianceAutomation.Management/tspconfig.yaml

@@ -11,6 +11,7 @@ options:
     use-read-only-status-schema: true
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/appcomplianceautomation.json"
     examples-directory: "{project-root}/examples"
   "@azure-tools/typespec-ts":

specification/azurefleet/AzureFleet.Management/tspconfig.yaml

@@ -13,6 +13,7 @@ options:
     use-read-only-status-schema: true
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/azurefleet.json"
     examples-directory: "examples"
   "@azure-tools/typespec-csharp":

specification/azurelargeinstance/AzureLargeInstance.Management/tspconfig.yaml

@@ -7,6 +7,7 @@ options:
   "@azure-tools/typespec-autorest":
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/azurelargeinstance.json"
     examples-directory: "{project-root}/examples"
     use-read-only-status-schema: true

specification/azurestackhci/AzureStackHCI.StackHCIVM.Management/tspconfig.yaml

@@ -5,6 +5,7 @@ options:
     use-read-only-status-schema: true
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     output-file: "{azure-resource-provider-folder}/{service-name}/StackHCIVM/{version-status}/{version}/stackhcivm.json"
     examples-directory: "{project-root}/examples"
 linter:

specification/azurestackhci/Operations.Management/tspconfig.yaml

@@ -5,6 +5,7 @@ options:
     use-read-only-status-schema: true
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     output-file: "{azure-resource-provider-folder}/{service-name}/operations/{version-status}/{version}/operations.json"
     examples-directory: "{project-root}/examples"
 linter:

specification/codesigning/CodeSigning.Management/tspconfig.yaml

@@ -5,6 +5,7 @@ options:
     use-read-only-status-schema: true
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/codeSigningAccount.json"
     examples-directory: "{project-root}/examples"
 linter:

specification/communitytraining/Community.Management/main.tsp

@@ -144,9 +144,12 @@ interface CommunityTrainings {
     CommunityTraining,
     LroHeaders = Azure.Core.Foundations.RetryAfterHeader
   >;
-  update is ArmResourcePatchAsync<
+  update is ArmCustomPatchAsync<
     CommunityTraining,
-    CommunityTrainingProperties
+    Azure.ResourceManager.Foundations.ResourceUpdateModel<
+      CommunityTraining,
+      CommunityTrainingProperties
+    >
   >;
   delete is ArmResourceDeleteAsync<CommunityTraining>;
   listByResourceGroup is ArmResourceListByParent<CommunityTraining>;

specification/communitytraining/Community.Management/tspconfig.yaml

@@ -4,6 +4,7 @@ options:
   "@azure-tools/typespec-autorest":
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/CommunityTrainings.json"
     examples-directory: "{project-root}/examples"
 linter:

specification/containerservice/Fleet.Management/fleetmember.tsp

@@ -90,9 +90,12 @@ interface FleetMembers {
   @sharedRoute
   @added(Versions.v2023_03_15_preview)
   @removed(Versions.v2023_06_15_preview)
-  update is ArmResourcePatchSync<
+  update is ArmCustomPatchSync<
     FleetMember,
-    FleetMemberProperties,
+    Azure.ResourceManager.Foundations.ResourceUpdateModel<
+      FleetMember,
+      FleetMemberProperties
+    >,
     Azure.ResourceManager.Foundations.BaseParameters<FleetMember> &
       IfMatchParameters<FleetMember>
   >;
@@ -107,9 +110,12 @@ interface FleetMembers {
       `final-state-via`: "original-uri",
     }
   )
-  updateAsync is ArmResourcePatchAsync<
+  updateAsync is ArmCustomPatchAsync<
     FleetMember,
-    FleetMemberProperties,
+    Azure.ResourceManager.Foundations.ResourceUpdateModel<
+      FleetMember,
+      FleetMemberProperties
+    >,
     Azure.ResourceManager.Foundations.BaseParameters<FleetMember> &
       IfMatchParameters<FleetMember>
   >;

specification/containerservice/Fleet.Management/tspconfig.yaml

@@ -8,6 +8,7 @@ linter:
 options:
   "@azure-tools/typespec-autorest":
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     emitter-output-dir: "{project-root}/.."
     arm-types-dir: "{project-root}/../../common-types/resource-management"
     examples-directory: "{project-root}/examples"

specification/containerstorage/ContainerStorage.Management/pool.tsp

@@ -25,7 +25,10 @@ interface Pools {
     LroHeaders = Azure.Core.Foundations.RetryAfterHeader
   >;
   delete is ArmResourceDeleteWithoutOkAsync<Pool>;
-  update is ArmResourcePatchAsync<Pool, PoolProperties>;
+  update is ArmCustomPatchAsync<
+    Pool,
+    Azure.ResourceManager.Foundations.ResourceUpdateModel<Pool, PoolProperties>
+  >;
   listByResourceGroup is ArmResourceListByParent<Pool>;
   listBySubscription is ArmListBySubscription<Pool>;
 }

specification/containerstorage/ContainerStorage.Management/tspconfig.yaml

@@ -8,6 +8,7 @@ linter:
 options:
   "@azure-tools/typespec-autorest":
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     emitter-output-dir: "{project-root}/.."
     examples-directory: "{project-root}/examples"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/containerstorage.json"

specification/containerstorage/ContainerStorage.Management/volume.tsp

@@ -25,7 +25,13 @@ interface Volumes {
     LroHeaders = Azure.Core.Foundations.RetryAfterHeader
   >;
   delete is ArmResourceDeleteWithoutOkAsync<Volume>;
-  update is ArmResourcePatchAsync<Volume, VolumeProperties>;
+  update is ArmCustomPatchAsync<
+    Volume,
+    Azure.ResourceManager.Foundations.ResourceUpdateModel<
+      Volume,
+      VolumeProperties
+    >
+  >;
   listByPool is ArmResourceListByParent<Volume>;
 }
 

specification/databasewatcher/DatabaseWatcher.Management/tspconfig.yaml

@@ -4,6 +4,7 @@ options:
   "@azure-tools/typespec-autorest":
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     examples-directory: "{project-root}/examples"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/Watcher.json"
     use-read-only-status-schema: true

specification/databasewatcher/DatabaseWatcher.Management/watcher.tsp

@@ -112,7 +112,13 @@ interface Watchers {
     Watcher,
     LroHeaders = Azure.Core.Foundations.RetryAfterHeader
   >;
-  update is ArmResourcePatchAsync<Watcher, WatcherProperties>;
+  update is ArmCustomPatchAsync<
+    Watcher,
+    Azure.ResourceManager.Foundations.ResourceUpdateModel<
+      Watcher,
+      WatcherProperties
+    >
+  >;
   delete is ArmResourceDeleteWithoutOkAsync<Watcher>;
   listByResourceGroup is ArmResourceListByParent<Watcher>;
   listBySubscription is ArmListBySubscription<Watcher>;

specification/deviceregistry/DeviceRegistry.Management/assetEndpointProfiles.tsp

@@ -127,9 +127,12 @@ interface AssetEndpointProfiles {
     LroHeaders = Azure.Core.Foundations.RetryAfterHeader
   >;
 
-  update is ArmResourcePatchAsync<
+  update is ArmCustomPatchAsync<
     AssetEndpointProfile,
-    AssetEndpointProfileProperties
+    Azure.ResourceManager.Foundations.ResourceUpdateModel<
+      AssetEndpointProfile,
+      AssetEndpointProfileProperties
+    >
   >;
 
   delete is ArmResourceDeleteWithoutOkAsync<AssetEndpointProfile>;

specification/deviceregistry/DeviceRegistry.Management/assets.tsp

@@ -212,7 +212,13 @@ interface Assets {
     LroHeaders = Azure.Core.Foundations.RetryAfterHeader
   >;
 
-  update is ArmResourcePatchAsync<Asset, AssetProperties>;
+  update is ArmCustomPatchAsync<
+    Asset,
+    Azure.ResourceManager.Foundations.ResourceUpdateModel<
+      Asset,
+      AssetProperties
+    >
+  >;
 
   delete is ArmResourceDeleteWithoutOkAsync<Asset>;
 

specification/deviceregistry/DeviceRegistry.Management/tspconfig.yaml

@@ -7,6 +7,7 @@ options:
   "@azure-tools/typespec-autorest":
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/deviceregistry.json"
     examples-directory: "{project-root}/examples"
     use-read-only-status-schema: true

specification/devopsinfrastructure/Microsoft.DevOpsInfrastructure/main.tsp

@@ -408,7 +408,10 @@ interface Pools {
     Pool,
     LroHeaders = Azure.Core.Foundations.RetryAfterHeader
   >;
-  update is ArmResourcePatchAsync<Pool, PoolProperties>;
+  update is ArmCustomPatchAsync<
+    Pool,
+    Azure.ResourceManager.Foundations.ResourceUpdateModel<Pool, PoolProperties>
+  >;
   delete is ArmResourceDeleteWithoutOkAsync<Pool>;
   listByResourceGroup is ArmResourceListByParent<Pool>;
   listBySubscription is ArmListBySubscription<Pool>;

specification/devopsinfrastructure/Microsoft.DevOpsInfrastructure/tspconfig.yaml

@@ -12,6 +12,7 @@ options:
   "@azure-tools/typespec-autorest":
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     examples-directory: "{project-root}/examples"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/devopsinfrastructure.json"
     omit-unreachable-types: true

specification/edgezones/EdgeZones.Management/tspconfig.yaml

@@ -9,6 +9,7 @@ linter:
 options:
   "@azure-tools/typespec-autorest":
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     use-read-only-status-schema: true
     emitter-output-dir: "{project-root}/.."
     examples-directory: "examples"

specification/fabric/Microsoft.Fabric.Management/capacity.tsp

@@ -32,7 +32,13 @@ model FabricCapacity is TrackedResource<FabricCapacityProperties> {
 interface FabricCapacities {
   get is ArmResourceRead<FabricCapacity>;
   createOrUpdate is ArmResourceCreateOrReplaceAsync<FabricCapacity>;
-  update is ArmResourcePatchSync<FabricCapacity, FabricCapacityProperties>;
+  update is ArmCustomPatchSync<
+    FabricCapacity,
+    Azure.ResourceManager.Foundations.ResourceUpdateModel<
+      FabricCapacity,
+      FabricCapacityProperties
+    >
+  >;
   delete is ArmResourceDeleteSync<FabricCapacity>;
   listByResourceGroup is ArmResourceListByParent<FabricCapacity>;
   listBySubscription is ArmListBySubscription<FabricCapacity>;

specification/fabric/Microsoft.Fabric.Management/tspconfig.yaml

@@ -5,6 +5,7 @@ options:
     use-read-only-status-schema: true
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/fabric.json"
     examples-directory: "{project-root}/examples"
 linter:

specification/informatica/Informatica.DataManagement/tspconfig.yaml

@@ -7,6 +7,7 @@ options:
   "@azure-tools/typespec-autorest":
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json"
     examples-directory: "{project-root}/examples"
   "@azure-tools/typespec-python":

specification/iotoperationsdataprocessor/IoTOperationsDataProcessor.Management/tspconfig.yaml

@@ -4,6 +4,7 @@ options:
   "@azure-tools/typespec-autorest":
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
+    emit-common-types-schema: "reference-only"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json"
     examples-directory: "{project-root}/examples"
     omit-unreachable-types: true