Resource manager dll reference

Author: safeermohammed

src/ResourceManager/Automation/Commands.Automation/Commands.ResourceManagement.Automation.csproj

@@ -73,7 +73,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.12.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
       <HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>

src/ServiceManagement/Automation/Commands.Automation/Common/AutomationClient.cs

@@ -1108,7 +1108,7 @@ public CertificateInfo CreateCertificate(string automationAccountName, string na
         public CertificateInfo UpdateCertificate(string automationAccountName, string name, string path, SecureString password,
             string description, bool? exportable)
         {
-            if (String.IsNullOrWhiteSpace(path) && password != null && exportable.HasValue)
+            if (String.IsNullOrWhiteSpace(path) && (password != null || exportable.HasValue))
             {
                 throw new ResourceCommonException(typeof(CertificateInfo),
                     string.Format(CultureInfo.CurrentCulture, Resources.SetCertificateInvalidArgs, name));
@@ -1634,8 +1634,8 @@ private Certificate CreateCertificateInternal(string automationAccountName, stri
             SecureString password, string description, bool exportable)
         {
             var cert = (password == null)
-                ? new X509Certificate2(path)
-                : new X509Certificate2(path, password);
+                ? new X509Certificate2(path, String.Empty, X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.MachineKeySet)
+                : new X509Certificate2(path, password, X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.MachineKeySet);
 
             var ccprop = new CertificateCreateProperties()
             {