Merge branch 'release/2.2'

build/dependencies.props

@@ -26,7 +26,7 @@
     <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
     <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
     <SerilogExtensionsLoggingPackageVersion>1.4.0</SerilogExtensionsLoggingPackageVersion>
-    <SerilogSinksFilePackageVersion>3.2.0</SerilogSinksFilePackageVersion>
+    <SerilogSinksFilePackageVersion>4.0.0</SerilogSinksFilePackageVersion>
     <SystemDiagnosticsEventLogPackageVersion>4.6.0-preview1-26907-04</SystemDiagnosticsEventLogPackageVersion>
     <SystemReflectionMetadataPackageVersion>1.7.0-preview1-26907-04</SystemReflectionMetadataPackageVersion>
     <SystemValueTuplePackageVersion>4.6.0-preview1-26829-04</SystemValueTuplePackageVersion>

src/Microsoft.Extensions.Logging.Testing/AssemblyTestLog.cs

@@ -258,7 +258,7 @@ namespace Microsoft.Extensions.Logging.Testing
                 .Enrich.FromLogContext()
                 .Enrich.With(new AssemblyLogTimestampOffsetEnricher(logStart))
                 .MinimumLevel.Verbose()
-                .WriteTo.File(fileName, outputTemplate: "[{TimestampOffset}] [{SourceContext}] [{Level}] {Message}{NewLine}{Exception}", flushToDiskInterval: TimeSpan.FromSeconds(1), shared: true)
+                .WriteTo.File(fileName, outputTemplate: "[{TimestampOffset}] [{SourceContext}] [{Level}] {Message:l}{NewLine}{Exception}", flushToDiskInterval: TimeSpan.FromSeconds(1), shared: true)
                 .CreateLogger();
             return new SerilogLoggerProvider(serilogger, dispose: true);
         }

test/Microsoft.Extensions.Logging.Testing.Tests/AssemblyTestLogTests.cs

@@ -101,15 +101,15 @@ namespace Microsoft.Extensions.Logging.Testing.Tests
                 var testLogContent = MakeConsistent(File.ReadAllText(testLog));
 
                 Assert.Equal(
-@"[OFFSET] [GlobalTestLog] [Information] Global Test Logging initialized at ""TIMESTAMP"". Configure the output directory via 'LoggingTestingFileLoggingDirectory' MSBuild property or set 'LoggingTestingDisableFileLogging' to 'true' to disable file logging.
-[OFFSET] [GlobalTestLog] [Information] Starting test ""FakeTestName""
-[OFFSET] [GlobalTestLog] [Information] Finished test ""FakeTestName"" in DURATION
+@"[OFFSET] [GlobalTestLog] [Information] Global Test Logging initialized at TIMESTAMP. Configure the output directory via 'LoggingTestingFileLoggingDirectory' MSBuild property or set 'LoggingTestingDisableFileLogging' to 'true' to disable file logging.
+[OFFSET] [GlobalTestLog] [Information] Starting test FakeTestName
+[OFFSET] [GlobalTestLog] [Information] Finished test FakeTestName in DURATION
 ", globalLogContent, ignoreLineEndingDifferences: true);
                 Assert.Equal(
-@"[OFFSET] [TestLifetime] [Information] Starting test ""FakeTestName"" at ""TIMESTAMP""
+@"[OFFSET] [TestLifetime] [Information] Starting test FakeTestName at TIMESTAMP
 [OFFSET] [TestLogger] [Information] Information!
 [OFFSET] [TestLogger] [Verbose] Trace!
-[OFFSET] [TestLifetime] [Information] Finished test ""FakeTestName"" in DURATION
+[OFFSET] [TestLifetime] [Information] Finished test FakeTestName in DURATION
 ", testLogContent, ignoreLineEndingDifferences: true);
             });