refs or cleanup

Author: SimonCropp

src/Directory.Packages.props

@@ -14,6 +14,6 @@
     <PackageVersion Include="NServiceBus.Extensions.Hosting" Version="4.0.0" />
     <PackageVersion Include="ProjectDefaults" Version="1.0.172" />
     <PackageVersion Include="System.ServiceProcess.ServiceController" Version="10.0.3" />
-    <PackageVersion Include="TUnit" Version="1.15.11" />
+    <PackageVersion Include="TUnit" Version="1.16.0" />
   </ItemGroup>
 </Project>

src/NsbMsLogging.sln

@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		appveyor.yml = appveyor.yml
 		Directory.Build.props = Directory.Build.props
 		..\readme.source.md = ..\readme.source.md
-		global.json = global.json
+		../global.json = ../global.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Community.MicrosoftLogging.Hosting", "NServiceBus.Community.MicrosoftLogging.Hosting\NServiceBus.Community.MicrosoftLogging.Hosting.csproj", "{17F6502A-A481-4820-B2C7-08875D12929B}"

src/Tests/DeferredLoggerFactoryTests.cs

@@ -1,5 +1,4 @@
 using NServiceBus.Logging;
-using System.Threading.Tasks;
 
 /// <summary>
 /// Tests for the DeferredLoggerFactory pattern using a local test implementation.
@@ -154,7 +153,7 @@ public void Write(string name, LogLevel messageLevel, string message)
         {
             return;
         }
-        var logQueue = DeferredLogs.GetOrAdd(name, _ => new ConcurrentQueue<(LogLevel level, string message)>());
+        var logQueue = DeferredLogs.GetOrAdd(name, _ => new());
         logQueue.Enqueue((messageLevel, message));
     }
 }

src/Tests/IntegrationTests.cs

@@ -2,7 +2,6 @@
 using Microsoft.Extensions.Hosting;
 using NServiceBus.Logging;
 using Microsoft.Extensions.Logging;
-using System.Threading.Tasks;
 
 public class IntegrationTests
 {
@@ -18,17 +17,16 @@ public async Task Ensure_log_messages_are_redirected()
         var configuration = new EndpointConfiguration("Tests");
         configuration.UseTransport<LearningTransport>();
         configuration.UseSerialization<SystemJsonSerializer>();
-        var cancel = TestContext.Current.CancellationToken;
-        var endpoint = await Endpoint.Start(configuration, cancel);
+        var endpoint = await Endpoint.Start(configuration);
 
         var message = new MyMessage
         {
             DateSend = DateTime.Now,
         };
-        await endpoint.SendLocal(message, cancellationToken: cancel);
-        await Task.Delay(500, cancel);
+        await endpoint.SendLocal(message);
+        await Task.Delay(500);
         await Assert.That(LogMessageCapture.LoggingEvents).IsNotEmpty();
-        await endpoint.Stop(cancel);
+        await endpoint.Stop();
     }
 
     [Test]

src/Tests/LoggerFactoryTests.cs

@@ -1,5 +1,4 @@
 using NServiceBus.Logging;
-using System.Threading.Tasks;
 
 /// <summary>
 /// Tests for the LoggerFactory class through the public MicrosoftLogFactory API.

src/Tests/LoggerTests.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using NServiceBus.Logging;
 using MsLogLevel = Microsoft.Extensions.Logging.LogLevel;
-using System.Threading.Tasks;
 
 /// <summary>
 /// Tests for the Logger class that wraps Microsoft.Extensions.Logging.ILogger.

src/Tests/MicrosoftLogFactoryTests.cs

@@ -1,5 +1,3 @@
-using System.Threading.Tasks;
-
 public class MicrosoftLogFactoryTests
 {
     [Test]

src/Tests/NamedLoggerTests.cs

@@ -1,5 +1,4 @@
 using NServiceBus.Logging;
-using System.Threading.Tasks;
 
 /// <summary>
 /// Tests for the NamedLogger class that queues logs for deferred processing.

src/Tests/TestHelpers.cs

@@ -54,7 +54,10 @@ public ILogger CreateLogger(string categoryName)
     {
         if (!Loggers.TryGetValue(categoryName, out var logger))
         {
-            logger = new MockMsLogger { EnabledLevel = DefaultEnabledLevel };
+            logger = new()
+            {
+                EnabledLevel = DefaultEnabledLevel
+            };
             Loggers[categoryName] = logger;
         }
         return logger;