From 680559a4c049a9814abaff7e37e4dafd572d57df Mon Sep 17 00:00:00 2001
From: YalinLi0312 <yall@microsoft.com>
Date: Mon, 8 Mar 2021 18:15:37 -0800
Subject: [PATCH] Move ApiVersionOverrides to ARMClientOptions class

---
 .../src/AzureResourceManagerClient.cs                    | 9 +--------
 .../src/AzureResourceManagerClientOptions.cs             | 6 ++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sdk/resourcemanager/Azure.ResourceManager.Core/src/AzureResourceManagerClient.cs b/sdk/resourcemanager/Azure.ResourceManager.Core/src/AzureResourceManagerClient.cs
index a9ea54021547..84c2d79d08a6 100644
--- a/sdk/resourcemanager/Azure.ResourceManager.Core/src/AzureResourceManagerClient.cs
+++ b/sdk/resourcemanager/Azure.ResourceManager.Core/src/AzureResourceManagerClient.cs
@@ -102,18 +102,11 @@ private AzureResourceManagerClient(
             _baseUri = baseUri;
             ClientOptions = options ?? new AzureResourceManagerClientOptions();
 
-            DefaultSubscription = string.IsNullOrWhiteSpace(defaultSubscriptionId) 
+            DefaultSubscription = string.IsNullOrWhiteSpace(defaultSubscriptionId)
                 ? GetDefaultSubscription()
                 : GetSubscriptionOperations(defaultSubscriptionId).Get().Value;
-
-            ApiVersionOverrides = new Dictionary<string, string>();
         }
 
-        /// <summary>
-        /// Gets the Api version overrides.
-        /// </summary>
-        public virtual Dictionary<string, string> ApiVersionOverrides { get; private set; }
-
         /// <summary>
         /// Gets the default Azure subscription.
         /// </summary>
diff --git a/sdk/resourcemanager/Azure.ResourceManager.Core/src/AzureResourceManagerClientOptions.cs b/sdk/resourcemanager/Azure.ResourceManager.Core/src/AzureResourceManagerClientOptions.cs
index ba82c50013e5..cd6d634057d0 100644
--- a/sdk/resourcemanager/Azure.ResourceManager.Core/src/AzureResourceManagerClientOptions.cs
+++ b/sdk/resourcemanager/Azure.ResourceManager.Core/src/AzureResourceManagerClientOptions.cs
@@ -49,8 +49,14 @@ internal AzureResourceManagerClientOptions(LocationData defaultLocation, AzureRe
             if (!ReferenceEquals(other, null))
                 Copy(other);
             DefaultLocation = defaultLocation;
+            ApiVersionOverrides = new Dictionary<string, string>();
         }
 
+        /// <summary>
+        /// Gets the Api version overrides.
+        /// </summary>
+        public Dictionary<string, string> ApiVersionOverrides { get; private set; }
+
         /// <summary>
         /// Gets the default location to use if can't be inherited from parent.
         /// </summary>