TW-72330 Sometimes build log skips errors from .NET runner

JetBrains · Aug 4, 2021 · 6d37089 · 6d37089
1 parent 68d76b9
commit 6d37089
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/TeamCity.MSBuild.Logger/Composer.cs b/TeamCity.MSBuild.Logger/Composer.cs
@@ -20,7 +20,7 @@ static Composer()
                 .Bind<IEnvironment>().To<Environment>()
                 .Bind<IDiagnostics>().To<Diagnostics>()
                 .Bind<ILoggerContext>().To<LoggerContext>()
-                .Bind<IConsole>().To<DefaultConsole>()
+                .Bind<IConsole>().Bind<IInitializable>().To<DefaultConsole>()
                 .Bind<IStringService>().To<StringService>()
                 .Bind<IPathService>().To<PathService>()
                 .Bind<IParametersParser>().To<ParametersParser>()

diff --git a/TeamCity.MSBuild.Logger/DefaultConsole.cs b/TeamCity.MSBuild.Logger/DefaultConsole.cs
@@ -6,7 +6,7 @@
     using JetBrains.Annotations;
 
     // ReSharper disable once ClassNeverInstantiated.Global
-    internal class DefaultConsole : IConsole
+    internal class DefaultConsole : IConsole, IInitializable
     {
         [NotNull] private readonly IDiagnostics _diagnostics;
         [NotNull] private readonly TextWriter _out;
@@ -19,6 +19,8 @@ public DefaultConsole([NotNull] IDiagnostics diagnostics)
             // https://youtrack.jetbrains.com/issue/TW-72330
             _out = Console.Out;
         }
+
+        public void Initialize() { }
 
         public void Write(string text)
         {

diff --git a/TeamCity.MSBuild.Logger/IInitializable.cs b/TeamCity.MSBuild.Logger/IInitializable.cs
@@ -0,0 +1,8 @@
+namespace TeamCity.MSBuild.Logger
+{
+    // ReSharper disable once IdentifierTypo
+    interface IInitializable
+    {
+        void Initialize();
+    }
+}
diff --git a/TeamCity.MSBuild.Logger/NodeLogger.cs b/TeamCity.MSBuild.Logger/NodeLogger.cs
@@ -34,6 +34,9 @@ internal class NodeLogger : INodeLogger
         private int _reentrancy;
 
         public NodeLogger(
+            // ReSharper disable once UnusedParameter.Local
+            // ReSharper disable once IdentifierTypo
+            [NotNull] IInitializable[] initializables,
             [NotNull] IParametersParser parametersParser,
             [NotNull] ILogWriter logWriter,
             [NotNull] ILoggerContext context,