From a81ff4229d2d1ac42c566e6c9ca8a3092937ad4d Mon Sep 17 00:00:00 2001 From: Mitchel Sellers Date: Wed, 26 Nov 2025 22:00:44 -0600 Subject: [PATCH 1/4] Updated Builds --- .github/release.yml | 22 ++++++++++++++++++++++ .github/workflows/ci-build.yml | 14 ++++++-------- .github/workflows/release-build.yml | 8 +++----- GitVersion.yml | 1 - 4 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 .github/release.yml diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 0000000..04e3967 --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,22 @@ +changelog: + exclude: + labels: + - question + - wontfix + - invalid + categories: + - title: Exciting New Features 🎉 + labels: + - enhancement + - feature + - title: Squashed Bugs 🐛 + labels: + - bug + - breaking-change + - title: Adminsitrative + labels: + - administrative + - documentation + - title: Other Changes + labels: + - "*" \ No newline at end of file diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index c9b67d0..babcc88 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -24,13 +24,13 @@ jobs: dotnet-version: 8.0.x - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v3.1.1 + uses: gittools/actions/gitversion/setup@v4.2.0 with: - versionSpec: '6.0.5' + versionSpec: '6.4.0' - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v3.1.1 + uses: gittools/actions/gitversion/execute@v4.2.0 with: useConfigFile: true @@ -81,15 +81,13 @@ jobs: dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v3.1.1 + uses: gittools/actions/gitversion/setup@v4.2.0 with: - versionSpec: '6.0.5' + versionSpec: '6.4.0' - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v3.1.1 - with: - useConfigFile: true + uses: gittools/actions/gitversion/execute@v4.2.0 - name: Build and analyze env: diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index f7d00c3..9617929 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -23,15 +23,13 @@ jobs: dotnet-version: 8.0.x - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v3.1.1 + uses: gittools/actions/gitversion/setup@v4.2.0 with: - versionSpec: '6.0.5' + versionSpec: '6.4.0' - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v3.1.1 - with: - useConfigFile: true + uses: gittools/actions/gitversion/execute@v4.2.0 - name: Restore Packages run: dotnet restore "${{ env.solution-path }}" diff --git a/GitVersion.yml b/GitVersion.yml index 86f6784..8914874 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -17,7 +17,6 @@ branches: pull-request: regex: (pull|pull\-requests|pr)[/-] label: 'pr' - label-number-pattern: '[/-](?\d+)[-/]' increment: Patch is-release-branch: false source-branches: [] From 0f5a3d489a3c26c2c96516d95462d1bec2e24994 Mon Sep 17 00:00:00 2001 From: Mitchel Sellers Date: Wed, 26 Nov 2025 22:01:59 -0600 Subject: [PATCH 2/4] Fixed build --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index babcc88..97f3896 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -95,7 +95,7 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} shell: powershell run: | - .\.sonar\scanner\dotnet-sonarscanner begin /k:"IowaComputerGurus_aspnetcore.utilities" /o:"iowacomputergurus-github" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /n:"AspNetCore Utilities" + .\.sonar\scanner\dotnet-sonarscanner begin /k:"IowaComputerGurus_aspnetcore.utilities" /o:"iowacomputergurus-github" /d:sonar.login="${{ env.SONAR_TOKEN }}" /n:"AspNetCore Utilities" dotnet restore "${{ env.solution-path }}" dotnet build "${{ env.solution-path }}" --no-restore --configuration Release -p:version=${{ steps.gitversion.outputs.majorMinorPatch }} dotnet test "${{ env.solution-path }}" --no-build --configuration Release --collect "XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover --logger "trx;LogFileName=unittests.trx" From 3238a46ae768b365716d638bdd7bac187ee2ce2f Mon Sep 17 00:00:00 2001 From: Mitchel Sellers Date: Wed, 26 Nov 2025 22:09:53 -0600 Subject: [PATCH 3/4] Fixed sonar cloud issues --- .../DependencyResolution/StartupExtensions.cs | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 src/AspNetCore.Utilities/DependencyResolution/StartupExtensions.cs diff --git a/src/AspNetCore.Utilities/DependencyResolution/StartupExtensions.cs b/src/AspNetCore.Utilities/DependencyResolution/StartupExtensions.cs deleted file mode 100644 index cbca7d3..0000000 --- a/src/AspNetCore.Utilities/DependencyResolution/StartupExtensions.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Microsoft.Extensions.DependencyInjection -{ - /// - /// - /// - public static class StartupExtensions - { - ///// - ///// Registers the items included in the ICG AspNetCore Utilities project for Dependency Injection - ///// - ///// Your existing services collection - //public static void UseIcgAspNetCoreUtilities(this IServiceCollection services) - //{ - // //Bind additional services - - //} - } -} \ No newline at end of file From 03ce29cbbad023a0971eacfb49299fb56ff84ff9 Mon Sep 17 00:00:00 2001 From: Mitchel Sellers Date: Wed, 26 Nov 2025 22:12:52 -0600 Subject: [PATCH 4/4] Apply suggestion from @coderabbitai[bot] Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .github/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/release.yml b/.github/release.yml index 04e3967..b036478 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -13,7 +13,7 @@ changelog: labels: - bug - breaking-change - - title: Adminsitrative + - title: Administrative labels: - administrative - documentation