diff --git a/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs b/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs index ca4ac6ea..2ff237e0 100644 --- a/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs +++ b/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs @@ -157,7 +157,7 @@ public sealed class WireMockContainerBuilder : ContainerBuilder diff --git a/src/WireMock.Net/Logging/WireMockConsoleLogger.cs b/src/WireMock.Net/Logging/WireMockConsoleLogger.cs index afd492ac..84fd4df8 100644 --- a/src/WireMock.Net/Logging/WireMockConsoleLogger.cs +++ b/src/WireMock.Net/Logging/WireMockConsoleLogger.cs @@ -10,6 +10,9 @@ namespace WireMock.Logging; /// public class WireMockConsoleLogger : IWireMockLogger { + private const string NewlineWindows = "\r\n"; + private const string NewlineUnix = "\n"; + private readonly bool _removeNewLines; /// @@ -81,6 +84,6 @@ public class WireMockConsoleLogger : IWireMockLogger /// The value to write. private void WriteLine(string value) { - Console.WriteLine(!_removeNewLines ? value : value.Replace(Environment.NewLine, string.Empty)); + Console.WriteLine(!_removeNewLines ? value : value.Replace(NewlineWindows, string.Empty).Replace(NewlineUnix, string.Empty)); } } \ No newline at end of file diff --git a/src/WireMock.Net/Settings/WireMockServerSettingsParser.cs b/src/WireMock.Net/Settings/WireMockServerSettingsParser.cs index 4f4f598f..fb78f72b 100644 --- a/src/WireMock.Net/Settings/WireMockServerSettingsParser.cs +++ b/src/WireMock.Net/Settings/WireMockServerSettingsParser.cs @@ -83,12 +83,12 @@ public static class WireMockServerSettingsParser private static void ParseLoggerSettings(WireMockServerSettings settings, IWireMockLogger? logger, SimpleSettingsParser parser) { var loggerType = parser.GetStringValue("WireMockLogger"); - var replaceNewLines = parser.GetBoolValue("ReplaceNewLines"); + var removeNewLines = parser.GetBoolValue("RemoveNewLines"); switch (loggerType) { case nameof(WireMockConsoleLogger): - settings.Logger = new WireMockConsoleLogger(replaceNewLines); + settings.Logger = new WireMockConsoleLogger(removeNewLines); break; case "WireMockNoNewLinesConsoleLogger":