Skip to content

Commit

Permalink
Merge pull request #34 from IowaComputerGurus/feature/updates
Browse files Browse the repository at this point in the history
Cleanup of project
  • Loading branch information
mitchelsellers authored Sep 23, 2024
2 parents b49be9b + 30bc5ed commit caabea5
Show file tree
Hide file tree
Showing 16 changed files with 527 additions and 214 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,16 @@ jobs:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- 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.13.2
uses: gittools/actions/gitversion/execute@v3.0.0
with:
useConfigFile: true

useConfigFile: true
- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,19 @@ jobs:
- name: Ensure .NET Installed
uses: actions/setup-dotnet@v4
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.13.2
uses: gittools/actions/gitversion/execute@v3.0.0
with:
useConfigFile: true

useConfigFile: true
- name: Restore Packages
run: dotnet restore "${{ env.solution-path }}"
- name: Build
Expand Down
13 changes: 7 additions & 6 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
mode: ContinuousDeployment
next-version: 1.0.0
branches:
main:
regex: main
tag: 'alpha'
develop:
regex: develop
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: '[/-](?<number>\d+)[-/]'
label: 'pr'
label-number-pattern: '[/-](?<number>\d+)[-/]'
increment: Patch
prevent-increment-of-merged-branch-version: false
is-release-branch: false
source-branches: []
ignore:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
Loading

0 comments on commit caabea5

Please sign in to comment.