Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev

Author: huangpf

src/Common/Commands.Common.Test/Common/ProfileCmdltsTests.cs

@@ -149,6 +149,20 @@ public void ClearAzureProfileClearsTokenCache()
             Assert.Equal(0, tokenCache.ReadItems().Count());
         }
 
+        [Fact]
+        public void DeleteCorruptedTokenCache()
+        {
+            //setup
+            string testFileName = @"c:\foobar\TokenCache.dat";
+            ProfileClient.DataStore.WriteFile(testFileName, new byte[] { 0, 1 });
+            
+            //Act
+            ProtectedFileTokenCache tokenCache = new ProtectedFileTokenCache(testFileName);
+
+            //Assert
+            Assert.False(ProfileClient.DataStore.FileExists(testFileName));
+        }
+
         [Fact]
         public void SetAzureSubscriptionAddsSubscriptionWithCertificate()
         {

src/Common/Commands.Common/Authentication/ProtectedFileTokenCache.cs

@@ -44,22 +44,39 @@ public static ProtectedFileTokenCache Instance
         // Initializes the cache against a local file.
         // If the file is already present, it loads its content in the ADAL cache
         private ProtectedFileTokenCache()
+        {
+            Initialize(CacheFileName);
+        }
+
+        private void Initialize(string fileName)
         {
             AfterAccess = AfterAccessNotification;
             BeforeAccess = BeforeAccessNotification;
             lock (fileLock)
             {
-                if (ProfileClient.DataStore.FileExists(CacheFileName))
+                if (ProfileClient.DataStore.FileExists(fileName))
                 {
-                    var existingData = ProfileClient.DataStore.ReadFileAsBytes(CacheFileName);
+                    var existingData = ProfileClient.DataStore.ReadFileAsBytes(fileName);
                     if (existingData != null)
                     {
-                        Deserialize(ProtectedData.Unprotect(existingData, null, DataProtectionScope.CurrentUser));
+                        try
+                        {
+                            Deserialize(ProtectedData.Unprotect(existingData, null, DataProtectionScope.CurrentUser));
+                        }
+                        catch (CryptographicException)
+                        {
+                            ProfileClient.DataStore.DeleteFile(fileName);
+                        }
                     }
                 }
             }
         }
 
+        public ProtectedFileTokenCache(string cacheFile)
+        {
+            Initialize(cacheFile);
+        }
+
         // Empties the persistent store.
         public override void Clear()
         {
@@ -81,7 +98,14 @@ void BeforeAccessNotification(TokenCacheNotificationArgs args)
                     var existingData = ProfileClient.DataStore.ReadFileAsBytes(CacheFileName);
                     if (existingData != null)
                     {
-                        Deserialize(ProtectedData.Unprotect(existingData, null, DataProtectionScope.CurrentUser));
+                        try
+                        {
+                            Deserialize(ProtectedData.Unprotect(existingData, null, DataProtectionScope.CurrentUser));
+                        }
+                        catch (CryptographicException)
+                        {
+                            ProfileClient.DataStore.DeleteFile(CacheFileName);
+                        }
                     }
                 }
             }

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/GetAzureHDInsightJobOutputCmdlet.cs

@@ -136,21 +136,39 @@ protected override void EndProcessing()
             this.command.CurrentSubscription = this.GetCurrentSubscription(this.Subscription, this.Certificate);
             this.AssertTaskLogsDirectorySpecified(this.TaskLogsDirectory);
 
-            if (this.StandardError.IsPresent)
+            int numSpecifiedOutputTypes = 0;
+            string selectedOutputType = "Standard Output";
+            this.command.OutputType = JobOutputType.StandardOutput;
+
+            if (this.StandardOutput.IsPresent)
             {
-                this.command.OutputType = JobOutputType.StandardError;
+                numSpecifiedOutputTypes++;
             }
-            else if (this.TaskSummary.IsPresent)
+
+            if (this.DownloadTaskLogs.IsPresent)
+            {
+                this.command.OutputType = JobOutputType.TaskLogs;
+                selectedOutputType = "Task Logs";
+                numSpecifiedOutputTypes++;
+            }
+
+            if (this.TaskSummary.IsPresent)
             {
                 this.command.OutputType = JobOutputType.TaskSummary;
+                selectedOutputType = "Task Summary";
+                numSpecifiedOutputTypes++;
             }
-            else if (this.DownloadTaskLogs.IsPresent)
+
+            if (this.StandardError.IsPresent)
             {
-                this.command.OutputType = JobOutputType.TaskLogs;
+                this.command.OutputType = JobOutputType.StandardError;
+                selectedOutputType = "Standard Error";
+                numSpecifiedOutputTypes++;
             }
-            else
+
+            if (numSpecifiedOutputTypes > 1)
             {
-                this.command.OutputType = JobOutputType.StandardOutput;
+                this.WriteWarning(String.Format("This cmdlet supports specifying only one job output type. Only {0} will be returned", selectedOutputType));
             }
 
             try