Skip to content

Commit caabea5

Browse files
Merge pull request #34 from IowaComputerGurus/feature/updates
Cleanup of project
2 parents b49be9b + 30bc5ed commit caabea5

16 files changed

+527
-214
lines changed

.github/workflows/ci-build.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,16 @@ jobs:
2626
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2727

2828
- name: Install GitVersion
29-
run: dotnet tool install --global GitVersion.Tool
30-
29+
uses: gittools/actions/gitversion/[email protected]
30+
with:
31+
versionSpec: '6.x'
32+
3133
- name: Determine Version
3234
id: gitversion
33-
uses: gittools/actions/gitversion/execute@v0.13.2
35+
uses: gittools/actions/gitversion/execute@v3.0.0
3436
with:
35-
useConfigFile: true
36-
37+
useConfigFile: true
38+
3739
- name: Build and analyze
3840
env:
3941
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any

.github/workflows/release-build.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,19 @@ jobs:
2222
- name: Ensure .NET Installed
2323
uses: actions/setup-dotnet@v4
2424
with:
25-
dotnet-version: 6.0.x
25+
dotnet-version: 8.0.x
2626

2727
- name: Install GitVersion
28-
run: dotnet tool install --global GitVersion.Tool
28+
uses: gittools/actions/gitversion/[email protected]
29+
with:
30+
versionSpec: '6.x'
2931

3032
- name: Determine Version
3133
id: gitversion
32-
uses: gittools/actions/gitversion/execute@v0.13.2
34+
uses: gittools/actions/gitversion/execute@v3.0.0
3335
with:
34-
useConfigFile: true
35-
36+
useConfigFile: true
37+
3638
- name: Restore Packages
3739
run: dotnet restore "${{ env.solution-path }}"
3840
- name: Build

GitVersion.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
mode: ContinuousDeployment
22
next-version: 1.0.0
33
branches:
4-
main:
5-
regex: main
6-
tag: 'alpha'
4+
develop:
5+
regex: develop
6+
label: 'alpha'
77
increment: Patch
8+
prevent-increment:
9+
when-current-commit-tagged: true
810
source-branches: []
911
pull-request:
1012
regex: (pull|pull\-requests|pr)[/-]
11-
tag: 'pr'
12-
tag-number-pattern: '[/-](?<number>\d+)[-/]'
13+
label: 'pr'
14+
label-number-pattern: '[/-](?<number>\d+)[-/]'
1315
increment: Patch
14-
prevent-increment-of-merged-branch-version: false
1516
is-release-branch: false
1617
source-branches: []
1718
ignore:

src/AspNetCore.Utilities.Bootstrap5TagHelpers.Sample/AspNetCore.Utilities.Bootstrap5TagHelpers.Sample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

0 commit comments

Comments
 (0)