From 843836259d5008eaef6901b93fb582d37a85f925 Mon Sep 17 00:00:00 2001
From: Geert van Horrik <GeertvanHorrik@users.noreply.github.com>
Date: Wed, 6 Mar 2024 14:26:25 +0100
Subject: [PATCH] GitHubSync update

---
 deployment/cake/generic-variables.cake    |  4 ++--
 deployment/cake/lib-msbuild.cake          |  4 ++--
 deployment/cake/sourcecontrol-github.cake |  2 +-
 deployment/cake/tasks.cake                | 16 ++++++++--------
 src/Directory.Build.analyzers.props       |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/deployment/cake/generic-variables.cake b/deployment/cake/generic-variables.cake
index a3a34d2..246657f 100644
--- a/deployment/cake/generic-variables.cake
+++ b/deployment/cake/generic-variables.cake
@@ -400,7 +400,7 @@ public class SonarQubeContext : BuildContextBase
     public string Url { get; set; }
     public string Organization { get; set; }
     public string Username { get; set; }
-    public string Password { get; set; }
+    public string Token { get; set; }
     public string Project { get; set; }
 
     protected override void ValidateContext()
@@ -514,7 +514,7 @@ private GeneralContext InitializeGeneralContext(BuildContext buildContext, IBuil
         Url = buildContext.BuildServer.GetVariable("SonarUrl", showValue: true),
         Organization = buildContext.BuildServer.GetVariable("SonarOrganization", showValue: true),
         Username = buildContext.BuildServer.GetVariable("SonarUsername", showValue: false),
-        Password = buildContext.BuildServer.GetVariable("SonarPassword", showValue: false),
+        Token = buildContext.BuildServer.GetVariable("SonarToken", showValue: false),
         Project = buildContext.BuildServer.GetVariable("SonarProject", data.Solution.Name, showValue: true)
     };
 
diff --git a/deployment/cake/lib-msbuild.cake b/deployment/cake/lib-msbuild.cake
index 8615520..ec71055 100644
--- a/deployment/cake/lib-msbuild.cake
+++ b/deployment/cake/lib-msbuild.cake
@@ -1,5 +1,5 @@
-#addin "nuget:?package=Cake.Issues&version=4.0.0"
-#addin "nuget:?package=Cake.Issues.MsBuild&version=4.0.0"
+#addin "nuget:?package=Cake.Issues&version=4.1.0"
+#addin "nuget:?package=Cake.Issues.MsBuild&version=4.1.0"
 
 #tool "nuget:?package=MSBuild.Extension.Pack&version=1.9.1"
 
diff --git a/deployment/cake/sourcecontrol-github.cake b/deployment/cake/sourcecontrol-github.cake
index fde50ef..a481e84 100644
--- a/deployment/cake/sourcecontrol-github.cake
+++ b/deployment/cake/sourcecontrol-github.cake
@@ -1,5 +1,5 @@
 #addin "nuget:?package=Cake.GitHub&version=0.1.0"
-#addin "nuget:?package=Octokit&version=9.1.2"
+#addin "nuget:?package=Octokit&version=10.0.0"
 
 //-------------------------------------------------------------
 
diff --git a/deployment/cake/tasks.cake b/deployment/cake/tasks.cake
index 0485f27..ffb490d 100644
--- a/deployment/cake/tasks.cake
+++ b/deployment/cake/tasks.cake
@@ -36,7 +36,7 @@
 // It probably means the tool is not correctly installed.
 // `dotnet tool install --global dotnet-sonarscanner --ignore-failed-sources`
 //#tool "nuget:?package=MSBuild.SonarQube.Runner.Tool&version=4.8.0"
-#tool "nuget:?package=dotnet-sonarscanner&version=6.1.0"
+#tool "nuget:?package=dotnet-sonarscanner&version=6.2.0"
 
 //-------------------------------------------------------------
 // BACKWARDS COMPATIBILITY CODE - START
@@ -397,9 +397,9 @@ Task("Build")
             sonarSettings.Login = buildContext.General.SonarQube.Username;
         }
 
-        if (!string.IsNullOrWhiteSpace(buildContext.General.SonarQube.Password))
+        if (!string.IsNullOrWhiteSpace(buildContext.General.SonarQube.Token))
         {
-            sonarSettings.Password = buildContext.General.SonarQube.Password;
+            sonarSettings.Token = buildContext.General.SonarQube.Token;
         }
 
         // see https://cakebuild.net/api/Cake.Sonar/SonarBeginSettings/ for more information on
@@ -450,7 +450,7 @@ Task("Build")
             {
                 await buildContext.SourceControl.MarkBuildAsPendingAsync("SonarQube");
 
-                var sonarEndSettings = new SonarEndSettings
+                var sonarSettings = new SonarEndSettings
                 {
                     // Use core clr version of SonarQube
                     UseCoreClr = true
@@ -458,17 +458,17 @@ Task("Build")
 
                 if (!string.IsNullOrWhiteSpace(buildContext.General.SonarQube.Username))
                 {
-                    sonarEndSettings.Login = buildContext.General.SonarQube.Username;
+                    sonarSettings.Login = buildContext.General.SonarQube.Username;
                 }
 
-                if (!string.IsNullOrWhiteSpace(buildContext.General.SonarQube.Password))
+                if (!string.IsNullOrWhiteSpace(buildContext.General.SonarQube.Token))
                 {
-                    sonarEndSettings.Password = buildContext.General.SonarQube.Password;
+                    sonarSettings.Token = buildContext.General.SonarQube.Token;
                 }
 
                 Information("Ending SonarQube");
 
-                SonarEnd(sonarEndSettings);
+                SonarEnd(sonarSettings);
 
                 await buildContext.SourceControl.MarkBuildAsSucceededAsync("SonarQube");
             }
diff --git a/src/Directory.Build.analyzers.props b/src/Directory.Build.analyzers.props
index ec23151..d903c90 100644
--- a/src/Directory.Build.analyzers.props
+++ b/src/Directory.Build.analyzers.props
@@ -16,7 +16,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUnit.Analyzers" Version="3.10.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>