Merge branch 'main' of https://github.com/CZEMacLeod/C3D.Extensions.Logging

Author: CZEMacLeod

global.json

@@ -2,7 +2,7 @@
   "sdk": {
     "version": "8.0.400",
     "rollForward": "latestMajor",
-    "allowPrerelease": true
+    "allowPrerelease": false
   },
   "msbuild-sdks": {
   }

src/C3D/Extensions/Logging/Xunit/GlobalSuppressions.cs

@@ -0,0 +1,15 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE0130:Namespace does not match folder structure", 
+    Justification = "Extensions", Scope = "namespace", Target = "~N:C3D.Extensions.Xunit.Logging")]
+[assembly: SuppressMessage("Style", "IDE0130:Namespace does not match folder structure", 
+    Justification = "Extensions", Scope = "namespace", Target = "~N:Xunit.Abstractions")]
+[assembly: SuppressMessage("Style", "IDE0130:Namespace does not match folder structure", 
+    Justification = "Extensions", Scope = "namespace", Target = "~N:Microsoft.Extensions.Logging")]
+[assembly: SuppressMessage("Style", "IDE0130:Namespace does not match folder structure", 
+    Justification = "Pending fs reorg", Scope = "namespace", Target = "~N:C3D.Extensions.Logging.Xunit.Utilities")]

test/C3D/Extensions/Logging/Xunit/Test/C3D.Extensions.Logging.Xunit.Tests.csproj

@@ -8,6 +8,7 @@
     <IsTestProject>true</IsTestProject>
 
     <PUTDirectory>$(SolutionDir)\src\C3D\Extensions\Logging\Xunit\</PUTDirectory>
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
 
   <ItemGroup>

test/C3D/Extensions/Logging/Xunit/Test/GlobalSuppressions.cs

@@ -0,0 +1,9 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE0130:Namespace does not match folder structure", 
+    Justification = "Assembly name needs to end in .Tests", Scope = "namespace", Target = "~N:C3D.Extensions.Logging.Xunit.Test")]

test/C3D/Extensions/Logging/Xunit/Test/LoggingTestFixture.cs

@@ -23,7 +23,7 @@ private static IConfiguration CreateConfiguration()
 
     }
 
-    private ILoggingBuilder ConfigureLogger(ILoggingBuilder builder, IConfiguration configuration) => builder
+    private static ILoggingBuilder ConfigureLogger(ILoggingBuilder builder, IConfiguration configuration) => builder
             .ClearProviders()
             .SetMinimumLevel(LogLevel.Debug)
             .AddConfiguration(configuration.GetSection("Logging"))

test/C3D/Extensions/Logging/Xunit/Test/TestOutputHelperTests.cs

@@ -138,7 +138,7 @@ public void CreateLoggerFiltersMessages()
 
         var messages = wrapper.Messages;
 
-        Assert.Collection(messages, s => s.EndsWith(info));
+        Assert.Single(messages, s => s.EndsWith(info));
     }
 
     [Fact]