diff --git a/Directory.Packages.props b/Directory.Packages.props index ce80c43b..ca9316d4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,7 +6,7 @@ - + diff --git a/global.json b/global.json index b35a5aa7..4713f969 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.100-preview.3.24204.13", + "version": "9.0.100-preview.4.24267.66", "allowPrerelease": false, "rollForward": "latestMajor" } diff --git a/src/Logging.XUnit/CompatibilitySuppressions.xml b/src/Logging.XUnit/CompatibilitySuppressions.xml new file mode 100644 index 00000000..247ae464 --- /dev/null +++ b/src/Logging.XUnit/CompatibilitySuppressions.xml @@ -0,0 +1,11 @@ + + + + + CP0021 + M:MartinCostello.Logging.XUnit.XUnitLogger.BeginScope``1(``0)``0:notnull + lib/netstandard2.0/MartinCostello.Logging.XUnit.dll + lib/netstandard2.0/MartinCostello.Logging.XUnit.dll + true + + \ No newline at end of file diff --git a/tests/Logging.XUnit.Tests/XUnitLoggerTests.cs b/tests/Logging.XUnit.Tests/XUnitLoggerTests.cs index dab28a5c..1e179d5a 100644 --- a/tests/Logging.XUnit.Tests/XUnitLoggerTests.cs +++ b/tests/Logging.XUnit.Tests/XUnitLoggerTests.cs @@ -287,7 +287,8 @@ public static void XUnitLogger_Log_Logs_Message_If_Only_Exception() string expected = string.Join( Environment.NewLine, - ["[2018-08-19 16:12:16Z] info: MyName[2]", "System.InvalidOperationException: Invalid"]); + "[2018-08-19 16:12:16Z] info: MyName[2]", + "System.InvalidOperationException: Invalid"); // Act logger.Log(LogLevel.Information, new EventId(2), "state", exception, FormatterNull); @@ -317,7 +318,9 @@ public static void XUnitLogger_Log_Logs_Message_If_Message_And_Exception() string expected = string.Join( Environment.NewLine, - ["[2018-08-19 16:12:16Z] warn: MyName[3]", " Message|False|True", "System.InvalidOperationException: Invalid"]); + "[2018-08-19 16:12:16Z] warn: MyName[3]", + " Message|False|True", + "System.InvalidOperationException: Invalid"); // Act logger.Log(LogLevel.Warning, new EventId(3), null, exception, Formatter); @@ -345,7 +348,8 @@ public static void XUnitLogger_Log_Logs_Message_If_Message_And_No_Exception() string expected = string.Join( Environment.NewLine, - ["[2018-08-19 16:12:16Z] fail: MyName[4]", " Message|False|False"]); + "[2018-08-19 16:12:16Z] fail: MyName[4]", + " Message|False|False"); // Act logger.Log(LogLevel.Error, new EventId(4), null, null, Formatter); @@ -379,7 +383,8 @@ public static void XUnitLogger_Log_Logs_Messages(LogLevel logLevel, string short string expected = string.Join( Environment.NewLine, - [$"[2018-08-19 16:12:16Z] {shortLevel}: Your Name[85]", " Message|True|False"]); + $"[2018-08-19 16:12:16Z] {shortLevel}: Your Name[85]", + " Message|True|False"); // Act logger.Log(logLevel, new EventId(85), "Martin", null, Formatter); @@ -429,7 +434,8 @@ public static void XUnitLogger_Log_Logs_Message_If_Scopes_Included_But_There_Are string expected = string.Join( Environment.NewLine, - ["[2018-08-19 16:12:16Z] info: MyName[0]", " Message|False|False"]); + "[2018-08-19 16:12:16Z] info: MyName[0]", + " Message|False|False"); // Act logger.Log(LogLevel.Information, 0, null, null, Formatter);