diff --git a/.editorconfig b/.editorconfig
index 80063826bf..9e3e81a06f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -117,7 +117,6 @@ dotnet_diagnostic.RCS1083.severity = suggestion
 dotnet_diagnostic.RCS1090.severity = suggestion
 dotnet_diagnostic.RCS1091.severity = suggestion
 dotnet_diagnostic.RCS1096.severity = warning
-dotnet_diagnostic.RCS1111.severity = suggestion
 dotnet_diagnostic.RCS1124.severity = suggestion
 dotnet_diagnostic.RCS1126.severity = warning
 dotnet_diagnostic.RCS1129.severity = suggestion
diff --git a/tools/cli_add_file_banner.ps1 b/tools/cli_add_file_banner.ps1
new file mode 100644
index 0000000000..b576847b6f
--- /dev/null
+++ b/tools/cli_add_file_banner.ps1
@@ -0,0 +1,9 @@
+#dotnet tool install -g roslynator.dotnet.cli
+
+dotnet build "..\src\CommandLine.sln" /p:Configuration=Debug /v:m /m
+
+roslynator fix "..\src\Roslynator.sln" `
+    --verbosity d `
+    --file-log "roslynator.log" `
+    --file-log-verbosity diag `
+    --file-banner " Copyright (c) Josef Pihrt and Contributors. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information."
diff --git a/tools/cli_analyze.cmd b/tools/cli_analyze.cmd
deleted file mode 100644
index 949604d2a4..0000000000
--- a/tools/cli_analyze.cmd
+++ /dev/null
@@ -1,23 +0,0 @@
-@echo off
-
-set _programFiles=%ProgramFiles%
-
-set _msbuildPath="%_programFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"
-
-%_msbuildPath%\msbuild "..\src\CommandLine.sln" /t:Build /p:Configuration=Debug /v:m /m
-
-"..\src\CommandLine\bin\Debug\net48\roslynator" analyze "..\src\Roslynator.sln" ^
- -m %_msbuildPath% ^
- --analyzer-assemblies ^
-  "..\src\Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.CSharp.Analyzers.dll" ^
-  "..\src\CodeAnalysis.Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.CodeAnalysis.Analyzers.dll" ^
-  "..\src\Formatting.Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.Formatting.Analyzers.dll" ^
- --ignore-analyzer-references ^
- --ignored-diagnostics CS1591 ^
- --severity-level info ^
- --culture en ^
- --verbosity n ^
- --file-log "roslynator.log" ^
- --file-log-verbosity diag
-
-pause
diff --git a/tools/cli_analyze.ps1 b/tools/cli_analyze.ps1
new file mode 100644
index 0000000000..39976101d8
--- /dev/null
+++ b/tools/cli_analyze.ps1
@@ -0,0 +1,16 @@
+#dotnet tool install -g roslynator.dotnet.cli
+
+dotnet build "..\src\CommandLine.sln" /p:Configuration=Debug /v:m /m
+
+roslynator analyze "..\src\Roslynator.sln" `
+    --analyzer-assemblies `
+    "..\src\Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.CSharp.Analyzers.dll" `
+    "..\src\CodeAnalysis.Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.CodeAnalysis.Analyzers.dll" `
+    "..\src\Formatting.Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.Formatting.Analyzers.dll" `
+    --ignore-analyzer-references `
+    --ignored-diagnostics CS1591 `
+    --severity-level info `
+    --culture en `
+    --verbosity n `
+    --file-log "roslynator.log" `
+    --file-log-verbosity diag
diff --git a/tools/cli_fix.cmd b/tools/cli_fix.cmd
deleted file mode 100644
index 18a8d62e8a..0000000000
--- a/tools/cli_fix.cmd
+++ /dev/null
@@ -1,30 +0,0 @@
-@echo off
-
-set _programFiles=%ProgramFiles%
-
-set _visualStudioPath=%_programFiles%\Microsoft Visual Studio\2022\Enterprise
-set _msbuildPath="%_visualStudioPath%\MSBuild\Current\Bin"
-
-%_msbuildPath%\msbuild "..\src\CommandLine.sln" /t:Build /p:Configuration=Debug /v:m /m
-
-"..\src\CommandLine\bin\Debug\net48\roslynator" fix "..\src\Roslynator.sln" ^
- -m %_msbuildPath% ^
- --analyzer-assemblies ^
-  "..\src\Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.CSharp.Analyzers.dll" ^
-  "..\src\Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.CSharp.Analyzers.CodeFixes.dll" ^
-  "..\src\CodeAnalysis.Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.CodeAnalysis.Analyzers.dll" ^
-  "..\src\CodeAnalysis.Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.CodeAnalysis.Analyzers.CodeFixes.dll" ^
-  "..\src\Formatting.Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.Formatting.Analyzers.dll" ^
-  "..\src\Formatting.Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.Formatting.Analyzers.CodeFixes.dll" ^
-  "%_visualStudioPath%\Common7\IDE\CommonExtensions\Microsoft\ManagedLanguages\VBCSharp\LanguageServices\Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll" ^
-  "%_visualStudioPath%\Common7\IDE\CommonExtensions\Microsoft\ManagedLanguages\VBCSharp\LanguageServices\Microsoft.CodeAnalysis.CSharp.Features.dll" ^
-  "%_visualStudioPath%\Common7\IDE\CommonExtensions\Microsoft\ManagedLanguages\VBCSharp\LanguageServices\Microsoft.CodeAnalysis.EditorFeatures.dll" ^
-  "%_visualStudioPath%\Common7\IDE\CommonExtensions\Microsoft\ManagedLanguages\VBCSharp\LanguageServices\Microsoft.CodeAnalysis.Features.dll" ^
- --format ^
- --verbosity d ^
- --file-log "roslynator.log" ^
- --file-log-verbosity diag ^
- --diagnostic-fix-map "RCS1155=Roslynator.RCS1155.OrdinalIgnoreCase" ^
- --file-banner " Copyright (c) Josef Pihrt and Contributors. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information."
-
-pause
diff --git a/tools/cli_fix.ps1 b/tools/cli_fix.ps1
new file mode 100644
index 0000000000..4d378efde0
--- /dev/null
+++ b/tools/cli_fix.ps1
@@ -0,0 +1,24 @@
+#dotnet tool install -g roslynator.dotnet.cli
+#Install-Module VSSetup -Scope CurrentUser
+
+$visualStudioPath = Get-VSSetupInstance -All | Select-VSSetupInstance -Require 'Microsoft.VisualStudio.Workload.ManagedDesktop' -Latest | Select-Object -ExpandProperty "InstallationPath"
+
+dotnet build "..\src\CommandLine.sln" /p:Configuration=Debug /v:m /m
+
+roslynator fix "..\src\Roslynator.sln" `
+    --analyzer-assemblies `
+    "..\src\Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.CSharp.Analyzers.dll" `
+    "..\src\Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.CSharp.Analyzers.CodeFixes.dll" `
+    "..\src\CodeAnalysis.Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.CodeAnalysis.Analyzers.dll" `
+    "..\src\CodeAnalysis.Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.CodeAnalysis.Analyzers.CodeFixes.dll" `
+    "..\src\Formatting.Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.Formatting.Analyzers.dll" `
+    "..\src\Formatting.Analyzers.CodeFixes\bin\Debug\netstandard2.0\Roslynator.Formatting.Analyzers.CodeFixes.dll" `
+    "$visualStudioPath\Common7\IDE\CommonExtensions\Microsoft\VBCSharp\LanguageServices\Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll" `
+    "$visualStudioPath\Common7\IDE\CommonExtensions\Microsoft\VBCSharp\LanguageServices\Microsoft.CodeAnalysis.CSharp.Features.dll" `
+    "$visualStudioPath\Common7\IDE\CommonExtensions\Microsoft\VBCSharp\LanguageServices\Microsoft.CodeAnalysis.EditorFeatures.dll" `
+    "$visualStudioPath\Common7\IDE\CommonExtensions\Microsoft\VBCSharp\LanguageServices\Microsoft.CodeAnalysis.Features.dll" `
+    --format `
+    --verbosity d `
+    --file-log "roslynator.log" `
+    --file-log-verbosity diag `
+    --diagnostic-fix-map "RCS1155=Roslynator.RCS1155.OrdinalIgnoreCase"
diff --git a/tools/cli_format.cmd b/tools/cli_format.cmd
deleted file mode 100644
index ed347b461a..0000000000
--- a/tools/cli_format.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-set _programFiles=%ProgramFiles%
-
-set _msbuildPath="%_programFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"
-
-%_msbuildPath%\msbuild "..\src\CommandLine.sln" /t:Build /p:Configuration=Debug /v:m /m
-
-"..\src\CommandLine\bin\Debug\net48\roslynator" format "..\src\Roslynator.sln" ^
- -m %_msbuildPath% ^
- --verbosity d ^
- --file-log "roslynator.log" ^
- --file-log-verbosity diag ^
- --end-of-line crlf
-pause
diff --git a/tools/cli_format.ps1 b/tools/cli_format.ps1
new file mode 100644
index 0000000000..7cc0c9b8ff
--- /dev/null
+++ b/tools/cli_format.ps1
@@ -0,0 +1,9 @@
+#dotnet tool install -g roslynator.dotnet.cli
+
+dotnet build "..\src\CommandLine.sln" /p:Configuration=Debug /v:m /m
+
+roslynator format "..\src\Roslynator.sln" `
+    --verbosity d `
+    --file-log "roslynator.log" `
+    --file-log-verbosity diag `
+    --end-of-line crlf
diff --git a/tools/cli_lloc.cmd b/tools/cli_lloc.cmd
deleted file mode 100644
index 5d60dda6ca..0000000000
--- a/tools/cli_lloc.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-set _programFiles=%ProgramFiles%
-
-set _msbuildPath="%_programFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"
-
-%_msbuildPath%\msbuild "..\src\CommandLine.sln" /t:Build /p:Configuration=Debug /v:m /m
-
-"..\src\CommandLine\bin\Debug\net48\roslynator" lloc "..\src\Roslynator.sln" ^
- -m %_msbuildPath% ^
- --verbosity d ^
- --file-log "roslynator.log" ^
- --file-log-verbosity diag
-
-pause
diff --git a/tools/cli_lloc.ps1 b/tools/cli_lloc.ps1
new file mode 100644
index 0000000000..3c96dfb48d
--- /dev/null
+++ b/tools/cli_lloc.ps1
@@ -0,0 +1,8 @@
+#dotnet tool install -g roslynator.dotnet.cli
+
+dotnet build "..\src\CommandLine.sln" /p:Configuration=Debug /v:m /m
+
+roslynator lloc "..\src\Roslynator.sln" `
+    --verbosity d `
+    --file-log "roslynator.log" `
+    --file-log-verbosity diag
diff --git a/tools/cli_loc.cmd b/tools/cli_loc.cmd
deleted file mode 100644
index 5e12d5b544..0000000000
--- a/tools/cli_loc.cmd
+++ /dev/null
@@ -1,16 +0,0 @@
-@echo off
-
-set _programFiles=%ProgramFiles%
-
-set _msbuildPath="%_programFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"
-
-%_msbuildPath%\msbuild "..\src\CommandLine.sln" /t:Build /p:Configuration=Debug /v:m /m
-
-"..\src\CommandLine\bin\Debug\net48\roslynator" loc "..\src\Roslynator.sln" ^
- -m %_msbuildPath% ^
- --ignore-block-boundary ^
- --verbosity d ^
- --file-log "roslynator.log" ^
- --file-log-verbosity diag
-
-pause
diff --git a/tools/cli_loc.ps1 b/tools/cli_loc.ps1
new file mode 100644
index 0000000000..8a9a181a72
--- /dev/null
+++ b/tools/cli_loc.ps1
@@ -0,0 +1,10 @@
+#dotnet tool install -g roslynator.dotnet.cli
+
+dotnet build "..\src\CommandLine.sln" /p:Configuration=Debug /v:m /m
+
+roslynator loc "..\src\Roslynator.sln" `
+    --ignore-block-boundary `
+    --verbosity d `
+    --file-log "roslynator.log" `
+    --file-log-verbosity diag
+ 
\ No newline at end of file