From 53df74d012eaa2f741a03d84432b02d0feb6b446 Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Thu, 11 Apr 2024 14:03:10 +0200 Subject: [PATCH 1/4] build: Update actions versions --- .github/workflows/atc-coding-rules-update.yml | 2 +- .github/workflows/post-integration.yml | 4 ++-- .github/workflows/pre-integration.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/atc-coding-rules-update.yml b/.github/workflows/atc-coding-rules-update.yml index de377cc..89fe71d 100644 --- 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 index ad21f83..061a4b4 100644 --- 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 index ec7d3c2..2536549 100644 --- 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 index 9e515ac..6b6fbb5 100644 --- 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' From 6454167a6df678fca847f467ecf33dd18fe64d77 Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Thu, 11 Apr 2024 14:03:34 +0200 Subject: [PATCH 2/4] fix: Change -v to --verbose --- sample/atc-coding-rules-updater.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample/atc-coding-rules-updater.ps1 b/sample/atc-coding-rules-updater.ps1 index df1a648..3d555a8 100644 --- 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 \ No newline at end of file + --verbose \ No newline at end of file From ba34e678d0cdb40b47b1d47d205aaa2b14706297 Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Thu, 11 Apr 2024 14:03:59 +0200 Subject: [PATCH 3/4] chore: Nuget update --- Directory.Build.props | 4 ++-- .../Atc.CodingRules.AnalyzerProviders.csproj | 2 +- ...CodingRules.AnalyzerRulesMetaData.Generator.CLI.csproj | 2 +- .../Atc.CodingRules.Updater.CLI.csproj | 8 ++++---- .../Atc.CodingRules.Updater.csproj | 6 +++--- src/Atc.CodingRules/Atc.CodingRules.csproj | 2 +- .../Atc.CodingRules.AnalyzerProviders.Tests.csproj | 2 +- test/Directory.Build.props | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 8b5ddd8..2c20e6e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -43,10 +43,10 @@ - + - + \ No newline at end of file diff --git a/src/Atc.CodingRules.AnalyzerProviders/Atc.CodingRules.AnalyzerProviders.csproj b/src/Atc.CodingRules.AnalyzerProviders/Atc.CodingRules.AnalyzerProviders.csproj index b242c91..579f0d4 100644 --- a/src/Atc.CodingRules.AnalyzerProviders/Atc.CodingRules.AnalyzerProviders.csproj +++ b/src/Atc.CodingRules.AnalyzerProviders/Atc.CodingRules.AnalyzerProviders.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Atc.CodingRules.AnalyzerRulesMetaData.Generator.CLI/Atc.CodingRules.AnalyzerRulesMetaData.Generator.CLI.csproj b/src/Atc.CodingRules.AnalyzerRulesMetaData.Generator.CLI/Atc.CodingRules.AnalyzerRulesMetaData.Generator.CLI.csproj index c196a80..613535c 100644 --- a/src/Atc.CodingRules.AnalyzerRulesMetaData.Generator.CLI/Atc.CodingRules.AnalyzerRulesMetaData.Generator.CLI.csproj +++ b/src/Atc.CodingRules.AnalyzerRulesMetaData.Generator.CLI/Atc.CodingRules.AnalyzerRulesMetaData.Generator.CLI.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 diff --git a/src/Atc.CodingRules.Updater.CLI/Atc.CodingRules.Updater.CLI.csproj b/src/Atc.CodingRules.Updater.CLI/Atc.CodingRules.Updater.CLI.csproj index 5b837f0..b3e1dfb 100644 --- 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 @@ - - - - + + + + diff --git a/src/Atc.CodingRules.Updater/Atc.CodingRules.Updater.csproj b/src/Atc.CodingRules.Updater/Atc.CodingRules.Updater.csproj index 72e6d71..288a02e 100644 --- a/src/Atc.CodingRules.Updater/Atc.CodingRules.Updater.csproj +++ b/src/Atc.CodingRules.Updater/Atc.CodingRules.Updater.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/src/Atc.CodingRules/Atc.CodingRules.csproj b/src/Atc.CodingRules/Atc.CodingRules.csproj index 860d081..77e413a 100644 --- a/src/Atc.CodingRules/Atc.CodingRules.csproj +++ b/src/Atc.CodingRules/Atc.CodingRules.csproj @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/test/Atc.CodingRules.AnalyzerProviders.Tests/Atc.CodingRules.AnalyzerProviders.Tests.csproj b/test/Atc.CodingRules.AnalyzerProviders.Tests/Atc.CodingRules.AnalyzerProviders.Tests.csproj index 4c843f4..d33be25 100644 --- 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 @@ - + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index d6c2c05..020fd5c 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -11,7 +11,7 @@ - + From 2e67e47adc01dd02631ec7f266459b8baa6c44aa Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Thu, 11 Apr 2024 14:06:58 +0200 Subject: [PATCH 4/4] feat: Add support for project-framework distribution 'cli' --- .../ProjectHelper.cs | 39 ++++++++----------- .../ProjectFrameworkType.cs | 1 + 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/Atc.CodingRules.Updater.CLI/ProjectHelper.cs b/src/Atc.CodingRules.Updater.CLI/ProjectHelper.cs index 9b3d3af..e61b1a7 100644 --- 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/ProjectFrameworkType.cs b/src/Atc.CodingRules.Updater/ProjectFrameworkType.cs index ed8d2a7..efbba5f 100644 --- 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,