Merge pull request #18 from aariste/dev

V0.7.1

AASAXUtilLib/AX/Framework/Tools/ModelManagement/AxUtil.cs → AASAXUtilLib/AxUtil.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Security.Cryptography.X509Certificates;
 
-namespace Microsoft.Dynamics.AX.Framework.Tools.ModelManagement
+namespace AASAXUtilLib
 {
     public class AxUtil
     {
@@ -15,57 +15,57 @@ public AxUtil()
         public AxUtil(AxUtilContext context, AxUtilConfiguration config)
           : this()
         {
-            AxUtil.ValidateContextAndConfigNotNull(context, config);
-            this.Context = context;
-            this.Config = config;
+            ValidateContextAndConfigNotNull(context, config);
+            Context = context;
+            Config = config;
         }
 
         public AxUtilContext Context
         {
             get
             {
-                return this.context;
+                return context;
             }
             set
             {
-                AxUtil.ValidateContextNotNull(value);
-                this.context = value;
+                ValidateContextNotNull(value);
+                context = value;
             }
         }
 
         public AxUtilConfiguration Config
         {
             get
             {
-                return this.config;
+                return config;
             }
             set
             {
-                AxUtil.ValidateConfigNotNull(value);
-                this.config = value;
+                ValidateConfigNotNull(value);
+                config = value;
             }
         }
 
         public bool GenerateLicense(X509Certificate2Collection scollection)
         {
             if (scollection.Count == 0)
             {
-                throw new System.NullReferenceException("No certificate loaded.");
+                throw new NullReferenceException("No certificate loaded.");
             }
 
             foreach (X509Certificate2 x509 in scollection)
             {
                 X509Certificate2 certificate = x509;
 
-                return new LicenseGenerator(this.config, this.context).GenerateLicense(certificate);
+                return new LicenseGenerator(config, context).GenerateLicense(certificate);
             }
 
             return false;
         }
 
         public bool GenerateLicenseKeyVault(string keyVaultDNS, string keyName, string tenantId, string clientId, string clientSecret)
-        { 
-            return new LicenseGenerator(this.config, this.context).GenerateLicenseKeyVault(keyVaultDNS, keyName, tenantId, clientId, clientSecret);
+        {
+            return new LicenseGenerator(config, context).GenerateLicenseKeyVault(keyVaultDNS, keyName, tenantId, clientId, clientSecret);
         }
 
         private static void ValidateContextNotNull(AxUtilContext context)
@@ -84,8 +84,8 @@ private static void ValidateConfigNotNull(AxUtilConfiguration config)
           AxUtilContext context,
           AxUtilConfiguration config)
         {
-            AxUtil.ValidateContextNotNull(context);
-            AxUtil.ValidateConfigNotNull(config);
+            ValidateContextNotNull(context);
+            ValidateConfigNotNull(config);
         }
     }
 }

AASAXUtilLib/AX/Framework/Tools/ModelManagement/AxUtilConfiguration.cs → AASAXUtilLib/AxUtilConfiguration.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Microsoft.Dynamics.AX.Framework.Tools.ModelManagement
+namespace AASAXUtilLib
 {
     [Serializable]
     public class AxUtilConfiguration

AASAXUtilLib/AxUtilContext.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+
+namespace AASAXUtilLib
+{
+    [Serializable]
+    public class AxUtilContext : MarshalByRefObject
+    {
+        private List<string> errors = new List<string>();        
+
+        public virtual void ReportError(string errorText)
+        {
+            this.errors.Add(errorText);
+        }
+    }
+}

AASAXUtilLib/AX/Framework/Tools/ModelManagement/LicenseGenerator.cs → AASAXUtilLib/LicenseGenerator.cs

@@ -5,17 +5,15 @@
 using Microsoft.Dynamics.AX.Framework.Tools.ModelManagement.Properties;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 
-namespace Microsoft.Dynamics.AX.Framework.Tools.ModelManagement
+namespace AASAXUtilLib
 {
     internal class LicenseGenerator
     {
@@ -171,22 +169,7 @@ private bool GenerateLicenseFileKeyVault(string keyVaultDNS, string keyName, str
                 return false;
             }
             return true;
-        }
-
-        private X509Certificate2 LoadCertificate()
-        {
-            X509Certificate2 certificate;
-            try
-            {
-                certificate = new X509Certificate2(this.licenseInfo.CertificatePath, this.licenseInfo.Password);
-            }
-            catch (CryptographicException ex)
-            {
-                this.context.ReportError(string.Format((IFormatProvider)CultureInfo.CurrentCulture, Resources.CertificateLoadFailure, (object)ex.Message));
-                return (X509Certificate2)null;
-            }
-            return !this.ValidateCertificate(certificate) ? (X509Certificate2)null : certificate;
-        }
+        }        
 
         private string GenerateSignature(X509Certificate2 certificate)
         {