diff --git a/deployment/cake/tasks.cake b/deployment/cake/tasks.cake
index 2c71e14..7fa530e 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=5.15.0"
+#tool "nuget:?package=dotnet-sonarscanner&version=6.0.0"
 
 //-------------------------------------------------------------
 // BACKWARDS COMPATIBILITY CODE - START
diff --git a/src/Directory.Build.analyzers.props b/src/Directory.Build.analyzers.props
index c336010..ec23151 100644
--- a/src/Directory.Build.analyzers.props
+++ b/src/Directory.Build.analyzers.props
@@ -4,10 +4,26 @@
   -->
 
   <ItemGroup>
-    <PackageReference Include="Catel.Analyzers" Version="1.6.1" PrivateAssets="all" />
-    <PackageReference Include="CatenaLogic.Analyzers" Version="1.4.3" PrivateAssets="all" />
-    <PackageReference Include="IDisposableAnalyzers" Version="4.0.6" PrivateAssets="all" />
-    <PackageReference Include="WpfAnalyzers" Version="4.1.1" PrivateAssets="all" />
+    <PackageReference Include="Catel.Analyzers" Version="1.6.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="CatenaLogic.Analyzers" Version="1.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="IDisposableAnalyzers" Version="4.0.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NUnit.Analyzers" Version="3.10.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="WpfAnalyzers" Version="4.1.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <PropertyGroup>