From 89c568d8b7ec15548a78f7ceb38032e1a0a1bd5f Mon Sep 17 00:00:00 2001
From: Timothee Guerin <timothee.guerin@outlook.com>
Date: Thu, 8 Feb 2024 12:08:23 -0800
Subject: [PATCH] Merge autorest 0.39.1 hotfix back into main (#240)

---
 .changeset/chatty-bobcats-love.md             |  5 --
 core                                          |  2 +-
 .../reference/data-types.md                   |  0
 .../reference/decorators.md                   |  0
 .../reference/index.mdx                       |  0
 eng/pipelines/pr-tryit.yml                    |  1 +
 packages/e2e-tests/package.json               |  2 +-
 packages/samples/package.json                 |  6 +-
 .../openapi3/openapi.2022-08-31.yaml          |  1 +
 .../openapi3/openapi.2022-08-31.yaml          |  1 +
 .../openapi3/openapi.2022-08-31.yaml          |  1 +
 .../openapi3/openapi.2023-02-07.yaml          |  1 +
 .../openapi3/openapi.2022-08-31.yaml          |  1 +
 packages/typespec-autorest/CHANGELOG.md       |  7 ++
 packages/typespec-autorest/package.json       |  8 +-
 packages/typespec-autorest/src/openapi.ts     | 34 ++++++--
 .../typespec-autorest/test/models.test.ts     | 35 ++++++++
 .../test/union-schema.test.ts                 | 16 +++-
 packages/typespec-azure-core/package.json     |  4 +-
 .../package.json                              |  6 +-
 .../typespec-azure-portal-core/package.json   |  8 +-
 .../package.json                              |  8 +-
 .../package.json                              |  4 +-
 packages/typespec-service-csharp/package.json |  8 +-
 packages/website/package.json                 |  1 +
 pnpm-lock.yaml                                | 87 ++++++++++---------
 26 files changed, 162 insertions(+), 85 deletions(-)
 delete mode 100644 .changeset/chatty-bobcats-love.md
 rename docs/libraries/{typespec-azure-portal-core => azure-portal-core}/reference/data-types.md (100%)
 rename docs/libraries/{typespec-azure-portal-core => azure-portal-core}/reference/decorators.md (100%)
 rename docs/libraries/{typespec-azure-portal-core => azure-portal-core}/reference/index.mdx (100%)

diff --git a/.changeset/chatty-bobcats-love.md b/.changeset/chatty-bobcats-love.md
deleted file mode 100644
index 3563e02d9d..0000000000
--- a/.changeset/chatty-bobcats-love.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@azure-tools/typespec-azure-portal-core": none
----
-
-adding typespec-azure-portal-core lib
diff --git a/core b/core
index ad74773b53..0b0c70e482 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit ad74773b53e03700bfbb542467b67382308a77bb
+Subproject commit 0b0c70e4821a6cfdfc8e68d47ba0416078de75c9
diff --git a/docs/libraries/typespec-azure-portal-core/reference/data-types.md b/docs/libraries/azure-portal-core/reference/data-types.md
similarity index 100%
rename from docs/libraries/typespec-azure-portal-core/reference/data-types.md
rename to docs/libraries/azure-portal-core/reference/data-types.md
diff --git a/docs/libraries/typespec-azure-portal-core/reference/decorators.md b/docs/libraries/azure-portal-core/reference/decorators.md
similarity index 100%
rename from docs/libraries/typespec-azure-portal-core/reference/decorators.md
rename to docs/libraries/azure-portal-core/reference/decorators.md
diff --git a/docs/libraries/typespec-azure-portal-core/reference/index.mdx b/docs/libraries/azure-portal-core/reference/index.mdx
similarity index 100%
rename from docs/libraries/typespec-azure-portal-core/reference/index.mdx
rename to docs/libraries/azure-portal-core/reference/index.mdx
diff --git a/eng/pipelines/pr-tryit.yml b/eng/pipelines/pr-tryit.yml
index 6d23aae289..0570aeb2d7 100644
--- a/eng/pipelines/pr-tryit.yml
+++ b/eng/pipelines/pr-tryit.yml
@@ -2,6 +2,7 @@ name: PR Tools
 trigger: none
 pr:
   - main
+  - release/*
 
 variables:
   - template: templates/variables/globals.yml
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 05c5de54c0..3d7a318411 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -25,7 +25,7 @@
     "build": ""
   },
   "devDependencies": {
-    "@typespec/compiler": "workspace:~0.53.0",
+    "@typespec/compiler": "workspace:~0.53.1",
     "typescript": "~5.3.3",
     "dotenv": "~16.3.1"
   }
diff --git a/packages/samples/package.json b/packages/samples/package.json
index 3e56db357b..8028175828 100644
--- a/packages/samples/package.json
+++ b/packages/samples/package.json
@@ -39,13 +39,13 @@
   ],
   "dependencies": {
     "@typespec/versioning": "workspace:~0.53.0",
-    "@typespec/compiler": "workspace:~0.53.0",
+    "@typespec/compiler": "workspace:~0.53.1",
     "@typespec/openapi": "workspace:~0.53.0",
-    "@typespec/openapi3": "workspace:~0.53.0",
+    "@typespec/openapi3": "workspace:~0.53.1",
     "@typespec/http": "workspace:~0.53.0",
     "@typespec/rest": "workspace:~0.53.0",
     "@azure-tools/typespec-azure-core": "workspace:~0.39.0",
-    "@azure-tools/typespec-autorest": "workspace:~0.39.0",
+    "@azure-tools/typespec-autorest": "workspace:~0.39.1",
     "@azure-tools/typespec-azure-resource-manager": "workspace:~0.39.0",
     "@azure-tools/typespec-client-generator-core": "workspace:~0.39.0"
   },
diff --git a/packages/samples/test/output/azure/core/data-plane/api-path-parameter/@typespec/openapi3/openapi.2022-08-31.yaml b/packages/samples/test/output/azure/core/data-plane/api-path-parameter/@typespec/openapi3/openapi.2022-08-31.yaml
index 4e2b4bc6e1..ecef77debb 100644
--- a/packages/samples/test/output/azure/core/data-plane/api-path-parameter/@typespec/openapi3/openapi.2022-08-31.yaml
+++ b/packages/samples/test/output/azure/core/data-plane/api-path-parameter/@typespec/openapi3/openapi.2022-08-31.yaml
@@ -857,6 +857,7 @@ components:
       enum:
         - accepted
         - rejected
+      description: Repeatability Result header options
     Versions:
       type: string
       enum:
diff --git a/packages/samples/test/output/azure/core/data-plane/custom-error-type/@typespec/openapi3/openapi.2022-08-31.yaml b/packages/samples/test/output/azure/core/data-plane/custom-error-type/@typespec/openapi3/openapi.2022-08-31.yaml
index 97329786be..42f0686242 100644
--- a/packages/samples/test/output/azure/core/data-plane/custom-error-type/@typespec/openapi3/openapi.2022-08-31.yaml
+++ b/packages/samples/test/output/azure/core/data-plane/custom-error-type/@typespec/openapi3/openapi.2022-08-31.yaml
@@ -454,6 +454,7 @@ components:
       enum:
         - accepted
         - rejected
+      description: Repeatability Result header options
     Versions:
       type: string
       enum:
diff --git a/packages/samples/test/output/azure/core/data-plane/trait-versioning/@typespec/openapi3/openapi.2022-08-31.yaml b/packages/samples/test/output/azure/core/data-plane/trait-versioning/@typespec/openapi3/openapi.2022-08-31.yaml
index 6f74a6f1a4..624d5f4a46 100644
--- a/packages/samples/test/output/azure/core/data-plane/trait-versioning/@typespec/openapi3/openapi.2022-08-31.yaml
+++ b/packages/samples/test/output/azure/core/data-plane/trait-versioning/@typespec/openapi3/openapi.2022-08-31.yaml
@@ -774,6 +774,7 @@ components:
       enum:
         - accepted
         - rejected
+      description: Repeatability Result header options
     Versions:
       type: string
       enum:
diff --git a/packages/samples/test/output/azure/core/data-plane/trait-versioning/@typespec/openapi3/openapi.2023-02-07.yaml b/packages/samples/test/output/azure/core/data-plane/trait-versioning/@typespec/openapi3/openapi.2023-02-07.yaml
index a1f333819b..4e58c53855 100644
--- a/packages/samples/test/output/azure/core/data-plane/trait-versioning/@typespec/openapi3/openapi.2023-02-07.yaml
+++ b/packages/samples/test/output/azure/core/data-plane/trait-versioning/@typespec/openapi3/openapi.2023-02-07.yaml
@@ -858,6 +858,7 @@ components:
       enum:
         - accepted
         - rejected
+      description: Repeatability Result header options
     Versions:
       type: string
       enum:
diff --git a/packages/samples/test/output/azure/core/data-plane/widget-manager/@typespec/openapi3/openapi.2022-08-31.yaml b/packages/samples/test/output/azure/core/data-plane/widget-manager/@typespec/openapi3/openapi.2022-08-31.yaml
index 7dbe65296f..a3c96d87b1 100644
--- a/packages/samples/test/output/azure/core/data-plane/widget-manager/@typespec/openapi3/openapi.2022-08-31.yaml
+++ b/packages/samples/test/output/azure/core/data-plane/widget-manager/@typespec/openapi3/openapi.2022-08-31.yaml
@@ -1517,6 +1517,7 @@ components:
       enum:
         - accepted
         - rejected
+      description: Repeatability Result header options
     Versions:
       type: string
       enum:
diff --git a/packages/typespec-autorest/CHANGELOG.md b/packages/typespec-autorest/CHANGELOG.md
index 3e4080581e..699829aba3 100644
--- a/packages/typespec-autorest/CHANGELOG.md
+++ b/packages/typespec-autorest/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log - @azure-tools/typespec-autorest
 
+## 0.39.1
+
+### Patch Changes
+
+- b5fa501: Support default value for union properties
+- b5fa501: Fix: Description being ignored on unions
+
 ## 0.39.0
 
 ### Minor Changes
diff --git a/packages/typespec-autorest/package.json b/packages/typespec-autorest/package.json
index 63b816a257..f2ddba26cc 100644
--- a/packages/typespec-autorest/package.json
+++ b/packages/typespec-autorest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-autorest",
-  "version": "0.39.0",
+  "version": "0.39.1",
   "author": "Microsoft Corporation",
   "description": "TypeSpec library for emitting openapi from the TypeSpec REST protocol binding",
   "homepage": "https://azure.github.io/typespec-azure",
@@ -54,7 +54,7 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@typespec/compiler": "workspace:~0.53.0",
+    "@typespec/compiler": "workspace:~0.53.1",
     "@azure-tools/typespec-azure-core": "workspace:~0.39.0",
     "@azure-tools/typespec-client-generator-core": "workspace:~0.39.0",
     "@typespec/http": "workspace:~0.53.0",
@@ -63,8 +63,8 @@
     "@typespec/versioning": "workspace:~0.53.0"
   },
   "devDependencies": {
-    "@typespec/compiler": "workspace:~0.53.0",
-    "@typespec/json-schema": "workspace:~0.53.0",
+    "@typespec/compiler": "workspace:~0.53.1",
+    "@typespec/json-schema": "workspace:~0.53.1",
     "@azure-tools/typespec-azure-core": "workspace:~0.39.0",
     "@azure-tools/typespec-client-generator-core": "workspace:~0.39.0",
     "@typespec/http": "workspace:~0.53.0",
diff --git a/packages/typespec-autorest/src/openapi.ts b/packages/typespec-autorest/src/openapi.ts
index f2332affd6..4649953b3f 100644
--- a/packages/typespec-autorest/src/openapi.ts
+++ b/packages/typespec-autorest/src/openapi.ts
@@ -1532,7 +1532,7 @@ function createOAPIEmitter(
     if (e.nullable) {
       schema["x-nullable"] = true;
     }
-    return schema;
+    return applyIntrinsicDecorators(union, schema);
   }
 
   function getSchemaForUnion(union: Union, visibility: Visibility): OpenAPI2Schema {
@@ -1607,6 +1607,8 @@ function createOAPIEmitter(
               format: { type: type.kind },
               target: type,
             });
+      case "UnionVariant":
+        return getDefaultValue(type.type);
       default:
         reportDiagnostic(program, {
           code: "invalid-default",
@@ -1793,10 +1795,20 @@ function createOAPIEmitter(
   }
 
   function resolveProperty(prop: ModelProperty, visibility: Visibility): OpenAPI2SchemaProperty {
-    const propSchema =
-      prop.type.kind === "Enum" && prop.default
-        ? getSchemaForEnum(prop.type)
-        : getSchemaOrRef(prop.type, visibility);
+    let propSchema;
+    if (prop.type.kind === "Enum" && prop.default) {
+      propSchema = getSchemaForEnum(prop.type);
+    } else if (prop.type.kind === "Union" && prop.default) {
+      const [asEnum, _] = getUnionAsEnum(prop.type);
+      if (asEnum) {
+        propSchema = getSchemaForUnionEnum(prop.type, asEnum);
+      } else {
+        propSchema = getSchemaOrRef(prop.type, visibility);
+      }
+    } else {
+      propSchema = getSchemaOrRef(prop.type, visibility);
+    }
+
     return applyIntrinsicDecorators(prop, propSchema);
   }
 
@@ -1830,15 +1842,17 @@ function createOAPIEmitter(
   }
 
   function applyIntrinsicDecorators(
-    typespecType: Model | Scalar | ModelProperty,
+    typespecType: Model | Scalar | ModelProperty | Union,
     target: OpenAPI2Schema
   ): OpenAPI2Schema {
     const newTarget = { ...target };
     const docStr = getDoc(program, typespecType);
     const isString =
-      typespecType.kind !== "Model" && isStringType(program, getPropertyType(typespecType));
+      (typespecType.kind === "Scalar" || typespecType.kind === "ModelProperty") &&
+      isStringType(program, getPropertyType(typespecType));
     const isNumeric =
-      typespecType.kind !== "Model" && isNumericType(program, getPropertyType(typespecType));
+      (typespecType.kind === "Scalar" || typespecType.kind === "ModelProperty") &&
+      isNumericType(program, getPropertyType(typespecType));
 
     if (docStr) {
       newTarget.description = docStr;
@@ -1927,7 +1941,9 @@ function createOAPIEmitter(
 
     attachExtensions(typespecType, newTarget);
 
-    return typespecType.kind === "Model" ? newTarget : applyEncoding(typespecType, newTarget);
+    return typespecType.kind === "Scalar" || typespecType.kind === "ModelProperty"
+      ? applyEncoding(typespecType, newTarget)
+      : newTarget;
   }
 
   function applyEncoding(
diff --git a/packages/typespec-autorest/test/models.test.ts b/packages/typespec-autorest/test/models.test.ts
index 6172bf8388..8efe0031eb 100644
--- a/packages/typespec-autorest/test/models.test.ts
+++ b/packages/typespec-autorest/test/models.test.ts
@@ -307,6 +307,41 @@ describe("typespec-autorest: model definitions", () => {
     });
   });
 
+  it("specify default value on union with variant", async () => {
+    const res = await oapiForModel(
+      "Foo",
+      `
+      model Foo {
+        optionalUnion?: MyUnion = MyUnion.a;
+      };
+      
+      union MyUnion {
+        a: "a-value",
+        b: "b-value",
+      }
+      `
+    );
+
+    deepStrictEqual(res.defs.Foo, {
+      type: "object",
+      properties: {
+        optionalUnion: {
+          type: "string",
+          enum: ["a-value", "b-value"],
+          "x-ms-enum": {
+            values: [
+              { name: "a", value: "a-value" },
+              { name: "b", value: "b-value" },
+            ],
+            modelAsString: false,
+            name: "MyUnion",
+          },
+          default: "a-value",
+        },
+      },
+    });
+  });
+
   it("errors on empty enum", async () => {
     const diagnostics = await diagnoseOpenApiFor(
       `
diff --git a/packages/typespec-autorest/test/union-schema.test.ts b/packages/typespec-autorest/test/union-schema.test.ts
index ffe1fd127f..abe4b5a2e8 100644
--- a/packages/typespec-autorest/test/union-schema.test.ts
+++ b/packages/typespec-autorest/test/union-schema.test.ts
@@ -1,5 +1,5 @@
 import { expectDiagnostics } from "@typespec/compiler/testing";
-import { deepStrictEqual } from "assert";
+import { deepStrictEqual, strictEqual } from "assert";
 import { describe, it } from "vitest";
 import { diagnoseOpenApiFor, openApiFor } from "./test-host.js";
 
@@ -138,5 +138,19 @@ describe("typespec-autorest: union schema", () => {
         },
       });
     });
+
+    it("supports description on unions that reduce to enums", async () => {
+      const res = await openApiFor(
+        `
+      @doc("FooUnion")
+      union Foo {
+        "a";
+        "b";
+      }
+
+      `
+      );
+      strictEqual(res.definitions.Foo.description, "FooUnion");
+    });
   });
 });
diff --git a/packages/typespec-azure-core/package.json b/packages/typespec-azure-core/package.json
index 7650b96e72..3da081a8c7 100644
--- a/packages/typespec-azure-core/package.json
+++ b/packages/typespec-azure-core/package.json
@@ -52,12 +52,12 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@typespec/compiler": "workspace:~0.53.0",
+    "@typespec/compiler": "workspace:~0.53.1",
     "@typespec/http": "workspace:~0.53.0",
     "@typespec/rest": "workspace:~0.53.0"
   },
   "devDependencies": {
-    "@typespec/compiler": "workspace:~0.53.0",
+    "@typespec/compiler": "workspace:~0.53.1",
     "@typespec/http": "workspace:~0.53.0",
     "@typespec/rest": "workspace:~0.53.0",
     "@typespec/eslint-config-typespec": "workspace:~0.53.0",
diff --git a/packages/typespec-azure-playground-website/package.json b/packages/typespec-azure-playground-website/package.json
index e03a7f071f..2bade99b8b 100644
--- a/packages/typespec-azure-playground-website/package.json
+++ b/packages/typespec-azure-playground-website/package.json
@@ -49,12 +49,12 @@
   ],
   "dependencies": {
     "@typespec/versioning": "workspace:~0.53.0",
-    "@typespec/compiler": "workspace:~0.53.0",
+    "@typespec/compiler": "workspace:~0.53.1",
     "@typespec/rest": "workspace:~0.53.0",
     "@typespec/http": "workspace:~0.53.0",
     "@typespec/openapi": "workspace:~0.53.0",
-    "@typespec/openapi3": "workspace:~0.53.0",
-    "@azure-tools/typespec-autorest": "workspace:~0.39.0",
+    "@typespec/openapi3": "workspace:~0.53.1",
+    "@azure-tools/typespec-autorest": "workspace:~0.39.1",
     "@azure-tools/typespec-azure-core": "workspace:~0.39.0",
     "@azure-tools/typespec-azure-resource-manager": "workspace:~0.39.0",
     "@azure-tools/typespec-client-generator-core": "workspace:~0.39.0",
diff --git a/packages/typespec-azure-portal-core/package.json b/packages/typespec-azure-portal-core/package.json
index b4c50255de..272eb07fc4 100644
--- a/packages/typespec-azure-portal-core/package.json
+++ b/packages/typespec-azure-portal-core/package.json
@@ -17,7 +17,7 @@
     "test-official": "vitest run --coverage --reporter=junit --reporter=default --no-file-parallelism",
     "lint": "eslint . --ext .ts --max-warnings=0",
     "lint:fix": "eslint . --fix --ext .ts",
-    "regen-docs": "tspd doc .  --enable-experimental  --output-dir ../../docs/libraries/typespec-azure-portal-core/reference"
+    "regen-docs": "tspd doc .  --enable-experimental  --output-dir ../../docs/libraries/azure-portal-core/reference"
   },
   "keywords": [
     "Azure",
@@ -29,15 +29,15 @@
   "tspMain": "lib/main.tsp",
   "peerDependencies": {
     "@azure-tools/typespec-azure-resource-manager": "workspace:~0.39.0",
-    "@typespec/compiler": "workspace:~0.53.0"
+    "@typespec/compiler": "workspace:~0.53.1"
   },
   "devDependencies": {
-    "@azure-tools/typespec-autorest": "workspace:~0.39.0",
+    "@azure-tools/typespec-autorest": "workspace:~0.39.1",
     "@azure-tools/typespec-azure-core": "workspace:~0.39.0",
     "@azure-tools/typespec-azure-resource-manager": "workspace:~0.39.0",
     "@azure-tools/typespec-client-generator-core": "workspace:~0.39.0",
     "@types/node": "~18.11.9",
-    "@typespec/compiler": "workspace:~0.53.0",
+    "@typespec/compiler": "workspace:~0.53.1",
     "@typespec/eslint-config-typespec": "workspace:~0.53.0",
     "@typespec/eslint-plugin": "workspace:~0.53.0",
     "@typespec/http": "workspace:~0.53.0",
diff --git a/packages/typespec-azure-resource-manager/package.json b/packages/typespec-azure-resource-manager/package.json
index cf0063bc65..6603f13bca 100644
--- a/packages/typespec-azure-resource-manager/package.json
+++ b/packages/typespec-azure-resource-manager/package.json
@@ -52,19 +52,19 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@typespec/compiler": "workspace:~0.53.0",
+    "@typespec/compiler": "workspace:~0.53.1",
     "@azure-tools/typespec-azure-core": "~0.39.0",
-    "@azure-tools/typespec-autorest": "~0.39.0",
+    "@azure-tools/typespec-autorest": "~0.39.1",
     "@typespec/openapi": "workspace:~0.53.0",
     "@typespec/rest": "workspace:~0.53.0",
     "@typespec/http": "workspace:~0.53.0",
     "@typespec/versioning": "workspace:~0.53.0"
   },
   "devDependencies": {
-    "@typespec/compiler": "workspace:~0.53.0",
+    "@typespec/compiler": "workspace:~0.53.1",
     "@typespec/openapi": "workspace:~0.53.0",
     "@azure-tools/typespec-azure-core": "workspace:~0.39.0",
-    "@azure-tools/typespec-autorest": "workspace:~0.39.0",
+    "@azure-tools/typespec-autorest": "workspace:~0.39.1",
     "@typespec/rest": "workspace:~0.53.0",
     "@typespec/http": "workspace:~0.53.0",
     "@typespec/versioning": "workspace:~0.53.0",
diff --git a/packages/typespec-client-generator-core/package.json b/packages/typespec-client-generator-core/package.json
index e9788102e5..8517c56e1a 100644
--- a/packages/typespec-client-generator-core/package.json
+++ b/packages/typespec-client-generator-core/package.json
@@ -57,13 +57,13 @@
     "change-case": "~5.3.0"
   },
   "peerDependencies": {
-    "@typespec/compiler": "workspace:~0.53.0",
+    "@typespec/compiler": "workspace:~0.53.1",
     "@typespec/http": "workspace:~0.53.0",
     "@typespec/rest": "workspace:~0.53.0",
     "@typespec/versioning": "workspace:~0.53.0"
   },
   "devDependencies": {
-    "@typespec/compiler": "workspace:~0.53.0",
+    "@typespec/compiler": "workspace:~0.53.1",
     "@typespec/http": "workspace:~0.53.0",
     "@typespec/rest": "workspace:~0.53.0",
     "@typespec/eslint-config-typespec": "workspace:~0.53.0",
diff --git a/packages/typespec-service-csharp/package.json b/packages/typespec-service-csharp/package.json
index 0ae8d2e65f..a276b1bb86 100644
--- a/packages/typespec-service-csharp/package.json
+++ b/packages/typespec-service-csharp/package.json
@@ -46,19 +46,19 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@typespec/compiler": "workspace:~0.53.0",
+    "@typespec/compiler": "workspace:~0.53.1",
     "@typespec/rest": "workspace:~0.53.0",
     "@typespec/http": "workspace:~0.53.0",
     "@typespec/versioning": "workspace:~0.53.0",
-    "@azure-tools/typespec-autorest": "~0.39.0",
+    "@azure-tools/typespec-autorest": "~0.39.1",
     "@azure-tools/typespec-azure-core": "~0.39.0"
   },
   "dependencies": {
     "change-case": "~5.3.0"
   },
   "devDependencies": {
-    "@typespec/compiler": "workspace:~0.53.0",
-    "@azure-tools/typespec-autorest": "workspace:~0.39.0",
+    "@typespec/compiler": "workspace:~0.53.1",
+    "@azure-tools/typespec-autorest": "workspace:~0.39.1",
     "@typespec/openapi": "workspace:~0.53.0",
     "@typespec/rest": "workspace:~0.53.0",
     "@typespec/http": "workspace:~0.53.0",
diff --git a/packages/website/package.json b/packages/website/package.json
index 3e8550e04f..bf4f481dc5 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -38,6 +38,7 @@
     "@azure-tools/typespec-azure-resource-manager": "workspace:~0.39.0",
     "@azure-tools/typespec-client-generator-core": "workspace:~0.39.0",
     "@azure-tools/typespec-service-csharp": "workspace:~0.32.0",
+    "@azure-tools/typespec-azure-portal-core": "workspace:~0.39.0",
     "@docusaurus/module-type-aliases": "^3.0.0",
     "@docusaurus/tsconfig": "^3.0.0",
     "@docusaurus/types": "^3.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 97cd76dce5..88db6756c1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -88,7 +88,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -194,7 +194,7 @@ importers:
         specifier: ~3.0.1
         version: 3.0.2(rollup@4.9.1)
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       picocolors:
         specifier: ~1.0.0
@@ -456,7 +456,7 @@ importers:
         specifier: ~18.2.7
         version: 18.2.18
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -489,7 +489,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -593,7 +593,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -644,7 +644,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -677,7 +677,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -729,7 +729,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -789,7 +789,7 @@ importers:
         specifier: workspace:~0.1.0
         version: link:../bundler
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/html-program-viewer':
         specifier: workspace:~0.53.0
@@ -801,7 +801,7 @@ importers:
         specifier: workspace:~0.53.0
         version: link:../openapi
       '@typespec/openapi3':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../openapi3
       '@typespec/protobuf':
         specifier: workspace:~0.53.0
@@ -919,7 +919,7 @@ importers:
   core/packages/playground-website:
     dependencies:
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/html-program-viewer':
         specifier: workspace:~0.53.0
@@ -928,13 +928,13 @@ importers:
         specifier: workspace:~0.53.0
         version: link:../http
       '@typespec/json-schema':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../json-schema
       '@typespec/openapi':
         specifier: workspace:~0.53.0
         version: link:../openapi
       '@typespec/openapi3':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../openapi3
       '@typespec/playground':
         specifier: workspace:~0.1.0
@@ -1029,7 +1029,7 @@ importers:
         specifier: ~5.0.2
         version: 5.0.5(rollup@4.9.1)
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/internal-build-utils':
         specifier: workspace:~0.53.0
@@ -1053,7 +1053,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -1095,7 +1095,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -1140,7 +1140,7 @@ importers:
         specifier: workspace:~0.46.0
         version: link:../best-practices
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/html-program-viewer':
         specifier: workspace:~0.53.0
@@ -1149,13 +1149,13 @@ importers:
         specifier: workspace:~0.53.0
         version: link:../http
       '@typespec/json-schema':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../json-schema
       '@typespec/openapi':
         specifier: workspace:~0.53.0
         version: link:../openapi
       '@typespec/openapi3':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../openapi3
       '@typespec/rest':
         specifier: workspace:~0.53.0
@@ -1241,7 +1241,7 @@ importers:
   core/packages/tspd:
     dependencies:
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       picocolors:
         specifier: ~1.0.0
@@ -1326,7 +1326,7 @@ importers:
         specifier: ~1.85.0
         version: 1.85.0
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -1371,7 +1371,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -1477,7 +1477,7 @@ importers:
         specifier: ~18.2.22
         version: 18.2.45
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -1489,13 +1489,13 @@ importers:
         specifier: workspace:~0.53.0
         version: link:../internal-build-utils
       '@typespec/json-schema':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../json-schema
       '@typespec/openapi':
         specifier: workspace:~0.53.0
         version: link:../openapi
       '@typespec/openapi3':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../openapi3
       '@typespec/playground-website':
         specifier: workspace:*
@@ -1552,7 +1552,7 @@ importers:
   packages/e2e-tests:
     devDependencies:
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../../core/packages/compiler
       dotenv:
         specifier: ~16.3.1
@@ -1564,7 +1564,7 @@ importers:
   packages/samples:
     dependencies:
       '@azure-tools/typespec-autorest':
-        specifier: workspace:~0.39.0
+        specifier: workspace:~0.39.1
         version: link:../typespec-autorest
       '@azure-tools/typespec-azure-core':
         specifier: workspace:~0.39.0
@@ -1576,7 +1576,7 @@ importers:
         specifier: workspace:~0.39.0
         version: link:../typespec-client-generator-core
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../../core/packages/compiler
       '@typespec/http':
         specifier: workspace:~0.53.0
@@ -1585,7 +1585,7 @@ importers:
         specifier: workspace:~0.53.0
         version: link:../../core/packages/openapi
       '@typespec/openapi3':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../../core/packages/openapi3
       '@typespec/rest':
         specifier: workspace:~0.53.0
@@ -1643,7 +1643,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../../core/packages/compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -1655,7 +1655,7 @@ importers:
         specifier: workspace:~0.53.0
         version: link:../../core/packages/http
       '@typespec/json-schema':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../../core/packages/json-schema
       '@typespec/library-linter':
         specifier: workspace:~0.53.0
@@ -1703,7 +1703,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../../core/packages/compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -1754,7 +1754,7 @@ importers:
   packages/typespec-azure-playground-website:
     dependencies:
       '@azure-tools/typespec-autorest':
-        specifier: workspace:~0.39.0
+        specifier: workspace:~0.39.1
         version: link:../typespec-autorest
       '@azure-tools/typespec-azure-core':
         specifier: workspace:~0.39.0
@@ -1769,7 +1769,7 @@ importers:
         specifier: ^11.11.1
         version: 11.11.3(@types/react@18.2.45)(react@18.2.0)
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../../core/packages/compiler
       '@typespec/http':
         specifier: workspace:~0.53.0
@@ -1778,7 +1778,7 @@ importers:
         specifier: workspace:~0.53.0
         version: link:../../core/packages/openapi
       '@typespec/openapi3':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../../core/packages/openapi3
       '@typespec/rest':
         specifier: workspace:~0.53.0
@@ -1839,7 +1839,7 @@ importers:
   packages/typespec-azure-portal-core:
     devDependencies:
       '@azure-tools/typespec-autorest':
-        specifier: workspace:~0.39.0
+        specifier: workspace:~0.39.1
         version: link:../typespec-autorest
       '@azure-tools/typespec-azure-core':
         specifier: workspace:~0.39.0
@@ -1854,7 +1854,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../../core/packages/compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -1905,7 +1905,7 @@ importers:
   packages/typespec-azure-resource-manager:
     devDependencies:
       '@azure-tools/typespec-autorest':
-        specifier: workspace:~0.39.0
+        specifier: workspace:~0.39.1
         version: link:../typespec-autorest
       '@azure-tools/typespec-azure-core':
         specifier: workspace:~0.39.0
@@ -1914,7 +1914,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../../core/packages/compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -1981,7 +1981,7 @@ importers:
         specifier: ^0.0.30
         version: 0.0.30
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../../core/packages/compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -2039,7 +2039,7 @@ importers:
         version: 5.3.0
     devDependencies:
       '@azure-tools/typespec-autorest':
-        specifier: workspace:~0.39.0
+        specifier: workspace:~0.39.1
         version: link:../typespec-autorest
       '@azure-tools/typespec-azure-core':
         specifier: workspace:~0.39.0
@@ -2048,7 +2048,7 @@ importers:
         specifier: ~18.11.9
         version: 18.11.19
       '@typespec/compiler':
-        specifier: workspace:~0.53.0
+        specifier: workspace:~0.53.1
         version: link:../../core/packages/compiler
       '@typespec/eslint-config-typespec':
         specifier: workspace:~0.53.0
@@ -2141,6 +2141,9 @@ importers:
       '@azure-tools/typespec-azure-playground-website':
         specifier: workspace:~1.0.0
         version: link:../typespec-azure-playground-website
+      '@azure-tools/typespec-azure-portal-core':
+        specifier: workspace:~0.39.0
+        version: link:../typespec-azure-portal-core
       '@azure-tools/typespec-azure-resource-manager':
         specifier: workspace:~0.39.0
         version: link:../typespec-azure-resource-manager