From 4ca5c13361f96aa6cbf3931312ff663fd9a08053 Mon Sep 17 00:00:00 2001 From: Mitchel Sellers Date: Thu, 27 Nov 2025 00:11:59 -0600 Subject: [PATCH 1/2] Updated Build & Dependencies --- .github/release.yml | 23 +++++++++++++++++++ .github/workflows/ci-build.yml | 18 +++++++-------- .github/workflows/release-build.yml | 8 +++---- ...etCore.Utilities.CloudStorage.Tests.csproj | 4 ++-- .../AspNetCore.Utilities.CloudStorage.csproj | 4 ++-- 5 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 .github/release.yml diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 0000000..d8aa928 --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,23 @@ +changelog: + exclude: + labels: + - question + - wontfix + - invalid + categories: + - title: Exciting New Features 🎉 + labels: + - enhancement + - feature + - title: Squashed Bugs 🐛 + labels: + - bug + - breaking-change + - title: Administrative + labels: + - administrative + - documentation + - dependencies + - 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 8b53b7e..4455662 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -24,15 +24,13 @@ jobs: dotnet-version: 9.0.x - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v3.2.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.2.1 - with: - useConfigFile: true + uses: gittools/actions/gitversion/execute@v4.2.0 - name: Restore Packages run: dotnet restore "${{ env.solution-path }}" @@ -81,13 +79,13 @@ jobs: dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v3.2.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.2.1 + uses: gittools/actions/gitversion/execute@v4.2.0 with: useConfigFile: true @@ -97,8 +95,8 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} shell: powershell run: | - .\.sonar\scanner\dotnet-sonarscanner begin /k:"IowaComputerGurus_aspnetcore.utilities.cloudstorage" /o:"iowacomputergurus-github" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" + .\.sonar\scanner\dotnet-sonarscanner begin /k:"IowaComputerGurus_aspnetcore.utilities.cloudstorage" /o:"iowacomputergurus-github" /d:sonar.login="${{ env.SONAR_TOKEN }}" 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" - .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}" + .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ env.SONAR_TOKEN }}" diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 8e765a5..3239267 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -23,15 +23,13 @@ jobs: dotnet-version: 9.0.x - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v3.2.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.2.1 - with: - useConfigFile: true + uses: gittools/actions/gitversion/execute@v4.2.0 - name: Restore Packages run: dotnet restore "${{ env.solution-path }}" diff --git a/src/AspNetCore.Utilities.CloudStorage.Tests/AspNetCore.Utilities.CloudStorage.Tests.csproj b/src/AspNetCore.Utilities.CloudStorage.Tests/AspNetCore.Utilities.CloudStorage.Tests.csproj index 6427f3d..de28650 100644 --- a/src/AspNetCore.Utilities.CloudStorage.Tests/AspNetCore.Utilities.CloudStorage.Tests.csproj +++ b/src/AspNetCore.Utilities.CloudStorage.Tests/AspNetCore.Utilities.CloudStorage.Tests.csproj @@ -19,10 +19,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/AspNetCore.Utilities.CloudStorage/AspNetCore.Utilities.CloudStorage.csproj b/src/AspNetCore.Utilities.CloudStorage/AspNetCore.Utilities.CloudStorage.csproj index e5de2f9..afd9e01 100644 --- a/src/AspNetCore.Utilities.CloudStorage/AspNetCore.Utilities.CloudStorage.csproj +++ b/src/AspNetCore.Utilities.CloudStorage/AspNetCore.Utilities.CloudStorage.csproj @@ -37,8 +37,8 @@ - - + + all From 2d9c3b0f28af2d4d4a44d448bf1bd90bd705046b Mon Sep 17 00:00:00 2001 From: Mitchel Sellers Date: Thu, 27 Nov 2025 00:14:40 -0600 Subject: [PATCH 2/2] Fixed build issue --- .github/workflows/ci-build.yml | 2 -- GitVersion.yml | 1 - 2 files changed, 3 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 4455662..f3437f4 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -86,8 +86,6 @@ jobs: - name: Determine Version id: gitversion uses: gittools/actions/gitversion/execute@v4.2.0 - with: - useConfigFile: true - name: Build and analyze env: diff --git a/GitVersion.yml b/GitVersion.yml index 24ee234..25872d0 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: []