diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 85af193..f8c19f7 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -21,16 +21,18 @@ jobs: - name: Ensure .NET Installed uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Install GitVersion - run: dotnet tool install --global GitVersion.Tool - + uses: gittools/actions/gitversion/setup@v3.0.0 + with: + versionSpec: '6.x' + - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.15 + uses: gittools/actions/gitversion/execute@v3.0.0 with: - useConfigFile: true + useConfigFile: true - name: Restore Packages run: dotnet restore "${{ env.solution-path }}" @@ -79,13 +81,15 @@ jobs: dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner - name: Install GitVersion - run: dotnet tool install --global GitVersion.Tool - + uses: gittools/actions/gitversion/setup@v3.0.0 + with: + versionSpec: '6.x' + - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.15 + uses: gittools/actions/gitversion/execute@v3.0.0 with: - useConfigFile: true + useConfigFile: true - name: Build and analyze env: diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index cfafdd6..44cf56f 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -20,16 +20,18 @@ jobs: - name: Ensure .NET Installed uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Install GitVersion - run: dotnet tool install --global GitVersion.Tool - + uses: gittools/actions/gitversion/setup@v3.0.0 + with: + versionSpec: '6.x' + - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.15 + uses: gittools/actions/gitversion/execute@v3.0.0 with: - useConfigFile: true + useConfigFile: true - name: Restore Packages run: dotnet restore "${{ env.solution-path }}" diff --git a/GitVersion.yml b/GitVersion.yml index ecba444..120eb4b 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -3,15 +3,16 @@ next-version: 5.2.0 branches: develop: regex: develop - tag: 'alpha' + label: 'alpha' increment: Patch + prevent-increment: + when-current-commit-tagged: true source-branches: [] pull-request: regex: (pull|pull\-requests|pr)[/-] - tag: 'pr' - tag-number-pattern: '[/-](?\d+)[-/]' + label: 'pr' + label-number-pattern: '[/-](?\d+)[-/]' increment: Patch - prevent-increment-of-merged-branch-version: false is-release-branch: false source-branches: [] ignore: diff --git a/src/AspNetCore.Utilities.Tests/AspNetCore.Utilities.Tests.csproj b/src/AspNetCore.Utilities.Tests/AspNetCore.Utilities.Tests.csproj index b15aadf..f25b434 100644 --- a/src/AspNetCore.Utilities.Tests/AspNetCore.Utilities.Tests.csproj +++ b/src/AspNetCore.Utilities.Tests/AspNetCore.Utilities.Tests.csproj @@ -1,17 +1,17 @@  - net6.0 + net8.0 false ICG.AspNetCore.Utilities.Tests Library - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/AspNetCore.Utilities/AspNetCore.Utilities.csproj b/src/AspNetCore.Utilities/AspNetCore.Utilities.csproj index 66b0dc6..c1ad578 100644 --- a/src/AspNetCore.Utilities/AspNetCore.Utilities.csproj +++ b/src/AspNetCore.Utilities/AspNetCore.Utilities.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 ICG.AspNetCore.Utilities true true @@ -14,7 +14,7 @@ ICG.AspNetCore.Utilities AspNetCore Utilities A collection of utilities designed to impove the unit-testability or speed development of AspNetCore development projects. - Copyright 2021, IowaComputerGurus, Subject to the MIT License + Copyright 2024, IowaComputerGurus, Subject to the MIT License https://github.com/IowaComputerGurus/aspnetcore.utilities aspnetcore;utility;unit-testing https://github.com/IowaComputerGurus/aspnetcore.utilities @@ -37,8 +37,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive