Merge pull request #159 from atc-net/feature/Add-support-for-project-…

…framework-cli Feature/add support for project framework cli
atc-net · Apr 11, 2024 · 4ec338b · 4ec338b
2 parents a450a90 + 2e67e47
commit 4ec338b
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 47 deletions.
diff --git a/.github/workflows/atc-coding-rules-update.yml b/.github/workflows/atc-coding-rules-update.yml
@@ -9,7 +9,7 @@ jobs:
   atc_check_for_updates:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: '0'
     - name: ⚙ set environment stuff

diff --git a/.github/workflows/post-integration.yml b/.github/workflows/post-integration.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 🛒 Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.PAT_WORKFLOWS }}
@@ -31,7 +31,7 @@ jobs:
           setAllVars: true
 
       - name: ⚙️ Setup dotnet 8.0.x
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.0.x'
 

diff --git a/.github/workflows/pre-integration.yml b/.github/workflows/pre-integration.yml
@@ -15,12 +15,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: 🛒 Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: ⚙️ Setup dotnet 8.0.x
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.0.x'
 
@@ -39,12 +39,12 @@ jobs:
       - dotnet-build
     steps:
       - name: 🛒 Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: ⚙️ Setup dotnet 8.0.x
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.0.x'
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 🛒 Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.PAT_WORKFLOWS }}
@@ -28,7 +28,7 @@ jobs:
           setAllVars: true
 
       - name: ⚙️ Setup dotnet 8.0.x
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.0.x'
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -43,10 +43,10 @@
   <ItemGroup Label="Code Analyzers">
     <PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
     <PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="All" />
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.146" PrivateAssets="All" />
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.147" PrivateAssets="All" />
     <PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="All" />
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.23.0.88079" PrivateAssets="All" />
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.23.1.88495" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/atc-coding-rules-updater.ps1 b/sample/atc-coding-rules-updater.ps1
@@ -9,4 +9,4 @@ atc-coding-rules-updater `
     run `
     -p $currentPath `
     --optionsPath $currentPath'\atc-coding-rules-updater.json' `
-    -v
+    --verbose
diff --git a/src/Atc.CodingRules.AnalyzerProviders/Atc.CodingRules.AnalyzerProviders.csproj b/src/Atc.CodingRules.AnalyzerProviders/Atc.CodingRules.AnalyzerProviders.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.442" />
+    <PackageReference Include="Atc" Version="2.0.465" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.60" />
   </ItemGroup>
 

diff --git a/...zerRulesMetaData.Generator.CLI/Atc.CodingRules.AnalyzerRulesMetaData.Generator.CLI.csproj b/...zerRulesMetaData.Generator.CLI/Atc.CodingRules.AnalyzerRulesMetaData.Generator.CLI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

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,10 +13,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.442" />
-    <PackageReference Include="Atc.DotNet" Version="2.0.442" />
-    <PackageReference Include="Atc.Console.Spectre" Version="2.0.442" />
-    <PackageReference Include="EPPlus" Version="7.1.0" />
+    <PackageReference Include="Atc" Version="2.0.465" />
+    <PackageReference Include="Atc.DotNet" Version="2.0.465" />
+    <PackageReference Include="Atc.Console.Spectre" Version="2.0.465" />
+    <PackageReference Include="EPPlus" Version="7.1.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
   </ItemGroup>
 

diff --git a/src/Atc.CodingRules.Updater.CLI/ProjectHelper.cs b/src/Atc.CodingRules.Updater.CLI/ProjectHelper.cs
@@ -119,7 +119,12 @@ private static void HandleEditorConfigFiles(
                 continue;
             }
 
-            EditorConfigHelper.HandleFile(logger, "ProjectFramework", projectFrameworkCodingRulesBaseUrl, csProjFile.Directory!, projectFrameworkType.ToStringLowerCase());
+            EditorConfigHelper.HandleFile(
+                logger,
+                "ProjectFramework",
+                projectFrameworkCodingRulesBaseUrl,
+                csProjFile.Directory!,
+                projectFrameworkType.ToStringLowerCase());
         }
     }
 
@@ -141,29 +146,17 @@ private static ProjectFrameworkType DetermineProjectFrameworkType(
         }
         else
         {
-            switch (projectType)
+            projectFrameworkType = projectType switch
             {
-                case DotnetProjectType.AzureFunctionApp:
-                    projectFrameworkType = ProjectFrameworkType.AzureFunctions;
-                    break;
-                case DotnetProjectType.BlazorServerApp:
-                case DotnetProjectType.BlazorWAsmApp:
-                    projectFrameworkType = ProjectFrameworkType.Blazor;
-                    break;
-                case DotnetProjectType.MauiApp:
-                    projectFrameworkType = ProjectFrameworkType.Maui;
-                    break;
-                case DotnetProjectType.WinFormApp:
-                    projectFrameworkType = ProjectFrameworkType.WinForms;
-                    break;
-                case DotnetProjectType.WpfApp:
-                case DotnetProjectType.WpfLibrary:
-                    projectFrameworkType = ProjectFrameworkType.Wpf;
-                    break;
-                case DotnetProjectType.WebApi:
-                    projectFrameworkType = ProjectFrameworkType.WebApi;
-                    break;
-            }
+                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/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.442" />
-    <PackageReference Include="Atc.DotNet" Version="2.0.442" />
-    <PackageReference Include="Atc.Console.Spectre" Version="2.0.442" />
+    <PackageReference Include="Atc" Version="2.0.465" />
+    <PackageReference Include="Atc.DotNet" Version="2.0.465" />
+    <PackageReference Include="Atc.Console.Spectre" Version="2.0.465" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Atc.CodingRules.Updater/ProjectFrameworkType.cs b/src/Atc.CodingRules.Updater/ProjectFrameworkType.cs
@@ -5,6 +5,7 @@ public enum ProjectFrameworkType
     None,
     AzureFunctions,
     Blazor,
+    Cli,
     Maui,
     WebApi,
     WinForms,

diff --git a/src/Atc.CodingRules/Atc.CodingRules.csproj b/src/Atc.CodingRules/Atc.CodingRules.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.442" />
+    <PackageReference Include="Atc" Version="2.0.465" />
   </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,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.XUnit" Version="2.0.442" />
+    <PackageReference Include="Atc.XUnit" Version="2.0.465" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="xunit" Version="2.7.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">

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.79" />
+    <PackageReference Include="Atc.Test" Version="1.0.89" />
     <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" PrivateAssets="All" />
   </ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,4 @@ atc-coding-rules-updater ` @@
         run `
         -p $currentPath `
         --optionsPath $currentPath'\atc-coding-rules-updater.json' `
-        -v
+        --verbose