Merge pull request Azure#357 from Azure/dev

huangpf · huangpf · commit da2ac74daee4 · 2016-01-25T15:02:23.000-08:00
HPF PR: dev &lt;- Azure:dev
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/SetAzureDiskEncryptionExtension.cs b/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)
             {
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj
@@ -67,9 +67,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.DataFactories, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.1.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.DataFactories">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.3.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.DataFactories" version="4.1.0" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.DataFactories" version="4.3.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5799.28345-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5799.28345-prerelease" targetFramework="net45" />
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj
@@ -67,7 +67,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.DataFactories, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.1.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.3.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config b/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.Azure.Common.Authentication" version="1.5.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.DataFactories" version="4.1.0" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.DataFactories" version="4.3.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ private AzureOperationResponse<VirtualMachine> UpdateVmEncryptionSettings()`
`309`	`309`	`parameters).GetAwaiter().GetResult();`
`310`	`310`	`}`
`311`	`311`
`312`		`- private string GetExtensionPublicSettings()`
	`312`	`+ private Hashtable GetExtensionPublicSettings()`
`313`	`313`	`{`
`314`	`314`	`Hashtable publicSettings = new Hashtable();`
`315`	`315`	`publicSettings.Add(aadClientIDKey, AadClientID ?? String.Empty);`
`@@ -321,24 +321,24 @@ private string GetExtensionPublicSettings()`
`321`	`321`	`publicSettings.Add(encryptionOperationKey, enableEncryptionOperation);`
`322`	`322`	`publicSettings.Add(sequenceVersionKey, SequenceVersion ?? String.Empty);`
`323`	`323`
`324`		`- return JsonConvert.SerializeObject(publicSettings);`
	`324`	`+ return publicSettings;`
`325`	`325`	`}`
`326`	`326`
`327`		`- private string GetExtensionProtectedSettings()`
	`327`	`+ private Hashtable GetExtensionProtectedSettings()`
`328`	`328`	`{`
`329`	`329`	`Hashtable protectedSettings = new Hashtable();`
`330`	`330`	`protectedSettings.Add(aadClientSecretKey, AadClientSecret ?? String.Empty);`
`331`	`331`	`if (string.Equals(this.currentOSType, "Linux"))`
`332`	`332`	`{`
`333`	`333`	`protectedSettings.Add(passphraseKey, Passphrase ?? null);`
`334`	`334`	`}`
`335`		`- return JsonConvert.SerializeObject(protectedSettings);`
	`335`	`+ return protectedSettings;`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`private VirtualMachineExtension GetVmExtensionParameters(VirtualMachine vmParameters)`
`339`	`339`	`{`
`340`		`- string SettingString = GetExtensionPublicSettings();`
`341`		`- string ProtectedSettingString = GetExtensionProtectedSettings();`
	`340`	`+ Hashtable SettingString = GetExtensionPublicSettings();`
	`341`	`+ Hashtable ProtectedSettingString = GetExtensionProtectedSettings();`
`342`	`342`
`343`	`343`	`if (vmParameters == null)`
`344`	`344`	`{`