Fix SonarQube analysis

Author: olsh

build/Build.cs

@@ -168,14 +168,35 @@ protected override void OnBuildInitialized()
         .Before(Compile)
         .Executes(() =>
         {
-            SonarScannerBegin(s => s
-                .SetServer("https://sonarcloud.io")
-                .SetFramework("net5.0")
-                .SetLogin(SonarQubeApiKey)
-                .SetProjectKey("resharper-structured-logging")
-                .SetName("ReSharper Structured Logging")
-                .SetOrganization("olsh-github")
-                .SetVersion("1.0.0.0"));
+            SonarScannerBegin(s =>
+            {
+                s = s
+                    .SetServer("https://sonarcloud.io")
+                    .SetFramework("net5.0")
+                    .SetLogin(SonarQubeApiKey)
+                    .SetProjectKey("resharper-structured-logging")
+                    .SetName("ReSharper Structured Logging")
+                    .SetOrganization("olsh")
+                    .SetVersion("1.0.0.0");
+
+                if (AppVeyor != null)
+                {
+                    if (AppVeyor.PullRequestNumber != null)
+                    {
+                        s = s
+                            .SetPullRequestKey(AppVeyor.PullRequestNumber.ToString())
+                            .SetPullRequestBase(AppVeyor.RepositoryBranch)
+                            .SetPullRequestBranch(AppVeyor.PullRequestHeadRepositoryBranch);
+                    }
+                    else
+                    {
+                        s = s
+                            .SetBranchName(AppVeyor.RepositoryBranch);
+                    }
+                }
+
+                return s;
+            });
         });
 
     Target Sonar => _ => _

build/_build.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="7.0.2" />
+    <PackageReference Include="Nuke.Common" Version="7.0.4" />
   </ItemGroup>
 
   <ItemGroup>