Merge branch 'bugfix/msbuild-task-message-null' into develop

iterate-ch · Nov 27, 2024 · 024d11d · 024d11d
2 parents a76579e + 9179ddb
commit 024d11d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/IKVM.MSBuild.Tasks/IkvmToolTaskDiagnosticWriter.cs b/src/IKVM.MSBuild.Tasks/IkvmToolTaskDiagnosticWriter.cs
@@ -54,10 +54,10 @@ public async ValueTask ReceiveAsync(IkvmToolDiagnosticEvent @event, Cancellation
                         logger.LogWarning(null, $"{@event.Id:D4}", null, null, @event.Location.StartLine, @event.Location.StartColumn, @event.Location.EndLine, @event.Location.EndColumn, @event.Message, @event.Args);
                         break;
                     case IkvmToolDiagnosticEventLevel.Error:
-                        logger.LogError(null, $"{@event.Id:D4}", null, null, @event.Location.StartLine, @event.Location.StartColumn, @event.Location.EndLine, @event.Location.EndColumn, MessageImportance.Normal, @event.Message, @event.Args);
+                        logger.LogError(null, $"{@event.Id:D4}", null, null, @event.Location.StartLine, @event.Location.StartColumn, @event.Location.EndLine, @event.Location.EndColumn, @event.Message, @event.Args);
                         break;
                     case IkvmToolDiagnosticEventLevel.Fatal:
-                        logger.LogError(null, $"{@event.Id:D4}", null, null, @event.Location.StartLine, @event.Location.StartColumn, @event.Location.EndLine, @event.Location.EndColumn, MessageImportance.High, @event.Message, @event.Args);
+                        logger.LogError(null, $"{@event.Id:D4}", null, null, @event.Location.StartLine, @event.Location.StartColumn, @event.Location.EndLine, @event.Location.EndColumn, @event.Message, @event.Args);
                         break;
                 }
 

diff --git a/src/IKVM.Tools.Importer/ImportContext.cs b/src/IKVM.Tools.Importer/ImportContext.cs
@@ -569,7 +569,7 @@ void ContinueParseCommandLine(RuntimeContext context, StaticCompiler compiler, I
 
             if (options.NoWarn != null)
                 foreach (var diagnostic in options.NoWarn)
-                    compilerOptions.suppressWarnings.Add($"IKVM{diagnostic.Id:D4}");
+                    compilerOptions.suppressWarnings.Add(diagnostic.Id.ToString());
 
             // TODO handle specific diagnostic IDs
             if (options.WarnAsError != null)
@@ -578,7 +578,7 @@ void ContinueParseCommandLine(RuntimeContext context, StaticCompiler compiler, I
                     compilerOptions.warnaserror = true;
                 else
                     foreach (var i in options.WarnAsError)
-                        compilerOptions.errorWarnings.Add($"IKVM{i.Id:D4}");
+                        compilerOptions.errorWarnings.Add(i.Id.ToString());
             }
 
             if (options.Runtime != null)