Fix merge conflicts

.azure-pipelines/azure-pipelines-data-container.yml

@@ -7,8 +7,8 @@ schedules:
   always: true
 
 pool:
-  name: azsdk-pool-x64
-  demands: ImageOverride -equals ubuntu-22.04
+  name: azsdk-pool
+  demands: ImageOverride -equals ubuntu-24.04
 
 variables:
   IMAGE_TAG_PREFIX: $[format('1.0.{0:HHm}', pipeline.startTime)]

.config/1espt/PipelineAutobaseliningConfig.yml

@@ -0,0 +1,10 @@
+## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
+
+pipelines:
+  7721:
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2025-05-16
+        policheck:
+          lastModifiedDate: 2025-05-16

.config/guardian/.gdnbaselines

@@ -0,0 +1,141 @@
+{
+  "properties": {
+    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
+  },
+  "version": "1.0.0",
+  "baselines": {
+    "default": {
+      "name": "default",
+      "createdDate": "2025-05-16 21:01:03Z",
+      "lastUpdatedDate": "2025-05-16 21:01:03Z"
+    }
+  },
+  "results": {
+    "66f678ca5f24b175fc27c406310611d1b24f7c6e93015464a6ca10784576b6ed": {
+      "signature": "66f678ca5f24b175fc27c406310611d1b24f7c6e93015464a6ca10784576b6ed",
+      "alternativeSignatures": [],
+      "target": "specification/cognitiveservices/data-plane/TranslatorText/stable/v3.0/TranslatorText.json",
+      "line": 12,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0060",
+      "createdDate": "2025-05-16 21:01:03Z",
+      "expirationDate": "2025-11-02 21:02:05Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2025-05-16 21:02:05Z"
+    },
+    "14da33d334bd6dae4e70b78bba2d59d6c7e902c33fc90377a718b404f8fb6151": {
+      "signature": "14da33d334bd6dae4e70b78bba2d59d6c7e902c33fc90377a718b404f8fb6151",
+      "alternativeSignatures": [],
+      "target": "specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.6-preview.1/keys.json",
+      "line": 1649,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0060",
+      "createdDate": "2025-05-16 21:01:03Z",
+      "expirationDate": "2025-11-02 21:02:05Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2025-05-16 21:02:05Z"
+    },
+    "47a19db622c1fc4c19a3b2434c5e077931cd0d0cfa6b1fbbdbde075bda9481b7": {
+      "signature": "47a19db622c1fc4c19a3b2434c5e077931cd0d0cfa6b1fbbdbde075bda9481b7",
+      "alternativeSignatures": [],
+      "target": "specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.6-preview.2/keys.json",
+      "line": 1696,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0060",
+      "createdDate": "2025-05-16 21:01:03Z",
+      "expirationDate": "2025-11-02 21:02:05Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2025-05-16 21:02:05Z"
+    },
+    "a471bf10714f13c5a04e572b21784278608532b1df6b9088aff1b99be1329563": {
+      "signature": "a471bf10714f13c5a04e572b21784278608532b1df6b9088aff1b99be1329563",
+      "alternativeSignatures": [],
+      "target": "specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.5/keys.json",
+      "line": 1647,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0060",
+      "createdDate": "2025-05-16 21:01:03Z",
+      "expirationDate": "2025-11-02 21:02:05Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2025-05-16 21:02:05Z"
+    },
+    "7919cd03b89028fefa170f4a5d6f750fc23470a94e52cbe2a84e2be9b9c7dd54": {
+      "signature": "7919cd03b89028fefa170f4a5d6f750fc23470a94e52cbe2a84e2be9b9c7dd54",
+      "alternativeSignatures": [],
+      "target": "specification/migrateprojects/resource-manager/Microsoft.Migrate/preview/2018-09-01-preview/examples/Solutions_GetConfig.json",
+      "line": 12,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-AZURE0030",
+      "createdDate": "2025-05-16 21:01:03Z",
+      "expirationDate": "2025-11-02 21:02:05Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2025-05-16 21:02:05Z"
+    },
+    "f21309c647e842c4ed9beff0e349d27e295b9475cce3b60fba6757e224e74caa": {
+      "signature": "f21309c647e842c4ed9beff0e349d27e295b9475cce3b60fba6757e224e74caa",
+      "alternativeSignatures": [],
+      "target": "specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2017-04-01-preview/examples/Output_Create_DataWarehouse.json",
+      "line": 16,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0030",
+      "createdDate": "2025-05-16 21:01:03Z",
+      "expirationDate": "2025-11-02 21:02:05Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2025-05-16 21:02:05Z"
+    },
+    "56768d8b0027f845342354b5f75b7a2b05a44e072adf8c5d4521ff091e984861": {
+      "signature": "56768d8b0027f845342354b5f75b7a2b05a44e072adf8c5d4521ff091e984861",
+      "alternativeSignatures": [],
+      "target": "specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2017-04-01-preview/examples/Output_Create_DataWarehouse.json",
+      "line": 61,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0030",
+      "createdDate": "2025-05-16 21:01:03Z",
+      "expirationDate": "2025-11-02 21:02:05Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2025-05-16 21:02:05Z"
+    },
+    "2485ac4150bf9f1e1d6eb90e52fbb3fe890539a83313f20e63a60f3f1157096a": {
+      "signature": "2485ac4150bf9f1e1d6eb90e52fbb3fe890539a83313f20e63a60f3f1157096a",
+      "alternativeSignatures": [],
+      "target": "specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/examples/Output_Create_DataWarehouse.json",
+      "line": 16,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0030",
+      "createdDate": "2025-05-16 21:01:03Z",
+      "expirationDate": "2025-11-02 21:02:05Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2025-05-16 21:02:05Z"
+    },
+    "4c6af74e1956243e47cf19e6abd3de23fcbc8cdaee10b6a4752a43e8c3a0e72f": {
+      "signature": "4c6af74e1956243e47cf19e6abd3de23fcbc8cdaee10b6a4752a43e8c3a0e72f",
+      "alternativeSignatures": [],
+      "target": "specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/examples/Output_Create_DataWarehouse.json",
+      "line": 16,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0030",
+      "createdDate": "2025-05-16 21:01:03Z",
+      "expirationDate": "2025-11-02 21:02:05Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2025-05-16 21:02:05Z"
+    }
+  }
+}

.github/.prettierignore

@@ -0,0 +1 @@
+coverage

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # Instructions for CODEOWNERS file format and automatic build failure notifications:
 # https://github.com/Azure/azure-sdk/blob/main/docs/policies/opensource.md#codeowners
 
@@ -85,14 +85,20 @@
 # PRLabel: %Container Service
 /specification/containerservice/ @palma21 @weinong @seguler @alvinli222 @justindavies @matthchr @robbiezhang @paulgmiller @yizhang4321 @circy9 @qike-ms
 
+# PRLabel: %Container Service Fleet
+/specification/containerservice/**/fleet/ @circy9 @serbrech @jim-minter @matthchr
+
+# PRLabel: %Container Service Fleet
+/specification/containerservice/Fleet.Management/ @circy9 @serbrech @jim-minter @matthchr
+
 # PRLabel: %Cosmos
 /specification/cosmos-db/ @pjohari-ms @MehaKaushik
 
 # PRLabel: %Customer Insights
 /specification/customer-insights/ @tjlvtao
 
 # PRLabel: %Data Factory
-/specification/datafactory/ @Frey-Wang @zhangyd2015 @davidzhaoyue
+/specification/datafactory/ @Frey-Wang @ruowan @davidzhaoyue
 
 # PRLabel: %Data Lake Analytics
 /specification/datalake-analytics/ @ro-joowan
@@ -137,7 +143,10 @@
 /specification/iothub/ @rkmanda
 
 # PRLabel: %KeyVault
-/specification/keyvault/ @vickm @chen-karen @cheathamb36 @lgonsoulin
+/specification/keyvault/resource-manager/ @vickm @chen-karen @cheathamb36 @lgonsoulin
+
+# PRLabel: %KeyVault
+/specification/keyvault/Security.*/ @vickm @chen-karen @cheathamb36 @lgonsoulin @heaths @chlowell
 
 # PRLabel: %KeyVault
 /specification/keyvault/data-plane/ @vickm @chen-karen @cheathamb36 @lgonsoulin @heaths
@@ -171,6 +180,9 @@
 # PRLabel: %Monitor - Operational Insights
 /specification/operationalinsights/ @sw47
 
+# PRLabel: %Online Experimentation
+/specification/onlineexperimentation/ @Azure/azure-sdk-write-onlineexperimentation
+
 # PRLabel: %Operations Management
 /specification/operationsmanagement/ @dashimi16
 
@@ -271,8 +283,6 @@
 /profile/ @shahabhijeet
 
 /specification/**/resource-manager/**/readme.typescript.md @qiaozha
-/specification/**/resource-manager/**/readme.az.md @jsntcy @qiaozha
-/specification/**/resource-manager/**/readme.cli.md @jsntcy @qiaozha
 /specification/**/resource-manager/**/readme.go.md @tadelesh
 /specification/**/resource-manager/**/readme.python.md @msyyc
 
@@ -291,5 +301,7 @@
 /.github/           @weshaggard @mikeharder @benbp
 /eng/               @weshaggard @mikeharder @benbp
 /eng/common/        @Azure/azure-sdk-eng
+/eng/tools/typespec-migration-validation @pshao25 @live1206
+/eng/tools/typespec-validation/src/rules/sdk-tspconfig-validation.ts @wanlwanl @raych1 @maririos
 /scripts/           @weshaggard @mikeharder
 /.github/CODEOWNERS @Azure/azure-sdk-eng

.github/PULL_REQUEST_TEMPLATE/control_plane_template.md

@@ -1,3 +1,3 @@
 # ARM (Control Plane) API Specification Update Pull Request 
 
 > [!TIP]
@@ -31,6 +31,7 @@
   [ARM resource provider contract](https://aka.ms/azurerpc) and
   [REST guidelines](https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md) (estimated time: 4 hours).  
   I understand this is required before I can proceed to the diagram Step 2, "ARM API changes review", for this PR.
+- [ ] A [release plan](https://aka.ms/azsdkdocs/release-plans) has been created. If not, please create one as it will help guide you through the REST API and SDK creation process. 
 
 ## Additional information
 

.github/PULL_REQUEST_TEMPLATE/data_plane_template.md

@@ -1,3 +1,3 @@
 # Data Plane API Specification Update Pull Request
 
 > [!TIP]
@@ -42,6 +42,10 @@
 [Swagger-Suppression-Process](https://aka.ms/pr-suppressions) 
 to get approval.
 
+### Release planner
+
+A [release plan](https://aka.ms/azsdkdocs/release-plans) should have been created. If not, please create one as it will help guide you through the REST API and SDK creation process. 
+
 ## ❔Got questions? Need additional info?? We are here to help!
 
 <details>

.github/dependabot.yml

@@ -1,3 +1,3 @@
 version: 2
 updates:
   - package-ecosystem: "npm"
@@ -16,9 +16,14 @@
       - dependency-name: "typescript"
       # Updated manually by the Liftr team
       - dependency-name: "@azure-tools/typespec-liftr-base"
-      # minimatch@9 is the last version to support Node 18
-      - dependency-name: "minimatch"
-        versions: [">= 10.0.0"]
+      # Updated manually by owner of eng/tools/lint-diff
+      - dependency-name: "@apidevtools/json-schema-ref-parser"
+      - dependency-name: "@types/js-yaml"
+      - dependency-name: "autorest"
+      - dependency-name: "js-yaml"
+      # Only allow patch updates for spec-gen-sdk
+      - dependency-name: "@azure-tools/spec-gen-sdk"
+        update-types: ["version-update:semver-minor", "version-update:semver-major"]
     groups:
       # Ships separately from other typespec packages
       typespec-client-generator-cli:
@@ -38,7 +43,8 @@
     versioning-strategy: increase-if-necessary
   - package-ecosystem: "npm"
     directories:
-      - "/.github/"
+      - "/.github"
+      - "/.github/shared"
     schedule:
       interval: "daily"
     ignore:
@@ -48,7 +54,12 @@
       - dependency-name: "@vitest/coverage-v8"
       - dependency-name: "prettier"
       - dependency-name: "vitest"
+      - dependency-name: "typescript"
       # Points to "github:actions/github-script" since package isn't published to npmjs
       - dependency-name: "@types/github-script"
+    groups:
+      eslint:
+        patterns:
+          - "*eslint*"
     # Leave the constraint if the original constraint allows the new version, otherwise, bump the constraint.
     versioning-strategy: increase-if-necessary

.github/eslint.config.js

@@ -0,0 +1,8 @@
+import pluginJs from "@eslint/js";
+import globals from "globals";
+
+/** @type {import('eslint').Linter.Config[]} */
+export default [
+  { languageOptions: { globals: globals.node } },
+  pluginJs.configs.recommended,
+];