Fixed Assembly mapping file checker to correctly detect changes and g…

…enerate for the correct app type.
sharpdx · Mar 26, 2017 · a58df51 · a58df51
1 parent 1132ec4
commit a58df51
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Source/Tools/SharpGen/Generator/TransformManager.cs b/Source/Tools/SharpGen/Generator/TransformManager.cs
@@ -1160,7 +1160,7 @@ private CsAssembly GetOrCreateAssembly(string assemblyName)
                                     select assembly).FirstOrDefault();
             if (selectedAssembly == null)
             {
-                selectedAssembly = new CsAssembly(assemblyName);
+                selectedAssembly = new CsAssembly(assemblyName, AppType);
                 selectedAssembly.RootDirectory = Path.Combine(GeneratedPath, selectedAssembly.Name);
                 Assemblies.Add(selectedAssembly);
             }

diff --git a/Source/Tools/SharpGen/Model/CsAssembly.cs b/Source/Tools/SharpGen/Model/CsAssembly.cs
@@ -40,12 +40,14 @@ public class CsAssembly : CsBase
         /// Initializes a new instance of the <see cref="CsAssembly"/> class.
         /// </summary>
         /// <param name="assemblyName">Name of the assembly.</param>
-        public CsAssembly(string assemblyName)
+        /// <param name="appType">The application type this assembly is generated for. (Used for the check file)</param>
+        public CsAssembly(string assemblyName, string appType)
         {
             Name = assemblyName;
             Interop = new InteropManager();
             _configFilesLinked = new List<ConfigFile>();
             IsToUpdate = false;
+            _appType = appType;
         }
 
         /// <summary>
@@ -66,6 +68,7 @@ public CsAssembly(string assemblyName)
         /// Path to the CodeComments file
         /// </summary>
         public const string CodeCommentsPath = @"Documentation\CodeComments.xml";
+        private string _appType;
 
         /// <summary>
         /// Gets config files linked to this assembly
@@ -92,7 +95,7 @@ public void AddLinkedConfigFile(ConfigFile configFileToAdd)
         /// <value>The name of the check file.</value>
         public string CheckFileName
         {
-            get { return QualifiedName + ".check"; }
+            get { return QualifiedName + "-" + _appType + ".check"; }
         }
 
         /// <summary>