Skip to content
This repository was archived by the owner on Mar 30, 2019. It is now read-only.

Commit a58df51

Browse files
committed
Fixed Assembly mapping file checker to correctly detect changes and generate for the correct app type.
1 parent 1132ec4 commit a58df51

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

Source/Tools/SharpGen/Generator/TransformManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ private CsAssembly GetOrCreateAssembly(string assemblyName)
11601160
select assembly).FirstOrDefault();
11611161
if (selectedAssembly == null)
11621162
{
1163-
selectedAssembly = new CsAssembly(assemblyName);
1163+
selectedAssembly = new CsAssembly(assemblyName, AppType);
11641164
selectedAssembly.RootDirectory = Path.Combine(GeneratedPath, selectedAssembly.Name);
11651165
Assemblies.Add(selectedAssembly);
11661166
}

Source/Tools/SharpGen/Model/CsAssembly.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,14 @@ public class CsAssembly : CsBase
4040
/// Initializes a new instance of the <see cref="CsAssembly"/> class.
4141
/// </summary>
4242
/// <param name="assemblyName">Name of the assembly.</param>
43-
public CsAssembly(string assemblyName)
43+
/// <param name="appType">The application type this assembly is generated for. (Used for the check file)</param>
44+
public CsAssembly(string assemblyName, string appType)
4445
{
4546
Name = assemblyName;
4647
Interop = new InteropManager();
4748
_configFilesLinked = new List<ConfigFile>();
4849
IsToUpdate = false;
50+
_appType = appType;
4951
}
5052

5153
/// <summary>
@@ -66,6 +68,7 @@ public CsAssembly(string assemblyName)
6668
/// Path to the CodeComments file
6769
/// </summary>
6870
public const string CodeCommentsPath = @"Documentation\CodeComments.xml";
71+
private string _appType;
6972

7073
/// <summary>
7174
/// Gets config files linked to this assembly
@@ -92,7 +95,7 @@ public void AddLinkedConfigFile(ConfigFile configFileToAdd)
9295
/// <value>The name of the check file.</value>
9396
public string CheckFileName
9497
{
95-
get { return QualifiedName + ".check"; }
98+
get { return QualifiedName + "-" + _appType + ".check"; }
9699
}
97100

98101
/// <summary>

0 commit comments

Comments
 (0)