Merge pull request #107 from atc-net/feature/maintenance

davidkallesen · web-flow · commit 7c891af0a822 · 2022-09-13T17:40:37.000+02:00
Feature/maintenance
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -41,12 +41,12 @@
 
   <!-- Shared code analyzers used for all projects in the solution -->
   <ItemGroup Label="Code Analyzers">
-    <PackageReference Include="AsyncFixer" Version="1.5.1" PrivateAssets="All" />
+    <PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
     <PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="All" />
-    <PackageReference Include="Meziantou.Analyzer" Version="1.0.698" PrivateAssets="All" />
-    <PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.2" PrivateAssets="All" />
+    <PackageReference Include="Meziantou.Analyzer" Version="1.0.725" PrivateAssets="All" />
+    <PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.37.0.45539" PrivateAssets="All" />
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.44.0.52574" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Atc.CodingRules.AnalyzerProviders/Atc.CodingRules.AnalyzerProviders.csproj b/src/Atc.CodingRules.AnalyzerProviders/Atc.CodingRules.AnalyzerProviders.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.115" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
+    <PackageReference Include="Atc" Version="2.0.209" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.45" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.CodingRules.AnalyzerProviders/Models/AnalyzerProviderBaseRuleData.cs b/src/Atc.CodingRules.AnalyzerProviders/Models/AnalyzerProviderBaseRuleData.cs
@@ -8,7 +8,7 @@ public AnalyzerProviderBaseRuleData()
 
     public AnalyzerProviderBaseRuleData(string name)
     {
-        this.Name = name;
+        Name = name;
     }
 
     public string Name { get; set; } = string.Empty;
diff --git a/src/Atc.CodingRules.AnalyzerProviders/Models/Rule.cs b/src/Atc.CodingRules.AnalyzerProviders/Models/Rule.cs
@@ -13,11 +13,11 @@ public Rule(
         string? category = null,
         string? description = null)
     {
-        this.Code = code;
-        this.Title = title;
-        this.Link = link;
-        this.Category = category;
-        this.Description = description;
+        Code = code;
+        Title = title;
+        Link = link;
+        Category = category;
+        Description = description;
     }
 
     public string Code { get; set; } = string.Empty;
diff --git a/src/Atc.CodingRules.AnalyzerProviders/Providers/AsyncFixerProvider.cs b/src/Atc.CodingRules.AnalyzerProviders/Providers/AsyncFixerProvider.cs
@@ -47,7 +47,7 @@ protected override async Task ReCollect(
             var title = sa[1].Trim();
             var hashTagId =
                 $"user-content-{code.ToLower(GlobalizationConstants.EnglishCultureInfo)}{title.ToLower(GlobalizationConstants.EnglishCultureInfo).Replace(" ", "-", StringComparison.Ordinal).Replace("/", string.Empty, StringComparison.Ordinal).Replace(".", string.Empty, StringComparison.Ordinal)}";
-            var link = $"{this.DocumentationLink.OriginalString}#{hashTagId}";
+            var link = $"{DocumentationLink.OriginalString}#{hashTagId}";
 
             data.Rules.Add(
                 new Rule(
diff --git a/src/Atc.CodingRules.AnalyzerProviders/Providers/AsyncifyProvider.cs b/src/Atc.CodingRules.AnalyzerProviders/Providers/AsyncifyProvider.cs
@@ -111,7 +111,7 @@ private void CollectCodesAndTitlesAndDescriptionsToRules(
             }
 
             var description = descriptions.First(x => x.Item1.Equals(code, StringComparison.Ordinal))?.Item2;
-            var link = this.DocumentationLink!.AbsoluteUri;
+            var link = DocumentationLink!.AbsoluteUri;
 
             data.Rules.Add(
                 new Rule(
diff --git a/src/Atc.CodingRules.AnalyzerProviders/Providers/MicrosoftCodeAnalysisNetAnalyzersProvider.cs b/src/Atc.CodingRules.AnalyzerProviders/Providers/MicrosoftCodeAnalysisNetAnalyzersProvider.cs
@@ -68,7 +68,7 @@ protected override async Task ReCollect(
             var code = sa[0];
             var title = sa[1].Trim();
             var description = HtmlEntity.DeEntitize(cells[TableColumnCategory].InnerText);
-            var link = $"{this.DocumentationLink.OriginalString}/{aHrefNode.Attributes["href"].Value}";
+            var link = $"{DocumentationLink.OriginalString}/{aHrefNode.Attributes["href"].Value}";
 
             data.Rules.Add(
                 new Rule(
diff --git a/src/Atc.CodingRules.AnalyzerProviders/Providers/SecurityCodeScanVs2019Provider.cs b/src/Atc.CodingRules.AnalyzerProviders/Providers/SecurityCodeScanVs2019Provider.cs
@@ -42,7 +42,7 @@ protected override async Task ReCollect(
 
             var code = sa[0];
             var title = sa[1];
-            var link = $"{this.DocumentationLink!.OriginalString}#{code}";
+            var link = $"{DocumentationLink!.OriginalString}#{code}";
 
             data.Rules.Add(
                 new Rule(
diff --git a/src/Atc.CodingRules.Updater.CLI/Atc.CodingRules.Updater.CLI.csproj b/src/Atc.CodingRules.Updater.CLI/Atc.CodingRules.Updater.CLI.csproj
@@ -13,9 +13,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.115" />
-    <PackageReference Include="Atc.Console.Spectre" Version="2.0.115" />
-    <PackageReference Include="EPPlus" Version="5.8.8" />
+    <PackageReference Include="Atc" Version="2.0.209" />
+    <PackageReference Include="Atc.Console.Spectre" Version="2.0.209" />
+    <PackageReference Include="EPPlus" Version="6.0.7" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
   </ItemGroup>
 
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/DescriptionAttributes/ProviderCollectingModeDescriptionAttribute.cs b/src/Atc.CodingRules.Updater.CLI/Commands/DescriptionAttributes/ProviderCollectingModeDescriptionAttribute.cs
@@ -1,5 +1,3 @@
-using System.ComponentModel;
-
 namespace Atc.CodingRules.Updater.CLI.Commands.DescriptionAttributes;
 
 [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Enum | AttributeTargets.Interface | AttributeTargets.Delegate)]
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/DescriptionAttributes/SupportedProjectTargetTypeDescriptionAttribute.cs b/src/Atc.CodingRules.Updater.CLI/Commands/DescriptionAttributes/SupportedProjectTargetTypeDescriptionAttribute.cs
@@ -1,6 +1,3 @@
-using System.ComponentModel;
-using Atc.CodingRules.Updater.CLI.Models.Options;
-
 namespace Atc.CodingRules.Updater.CLI.Commands.DescriptionAttributes;
 
 [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Enum | AttributeTargets.Interface | AttributeTargets.Delegate)]
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/OptionsFileCreateCommand.cs b/src/Atc.CodingRules.Updater.CLI/Commands/OptionsFileCreateCommand.cs
@@ -24,7 +24,7 @@ private async Task<int> ExecuteInternalAsync(
 
         try
         {
-            (bool isSuccessful, string error) = await OptionsHelper.CreateOptionsFile(projectPath, settings);
+            var (isSuccessful, error) = await OptionsHelper.CreateOptionsFile(projectPath, settings);
             if (isSuccessful)
             {
                 logger.LogInformation("The options file is created");
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/OptionsFileValidateCommand.cs b/src/Atc.CodingRules.Updater.CLI/Commands/OptionsFileValidateCommand.cs
@@ -26,7 +26,7 @@ private async Task<int> ExecuteInternalAsync(
 
         try
         {
-            (bool isSuccessful, string error) = await OptionsHelper.ValidateOptionsFile(projectPath, optionsPath);
+            var (isSuccessful, error) = await OptionsHelper.ValidateOptionsFile(projectPath, optionsPath);
             if (isSuccessful)
             {
                 logger.LogInformation("The options file is valid");
diff --git a/src/Atc.CodingRules.Updater.CLI/Commands/Settings/ProjectBaseCommandSettings.cs b/src/Atc.CodingRules.Updater.CLI/Commands/Settings/ProjectBaseCommandSettings.cs
@@ -27,9 +27,9 @@ public override ValidationResult Validate()
     internal string GetOptionsPath()
     {
         var optionsPath = string.Empty;
-        if (this.OptionsPath is not null && this.OptionsPath.IsSet)
+        if (OptionsPath is not null && OptionsPath.IsSet)
         {
-            optionsPath = this.OptionsPath.Value;
+            optionsPath = OptionsPath.Value;
         }
 
         return optionsPath;
diff --git a/src/Atc.CodingRules.Updater/Atc.CodingRules.Updater.csproj b/src/Atc.CodingRules.Updater/Atc.CodingRules.Updater.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.115" />
-    <PackageReference Include="Atc.DotNet" Version="2.0.115" />
-    <PackageReference Include="Atc.Console.Spectre" Version="2.0.115" />
+    <PackageReference Include="Atc" Version="2.0.209" />
+    <PackageReference Include="Atc.DotNet" Version="2.0.209" />
+    <PackageReference Include="Atc.Console.Spectre" Version="2.0.209" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.CodingRules.Updater/EditorConfigHelper.cs b/src/Atc.CodingRules.Updater/EditorConfigHelper.cs
@@ -283,7 +283,7 @@ private static string ExtractContentBasePart(
         var lines = content.Split(FileHelper.LineBreaks, StringSplitOptions.None);
 
         var sb = new StringBuilder();
-        for (int i = 0; i < lines.Length; i++)
+        for (var i = 0; i < lines.Length; i++)
         {
             var line = lines[i];
             if (line.Equals(SectionDivider, StringComparison.Ordinal) &&
@@ -315,7 +315,7 @@ private static List<Tuple<string, List<string>>> ExtractContentCustomParts(
 
         var workingOnCustomHeader = string.Empty;
         var workingOnCustomLines = new List<string>();
-        for (int i = 0; i < lines.Length; i++)
+        for (var i = 0; i < lines.Length; i++)
         {
             var line = lines[i];
             if (line.Equals(SectionDivider, StringComparison.Ordinal) &&
diff --git a/src/Atc.CodingRules.Updater/Models/DotnetNugetPackage.cs b/src/Atc.CodingRules.Updater/Models/DotnetNugetPackage.cs
@@ -4,16 +4,16 @@ public class DotnetNugetPackage
 {
     public DotnetNugetPackage(string packageId, Version currentVersion)
     {
-        this.PackageId = packageId;
-        this.Version = currentVersion;
-        this.NewestVersion = currentVersion;
+        PackageId = packageId;
+        Version = currentVersion;
+        NewestVersion = currentVersion;
     }
 
     public DotnetNugetPackage(string packageId, Version currentVersion, Version newestVersion)
     {
-        this.PackageId = packageId;
-        this.Version = currentVersion;
-        this.NewestVersion = newestVersion;
+        PackageId = packageId;
+        Version = currentVersion;
+        NewestVersion = newestVersion;
     }
 
     public string PackageId { get; }
diff --git a/src/Atc.CodingRules/Atc.CodingRules.csproj b/src/Atc.CodingRules/Atc.CodingRules.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.115" />
+    <PackageReference Include="Atc" Version="2.0.209" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -52,6 +52,6 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-      <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255" PrivateAssets="All" />
+      <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.109" PrivateAssets="All" />
     </ItemGroup>
 </Project>
diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/Atc.CodingRules.AnalyzerProviders.Tests.csproj b/test/Atc.CodingRules.AnalyzerProviders.Tests/Atc.CodingRules.AnalyzerProviders.Tests.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.XUnit" Version="2.0.115" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Atc.XUnit" Version="2.0.209" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/test/Atc.CodingRules.Updater.Tests/Atc.CodingRules.Updater.Tests.csproj b/test/Atc.CodingRules.Updater.Tests/Atc.CodingRules.Updater.Tests.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Divergic.Logging.Xunit" Version="4.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Divergic.Logging.Xunit" Version="4.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Test" Version="1.0.58" />
+    <PackageReference Include="Atc.Test" Version="1.0.70" />
     <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.15" PrivateAssets="All" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public AnalyzerProviderBaseRuleData()`
`8`	`8`
`9`	`9`	`public AnalyzerProviderBaseRuleData(string name)`
`10`	`10`	`{`
`11`		`- this.Name = name;`
	`11`	`+ Name = name;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public string Name { get; set; } = string.Empty;`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ private void CollectCodesAndTitlesAndDescriptionsToRules(`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`var description = descriptions.First(x => x.Item1.Equals(code, StringComparison.Ordinal))?.Item2;`
`114`		`- var link = this.DocumentationLink!.AbsoluteUri;`
	`114`	`+ var link = DocumentationLink!.AbsoluteUri;`
`115`	`115`
`116`	`116`	`data.Rules.Add(`
`117`	`117`	`new Rule(`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using System.ComponentModel;`
`2`		`-`
`3`	`1`	`namespace Atc.CodingRules.Updater.CLI.Commands.DescriptionAttributes;`
`4`	`2`
`5`	`3`	`[AttributeUsage(AttributeTargets.Property \| AttributeTargets.Field \| AttributeTargets.Enum \| AttributeTargets.Interface \| AttributeTargets.Delegate)]`