Merge pull request #12 from serilog/revert-11-master

nblumhardt · web-flow · commit 073a5fd93602 · 2016-07-28T10:25:32.000+10:00
Revert "Changed the UTF Encoding instance to avoid inserting the BOM character"
diff --git a/src/Serilog.Sinks.RollingFile/Sinks/RollingFile/RollingFileSink.cs b/src/Serilog.Sinks.RollingFile/Sinks/RollingFile/RollingFileSink.cs
@@ -74,7 +74,7 @@ public RollingFileSink(string pathFormat,
             _textFormatter = textFormatter;
             _fileSizeLimitBytes = fileSizeLimitBytes;
             _retainedFileCountLimit = retainedFileCountLimit;
-            _encoding = encoding ?? new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);
+            _encoding = encoding ?? Encoding.UTF8;
             _buffered = buffered;
         }
 
diff --git a/src/Serilog.Sinks.RollingFile/project.json b/src/Serilog.Sinks.RollingFile/project.json
@@ -23,8 +23,7 @@
       "dependencies": {
         "System.IO": "4.1.0",
         "System.IO.FileSystem.Primitives": "4.0.1",
-        "System.Runtime.InteropServices": "4.1.0",
-        "System.Text.Encoding.Extensions": "4.0.11"
+        "System.Runtime.InteropServices": "4.1.0"
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public RollingFileSink(string pathFormat,`
`74`	`74`	`_textFormatter = textFormatter;`
`75`	`75`	`_fileSizeLimitBytes = fileSizeLimitBytes;`
`76`	`76`	`_retainedFileCountLimit = retainedFileCountLimit;`
`77`		`- _encoding = encoding ?? new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);`
	`77`	`+ _encoding = encoding ?? Encoding.UTF8;`
`78`	`78`	`_buffered = buffered;`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@`
`23`	`23`	`"dependencies": {`
`24`	`24`	`"System.IO": "4.1.0",`
`25`	`25`	`"System.IO.FileSystem.Primitives": "4.0.1",`
`26`		`- "System.Runtime.InteropServices": "4.1.0",`
`27`		`- "System.Text.Encoding.Extensions": "4.0.11"`
	`26`	`+ "System.Runtime.InteropServices": "4.1.0"`
`28`	`27`	`}`
`29`	`28`	`}`
`30`	`29`	`}`