Updated to NLog 5 preview 2 to fix unit-test

NLog · Oct 3, 2021 · 4ab0b27 · 4ab0b27
1 parent c964fd2
commit 4ab0b27
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/src/NLog.Extensions.Logging/LayoutRenderers/ConfigSettingLayoutRenderer.cs b/src/NLog.Extensions.Logging/LayoutRenderers/ConfigSettingLayoutRenderer.cs
@@ -30,7 +30,6 @@ namespace NLog.Extensions.Logging
     /// </example>
     [LayoutRenderer("configsetting")]
     [ThreadAgnostic]
-    [ThreadSafe]
     public class ConfigSettingLayoutRenderer : LayoutRenderer
     {
         private IConfiguration _serviceConfiguration;
@@ -77,6 +76,7 @@ protected override void InitializeLayoutRenderer()
             }
             catch (NLogDependencyResolveException ex)
             {
+                _serviceConfiguration = null;
                 InternalLogger.Debug("ConfigSetting - IConfiguration could not be resolved, so fallback to DefaultConfiguration: {0}", ex.Message);
             }
 

diff --git a/src/NLog.Extensions.Logging/LayoutRenderers/MicrosoftConsoleLayoutRenderer.cs b/src/NLog.Extensions.Logging/LayoutRenderers/MicrosoftConsoleLayoutRenderer.cs
@@ -9,7 +9,6 @@ namespace NLog.Extensions.Logging
     /// Renders output that simulates simple Microsoft Console Logger. Useful for Hosting Lifetime Startup Messages.
     /// </summary>
     [LayoutRenderer("MicrosoftConsoleLayout")]
-    [ThreadSafe]
     [ThreadAgnostic]
     class MicrosoftConsoleLayoutRenderer : LayoutRenderer
     {

diff --git a/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj b/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj
@@ -81,7 +81,7 @@ Full changelog: https://github.com/NLog/NLog.Extensions.Logging/blob/master/CHAN
     <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NLog" Version="5.0.0-preview.1" />
+    <PackageReference Include="NLog" Version="5.0.0-preview.2" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

diff --git a/test/NLog.Extensions.Logging.Tests/CustomBeginScopeTest.cs b/test/NLog.Extensions.Logging.Tests/CustomBeginScopeTest.cs
@@ -13,7 +13,7 @@ public class CustomBeginScopeTest : NLogTestBase
         public void TestNonSerializableSayHello()
         {
             var runner = GetRunner<CustomBeginScopeTestRunner>();
-            var target = new Targets.MemoryTarget { Layout = "${message} ${scopeproperty:World}. Welcome ${ndlc}" };
+            var target = new Targets.MemoryTarget { Layout = "${message} ${scopeproperty:World}. Welcome ${scopenested}" };
             ConfigureNLog(target);
             runner.SayHello().Wait();
             Assert.Single(target.Logs);
@@ -24,7 +24,7 @@ public void TestNonSerializableSayHello()
         public void TestNonSerializableSayHelloWithScope()
         {
             var runner = GetRunner<CustomBeginScopeTestRunner>(new NLogProviderOptions { IncludeScopes = false });
-            var target = new Targets.MemoryTarget { Layout = "${message} ${scopeproperty:World}. Welcome ${ndlc}" };
+            var target = new Targets.MemoryTarget { Layout = "${message} ${scopeproperty:World}. Welcome ${scopenested}" };
             ConfigureNLog(target);
             runner.SayHello().Wait();
             Assert.Single(target.Logs);
@@ -35,7 +35,7 @@ public void TestNonSerializableSayHelloWithScope()
         public void TestNonSerializableSayHi()
         {
             var runner = GetRunner<CustomBeginScopeTestRunner>();
-            var target = new Targets.MemoryTarget { Layout = "${message} ${scopeproperty:World}. Welcome ${ndlc}" };
+            var target = new Targets.MemoryTarget { Layout = "${message} ${scopeproperty:World}. Welcome ${scopenested}" };
             ConfigureNLog(target);
             var scopeString = runner.SayHi().Result;
             Assert.Single(target.Logs);