Merge branch 'dev' into custom-column-names

Colin Young · Colin Young · commit 1f6d580c81e3 · 2016-08-22T14:13:42.000-04:00
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSink.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSink.cs
@@ -389,12 +389,12 @@ private static bool TryChangeType(object obj, Type type, out object conversion)
         /// <param name="disposing"></param>
         protected override void Dispose(bool disposing)
         {
-            _token.Cancel();
-
             if (_eventsTable != null)
                 _eventsTable.Dispose();
 
             base.Dispose(disposing);
+
+            _token.Cancel();
         }
     }
 }
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/project.lock.json b/test/Serilog.Sinks.MSSqlServer.Tests/project.lock.json
@@ -362,7 +362,7 @@
           "lib/net35/xunit.runner.utility.desktop.dll": {}
         }
       },
-      "Serilog.Sinks.MSSqlServer/4.0.0": {
+      "Serilog.Sinks.MSSqlServer/4.1.0": {
         "type": "project",
         "framework": ".NETFramework,Version=v4.5",
         "dependencies": {
@@ -708,7 +708,7 @@
           "lib/net35/xunit.runner.utility.desktop.dll": {}
         }
       },
-      "Serilog.Sinks.MSSqlServer/4.0.0": {
+      "Serilog.Sinks.MSSqlServer/4.1.0": {
         "type": "project",
         "framework": ".NETFramework,Version=v4.5",
         "dependencies": {
@@ -1166,7 +1166,7 @@
         "xunit.runner.utility.nuspec"
       ]
     },
-    "Serilog.Sinks.MSSqlServer/4.0.0": {
+    "Serilog.Sinks.MSSqlServer/4.1.0": {
       "type": "project",
       "path": "../../src/Serilog.Sinks.MSSqlServer/project.json",
       "msbuildProject": "../../src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.xproj"

Original file line number	Diff line number	Diff line change
`@@ -389,12 +389,12 @@ private static bool TryChangeType(object obj, Type type, out object conversion)`
`389`	`389`	`/// <param name="disposing"></param>`
`390`	`390`	`protected override void Dispose(bool disposing)`
`391`	`391`	`{`
`392`		`- _token.Cancel();`
`393`		`-`
`394`	`392`	`if (_eventsTable != null)`
`395`	`393`	`_eventsTable.Dispose();`
`396`	`394`
`397`	`395`	`base.Dispose(disposing);`
	`396`	`+`
	`397`	`+ _token.Cancel();`
`398`	`398`	`}`
`399`	`399`	`}`
`400`	`400`	`}`