From 2be025cc495779f41167acb5fb1f1891403657f1 Mon Sep 17 00:00:00 2001
From: JoyerJin <116236375+JoyerJin@users.noreply.github.com>
Date: Fri, 18 Jul 2025 12:09:46 +0800
Subject: [PATCH 1/4] Monitor Add Breaking Change Message for ActivityLog

---
 .../Properties/AssemblyInfo.cs                | 26 ++++++++++
 .../DiagnosticSetting.Autorest/README.md      | 50 +++++++++++++++++++
 .../docs/Az.DiagnosticSetting.md              |  2 +-
 .../generate-info.json                        |  3 --
 .../resources/README.md                       | 11 ++++
 src/Monitor/Monitor.sln                       | 31 ++++++------
 src/Monitor/Monitor/Az.Monitor.psd1           |  2 +-
 7 files changed, 106 insertions(+), 19 deletions(-)
 create mode 100644 src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs
 delete mode 100644 src/Monitor/DiagnosticSetting.Autorest/generate-info.json
 create mode 100644 src/Monitor/DiagnosticSetting.Autorest/resources/README.md

diff --git a/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs b/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000000..f849d81272b8
--- /dev/null
+++ b/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the ""License"");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an ""AS IS"" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
+// is regenerated.
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("Microsoft")]
+[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
+[assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
+[assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - DiagnosticSetting")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("0.1.0.0")]
+[assembly: System.Reflection.AssemblyVersionAttribute("0.1.0.0")]
+[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
+[assembly: System.CLSCompliantAttribute(false)]
\ No newline at end of file
diff --git a/src/Monitor/DiagnosticSetting.Autorest/README.md b/src/Monitor/DiagnosticSetting.Autorest/README.md
index 562e449ab291..fffee2f47e65 100644
--- a/src/Monitor/DiagnosticSetting.Autorest/README.md
+++ b/src/Monitor/DiagnosticSetting.Autorest/README.md
@@ -53,6 +53,56 @@ use-extension:
   "@autorest/powershell": "3.x"
 
 directive:
+  - where:
+      verb: Get|New
+      subject: DiagnosticSetting
+    set:
+      breaking-change:
+        deprecated-output-properties:
+          - Log
+          - Metric
+        new-output-properties:
+          - Log
+          - Metric
+        change-description: The types of the properties Log and Metric will be changed from single object or fixed array to 'List'.
+        deprecated-by-version: 7.0.0
+        deprecated-by-azversion: 15.0.0
+        change-effective-date: 2025/11/03
+  - where:
+      verb: Get
+      subject: DiagnosticSettingsCategory
+    set:
+      breaking-change:
+        deprecated-output-properties:
+          - CategoryGroup
+        new-output-properties:
+          - CategoryGroup
+        change-description: The type of the property CategoryGroup will be changed from fixed array to 'List'.
+        deprecated-by-version: 7.0.0
+        deprecated-by-azversion: 15.0.0
+        change-effective-date: 2025/11/
+  - where:
+      verb: Get|New
+      subject: SubscriptionDiagnosticSetting
+    set:
+      breaking-change:
+        deprecated-output-properties:
+          - Log
+        new-output-properties:
+          - Log
+        change-description: The type of the property Log will be changed from single object or fixed array to 'List'.
+        deprecated-by-version: 7.0.0
+        deprecated-by-azversion: 15.0.0
+        change-effective-date: 2025/11/03
+  - where:
+      parameter-name: Log
+    set:
+      breaking-change:
+        old-parameter-type: Array
+        new-parameter-type: List
+        deprecated-by-version: 7.0.0
+        deprecated-by-azversion: 15.0.0
+        change-effective-date: 2025/11/03
   # Following is two common directive which are normally required in all the RPs
   # 1. Remove the unexpanded parameter set
   # 2. For New-* cmdlets, ViaIdentity is not required, so CreateViaIdentityExpanded is removed as well
diff --git a/src/Monitor/DiagnosticSetting.Autorest/docs/Az.DiagnosticSetting.md b/src/Monitor/DiagnosticSetting.Autorest/docs/Az.DiagnosticSetting.md
index 85dd7dd51b93..3c645346c183 100644
--- a/src/Monitor/DiagnosticSetting.Autorest/docs/Az.DiagnosticSetting.md
+++ b/src/Monitor/DiagnosticSetting.Autorest/docs/Az.DiagnosticSetting.md
@@ -1,6 +1,6 @@
 ---
 Module Name: Az.DiagnosticSetting
-Module Guid: 58f9f986-1839-4efb-baf4-5ba95f2726bd
+Module Guid: 6210decd-f3c4-4cdf-87d4-f4bca61bf471
 Download Help Link: https://learn.microsoft.com/powershell/module/az.diagnosticsetting
 Help Version: 1.0.0.0
 Locale: en-US
diff --git a/src/Monitor/DiagnosticSetting.Autorest/generate-info.json b/src/Monitor/DiagnosticSetting.Autorest/generate-info.json
deleted file mode 100644
index 511ed3565792..000000000000
--- a/src/Monitor/DiagnosticSetting.Autorest/generate-info.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "generate_Id": "c5c70d3a-756d-4a6b-aad1-fe0e0747df71"
-}
diff --git a/src/Monitor/DiagnosticSetting.Autorest/resources/README.md b/src/Monitor/DiagnosticSetting.Autorest/resources/README.md
new file mode 100644
index 000000000000..937f07f8fec2
--- /dev/null
+++ b/src/Monitor/DiagnosticSetting.Autorest/resources/README.md
@@ -0,0 +1,11 @@
+# Resources
+This directory can contain any additional resources for module that are not required at runtime. This directory **does not** get packaged with the module. If you have assets for custom implementation, place them into the `..\custom` folder.
+
+## Info
+- Modifiable: yes
+- Generated: no
+- Committed: yes
+- Packaged: no
+
+## Purpose
+Use this folder to put anything you want to keep around as part of the repository for the module, but is not something that is required for the module. For example, development files, packaged builds, or additional information. This is only intended to be used in repositories where the module's output directory is cleaned, but tangential resources for the module want to remain intact.
\ No newline at end of file
diff --git a/src/Monitor/Monitor.sln b/src/Monitor/Monitor.sln
index 15b67159017c..76af0a2b6c14 100644
--- a/src/Monitor/Monitor.sln
+++ b/src/Monitor/Monitor.sln
@@ -37,8 +37,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestFx", "..\..\tools\TestF
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ActionGroup", "..\..\generated\Monitor\ActionGroup.Autorest\Az.ActionGroup.csproj", "{D76924F4-9611-46DC-8F04-B15A105806B8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ActivityLogAlert", "..\..\generated\Monitor\ActivityLogAlert.Autorest\Az.ActivityLogAlert.csproj", "{A25F7324-8E75-4640-A6B2-B904378FC7F4}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Autoscale", "..\..\generated\Monitor\Autoscale.Autorest\Az.Autoscale.csproj", "{64D875E7-2E3B-40B2-945C-B8891BC6EF41}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.DiagnosticSetting", "..\..\generated\Monitor\DiagnosticSetting.Autorest\Az.DiagnosticSetting.csproj", "{32336385-5322-43AC-B6D4-B99CDB5EDA5A}"
@@ -59,6 +57,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Metricdata.Autorest", "Metr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Metricdata", "..\..\generated\Monitor\Metricdata.Autorest\Az.Metricdata.csproj", "{0A51A656-9092-4C82-83B5-524516C8FED7}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ActivityLogAlert.Autorest", "ActivityLogAlert.Autorest", "{F5B68159-9278-7C75-41B6-315547561DBE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ActivityLogAlert", "..\..\generated\Monitor\ActivityLogAlert.Autorest\Az.ActivityLogAlert.csproj", "{81F263BA-D395-42CB-A7E0-AFC20029C4BC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -237,18 +239,6 @@ Global
 		{D76924F4-9611-46DC-8F04-B15A105806B8}.Release|x64.Build.0 = Release|Any CPU
 		{D76924F4-9611-46DC-8F04-B15A105806B8}.Release|x86.ActiveCfg = Release|Any CPU
 		{D76924F4-9611-46DC-8F04-B15A105806B8}.Release|x86.Build.0 = Release|Any CPU
-		{A25F7324-8E75-4640-A6B2-B904378FC7F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A25F7324-8E75-4640-A6B2-B904378FC7F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A25F7324-8E75-4640-A6B2-B904378FC7F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A25F7324-8E75-4640-A6B2-B904378FC7F4}.Debug|x64.Build.0 = Debug|Any CPU
-		{A25F7324-8E75-4640-A6B2-B904378FC7F4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A25F7324-8E75-4640-A6B2-B904378FC7F4}.Debug|x86.Build.0 = Debug|Any CPU
-		{A25F7324-8E75-4640-A6B2-B904378FC7F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A25F7324-8E75-4640-A6B2-B904378FC7F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A25F7324-8E75-4640-A6B2-B904378FC7F4}.Release|x64.ActiveCfg = Release|Any CPU
-		{A25F7324-8E75-4640-A6B2-B904378FC7F4}.Release|x64.Build.0 = Release|Any CPU
-		{A25F7324-8E75-4640-A6B2-B904378FC7F4}.Release|x86.ActiveCfg = Release|Any CPU
-		{A25F7324-8E75-4640-A6B2-B904378FC7F4}.Release|x86.Build.0 = Release|Any CPU
 		{64D875E7-2E3B-40B2-945C-B8891BC6EF41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{64D875E7-2E3B-40B2-945C-B8891BC6EF41}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{64D875E7-2E3B-40B2-945C-B8891BC6EF41}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -345,6 +335,18 @@ Global
 		{0A51A656-9092-4C82-83B5-524516C8FED7}.Release|x64.Build.0 = Release|Any CPU
 		{0A51A656-9092-4C82-83B5-524516C8FED7}.Release|x86.ActiveCfg = Release|Any CPU
 		{0A51A656-9092-4C82-83B5-524516C8FED7}.Release|x86.Build.0 = Release|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Debug|x64.Build.0 = Debug|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Debug|x86.Build.0 = Debug|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x64.ActiveCfg = Release|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x64.Build.0 = Release|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x86.ActiveCfg = Release|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -365,5 +367,6 @@ Global
 		{0636EEB2-FE81-4424-8CFC-CCEB25360A40} = {3F76A15C-B128-4A31-A887-05E303CF8D7F}
 		{138B61C0-9D0E-44A1-9EA1-E8142303ECA5} = {35E5CBAF-5596-AC3C-3DBD-816FC74B54D0}
 		{0A51A656-9092-4C82-83B5-524516C8FED7} = {97973F8C-3EE1-368A-3B71-C62280C2DC8C}
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC} = {F5B68159-9278-7C75-41B6-315547561DBE}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Monitor/Monitor/Az.Monitor.psd1 b/src/Monitor/Monitor/Az.Monitor.psd1
index 0456fc90a331..b12b522a1f0e 100644
--- a/src/Monitor/Monitor/Az.Monitor.psd1
+++ b/src/Monitor/Monitor/Az.Monitor.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 7/2/2025
+# Generated on: 7/18/2025
 #
 
 @{

From a5e68f24da21dbf4b27a95bf9dc7dc7c526cb175 Mon Sep 17 00:00:00 2001
From: JoyerJin <116236375+JoyerJin@users.noreply.github.com>
Date: Fri, 18 Jul 2025 14:23:09 +0800
Subject: [PATCH 2/4] add generate info

---
 .../Properties/AssemblyInfo.cs                |  6 ++--
 .../generate-info.json                        |  3 ++
 src/Monitor/Monitor.sln                       | 31 ++++++++++---------
 3 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 src/Monitor/DiagnosticSetting.Autorest/generate-info.json

diff --git a/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs b/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs
index f849d81272b8..ea1dd81fa6a1 100644
--- a/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs
+++ b/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 [assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
 [assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - DiagnosticSetting")]
-[assembly: System.Reflection.AssemblyFileVersionAttribute("0.1.0.0")]
-[assembly: System.Reflection.AssemblyVersionAttribute("0.1.0.0")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("6.0.2")]
+[assembly: System.Reflection.AssemblyVersionAttribute("6.0.2")]
 [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
-[assembly: System.CLSCompliantAttribute(false)]
\ No newline at end of file
+[assembly: System.CLSCompliantAttribute(false)]
diff --git a/src/Monitor/DiagnosticSetting.Autorest/generate-info.json b/src/Monitor/DiagnosticSetting.Autorest/generate-info.json
new file mode 100644
index 000000000000..8a4c374b3ddc
--- /dev/null
+++ b/src/Monitor/DiagnosticSetting.Autorest/generate-info.json
@@ -0,0 +1,3 @@
+{
+  "generate_Id": "d15ce64d-01cd-4548-ad5d-e8592ddc6540"
+}
diff --git a/src/Monitor/Monitor.sln b/src/Monitor/Monitor.sln
index 76af0a2b6c14..1a922ce47314 100644
--- a/src/Monitor/Monitor.sln
+++ b/src/Monitor/Monitor.sln
@@ -39,8 +39,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ActionGroup", "..\..\gen
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Autoscale", "..\..\generated\Monitor\Autoscale.Autorest\Az.Autoscale.csproj", "{64D875E7-2E3B-40B2-945C-B8891BC6EF41}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.DiagnosticSetting", "..\..\generated\Monitor\DiagnosticSetting.Autorest\Az.DiagnosticSetting.csproj", "{32336385-5322-43AC-B6D4-B99CDB5EDA5A}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.MonitorWorkspace", "..\..\generated\Monitor\MonitorWorkspace.Autorest\Az.MonitorWorkspace.csproj", "{803B981D-ED22-4DFF-90FA-C278DE8D228B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.PipelineGroup", "..\..\generated\Monitor\PipelineGroup.Autorest\Az.PipelineGroup.csproj", "{BBB1BE4E-4595-4589-AB2B-14BCFF7EB65C}"
@@ -61,6 +59,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ActivityLogAlert.Autorest",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ActivityLogAlert", "..\..\generated\Monitor\ActivityLogAlert.Autorest\Az.ActivityLogAlert.csproj", "{81F263BA-D395-42CB-A7E0-AFC20029C4BC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DiagnosticSetting.Autorest", "DiagnosticSetting.Autorest", "{4644B825-05AB-0B45-5567-89C0D700A638}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.DiagnosticSetting", "..\..\generated\Monitor\DiagnosticSetting.Autorest\Az.DiagnosticSetting.csproj", "{9E385E78-41AA-4D0C-A1C2-946E198E17A7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -251,18 +253,6 @@ Global
 		{64D875E7-2E3B-40B2-945C-B8891BC6EF41}.Release|x64.Build.0 = Release|Any CPU
 		{64D875E7-2E3B-40B2-945C-B8891BC6EF41}.Release|x86.ActiveCfg = Release|Any CPU
 		{64D875E7-2E3B-40B2-945C-B8891BC6EF41}.Release|x86.Build.0 = Release|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Debug|x64.Build.0 = Debug|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Debug|x86.Build.0 = Debug|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Release|x64.ActiveCfg = Release|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Release|x64.Build.0 = Release|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Release|x86.ActiveCfg = Release|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Release|x86.Build.0 = Release|Any CPU
 		{803B981D-ED22-4DFF-90FA-C278DE8D228B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{803B981D-ED22-4DFF-90FA-C278DE8D228B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{803B981D-ED22-4DFF-90FA-C278DE8D228B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -347,6 +337,18 @@ Global
 		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x64.Build.0 = Release|Any CPU
 		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x86.ActiveCfg = Release|Any CPU
 		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x86.Build.0 = Release|Any CPU
+		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Debug|x64.Build.0 = Debug|Any CPU
+		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Debug|x86.Build.0 = Debug|Any CPU
+		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Release|x64.ActiveCfg = Release|Any CPU
+		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Release|x64.Build.0 = Release|Any CPU
+		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Release|x86.ActiveCfg = Release|Any CPU
+		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -368,5 +370,6 @@ Global
 		{138B61C0-9D0E-44A1-9EA1-E8142303ECA5} = {35E5CBAF-5596-AC3C-3DBD-816FC74B54D0}
 		{0A51A656-9092-4C82-83B5-524516C8FED7} = {97973F8C-3EE1-368A-3B71-C62280C2DC8C}
 		{81F263BA-D395-42CB-A7E0-AFC20029C4BC} = {F5B68159-9278-7C75-41B6-315547561DBE}
+		{9E385E78-41AA-4D0C-A1C2-946E198E17A7} = {4644B825-05AB-0B45-5567-89C0D700A638}
 	EndGlobalSection
 EndGlobal

From 60cd41ebc1349f4ffb96a39be857ff210ff39f69 Mon Sep 17 00:00:00 2001
From: JoyerJin <116236375+JoyerJin@users.noreply.github.com>
Date: Fri, 18 Jul 2025 18:29:49 +0800
Subject: [PATCH 3/4] Update ChangeLog.md

---
 .../Properties/AssemblyInfo.cs                |  1 +
 .../generate-info.json                        |  2 +-
 src/Monitor/Monitor.sln                       | 41 +++++++------------
 src/Monitor/Monitor/ChangeLog.md              |  5 +++
 4 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs b/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs
index ea1dd81fa6a1..2a232c23ffd2 100644
--- a/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs
+++ b/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs
@@ -24,3 +24,4 @@
 [assembly: System.Reflection.AssemblyVersionAttribute("6.0.2")]
 [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
 [assembly: System.CLSCompliantAttribute(false)]
+
diff --git a/src/Monitor/DiagnosticSetting.Autorest/generate-info.json b/src/Monitor/DiagnosticSetting.Autorest/generate-info.json
index 8a4c374b3ddc..df09006b862a 100644
--- a/src/Monitor/DiagnosticSetting.Autorest/generate-info.json
+++ b/src/Monitor/DiagnosticSetting.Autorest/generate-info.json
@@ -1,3 +1,3 @@
 {
-  "generate_Id": "d15ce64d-01cd-4548-ad5d-e8592ddc6540"
+  "generate_Id": "a61cca1c-3798-4b51-9d48-f8981ebf9903"
 }
diff --git a/src/Monitor/Monitor.sln b/src/Monitor/Monitor.sln
index a2134994061e..55b5f99a72c1 100644
--- a/src/Monitor/Monitor.sln
+++ b/src/Monitor/Monitor.sln
@@ -61,7 +61,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ActivityLogAlert", "..\.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DiagnosticSetting.Autorest", "DiagnosticSetting.Autorest", "{4644B825-05AB-0B45-5567-89C0D700A638}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.DiagnosticSetting", "..\..\generated\Monitor\DiagnosticSetting.Autorest\Az.DiagnosticSetting.csproj", "{9E385E78-41AA-4D0C-A1C2-946E198E17A7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.DiagnosticSetting", "..\..\generated\Monitor\DiagnosticSetting.Autorest\Az.DiagnosticSetting.csproj", "{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -337,30 +337,18 @@ Global
 		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x64.Build.0 = Release|Any CPU
 		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x86.ActiveCfg = Release|Any CPU
 		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x86.Build.0 = Release|Any CPU
-		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Debug|x64.Build.0 = Debug|Any CPU
-		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Debug|x86.Build.0 = Debug|Any CPU
-		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Release|x64.ActiveCfg = Release|Any CPU
-		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Release|x64.Build.0 = Release|Any CPU
-		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Release|x86.ActiveCfg = Release|Any CPU
-		{9E385E78-41AA-4D0C-A1C2-946E198E17A7}.Release|x86.Build.0 = Release|Any CPU
-		{0D41ADE3-ABBA-445B-8990-EA015AD4203D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D41ADE3-ABBA-445B-8990-EA015AD4203D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D41ADE3-ABBA-445B-8990-EA015AD4203D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0D41ADE3-ABBA-445B-8990-EA015AD4203D}.Debug|x64.Build.0 = Debug|Any CPU
-		{0D41ADE3-ABBA-445B-8990-EA015AD4203D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0D41ADE3-ABBA-445B-8990-EA015AD4203D}.Debug|x86.Build.0 = Debug|Any CPU
-		{0D41ADE3-ABBA-445B-8990-EA015AD4203D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D41ADE3-ABBA-445B-8990-EA015AD4203D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0D41ADE3-ABBA-445B-8990-EA015AD4203D}.Release|x64.ActiveCfg = Release|Any CPU
-		{0D41ADE3-ABBA-445B-8990-EA015AD4203D}.Release|x64.Build.0 = Release|Any CPU
-		{0D41ADE3-ABBA-445B-8990-EA015AD4203D}.Release|x86.ActiveCfg = Release|Any CPU
-		{0D41ADE3-ABBA-445B-8990-EA015AD4203D}.Release|x86.Build.0 = Release|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Debug|x64.Build.0 = Debug|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Debug|x86.Build.0 = Debug|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Release|x64.ActiveCfg = Release|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Release|x64.Build.0 = Release|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Release|x86.ActiveCfg = Release|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -382,7 +370,6 @@ Global
 		{138B61C0-9D0E-44A1-9EA1-E8142303ECA5} = {35E5CBAF-5596-AC3C-3DBD-816FC74B54D0}
 		{0A51A656-9092-4C82-83B5-524516C8FED7} = {97973F8C-3EE1-368A-3B71-C62280C2DC8C}
 		{81F263BA-D395-42CB-A7E0-AFC20029C4BC} = {F5B68159-9278-7C75-41B6-315547561DBE}
-		{9E385E78-41AA-4D0C-A1C2-946E198E17A7} = {4644B825-05AB-0B45-5567-89C0D700A638}
-		{0D41ADE3-ABBA-445B-8990-EA015AD4203D} = {F5B68159-9278-7C75-41B6-315547561DBE}
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033} = {4644B825-05AB-0B45-5567-89C0D700A638}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Monitor/Monitor/ChangeLog.md b/src/Monitor/Monitor/ChangeLog.md
index ff0c0196e94a..efe52e54efef 100644
--- a/src/Monitor/Monitor/ChangeLog.md
+++ b/src/Monitor/Monitor/ChangeLog.md
@@ -25,6 +25,11 @@
   - `Update-AzActivityLogAlert`
   - `New-AzActivityLogAlertAlertRuleAnyOfOrLeafConditionObject`
   - `New-AzActivityLogAlertAlertRuleLeafConditionObject`
+  - `New-AzDiagnosticSetting`
+  - `New-AzSubscriptionDiagnosticSetting`
+  - `Get-AzDiagnosticSetting`
+  - `Get-AzDiagnosticSettingCategory`
+  - `Get-AzSubscriptionDiagnosticSetting`
 
 ## Version 6.0.2
 * Pipeline Group upgraded API version to 2024-10-01-preview

From b518be1d0c7f543cea7f6a087c86d80e2b5f21b0 Mon Sep 17 00:00:00 2001
From: JoyerJin <116236375+JoyerJin@users.noreply.github.com>
Date: Mon, 21 Jul 2025 15:52:49 +0800
Subject: [PATCH 4/4] Update src/Monitor/DiagnosticSetting.Autorest/README.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/Monitor/DiagnosticSetting.Autorest/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Monitor/DiagnosticSetting.Autorest/README.md b/src/Monitor/DiagnosticSetting.Autorest/README.md
index fffee2f47e65..c385cda2b9fc 100644
--- a/src/Monitor/DiagnosticSetting.Autorest/README.md
+++ b/src/Monitor/DiagnosticSetting.Autorest/README.md
@@ -80,7 +80,7 @@ directive:
         change-description: The type of the property CategoryGroup will be changed from fixed array to 'List'.
         deprecated-by-version: 7.0.0
         deprecated-by-azversion: 15.0.0
-        change-effective-date: 2025/11/
+        change-effective-date: 2025/11/03
   - where:
       verb: Get|New
       subject: SubscriptionDiagnosticSetting