From a7cf748e229a57c510fe772a42f9938833723216 Mon Sep 17 00:00:00 2001 From: AkrausGH Date: Fri, 20 Jun 2025 08:41:55 -0400 Subject: [PATCH 1/2] Updated csproj file. Updated yml files with new dotnet command fixed up some GitVersion commands. --- .github/workflows/ci-build.yml | 6 ++--- .github/workflows/release-build.yml | 8 +++---- GitVersion.yml | 23 ++++++------------- .../NetCore.Utilities.UnitTesting.csproj | 2 +- 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index cf36355..67961bf 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -21,12 +21,10 @@ jobs: - name: Ensure .NET Installed uses: actions/setup-dotnet@v4 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v3.1.11 - with: - versionSpec: '6.0.5' + run: dotnet tool install --global GitVersion.Tool --version 5.12.0 - name: Determine Version id: gitversion diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index c03455b..9a46907 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -20,12 +20,10 @@ jobs: - name: Ensure .NET Installed uses: actions/setup-dotnet@v4 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v3.1.11 - with: - versionSpec: '6.0.5' + run: dotnet tool install --global GitVersion.Tool --version 5.12.0 - name: Determine Version id: gitversion @@ -39,4 +37,4 @@ jobs: run: dotnet build "${{ env.solution-path }}" --no-restore --configuration Release -p:version=${{ steps.gitversion.outputs.majorMinorPatch }} - name: Publish - run: nuget push **\*.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.ICG_NUGET_API_KEY}} + run: dotnet nuget push **/*.nupkg -s 'https://api.nuget.org/v3/index.json' -k ${{secrets.ICG_NUGET_API_KEY}} diff --git a/GitVersion.yml b/GitVersion.yml index f9d9ea4..9306b18 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,26 +1,17 @@ mode: ContinuousDeployment -next-version: 6.0.5 +next-version: 1.0.0 branches: - develop: - regex: develop - label: 'alpha' + main: + regex: main + tag: 'alpha' increment: Patch - prevent-increment: - when-current-commit-tagged: true source-branches: [] - hotfix: - regex: hotfix[/-] - source-branches: [develop] - prevent-increment: - when-current-commit-tagged: true - is-release-branch: true pull-request: regex: (pull|pull\-requests|pr)[/-] - label: 'pr' - label-number-pattern: '[/-](?\d+)[-/]' + tag: 'pr' + tag-number-pattern: '[/-](?\d+)[-/]' increment: Patch - prevent-increment: - when-current-commit-tagged: true + prevent-increment-of-merged-branch-version: false is-release-branch: false source-branches: [] ignore: diff --git a/src/NetCore.Utilities.UnitTesting/NetCore.Utilities.UnitTesting.csproj b/src/NetCore.Utilities.UnitTesting/NetCore.Utilities.UnitTesting.csproj index 69bc35b..01189a4 100644 --- a/src/NetCore.Utilities.UnitTesting/NetCore.Utilities.UnitTesting.csproj +++ b/src/NetCore.Utilities.UnitTesting/NetCore.Utilities.UnitTesting.csproj @@ -18,7 +18,7 @@ true - net6.0 + net8.0 ICG.NetCore.Utilities.UnitTesting true true From 97f60f2b5e5218ee51037aac72ce8911fd1c40a6 Mon Sep 17 00:00:00 2001 From: AkrausGH Date: Fri, 20 Jun 2025 08:59:23 -0400 Subject: [PATCH 2/2] Updating the release and ci builds to use the proper gitversion. --- .github/workflows/ci-build.yml | 2 +- .github/workflows/release-build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 67961bf..4af3bed 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -28,7 +28,7 @@ jobs: - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v3.1.11 + uses: gittools/actions/gitversion/execute@v0.10.2 with: useConfigFile: true diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 9a46907..c2d752c 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -27,9 +27,9 @@ jobs: - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v3.1.11 + uses: gittools/actions/gitversion/execute@v0.10.2 with: - useConfigFile: true 15 + useConfigFile: true - name: Restore Packages run: dotnet restore "${{ env.solution-path }}"