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(); } - /// - /// Gets the Api version overrides. - /// - public virtual Dictionary ApiVersionOverrides { get; private set; } - /// /// Gets the default Azure subscription. /// 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(); } + /// + /// Gets the Api version overrides. + /// + public Dictionary ApiVersionOverrides { get; private set; } + /// /// Gets the default location to use if can't be inherited from parent. ///