fixdynamic

Author: markcowl

src/Common/Commands.Common/AzurePSCmdlet.cs

@@ -97,6 +97,20 @@ protected static AzureProfile InitializeDefaultProfile()
             return new AzureProfile();
         }
 
+        /// <summary>
+        /// Get the context the context for the current profile before BeginProcessing is called
+        /// </summary>
+        /// <returns>The context for the current profile</returns>
+        protected AzureContext GetCurrentContext()
+        {
+            if (Profile != null)
+            {
+                return Profile.Context;
+            }
+
+            return CurrentProfile.Context;
+        }
+
         protected static void InitializeTokenCaches()
         {
             DefaultMemoryTokenCache = new TokenCache();

src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourcesBaseCmdlet.cs

@@ -53,12 +53,9 @@ public GalleryTemplatesClient GalleryTemplatesClient
             {
                 if (galleryTemplatesClient == null)
                 {
-                    if(Profile == null)
-                    {
-                        Profile = new AzureProfile(Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile));
-                    }
-
-                    galleryTemplatesClient = new GalleryTemplatesClient(Profile.Context);
+                    // since this accessor can be called before BeginProcessing, use GetCurrentContext if no 
+                    // profile is passed in
+                    galleryTemplatesClient = new GalleryTemplatesClient(GetCurrentContext());
                 }
                 return galleryTemplatesClient;
             }