Merge pull request Azure#1694 from hyonholee/hotfix

Fix New-AzureDiskEncryptionExtenion issue due to client library update

Author: Hovsep

src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/SetAzureDiskEncryptionExtension.cs

@@ -309,7 +309,7 @@ private AzureOperationResponse<VirtualMachine> UpdateVmEncryptionSettings()
                 parameters).GetAwaiter().GetResult();
         }
 
-        private string GetExtensionPublicSettings()
+        private Hashtable GetExtensionPublicSettings()
         {
             Hashtable publicSettings = new Hashtable();
             publicSettings.Add(aadClientIDKey, AadClientID ?? String.Empty);
@@ -321,24 +321,24 @@ private string GetExtensionPublicSettings()
             publicSettings.Add(encryptionOperationKey, enableEncryptionOperation);
             publicSettings.Add(sequenceVersionKey, SequenceVersion ?? String.Empty);
 
-            return JsonConvert.SerializeObject(publicSettings);
+            return publicSettings;
         }
 
-        private string GetExtensionProtectedSettings()
+        private Hashtable GetExtensionProtectedSettings()
         {
             Hashtable protectedSettings = new Hashtable();
             protectedSettings.Add(aadClientSecretKey, AadClientSecret ?? String.Empty);
             if (string.Equals(this.currentOSType, "Linux"))
             {
                 protectedSettings.Add(passphraseKey, Passphrase ?? null);
             }
-            return JsonConvert.SerializeObject(protectedSettings);
+            return protectedSettings;
         }
 
         private VirtualMachineExtension GetVmExtensionParameters(VirtualMachine vmParameters)
         {
-            string SettingString = GetExtensionPublicSettings();
-            string ProtectedSettingString = GetExtensionProtectedSettings();
+            Hashtable SettingString = GetExtensionPublicSettings();
+            Hashtable ProtectedSettingString = GetExtensionProtectedSettings();
 
             if (vmParameters == null)
             {