From 69f55345239cf1401bb5022e861d1c0283ffd356 Mon Sep 17 00:00:00 2001 From: Philip Schell Date: Fri, 29 Nov 2019 14:45:42 +0100 Subject: [PATCH] prevent to display things double in console --- Utils/ProgramLogger.cs | 19 +++++++++---------- Utils/Properties/AssemblyInfo.cs | 7 +++---- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Utils/ProgramLogger.cs b/Utils/ProgramLogger.cs index dc4c89e..55ce968 100644 --- a/Utils/ProgramLogger.cs +++ b/Utils/ProgramLogger.cs @@ -65,13 +65,13 @@ namespace BlubbFish.Utils { private void DisattachToFw() { this.stdout.WriteEvent -= this.fw.Write; this.stdout.WriteLineEvent -= this.fw.WriteLine; - this.errout.WriteEvent -= this.fw.WriteLine; + this.errout.WriteEvent -= this.fw.Write; this.errout.WriteLineEvent -= this.fw.WriteLine; } private void AttachToFw() { this.stdout.WriteEvent += this.fw.Write; this.stdout.WriteLineEvent += this.fw.WriteLine; - this.errout.WriteEvent += this.fw.WriteLine; + this.errout.WriteEvent += this.fw.Write; this.errout.WriteLineEvent += this.fw.WriteLine; } } @@ -137,14 +137,13 @@ namespace BlubbFish.Utils { } public override Encoding Encoding => Encoding.UTF8; - public override void Write(String value) { - this.WriteEvent?.Invoke(this, new ConsoleWriterEventArgs(value, this.stream, this.streamtype)); - base.Write(value); - } - public override void WriteLine(String value) { - this.WriteLineEvent?.Invoke(this, new ConsoleWriterEventArgs(value, this.stream, this.streamtype)); - base.WriteLine(value); - } + + public override void Write(String value) => this.WriteEvent?.Invoke(this, new ConsoleWriterEventArgs(value, this.stream, this.streamtype)); + //base.Write(value); + + public override void WriteLine(String value) => this.WriteLineEvent?.Invoke(this, new ConsoleWriterEventArgs(value, this.stream, this.streamtype)); + //base.WriteLine(value); + public event EventHandler WriteEvent; public event EventHandler WriteLineEvent; } diff --git a/Utils/Properties/AssemblyInfo.cs b/Utils/Properties/AssemblyInfo.cs index 5125935..7364dd0 100644 --- a/Utils/Properties/AssemblyInfo.cs +++ b/Utils/Properties/AssemblyInfo.cs @@ -1,12 +1,11 @@ -using System.Reflection; +#if !NETCOREAPP +using System.Reflection; using System.Resources; using System.Runtime.InteropServices; // Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die mit einer Assembly verknüpft sind. -#if NETCOREAPP -#else +// die mit einer Assembly verknüpft sind. [assembly: AssemblyTitle("Utils")] [assembly: AssemblyDescription("Provides useful classes for other projects")] [assembly: AssemblyConfiguration("")]