Merge pull request Azure#2832 from TianoMS/tiano-d2

Include environment name in the key of Api-Version cache.

Author: markcowl

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/ApiVersionHelper.cs

@@ -59,7 +59,7 @@ internal static Task<string> DetermineApiVersion(AzureContext context, string re
         /// <param name="pre">When specified, indicates if pre-release API versions should be considered.</param>
         internal static Task<string> DetermineApiVersion(AzureContext context, string providerNamespace, string resourceType, CancellationToken cancellationToken, bool? pre = null, Dictionary<string, string> cmdletHeaderValues = null)
         {
-            var cacheKey = ApiVersionCache.GetCacheKey(providerNamespace: providerNamespace, resourceType: resourceType);
+            var cacheKey = ApiVersionCache.GetCacheKey(context.Environment.Name, providerNamespace: providerNamespace, resourceType: resourceType);
             var apiVersions = ApiVersionCache.Instance
                 .AddOrGetExisting(cacheKey: cacheKey, getFreshData: () => ApiVersionHelper.GetApiVersionsForResourceType(
                     context,
@@ -206,11 +206,12 @@ private void SetCacheItem(string cacheKey, string[] data, DateTimeOffset absolut
             /// <summary>
             /// Gets the cache key.
             /// </summary>
+            /// <param name="environmentName">The environment name.</param>
             /// <param name="providerNamespace">The provider namespace.</param>
             /// <param name="resourceType">The resource type.</param>
-            internal static string GetCacheKey(string providerNamespace, string resourceType)
+            internal static string GetCacheKey(string environmentName, string providerNamespace, string resourceType)
             {
-                return string.Format("{0}/{1}", providerNamespace.CoalesceString(), resourceType.CoalesceString()).ToUpperInvariant();
+                return string.Format("{0}/{1}/{2}", environmentName.CoalesceEnumerable(), providerNamespace.CoalesceString(), resourceType.CoalesceString()).ToUpperInvariant();
             }
         }
     }

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Locations/GetAzureLocationCmdlet.cs

@@ -34,8 +34,6 @@ public class GetAzureLocationCmdlet: ResourceManagerCmdletBase
         /// </summary>
         public override void ExecuteCmdlet()
         {
-            WriteWarning("The output object type of this cmdlet will be modified in a future release.");
-
             var allLocations = this.SubscriptionSdkClient.ListLocations(DefaultContext.Subscription.Id.ToString());
             var providers = this.ResourceManagerSdkClient.ListResourceProviders(providerName: null, listAvailable: true);
             var providerLocations = ConstructResourceProviderLocations(allLocations, providers);