Merge branch 'main' into changjian-wang/sample-advanced-contentsource-grouding

Author: changjian-wang

eng/emitter-package-lock.json

@@ -1,13 +1,13 @@
 {
   "main": "dist/src/index.js",
   "dependencies": {
-    "@azure-tools/typespec-java": "0.43.2"
+    "@azure-tools/typespec-java": "0.43.3"
   },
   "devDependencies": {
     "@azure-tools/openai-typespec": "1.11.0",
-    "@azure-tools/typespec-autorest": "0.66.1",
+    "@azure-tools/typespec-autorest": "0.66.2",
     "@azure-tools/typespec-azure-core": "0.66.1",
-    "@azure-tools/typespec-azure-resource-manager": "0.66.0",
+    "@azure-tools/typespec-azure-resource-manager": "0.66.1",
     "@azure-tools/typespec-azure-rulesets": "0.66.0",
     "@azure-tools/typespec-client-generator-core": "0.66.4",
     "@azure-tools/typespec-liftr-base": "0.13.0",

eng/emitter-package.json

@@ -1297,6 +1297,84 @@
             "match": "class com\\.azure\\.resourcemanager\\.containerinstance\\.models\\.(CachedImagesListResult|CapabilitiesListResult|ContainerGroupListResult|OperationListResult|UsageListResult)"
           },
           "justification": "Pageable models moved to implementation package. Unlikely used by user."
+        },
+        {
+          "code": "java.method.visibilityIncreased",
+          "old" : "method void com.azure.resourcemanager.containerservice.models.MachineProperties::<init>()",
+          "new" : "method void com.azure.resourcemanager.containerservice.models.MachineProperties::<init>()",
+          "justification": "Output-only immutable model's constructor visibility increased."
+        },
+        {
+          "code": "java.method.visibilityReduced",
+          "old" : {
+            "matcher": "regex",
+            "match": "method void com\\.azure\\.resourcemanager\\.compute\\.models\\..*\\:\\:\\<init\\>\\(\\)"
+          },
+          "justification": "Output-only immutable models constructors are now private."
+        },
+        {
+          "code": "java.method.visibilityReduced",
+          "old" : {
+            "matcher": "regex",
+            "match": "method .* com\\.azure\\.resourcemanager\\.compute\\.models\\..*\\:\\:with.*\\(.*\\).*"
+          },
+          "justification": "Output-only immutable models setters are now package-private if being used by child class."
+        },
+        {
+          "code": "java.method.removed",
+          "old" : {
+            "matcher": "regex",
+            "match": "method .* com\\.azure\\.resourcemanager\\.compute\\.models\\..*\\:\\:with.*\\(.*\\).*"
+          },
+          "justification": "Output-only immutable models setters are removed if no explicit usage."
+        },
+        {
+          "code": "java.class.removed",
+          "old" : {
+            "matcher": "regex",
+            "match": "class com\\.azure\\.resourcemanager\\.compute\\.models\\.(AvailabilitySetListResult|CapacityReservationGroupListResult|CapacityReservationListResult|CloudServiceListResult|CloudServiceRoleListResult|DedicatedHostGroupListResult|DedicatedHostListResult|DedicatedHostSizeListResult|ImageListResult|ListUsagesResult|OSFamilyListResult|OSVersionListResult|OperationListResult|PrivateEndpointConnectionListResult|ProximityPlacementGroupListResult|ResourceSkusResult|RestorePointCollectionListResult|RoleInstanceListResult|RunCommandListResult|SshPublicKeysGroupListResult|UpdateDomainListResult|VirtualMachineListResult|VirtualMachineRunCommandsListResult|VirtualMachineScaleSetExtensionListResult|VirtualMachineScaleSetListResult|VirtualMachineScaleSetListSkusResult|VirtualMachineScaleSetListWithLinkResult|VirtualMachineScaleSetVMListResult|VirtualMachineSizeListResult)"
+          },
+          "justification": "Pageable models moved to implementation package. Unlikely used by user."
+        },
+        {
+          "code": "java.class.removed",
+          "old" : {
+            "matcher": "regex",
+            "match": "class com\\.azure\\.resourcemanager\\.compute\\.models\\.(CommunityGalleryImageList|CommunityGalleryImageVersionList|DiskAccessList|DiskEncryptionSetList|DiskList|DiskRestorePointList|GalleryApplicationList|GalleryApplicationVersionList|GalleryImageList|GalleryImageVersionList|GalleryInVMAccessControlProfileList|GalleryInVMAccessControlProfileVersionList|GalleryList|GalleryScriptList|GalleryScriptVersionList|GallerySoftDeletedResourceList|ResourceUriList|SharedGalleryImageList|SharedGalleryImageVersionList|SharedGalleryList|SnapshotList|VirtualMachineScaleSetListOSUpgradeHistory)"
+          },
+          "justification": "Pageable models moved to implementation package. Unlikely used by user."
+        },
+        {
+          "code": "java.method.visibilityReduced",
+          "old" : {
+            "matcher": "regex",
+            "match": "method void com\\.azure\\.resourcemanager\\.redis\\.models\\.(OperationDisplay|RedisInstanceDetails|RedisLinkedServer)::\\<init\\>\\(\\)"
+          },
+          "justification": "Output-only immutable models' constructors are now private."
+        },
+        {
+          "code": "java.method.removed",
+          "old" : {
+            "matcher": "regex",
+            "match": "method .* com\\.azure\\.resourcemanager\\.redis\\.models\\.OperationDisplay\\:\\:with.*\\(.*\\).*"
+          },
+          "justification": "Output-only immutable models' setters are removed if no explicit usage."
+        },
+        {
+          "code": "java.method.visibilityReduced",
+          "old" : {
+            "matcher": "regex",
+            "match": "method .* com\\.azure\\.resourcemanager\\.redis\\.models\\.OperationStatusResult\\:\\:with.*\\(.*\\).*"
+          },
+          "justification": "Output-only immutable models' setters are now package-private if it's being used by child class."
+        },
+        {
+          "code": "java.class.removed",
+          "old" : {
+            "matcher": "regex",
+            "match": "class com\\.azure\\.resourcemanager\\.redis\\.models\\.(OperationListResult|RedisListResult|RedisCacheAccessPolicyAssignmentList|RedisFirewallRuleListResult|RedisPatchScheduleListResult|RedisCacheAccessPolicyList|PrivateLinkResourceListResult|NotificationListResponse|PrivateEndpointConnectionListResult|RedisLinkedServerWithPropertiesList)"
+          },
+          "justification": "Pageable models moved to implementation package. Unlikely used by user."
         }
       ]
     }

eng/lintingconfigs/revapi/track2/revapi.json

@@ -37,7 +37,7 @@ com.azure:azure-data-sdk-parent;1.3.0;1.3.0
 com.azure:azure-sdk-parent;1.6.0;1.6.0
 com.azure:azure-client-sdk-parent;1.7.0;1.7.0
 com.azure:azure-ai-agents-persistent;1.0.0-beta.2;1.0.0-beta.3
-com.azure:azure-ai-agents;2.0.0-beta.3;2.0.0
+com.azure:azure-ai-agents;2.0.0;2.1.0-beta.1
 com.azure:azure-ai-anomalydetector;3.0.0-beta.5;3.0.0-beta.6
 com.azure:azure-ai-contentsafety;1.0.17;1.1.0-beta.1
 com.azure:azure-ai-contentunderstanding;1.0.0;1.1.0-beta.1
@@ -53,7 +53,7 @@ com.azure:azure-ai-openai-assistants;1.0.0-beta.5;1.0.0-beta.6
 com.azure:azure-ai-openai-realtime;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-ai-openai-stainless;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-ai-personalizer;1.0.0-beta.1;1.0.0-beta.2
-com.azure:azure-ai-projects;2.0.0-beta.3;2.0.0
+com.azure:azure-ai-projects;2.0.0;2.1.0-beta.1
 com.azure:azure-ai-speech-transcription;1.0.0-beta.2;1.0.0-beta.3
 com.azure:azure-ai-textanalytics;5.5.12;5.6.0-beta.1
 com.azure:azure-ai-textanalytics-perf;1.0.0-beta.1;1.0.0-beta.1
@@ -281,7 +281,7 @@ com.azure.resourcemanager:azure-resourcemanager-cdn;2.53.6;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-compute;2.56.2;2.57.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-containerinstance;2.53.8;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-containerregistry;2.55.0;2.56.0-beta.2
-com.azure.resourcemanager:azure-resourcemanager-containerservice;2.58.0;2.59.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-containerservice;2.58.0;2.59.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-cosmos;2.54.1;2.55.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-dns;2.53.6;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-eventhubs;2.53.6;2.54.0-beta.1
@@ -294,7 +294,7 @@ com.azure.resourcemanager:azure-resourcemanager-privatedns;2.53.6;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-resources;2.54.0;2.55.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-redis;2.53.6;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-samples;2.0.0-beta.1;2.0.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-search;2.54.5;2.55.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-search;2.54.5;2.55.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-servicebus;2.53.6;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-sql;2.53.6;2.54.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-storage;2.55.3;2.56.0-beta.1
@@ -312,7 +312,7 @@ com.azure.resourcemanager:azure-resourcemanager-kusto;1.2.0;1.3.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-loganalytics;2.1.0;2.2.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-eventgrid;1.2.0;1.3.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-healthbot;1.1.0;1.2.0
-com.azure.resourcemanager:azure-resourcemanager-confluent;1.2.0;1.3.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-confluent;1.2.0;1.3.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-digitaltwins;1.3.0;1.4.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-netapp;2.1.0;2.2.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-storagecache;1.1.0;1.2.0-beta.1
@@ -338,10 +338,10 @@ com.azure.resourcemanager:azure-resourcemanager-advisor;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-appconfiguration;1.1.0;1.2.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-attestation;1.0.0-beta.3;1.0.0-beta.4
 com.azure.resourcemanager:azure-resourcemanager-azurestack;1.0.0;1.1.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-azurestackhci;1.0.0-beta.5;1.0.0-beta.6
+com.azure.resourcemanager:azure-resourcemanager-azurestackhci;1.0.0-beta.5;1.0.0
 com.azure.resourcemanager:azure-resourcemanager-avs;1.4.0;1.5.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-consumption;1.0.0;1.1.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-commerce;1.0.0-beta.2;1.0.0-beta.3
+com.azure.resourcemanager:azure-resourcemanager-commerce;1.0.0-beta.3;1.0.0-beta.4
 com.azure.resourcemanager:azure-resourcemanager-billing;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-signalr;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-cognitiveservices;1.4.0;1.5.0-beta.1
@@ -501,7 +501,7 @@ com.azure.resourcemanager:azure-resourcemanager-mongodbatlas;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-purestorageblock;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-planetarycomputer;1.0.0-beta.1;1.0.0
 com.azure.resourcemanager:azure-resourcemanager-kubernetesconfiguration-fluxconfigurations;1.0.0-beta.1;1.0.0-beta.2
-com.azure.resourcemanager:azure-resourcemanager-kubernetesconfiguration-extensions;1.0.0-beta.1;1.0.0-beta.2
+com.azure.resourcemanager:azure-resourcemanager-kubernetesconfiguration-extensions;1.0.0-beta.1;1.0.0
 com.azure.resourcemanager:azure-resourcemanager-kubernetesconfiguration-extensiontypes;1.0.0-beta.1;1.0.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-cloudhealth;1.0.0-beta.1;1.0.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-resources-deploymentstacks;1.1.0;1.2.0-beta.1

eng/versioning/version_client.txt

@@ -1,5 +1,15 @@
 # Release History
 
+## 2.1.0-beta.1 (Unreleased)
+
+### Features Added
+
+### Breaking Changes
+
+### Bugs Fixed
+
+### Other Changes
+
 ## 2.0.0 (2026-03-27)
 
 ### Features Added

sdk/ai/azure-ai-agents/CHANGELOG.md

@@ -14,7 +14,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-ai-agents</artifactId>
-  <version>2.0.0</version> <!-- {x-version-update;com.azure:azure-ai-agents;current} -->
+  <version>2.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-ai-agents;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for Agents</name>

sdk/ai/azure-ai-agents/pom.xml

@@ -1,5 +1,15 @@
 # Release History
 
+## 2.1.0-beta.1 (Unreleased)
+
+### Features Added
+
+### Breaking Changes
+
+### Bugs Fixed
+
+### Other Changes
+
 ## 2.0.0 (2026-03-27)
 
 ### Features Added

sdk/ai/azure-ai-projects/CHANGELOG.md

@@ -14,7 +14,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
 
   <groupId>com.azure</groupId>
   <artifactId>azure-ai-projects</artifactId>
-  <version>2.0.0</version> <!-- {x-version-update;com.azure:azure-ai-projects;current} -->
+  <version>2.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-ai-projects;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for Projects</name>
@@ -72,7 +72,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-ai-agents</artifactId>
-      <version>2.0.0</version>  <!-- {x-version-update;com.azure:azure-ai-agents;current} -->
+      <version>2.1.0-beta.1</version>  <!-- {x-version-update;com.azure:azure-ai-agents;current} -->
     </dependency>
     <dependency>
       <groupId>com.openai</groupId>