Skip to content

Commit b7af9d4

Browse files
josesimoesjosesimoes
authored
Fix Log output messages (#163)
***NO_CI***
1 parent d88efb0 commit b7af9d4

File tree

2 files changed

+26
-17
lines changed

2 files changed

+26
-17
lines changed

‎MetadataProcessor.MsBuildTask/MetaDataProcessorTask.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public class MetaDataProcessorTask : Task
119119
public override bool Execute()
120120
{
121121
// report to VS output window what step the build is
122-
Log.LogCommandLine(MessageImportance.Normal, "Starting nanoFramework MetadataProcessor...");
122+
Log.LogCommandLine(MessageImportance.Normal, "Starting nanoFramework MetadataProcessor..");
123123

124124
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
125125
// developer note: to debug this task set an environment variable like this:
@@ -137,7 +137,7 @@ public override bool Execute()
137137
if (LoadHints != null &&
138138
LoadHints.Any())
139139
{
140-
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Processing load hints...");
140+
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Processing load hints..");
141141

142142
foreach (var hint in LoadHints)
143143
{
@@ -154,7 +154,7 @@ public override bool Execute()
154154
if (ExcludeClassByName != null &&
155155
ExcludeClassByName.Any())
156156
{
157-
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Processing class exclusion list...");
157+
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Processing class exclusion list..");
158158

159159
foreach (var className in ExcludeClassByName)
160160
{
@@ -167,7 +167,7 @@ public override bool Execute()
167167
// Analyses a .NET assembly
168168
if (!string.IsNullOrEmpty(Parse))
169169
{
170-
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, $"Analysing .NET assembly {Path.GetFileNameWithoutExtension(Parse)}...");
170+
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, $"Analysing .NET assembly {Path.GetFileNameWithoutExtension(Parse)}..");
171171

172172
ExecuteParse(Parse);
173173
}
@@ -183,7 +183,7 @@ public override bool Execute()
183183
}
184184
else
185185
{
186-
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, $"Compiling {Path.GetFileNameWithoutExtension(Compile)} into nanoCLR format...");
186+
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, $"Compiling {Path.GetFileNameWithoutExtension(Compile)} into nanoCLR format..");
187187

188188
ExecuteCompile(Compile);
189189
}
@@ -280,14 +280,14 @@ private void ExecuteParse(
280280
{
281281
try
282282
{
283-
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Parsing assembly...");
283+
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Parsing assembly..");
284284

285285
_assemblyDefinition = AssemblyDefinition.ReadAssembly(fileName,
286286
new ReaderParameters { AssemblyResolver = new LoadHintsAssemblyResolver(_loadHints) });
287287
}
288288
catch (Exception)
289289
{
290-
Log.LogError($"Unable to parse input assembly file '{fileName}' - check if path and file exists.");
290+
Log.LogError($"Unable to parse input assembly file '{fileName}' - check if path and file exists");
291291
}
292292
}
293293

@@ -297,7 +297,7 @@ private void ExecuteCompile(
297297
try
298298
{
299299
// compile assembly (1st pass)
300-
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Compiling assembly...");
300+
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Compiling assembly..");
301301

302302
_assemblyBuilder = new nanoAssemblyBuilder(
303303
_assemblyDefinition,
@@ -313,7 +313,7 @@ private void ExecuteCompile(
313313
}
314314
catch (Exception)
315315
{
316-
Log.LogError($"Unable to compile output assembly file '{fileName}' - check parse command results.");
316+
Log.LogError($"Unable to compile output assembly file '{fileName}' - check parse command results");
317317

318318
throw;
319319
}
@@ -324,12 +324,12 @@ private void ExecuteCompile(
324324
File.Delete(Path.ChangeExtension(fileName, "tmp"));
325325

326326
// minimize (has to be called after the 1st compile pass)
327-
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Minimizing assembly...");
327+
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Minimizing assembly..");
328328

329329
_assemblyBuilder.Minimize();
330330

331331
// compile assembly (2nd pass after minimize)
332-
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Recompiling assembly...");
332+
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Recompiling assembly..");
333333

334334
using (var stream = File.Open(fileName, FileMode.Create, FileAccess.ReadWrite))
335335
using (var writer = new BinaryWriter(stream))
@@ -346,7 +346,7 @@ private void ExecuteCompile(
346346
// output assembly metadata
347347
if (DumpMetadata)
348348
{
349-
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Dumping assembly metadata...");
349+
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Dumping assembly metadata..");
350350

351351
DumpFile = Path.ChangeExtension(fileName, "dump.txt");
352352

@@ -364,11 +364,11 @@ private void ExecuteCompile(
364364
}
365365
catch (ArgumentException ex)
366366
{
367-
Log.LogError($"Exception minimizing assembly: {ex.Message}.");
367+
Log.LogError($"Exception minimizing assembly: {ex.Message}");
368368
}
369369
catch (Exception)
370370
{
371-
Log.LogError($"Exception minimizing assembly.");
371+
Log.LogError($"Exception minimizing assembly");
372372
throw;
373373
}
374374
}
@@ -387,7 +387,7 @@ private void ExecuteGenerateSkeleton(
387387
{
388388
try
389389
{
390-
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Generating skeleton files...");
390+
if (Verbose) Log.LogCommandLine(MessageImportance.Normal, "Generating skeleton files..");
391391

392392
var skeletonGenerator = new nanoSkeletonGenerator(
393393
_assemblyBuilder.TablesContext,
@@ -424,7 +424,7 @@ private void ExecuteGenerateDependency(
424424
}
425425
catch (Exception)
426426
{
427-
Log.LogError($"Unable to generate and write dependency graph for assembly file '{fileName}'.");
427+
Log.LogError($"Unable to generate and write dependency graph for assembly file '{fileName}'");
428428

429429
throw;
430430
}

‎MetadataProcessor.Shared/nanoAssemblyBuilder.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,16 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)
713713
{
714714
if (v.VariableType.DeclaringType != null)
715715
{
716-
set.Add(v.VariableType.DeclaringType.MetadataToken);
716+
var resolvedType = v.VariableType.Resolve();
717+
718+
if (resolvedType != null && resolvedType.IsEnum)
719+
{
720+
set.Add(v.VariableType.MetadataToken);
721+
}
722+
else
723+
{
724+
set.Add(v.VariableType.DeclaringType.MetadataToken);
725+
}
717726
}
718727
else if (v.VariableType.MetadataType == MetadataType.Class)
719728
{

0 commit comments

Comments
 (0)