From c500908fe92ef66f995992193d03d440ff914ab7 Mon Sep 17 00:00:00 2001
From: Yeming Liu <11371776+isra-fel@users.noreply.github.com>
Date: Thu, 1 Oct 2026 16:58:50 +1000
Subject: [PATCH 1/2] Add Microsoft.Extensions.Options to dependencies

Added Microsoft.Extensions.Options to the assembly resolver dependencies.
---
 src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs b/src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs
index 5cc9751c2c4c..f8e226538d14 100644
--- a/src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs
+++ b/src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs
@@ -33,6 +33,7 @@ public static class CustomAssemblyResolver
             "System.Memory.Data",
             "System.Text.Json",
             "Microsoft.Bcl.AsyncInterfaces",
+            "Microsoft.Extensions.Options", // Azure.Identity depends on v10, Az.Resources depends on v2
             "Microsoft.IdentityModel.Abstractions", // Azure.Identity 1.13 depends on v6, MSAL 4.82 depends on v8 (what we ship)
             "System.Text.Encodings.Web"
         };

From 53ded3fb8ba936accffd79914a7bd125a9e2450a Mon Sep 17 00:00:00 2001
From: Yeming Liu <yeliu@microsoft.com>
Date: Thu, 1 Oct 2026 17:26:12 +1000
Subject: [PATCH 2/2] smoke test new-azresource and remove

---
 tools/Test/SmokeTest/RmCoreSmokeTests.ps1 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/Test/SmokeTest/RmCoreSmokeTests.ps1 b/tools/Test/SmokeTest/RmCoreSmokeTests.ps1
index b183dacb2c74..2619a808a45e 100644
--- a/tools/Test/SmokeTest/RmCoreSmokeTests.ps1
+++ b/tools/Test/SmokeTest/RmCoreSmokeTests.ps1
@@ -72,6 +72,7 @@ function Retry-AzCommand {
 
 # The name of resource group is 1~90 charactors complying with ^[-\w\._\(\)]+$
 $resourceGroupName = "azpssmokerg$randomValue"
+$resourceCmdletResourceGroupName = "azpssmokecmdletrg$randomValue"
 # The name of storage account should be 3~24 lowercase letters and numbers.
 $storageAccountName = "azpssmokesa$randomValue"
 
@@ -81,6 +82,11 @@ $resourceSetUpCommands = @(
 
 $resourceCleanUpCommands = @(
     @{Name = "Az.Storage [Cleanup]"; Command = { Remove-AzStorageAccount -Name $storageAccountName -ResourceGroupName $resourceGroupName -Force } },
+    @{Name = "Az.Resources [Resource Cmdlets Cleanup]"; Command = {
+        if (Get-AzResourceGroup -Name $resourceCmdletResourceGroupName -ErrorAction SilentlyContinue) {
+            Remove-AzResourceGroup -Name $resourceCmdletResourceGroupName -Force
+        }
+    } },
     @{Name = "Az.Resources [Cleanup]"; Command = { Remove-AzResourceGroup -Name $resourceGroupName -Force } }
 )
 
@@ -155,6 +161,10 @@ $resourceTestCommands = @(
     @{Name = "Az.StreamAnalytics"; Command = { Get-AzStreamAnalyticsJob } },
     @{Name = "Az.StorageSync"; Command = { Get-AzStorageSyncService } },
     @{Name = "Az.Support"; Command = { Get-AzSupportTicket } },
+    @{Name = "Az.Resources [Resource Cmdlets]"; Command = {
+        New-AzResource -ResourceName $resourceCmdletResourceGroupName -ResourceType "Microsoft.Resources/resourceGroups" -Location westus -Force
+        Remove-AzResource -ResourceName $resourceCmdletResourceGroupName -ResourceType "Microsoft.Resources/resourceGroups" -Force
+    } },
     @{Name = "Az.Resources [Tags]"; Command = { Get-AzTag } },
     @{Name = "Az.Resources [MSGraph]"; Command = { Get-AzADUser -First 1 -Select Id } },
     @{Name = "Az.TrafficManager"; Command = { Get-AzTrafficManagerProfile } },