Upgrade dotnet to v6

.automation/generated/linter-helps.json

@@ -1563,30 +1563,35 @@
         "    list       Shows list of available checks [aliases: l]"
     ],
     "dotnet-format": [
-        "dotnet-format",
-        "  dotnet-format",
+        "Description:",
+		"  Formats code to match editorconfig settings.",
         "",
         "Usage:",
-        "  dotnet-format [options] [<workspace>]",
+        "  dotnet format [<PROJECT | SOLUTION>] [command] [options]",
         "",
         "Arguments:",
-        "  <workspace>  A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. [default: ]",
+        "  <PROJECT | SOLUTION>  The project or solution file to operate on. If a file is not specified, the command will search the current directory for one. [default: ]",
         "",
         "Options:",
+        "  --diagnostics <diagnostics>                                              A space separated list of diagnostic ids to use as a filter when fixing code style or 3rd party issues.",
+        "                                                                           [default: whichever ids are listed in the editorconfig file]",
+        "  --severity <error|info|warn>                                             The severity of diagnostics to fix. Allowed values are info, warn, and error.",
         "  --no-restore                                                             Doesn't execute an implicit restore before formatting.",
-        "  -f, --folder                                                             Whether to treat the `<workspace>` argument as a simple folder of files.",
-        "  -w, --fix-whitespace                                                     Run whitespace formatting. Run by default when not applying fixes.",
-        "  -s, --fix-style <error|info|warn>                                        Run code style analyzers and apply fixes.",
-        "  -a, --fix-analyzers <error|info|warn>                                    Run 3rd party analyzers and apply fixes.",
-        "  --diagnostics <diagnostics>                                              A space separated list of diagnostic ids to use as a filter when fixing code style or 3rd party issues. [default: ]",
-        "  --include <include>                                                      A list of relative file or folder paths to include in formatting. All files are formatted if empty. [default: ]",
-        "  --exclude <exclude>                                                      A list of relative file or folder paths to exclude from formatting. [default: ]",
-        "  --check                                                                  Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted.",
-        "  --report <report-path>                                                   Accepts a file path, which if provided, will produce a json report in the given directory.",
+        "  --verify-no-changes                                                      Verify no formatting changes would be performed. Terminates with a non-zero exit code if any files would have",
+        "                                                                           been formatted.",
+        "  --include <include>                                                      A list of relative file or folder paths to include in formatting. All files are formatted if empty. [default:",
+        "                                                                           all files in the solution or project]",
+        "  --exclude <exclude>                                                      A list of relative file or folder paths to exclude from formatting. [default: none]",
+        "  --include-generated                                                      Format files generated by the SDK.",
         "  -v, --verbosity <d|detailed|diag|diagnostic|m|minimal|n|normal|q|quiet>  Set the verbosity level. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]",
         "  --binarylog <binary-log-path>                                            Log all project or solution load information to a binary log file.",
-        "  --version                                                                Show version information",
-        "  -?, -h, --help                                                           Show help and usage information",
+        "  --report <report-path>                                                   Accepts a file path, which if provided, will produce a json report in the given directory.",
+        "  -?, -h, --help                                                           Show command line help.",
+		"",
+		"Commands:",
+		"  whitespace <PROJECT | SOLUTION>  Run whitespace formatting. [default: ]",
+		"  style <PROJECT | SOLUTION>       Run code style analyzers and apply fixes. [default: ]",
+		"  analyzers <PROJECT | SOLUTION>   Run 3rd party analyzers and apply fixes. [default: ]",
         ""
     ],
     "dustilock": [

.automation/generated/linter-versions.json

@@ -21,7 +21,7 @@
     "djlint": "1.19.4",
     "dockerfilelint": "1.8.0",
     "dotenv-linter": "3.2.0",
-    "dotnet-format": "000",
+    "dotnet-format": "6.3.322007",
     "dustilock": "0.0.0",
     "editorconfig-checker": "2.4.0",
     "eslint": "8.27.0",

.automation/test/csharp/csharp_bad_02.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace HelloWorld
+{
+    class Program
+    {
+        static void Main (string[] args)
+        {
+            Console.WriteLine ("Hello World!");
+        }
+    }
+}

.automation/test/csharp/csharp_good_02.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace HelloWorld
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine("Hello World!");
+        }
+    }
+}

.automation/test/csharp/csharp_project.csproj

@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

.automation/test/csharp/reports/ERROR-CSHARP_DOTNET_FORMAT.txt

@@ -1,10 +1,7 @@
-Results of dotnet-format linter (version 4.1.131201)
+Results of dotnet-format linter (version 6.3.322007)
 See documentation on https://megalinter.github.io/descriptors/csharp_dotnet_format/
 -----------------------------------------------
 
 [ERROR] .automation/test/csharp/csharp_bad_01.cs
-      Formatting code files in workspace '.automation/test/csharp'.
-      csharp/csharp_bad_01.cs(1,33): Fix whitespace formatting.
-      Formatted code file '.automation/test/csharp/csharp_bad_01.cs'.
-      Format complete in 1295ms.
+      .automation/test/csharp/csharp_bad_01.cs(5,18): error WHITESPACE: Fix whitespace formatting. Replace 1 characters with '\r\n\s\s\s\s'. [.automation/test/csharp/csharp_project.csproj]
 

.automation/test/csharp/reports/SUCCESS-CSHARP_DOTNET_FORMAT.txt

@@ -1,8 +1,6 @@
-Results of dotnet-format linter (version 4.1.131201)
+Results of dotnet-format linter (version 6.3.322007)
 See documentation on https://megalinter.github.io/descriptors/csharp_dotnet_format/
 -----------------------------------------------
 
 [SUCCESS] .automation/test/csharp/csharp_good_01.cs
-      Formatting code files in workspace '.automation/test/csharp'.
-      Format complete in 1181ms.
 

.automation/test/sample_project_fixes/csharp_project/csharp_project.csproj

@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

.automation/test/sample_project_fixes/dotnet_solution.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32630.192
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "csharp_project", "csharp_project\csharp_project.csproj", "{FF219771-9DBB-4FB0-8217-F77034831035}"
+EndProject
+Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "vbdotnet_project", "vbdotnet_project\vbdotnet_project.vbproj", "{AF06A915-8734-4B54-836D-A0E2BAE228EB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FF219771-9DBB-4FB0-8217-F77034831035}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF219771-9DBB-4FB0-8217-F77034831035}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF219771-9DBB-4FB0-8217-F77034831035}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF219771-9DBB-4FB0-8217-F77034831035}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF06A915-8734-4B54-836D-A0E2BAE228EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF06A915-8734-4B54-836D-A0E2BAE228EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF06A915-8734-4B54-836D-A0E2BAE228EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF06A915-8734-4B54-836D-A0E2BAE228EB}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {4DFF31ED-FADA-4A6E-B9D4-51D89C3C1FFC}
+	EndGlobalSection
+EndGlobal

.automation/test/sample_project_fixes/vbdotnet_project/vbdotnet_project.vbproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>vb_projecty</RootNamespace>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>

.automation/test/vbdotnet/reports/ERROR-VBDOTNET_DOTNET_FORMAT.txt

@@ -1,12 +1,9 @@
-Results of dotnet-format linter (version 4.1.131201)
+Results of dotnet-format linter (version 6.3.322007)
 See documentation on https://megalinter.github.io/descriptors/vbdotnet_dotnet_format/
 -----------------------------------------------
 
 [ERROR] .automation/test/vbdotnet/vbdotnet_bad_1.vb
-      Formatting code files in workspace '.automation/test/vbdotnet'.
-      vbdotnet/vbdotnet_bad_1.vb(4,4): Fix whitespace formatting.
-      vbdotnet/vbdotnet_bad_1.vb(4,20): Fix whitespace formatting.
-      vbdotnet/vbdotnet_bad_1.vb(5,7): Fix whitespace formatting.
-      Formatted code file '.automation/test/vbdotnet/vbdotnet_bad_1.vb'.
-      Format complete in 1188ms.
+      .automation/test/vbdotnet/vbdotnet_bad_1.vb(3,20): error WHITESPACE: Fix whitespace formatting. Replace 4 characters with '\r\n\s\s\s\s'. [.automation/test/vbdotnet/vb_projecty.vbproj]
+      .automation/test/vbdotnet/vbdotnet_bad_1.vb(4,20): error WHITESPACE: Fix whitespace formatting. Delete 2 characters. [.automation/test/vbdotnet/vb_projecty.vbproj]
+      .automation/test/vbdotnet/vbdotnet_bad_1.vb(4,23): error WHITESPACE: Fix whitespace formatting. Replace 7 characters with '\r\n\s\s\s\s\s\s\s\s'. [.automation/test/vbdotnet/vb_projecty.vbproj]
 

.automation/test/vbdotnet/reports/SUCCESS-VBDOTNET_DOTNET_FORMAT.txt

@@ -1,8 +1,6 @@
-Results of dotnet-format linter (version 4.1.131201)
+Results of dotnet-format linter (version 6.3.322007)
 See documentation on https://megalinter.github.io/descriptors/vbdotnet_dotnet_format/
 -----------------------------------------------
 
-[SUCCESS] .automation/test/vbdotnet/vbdotnet_good_1.vb
-      Formatting code files in workspace '.automation/test/vbdotnet'.
-      Format complete in 1063ms.
+[SUCCESS] .automation/test/vbdotnet/vbdotnet_good_1.vb      
 

.automation/test/vbdotnet/vb_projecty.vbproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>vb_projecty</RootNamespace>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>

.automation/test/vbdotnet/vbdotnet_bad_2.vb

@@ -0,0 +1,7 @@
+Imports System
+
+Public Module Hello
+   Public Sub Main(  )
+      Console.WriteLine("hello, world"
+   End Sub
+End Module

.automation/test/vbdotnet/vbdotnet_good_2.vb

@@ -0,0 +1,7 @@
+Imports System
+
+Public Module Hello
+    Public Sub Main()
+        Console.WriteLine("hello, world")
+    End Sub
+End Module

CHANGELOG.md

@@ -27,6 +27,8 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
   - Allow cspell to also analyze file names (new variable SPELL_CSPELL_ANALYZE_FILE_NAMES) ([#2009](https://github.com/oxsecurity/megalinter/issues/2009))
   - Fix bicep version regex
 
+- Upgrade to dotnet 6.0 + `list_of_files` for dotnet-format CLI lint mode to improve performances (requires `.csproj` or `.vbproj` in the repo)
+
 - Linter versions upgrades
   - [actionlint](https://rhysd.github.io/actionlint/) from 1.6.21 to **1.6.22**
   - [bicep_linter](https://learn.microsoft.com/en-us/azure/azure-resource-manager/bicep/linter) from 0.11.1 to to **0.12.1**

Dockerfile

@@ -321,7 +321,7 @@ RUN rc-update add docker boot && rc-service docker start || true \
 # CSHARP installation
     && wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
     && chmod +x dotnet-install.sh \
-    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 5.0 -version latest
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
 
 ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 
@@ -373,7 +373,7 @@ RUN wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \
 # Next line commented because already managed by another linter
 # RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
 #     && chmod +x dotnet-install.sh \
-#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 5.0 -version latest
+#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
 # Next line commented because already managed by another linter
 # ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 
@@ -547,7 +547,7 @@ ENV PATH="~/.raku/bin:/opt/rakudo-pkg/bin:/opt/rakudo-pkg/share/perl6/site/bin:$
 # Next line commented because already managed by another linter
 # RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
 #     && chmod +x dotnet-install.sh \
-#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 5.0 -version latest
+#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
 # Next line commented because already managed by another linter
 # ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 RUN dotnet tool install --global Microsoft.CST.DevSkim.CLI --version 0.6.9 \
@@ -606,7 +606,7 @@ RUN dotnet tool install --global Microsoft.CST.DevSkim.CLI --version 0.6.9 \
 # Next line commented because already managed by another linter
 # RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
 #     && chmod +x dotnet-install.sh \
-#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 5.0 -version latest
+#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
 # Next line commented because already managed by another linter
 # ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
     && dotnet tool install --global --version 1.14.5 TSQLLint \
@@ -629,10 +629,6 @@ RUN dotnet tool install --global Microsoft.CST.DevSkim.CLI --version 0.6.9 \
 ENV KICS_QUERIES_PATH=/opt/kics/assets/queries KICS_LIBRARIES_PATH=/opt/kics/assets/libraries
 # Managed with COPY --from=kics /app/bin/assets /opt/kics/assets/
 
-# dotnet-format installation
-# Next line commented because already managed by another linter
-# RUN /usr/share/dotnet/dotnet tool install -g dotnet-format
-
 #OTHER__END
 
 ################################

flavors/dotnet/Dockerfile

@@ -233,7 +233,7 @@ RUN mkdir -p ${PWSH_DIRECTORY} \
 # CSHARP installation
     && wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
     && chmod +x dotnet-install.sh \
-    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 5.0 -version latest
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
 
 ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 
@@ -252,7 +252,7 @@ ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 # Next line commented because already managed by another linter
 # RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
 #     && chmod +x dotnet-install.sh \
-#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 5.0 -version latest
+#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
 # Next line commented because already managed by another linter
 # ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 
@@ -354,15 +354,11 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
 # Next line commented because already managed by another linter
 # RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
 #     && chmod +x dotnet-install.sh \
-#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 5.0 -version latest
+#     && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
 # Next line commented because already managed by another linter
 # ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
     && dotnet tool install --global --version 1.14.5 TSQLLint
 
-# dotnet-format installation
-# Next line commented because already managed by another linter
-# RUN /usr/share/dotnet/dotnet tool install -g dotnet-format
-
 #OTHER__END
 
 ################################

flavors/security/Dockerfile

@@ -210,7 +210,7 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
 # devskim installation
     && wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
     && chmod +x dotnet-install.sh \
-    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 5.0 -version latest
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
 
 ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 RUN dotnet tool install --global Microsoft.CST.DevSkim.CLI --version 0.6.9 \

linters/csharp_dotnet_format/Dockerfile

@@ -107,13 +107,10 @@ ENV PATH="/node_modules/.bin:${PATH}"
 # CSHARP installation
 RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
     && chmod +x dotnet-install.sh \
-    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 5.0 -version latest
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
 
 ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 
-# dotnet-format installation
-RUN /usr/share/dotnet/dotnet tool install -g dotnet-format
-
 #OTHER__END
 
 ######################

linters/sql_tsqllint/Dockerfile

@@ -107,7 +107,7 @@ ENV PATH="/node_modules/.bin:${PATH}"
 # tsqllint installation
 RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
     && chmod +x dotnet-install.sh \
-    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 5.0 -version latest
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
 
 ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 RUN dotnet tool install --global TSQLLint

linters/vbdotnet_dotnet_format/Dockerfile

@@ -107,13 +107,10 @@ ENV PATH="/node_modules/.bin:${PATH}"
 # VBDOTNET installation
 RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
     && chmod +x dotnet-install.sh \
-    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 5.0 -version latest
+    && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest
 
 ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
 
-# dotnet-format installation
-RUN /usr/share/dotnet/dotnet tool install -g dotnet-format
-
 #OTHER__END
 
 ######################