Add support for ZLogger #94

.nuke/build.schema.json

@@ -70,6 +70,7 @@
           "items": {
             "type": "string",
             "enum": [
+              "Clean",
               "Compile",
               "Pack",
               "PackRiderPlugin",
@@ -92,6 +93,7 @@
           "items": {
             "type": "string",
             "enum": [
+              "Clean",
               "Compile",
               "Pack",
               "PackRiderPlugin",

build/Build.cs

@@ -53,6 +53,11 @@ protected override void OnBuildInitialized()
 
     [LocalPath("./gradlew.bat")] readonly Tool Gradle;
 
+    [NuGetPackage(
+        packageId: "dotnet-cleanup",
+        packageExecutable: "cleanup.dll")]
+    readonly Tool DotNetCleanup;
+
     string NuGetPackageFileName => $"{Project.Name}.{ExtensionVersion}.nupkg";
 
     string NuGetPackagePath => RootDirectory / NuGetPackageFileName;
@@ -90,6 +95,12 @@ protected override void OnBuildInitialized()
             AppVeyor.Instance.UpdateBuildVersion(ExtensionVersion);
         });
 
+    Target Clean => _ => _
+        .Executes(() =>
+        {
+            DotNetCleanup($"{Solution.Path} -y -v");
+        });
+
     Target Compile => _ => _
         .DependsOn()
         .Executes(() =>

build/_build.csproj

@@ -18,6 +18,7 @@
     <PackageDownload Include="dotnet-sonarscanner" Version="[5.9.1]" />
     <PackageDownload Include="NuGet.CommandLine" Version="[6.3.1]" />
     <PackageDownload Include="NUnit.ConsoleRunner" Version="[3.16.0]" />
+    <PackageDownload Include="dotnet-cleanup" Version="[0.6.1]" />
   </ItemGroup>
 
 </Project>

src/ReSharper.Structured.Logging/Caching/TemplateParameterNameAttributeProvider.cs

@@ -35,6 +35,11 @@ protected override string CalculateInfo(ITypeMember attributesOwner, IEnumerable
                 return attributesOwner.ShortName == "BeginScope" ? "messageFormat" : "message";
             }
 
+            if (className == "ZLogger.ZLoggerExtensions")
+            {
+                return "format";
+            }
+
             return null;
         }
 

test/data/Analyzers/PropertiesNamingAnalyzerDotNet6/ZLoggerInvalidNamedProperty.cs

@@ -0,0 +1,13 @@
+using Microsoft.Extensions.Logging;
+using ZLogger;
+
+namespace ConsoleApp
+{
+    class A
+    {
+        public A(ILogger<A> log)
+        {
+            log.ZLogInformation("{myProperty}", 1);
+        }
+    }
+}

test/data/Analyzers/PropertiesNamingAnalyzerDotNet6/ZLoggerInvalidNamedProperty.cs.gold

@@ -0,0 +1,16 @@
+using Microsoft.Extensions.Logging;
+using ZLogger;
+
+namespace ConsoleApp
+{
+    class A
+    {
+        public A(ILogger<A> log)
+        {
+            log.ZLogInformation("|{myProperty}|(0)", 1);
+        }
+    }
+}
+
+---------------------------------------------------------
+(0): ReSharper Warning: Property name 'myProperty' does not match naming rules. Suggested name is 'MyProperty'.

test/src/Analyzer/PropertiesNamingAnalyzerDotNet6Tests.cs

@@ -0,0 +1,19 @@
+using JetBrains.ReSharper.TestFramework;
+
+using NUnit.Framework;
+
+using ReSharper.Structured.Logging.Tests.Constants;
+
+namespace ReSharper.Structured.Logging.Tests.Analyzer
+{
+    [TestNet60]
+    [TestPackages(
+        NugetPackages.ZLoggerLoggingPackage,
+        Inherits = true)]
+    public class PropertiesNamingAnalyzerDotNet6Tests : MessageTemplateAnalyzerTestBase
+    {
+        protected override string SubPath => "PropertiesNamingAnalyzerDotNet6";
+
+        [Test] public void TestZLoggerInvalidNamedProperty() => DoNamedTest2();
+    }
+}

test/src/Constants/NugetPackages.cs

@@ -7,5 +7,7 @@ internal static class NugetPackages
         public const string MicrosoftLoggingPackage = "Microsoft.Extensions.Logging/1.0.0";
 
         public const string NlogLoggingPackage = "NLog/4.5.11";
+
+        public const string ZLoggerLoggingPackage = "ZLogger/1.7.0";
     }
 }