Merge pull request #169 from atc-net/feature/dotnet9

perkops · web-flow · commit f1b4fbb36088 · 2024-11-13T14:10:16.000+01:00
DotNet9
diff --git a/.editorconfig b/.editorconfig
@@ -516,11 +516,20 @@ dotnet_diagnostic.S1135.severity = suggestion       # https://github.com/atc-net
 # Custom - Code Analyzers Rules
 ##########################################
 
+dotnet_diagnostic.IDE0010.severity = suggestion     # Populate switch
+dotnet_diagnostic.IDE0021.severity = suggestion     # Use expression body for constructor
+dotnet_diagnostic.IDE0046.severity = suggestion     # If statement can be simplified
+dotnet_diagnostic.IDE0055.severity = none           # Fix formatting
 dotnet_diagnostic.IDE0057.severity = none           # Substring can be simplified
+dotnet_diagnostic.IDE0072.severity = suggestion     # Populate switch
+dotnet_diagnostic.IDE0130.severity = suggestion     # Namespace does not match folder structure
+dotnet_diagnostic.IDE0290.severity = none			# Use primary constructor
+dotnet_diagnostic.IDE0305.severity = suggestion     # Collection initialization can be simplified
 
 dotnet_diagnostic.SA1010.severity = none            #
 
 dotnet_diagnostic.CA1054.severity = none            # URI parameters should not be strings
+dotnet_diagnostic.CA1515.severity = suggestion      # Because an application's API isn't typically referenced from outside the assembly, types can be made internal (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1515)
 dotnet_diagnostic.CA1848.severity = none            # For improved performance, use the LoggerMessage delegates instead of calling 'LoggerExtensions.LogTrace(ILogger, string, params object[])'
 dotnet_diagnostic.CA1859.severity = none            #
 dotnet_diagnostic.CA1860.severity = none            #
@@ -536,6 +545,7 @@ dotnet_diagnostic.S1172.severity = none             # False positive
 dotnet_diagnostic.S2589.severity = none             #
 dotnet_diagnostic.S2629.severity = none             #
 dotnet_diagnostic.S3267.severity = none             #
+dotnet_diagnostic.S3358.severity = none             #
 dotnet_diagnostic.S3878.severity = none             #
 dotnet_diagnostic.S4457.severity = none             # Split this method into two, one handling parameters check and the other handling the asynchronous code
 dotnet_diagnostic.S6602.severity = none             #
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -20,7 +20,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>1573,1591,1712,CA1014</NoWarn>
+    <NoWarn>1573,1591,1712,CA1014,NU1903</NoWarn>
 
     <!-- Used by code coverage -->
     <DebugType>full</DebugType>
diff --git a/src/Atc.CodingRules.AnalyzerProviders/Models/AnalyzerProviderBaseRuleData.cs b/src/Atc.CodingRules.AnalyzerProviders/Models/AnalyzerProviderBaseRuleData.cs
@@ -14,7 +14,7 @@ public AnalyzerProviderBaseRuleData(string name)
     public string Name { get; set; } = string.Empty;
 
     [SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "OK.")]
-    public ICollection<Rule> Rules { get; set; } = new List<Rule>();
+    public ICollection<Rule> Rules { get; set; } = [];
 
     public string? ExceptionMessage { get; set; }
 
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/DescriptionAttributes/SupportedProjectTargetTypeDescriptionAttribute.cs b/src/Atc.CodingRules.Updater.CLI/Commands/DescriptionAttributes/SupportedProjectTargetTypeDescriptionAttribute.cs
@@ -8,7 +8,7 @@ public override string Description
         get
         {
             var defaultValue = new OptionsFile().ProjectTarget;
-            var values = Enum.GetNames(typeof(SupportedProjectTargetType))
+            var values = Enum.GetNames<SupportedProjectTargetType>()
                 .Select(enumValue => enumValue.Equals(defaultValue.ToString(), StringComparison.Ordinal)
                     ? $"{enumValue} (default)"
                     : enumValue)
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/RunCommand.cs b/src/Atc.CodingRules.Updater.CLI/Commands/RunCommand.cs
@@ -140,13 +140,10 @@ private static async Task<OptionsFile> GetOptionsFromFileAndUserArguments(
             buildFile = settings.BuildFile.Value;
         }
 
-        if (!string.IsNullOrEmpty(buildFile))
-        {
-            return buildFile.Contains(':', StringComparison.Ordinal)
+        return !string.IsNullOrEmpty(buildFile)
+            ? buildFile.Contains(':', StringComparison.Ordinal)
                 ? new FileInfo(buildFile)
-                : new FileInfo(Path.Combine(projectPath.FullName, buildFile));
-        }
-
-        return null;
+                : new FileInfo(Path.Combine(projectPath.FullName, buildFile))
+            : null;
     }
 }
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/Settings/ProjectBaseCommandSettings.cs b/src/Atc.CodingRules.Updater.CLI/Commands/Settings/ProjectBaseCommandSettings.cs
@@ -14,14 +14,11 @@ public class ProjectBaseCommandSettings : BaseCommandSettings
     public override ValidationResult Validate()
     {
         var validationResult = base.Validate();
-        if (!validationResult.Successful)
-        {
-            return validationResult;
-        }
-
-        return string.IsNullOrEmpty(ProjectPath)
-            ? ValidationResult.Error("ProjectPath is missing.")
-            : ValidationResult.Success();
+        return !validationResult.Successful
+            ? validationResult
+            : string.IsNullOrEmpty(ProjectPath)
+                ? ValidationResult.Error("ProjectPath is missing.")
+                : ValidationResult.Success();
     }
 
     internal string GetOptionsPath()
diff --git a/src/Atc.CodingRules.Updater.CLI/Models/Options/OptionsFolderMappings.cs b/src/Atc.CodingRules.Updater.CLI/Models/Options/OptionsFolderMappings.cs
@@ -3,7 +3,7 @@ namespace Atc.CodingRules.Updater.CLI.Models.Options;
 public class OptionsFolderMappings
 {
     [SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "OK.")]
-    public IList<string> Paths { get; set; } = new List<string>();
+    public IList<string> Paths { get; set; } = [];
 
     public override string ToString()
         => $"{nameof(Paths)}.Count: {Paths.Count}";
diff --git a/src/Atc.CodingRules.Updater.CLI/ProjectHelper.cs b/src/Atc.CodingRules.Updater.CLI/ProjectHelper.cs
@@ -33,7 +33,8 @@ is SupportedProjectTargetType.DotNetCore
             or SupportedProjectTargetType.DotNet5
             or SupportedProjectTargetType.DotNet6
             or SupportedProjectTargetType.DotNet7
-            or SupportedProjectTargetType.DotNet8)
+            or SupportedProjectTargetType.DotNet8
+            or SupportedProjectTargetType.DotNet9)
         {
             HandleDirectoryBuildPropsFiles(logger, projectPath, options);
 
@@ -140,24 +141,17 @@ private static ProjectFrameworkType DetermineProjectFrameworkType(
                 Path.GetFileNameWithoutExtension(csProjFile.Name),
                 StringComparison.OrdinalIgnoreCase));
 
-        if (optionsProjectFrameworkMapping is not null)
+        projectFrameworkType = optionsProjectFrameworkMapping?.Type ?? projectType switch
         {
-            projectFrameworkType = optionsProjectFrameworkMapping.Type;
-        }
-        else
-        {
-            projectFrameworkType = projectType switch
-            {
-                DotnetProjectType.AzureFunctionApp => ProjectFrameworkType.AzureFunctions,
-                DotnetProjectType.BlazorServerApp or DotnetProjectType.BlazorWAsmApp => ProjectFrameworkType.Blazor,
-                DotnetProjectType.CliApp => ProjectFrameworkType.Cli,
-                DotnetProjectType.MauiApp => ProjectFrameworkType.Maui,
-                DotnetProjectType.WinFormApp => ProjectFrameworkType.WinForms,
-                DotnetProjectType.WpfApp or DotnetProjectType.WpfLibrary => ProjectFrameworkType.Wpf,
-                DotnetProjectType.WebApi => ProjectFrameworkType.WebApi,
-                _ => projectFrameworkType,
-            };
-        }
+            DotnetProjectType.AzureFunctionApp => ProjectFrameworkType.AzureFunctions,
+            DotnetProjectType.BlazorServerApp or DotnetProjectType.BlazorWAsmApp => ProjectFrameworkType.Blazor,
+            DotnetProjectType.CliApp => ProjectFrameworkType.Cli,
+            DotnetProjectType.MauiApp => ProjectFrameworkType.Maui,
+            DotnetProjectType.WinFormApp => ProjectFrameworkType.WinForms,
+            DotnetProjectType.WpfApp or DotnetProjectType.WpfLibrary => ProjectFrameworkType.Wpf,
+            DotnetProjectType.WebApi => ProjectFrameworkType.WebApi,
+            _ => projectFrameworkType,
+        };
 
         return projectFrameworkType;
     }
diff --git a/src/Atc.CodingRules.Updater/EditorConfigHelper.cs b/src/Atc.CodingRules.Updater/EditorConfigHelper.cs
@@ -333,7 +333,7 @@ private static List<Tuple<string, List<string>>> ExtractContentCustomParts(
                     }
 
                     workingOnCustomHeader = nextLine.Substring(CustomSectionHeaderPrefix.Length).Trim();
-                    workingOnCustomLines = new List<string>();
+                    workingOnCustomLines = [];
                 }
             }
 
diff --git a/src/Atc.CodingRules.Updater/Extensions/StringExtensions.cs b/src/Atc.CodingRules.Updater/Extensions/StringExtensions.cs
@@ -4,7 +4,7 @@ namespace System;
 
 public static class StringExtensions
 {
-    private static readonly string[] LineBreaks = { "\r\n", "\r", "\n" };
+    private static readonly string[] LineBreaks = ["\r\n", "\r", "\n"];
 
     public static string TrimEndForEmptyLines(
         this string value)
@@ -25,7 +25,7 @@ public static string TrimEndForEmptyLines(
     public static Collection<KeyValueItem> GetKeyValues(
         this string value)
         => string.IsNullOrEmpty(value)
-            ? new Collection<KeyValueItem>()
+            ? []
             : value
                 .Split(LineBreaks, StringSplitOptions.RemoveEmptyEntries)
                 .GetKeyValues();
diff --git a/src/Atc.CodingRules.Updater/FileHelper.cs b/src/Atc.CodingRules.Updater/FileHelper.cs
@@ -1,4 +1,3 @@
-// ReSharper disable ConvertIfStatementToReturnStatement
 namespace Atc.CodingRules.Updater;
 
 public static class FileHelper
@@ -83,13 +82,8 @@ public static bool AreFilesEqual(
             return false;
         }
 
-        if (headerLinesA.Find(x => x.StartsWith("# Distribution", StringComparison.CurrentCultureIgnoreCase)) !=
-            headerLinesB.Find(x => x.StartsWith("# Distribution", StringComparison.CurrentCultureIgnoreCase)))
-        {
-            return false;
-        }
-
-        return true;
+        return headerLinesA.Find(x => x.StartsWith("# Distribution", StringComparison.CurrentCultureIgnoreCase)) ==
+               headerLinesB.Find(x => x.StartsWith("# Distribution", StringComparison.CurrentCultureIgnoreCase));
     }
 
     public static bool ContainsEditorConfigFile(
diff --git a/src/Atc.CodingRules.Updater/ProjectSanityCheckHelper.cs b/src/Atc.CodingRules.Updater/ProjectSanityCheckHelper.cs
@@ -19,6 +19,7 @@ public static void CheckFiles(
             case SupportedProjectTargetType.DotNet6:
             case SupportedProjectTargetType.DotNet7:
             case SupportedProjectTargetType.DotNet8:
+            case SupportedProjectTargetType.DotNet9:
                 HasTargetFrameworkAndImplicitUsings(throwIf, logger, projectPath, "netcoreapp3.1");
                 break;
         }
diff --git a/src/Atc.CodingRules.Updater/SupportedProjectTargetType.cs b/src/Atc.CodingRules.Updater/SupportedProjectTargetType.cs
@@ -3,8 +3,9 @@ namespace Atc.CodingRules.Updater;
 public enum SupportedProjectTargetType
 {
     DotNetCore,
-    DotNet5,
-    DotNet6,
-    DotNet7,
-    DotNet8,
+    DotNet5, // STS
+    DotNet6, // LTS
+    DotNet7, // STS
+    DotNet8, // LTS
+    DotNet9, // STS
 }
diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/MicrosoftCompilerErrorsProviderTests.cs b/test/Atc.CodingRules.AnalyzerProviders.Tests/Providers/MicrosoftCompilerErrorsProviderTests.cs
@@ -21,6 +21,6 @@ public async Task CollectBaseRules(ProviderCollectingMode providerCollectingMode
         Assert.NotNull(actual.Name);
         Assert.Equal(MicrosoftCompilerErrorsProvider.Name, actual.Name);
         Assert.NotNull(actual.Rules);
-        Assert.True(actual.Rules.Count >= 910);
+        Assert.True(actual.Rules.Count >= 850);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public override string Description`
`8`	`8`	`get`
`9`	`9`	`{`
`10`	`10`	`var defaultValue = new OptionsFile().ProjectTarget;`
`11`		`- var values = Enum.GetNames(typeof(SupportedProjectTargetType))`
	`11`	`+ var values = Enum.GetNames<SupportedProjectTargetType>()`
`12`	`12`	`.Select(enumValue => enumValue.Equals(defaultValue.ToString(), StringComparison.Ordinal)`
`13`	`13`	`? $"{enumValue} (default)"`
`14`	`14`	`: enumValue)`
Original file line number	Diff line number	Diff line change
`@@ -140,13 +140,10 @@ private static async Task<OptionsFile> GetOptionsFromFileAndUserArguments(`
`140`	`140`	`buildFile = settings.BuildFile.Value;`
`141`	`141`	`}`
`142`	`142`
`143`		`- if (!string.IsNullOrEmpty(buildFile))`
`144`		`- {`
`145`		`- return buildFile.Contains(':', StringComparison.Ordinal)`
	`143`	`+ return !string.IsNullOrEmpty(buildFile)`
	`144`	`+ ? buildFile.Contains(':', StringComparison.Ordinal)`
`146`	`145`	`? new FileInfo(buildFile)`
`147`		`- : new FileInfo(Path.Combine(projectPath.FullName, buildFile));`
`148`		`- }`
`149`		`-`
`150`		`- return null;`
	`146`	`+ : new FileInfo(Path.Combine(projectPath.FullName, buildFile))`
	`147`	`+ : null;`
`151`	`148`	`}`
`152`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ namespace Atc.CodingRules.Updater.CLI.Models.Options;`
`3`	`3`	`public class OptionsFolderMappings`
`4`	`4`	`{`
`5`	`5`	`[SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "OK.")]`
`6`		`- public IList<string> Paths { get; set; } = new List<string>();`
	`6`	`+ public IList<string> Paths { get; set; } = [];`
`7`	`7`
`8`	`8`	`public override string ToString()`
`9`	`9`	`=> $"{nameof(Paths)}.Count: {Paths.Count}";`
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ private static List<Tuple<string, List<string>>> ExtractContentCustomParts(`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`workingOnCustomHeader = nextLine.Substring(CustomSectionHeaderPrefix.Length).Trim();`
`336`		`- workingOnCustomLines = new List<string>();`
	`336`	`+ workingOnCustomLines = [];`
`337`	`337`	`}`
`338`	`338`	`}`
`339`	`339`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public static void CheckFiles(`
`19`	`19`	`case SupportedProjectTargetType.DotNet6:`
`20`	`20`	`case SupportedProjectTargetType.DotNet7:`
`21`	`21`	`case SupportedProjectTargetType.DotNet8:`
	`22`	`+ case SupportedProjectTargetType.DotNet9:`
`22`	`23`	`HasTargetFrameworkAndImplicitUsings(throwIf, logger, projectPath, "netcoreapp3.1");`
`23`	`24`	`break;`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@ namespace Atc.CodingRules.Updater;`
`3`	`3`	`public enum SupportedProjectTargetType`
`4`	`4`	`{`
`5`	`5`	`DotNetCore,`
`6`		`- DotNet5,`
`7`		`- DotNet6,`
`8`		`- DotNet7,`
`9`		`- DotNet8,`
	`6`	`+ DotNet5, // STS`
	`7`	`+ DotNet6, // LTS`
	`8`	`+ DotNet7, // STS`
	`9`	`+ DotNet8, // LTS`
	`10`	`+ DotNet9, // STS`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ public async Task CollectBaseRules(ProviderCollectingMode providerCollectingMode`
`21`	`21`	`Assert.NotNull(actual.Name);`
`22`	`22`	`Assert.Equal(MicrosoftCompilerErrorsProvider.Name, actual.Name);`
`23`	`23`	`Assert.NotNull(actual.Rules);`
`24`		`- Assert.True(actual.Rules.Count >= 910);`
	`24`	`+ Assert.True(actual.Rules.Count >= 850);`
`25`	`25`	`}`
`26`	`26`	`}`