Updating test to include environment name in environment record

Author: markcowl

src/ResourceManager/Profile/Commands.Profile.Test/ProfileCmdletTests.cs

@@ -52,7 +52,9 @@ public ProfileCmdletTests(ITestOutputHelper output)
         public void SelectAzureProfileInMemory()
         {
             var profile = new AzureRmProfile { DefaultContext = new AzureContext() };
-            profile.EnvironmentTable.Add("foo", new AzureEnvironment(AzureEnvironment.PublicEnvironments.Values.FirstOrDefault()));
+            var env = new AzureEnvironment(AzureEnvironment.PublicEnvironments.Values.FirstOrDefault());
+            env.Name = "foo";
+            profile.EnvironmentTable.Add("foo", env);
             ImportAzureRMContextCommand cmdlt = new ImportAzureRMContextCommand();
             // Setup
             cmdlt.AzureContext = profile;

src/ResourceManager/Profile/Commands.Profile/Context/ImportAzureRMContext.cs

@@ -14,14 +14,16 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-using Microsoft.Azure.Commands.Common.Authentication.Core;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Common.Authentication.ResourceManager;
 using Microsoft.Azure.Commands.Profile.Common;
 using Microsoft.Azure.Commands.Profile.Models;
 // TODO: Remove IfDef
 #if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Core;
 using Microsoft.Azure.Commands.Profile.Models.Core;
+#else
+using Microsoft.Azure.Commands.Common.Authentication;
 #endif
 using Microsoft.Azure.Commands.Profile.Properties;
 using System;
@@ -82,6 +84,11 @@ void CopyProfile(AzureRmProfile source, IProfileOperations target)
 
         void EnsureProtectedCache(IProfileOperations profile, byte[] cacheData)
         {
+            if (profile == null || cacheData == null)
+            {
+                return;
+            }
+
             AzureRmAutosaveProfile autosave = profile as AzureRmAutosaveProfile;
             var protectedcache = AzureSession.Instance.TokenCache as ProtectedFileTokenCache;
             if (autosave != null && protectedcache == null && cacheData.Any())