Jump on VS2019; fix BDN upgrade requirements

serilog · Jun 7, 2019 · 91f7b81 · 91f7b81
1 parent d4b3b32
commit 91f7b81
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 version: '{build}'
 skip_tags: true
-image: Visual Studio 2017
+image: Visual Studio 2019
 build_script:
 - ps: ./Build.ps1
 test: off

diff --git a/test/Serilog.Sinks.Async.PerformanceTests/LatencyBenchmark.cs b/test/Serilog.Sinks.Async.PerformanceTests/LatencyBenchmark.cs
@@ -11,17 +11,17 @@ namespace Serilog.Sinks.Async.PerformanceTests
 {
     public class LatencyBenchmark
     {
-        private readonly LogEvent _evt = new LogEvent(DateTimeOffset.Now, LogEventLevel.Information, null,
+        readonly LogEvent _evt = new LogEvent(DateTimeOffset.Now, LogEventLevel.Information, null,
             new MessageTemplate(new[] {new TextToken("Hello")}), new LogEventProperty[0]);
 
-        private Logger _syncLogger, _asyncLogger, _fileLogger, _asyncFileLogger;
+        Logger _syncLogger, _asyncLogger, _fileLogger, _asyncFileLogger;
 
         static LatencyBenchmark()
         {
             SelfLog.Enable(new TerminatingTextWriter());
         }
 
-        [Setup]
+        [GlobalSetup]
         public void Reset()
         {
             foreach (var logger in new[] { _syncLogger, _asyncLogger, _fileLogger, _asyncFileLogger})

diff --git a/test/Serilog.Sinks.Async.PerformanceTests/SignallingSink.cs b/test/Serilog.Sinks.Async.PerformanceTests/SignallingSink.cs
@@ -5,11 +5,11 @@
 
 namespace Serilog.Sinks.Async.PerformanceTests
 {
-    internal class SignallingSink : ILogEventSink
+    class SignallingSink : ILogEventSink
     {
-        private readonly int _expectedCount;
-        private readonly ManualResetEvent _wh;
-        private int _current;
+        readonly int _expectedCount;
+        readonly ManualResetEvent _wh;
+        int _current;
 
         public SignallingSink(int expectedCount)
         {

diff --git a/test/Serilog.Sinks.Async.PerformanceTests/ThroughputBenchmark.cs b/test/Serilog.Sinks.Async.PerformanceTests/ThroughputBenchmark.cs
@@ -8,20 +8,20 @@ namespace Serilog.Sinks.Async.PerformanceTests
 {
     public class ThroughputBenchmark
     {
-        private const int Count = 10000;
+        const int Count = 10000;
 
-        private readonly LogEvent _evt = new LogEvent(DateTimeOffset.Now, LogEventLevel.Information, null,
+        readonly LogEvent _evt = new LogEvent(DateTimeOffset.Now, LogEventLevel.Information, null,
             new MessageTemplate(new[] {new TextToken("Hello")}), new LogEventProperty[0]);
 
-        private readonly SignallingSink _signal;
-        private Logger _syncLogger, _asyncLogger;
+        readonly SignallingSink _signal;
+        Logger _syncLogger, _asyncLogger;
 
         public ThroughputBenchmark()
         {
             _signal = new SignallingSink(Count);
         }
 
-        [Setup]
+        [GlobalSetup]
         public void Reset()
         {
             _syncLogger?.Dispose();

diff --git a/test/Serilog.Sinks.Async.Tests/BackgroundWorkerSinkIntegrationSpec.cs b/test/Serilog.Sinks.Async.Tests/BackgroundWorkerSinkIntegrationSpec.cs
@@ -15,7 +15,7 @@ public class BackgroundWorkerSinkIntegrationSpec
         /// <summary>
         ///     If <see cref="withDelay" />, then adds a 1sec delay before every fifth element created
         /// </summary>
-        private static void CreateAudits(ILogger logger, int count, bool withDelay)
+        static void CreateAudits(ILogger logger, int count, bool withDelay)
         {
             var delay = TimeSpan.FromMilliseconds(1000);
             var sw = new Stopwatch();
@@ -47,7 +47,7 @@ private static void CreateAudits(ILogger logger, int count, bool withDelay)
             }
         }
 
-        private static List<LogEvent> RetrieveEvents(MemorySink sink, int count)
+        static List<LogEvent> RetrieveEvents(MemorySink sink, int count)
         {
             Debug.WriteLine("{0:h:mm:ss tt} Retrieving {1} events", DateTime.Now, count);
 
@@ -91,9 +91,9 @@ public GivenBufferQueueAndDelays()
 
         public abstract class SinkSpecBase : IDisposable
         {
-            private bool _delayCreation;
-            private Logger _logger;
-            private MemorySink _memorySink;
+            bool _delayCreation;
+            Logger _logger;
+            MemorySink _memorySink;
 
             protected SinkSpecBase(bool useBufferedQueue, bool delayCreation)
             {

diff --git a/test/Serilog.Sinks.Async.Tests/BackgroundWorkerSinkSpec.cs b/test/Serilog.Sinks.Async.Tests/BackgroundWorkerSinkSpec.cs
@@ -230,12 +230,12 @@ public void MonitorParameterAffordsSinkInspectorSuitableForHealthChecking()
             Assert.Null(monitor.Inspector);
         }
 
-        private BackgroundWorkerSink CreateSinkWithDefaultOptions()
+        BackgroundWorkerSink CreateSinkWithDefaultOptions()
         {
             return new BackgroundWorkerSink(_logger, 10000, false);
         }
 
-        private static LogEvent CreateEvent()
+        static LogEvent CreateEvent()
         {
             return new LogEvent(DateTimeOffset.MaxValue, LogEventLevel.Error, null,
                 new MessageTemplate("amessage", Enumerable.Empty<MessageTemplateToken>()),