Merge pull request #82 from IowaComputerGurus/feature/build-updates

Updated to build new way

.github/workflows/ci-build.yml

@@ -24,14 +24,16 @@ jobs:
         dotnet-version: 6.0.x
 
     - name: Install GitVersion
-      run: dotnet tool install --global GitVersion.Tool
+      uses: gittools/actions/gitversion/[email protected]
+      with:
+        versionSpec: '6.x'
 
     - name: Determine Version
       id: gitversion
-      uses: gittools/actions/gitversion/execute@v1.1.1
+      uses: gittools/actions/gitversion/execute@v3.0.0
       with:
-        useConfigFile: true 
-
+        useConfigFile: true
+        
     - name: Restore Packages
       run: dotnet restore "${{ env.solution-path }}"
     - name: Build
@@ -75,14 +77,16 @@ jobs:
           dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
           
       - name: Install GitVersion
-        run: dotnet tool install --global GitVersion.Tool
-
+        uses: gittools/actions/gitversion/[email protected]
+        with:
+          versionSpec: '6.x'
+
       - name: Determine Version
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v1.1.1
+        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

.github/workflows/release-build.yml

@@ -23,13 +23,15 @@ jobs:
         dotnet-version: 6.0.x
 
     - name: Install GitVersion
-      run: dotnet tool install --global GitVersion.Tool
+      uses: gittools/actions/gitversion/[email protected]
+      with:
+        versionSpec: '6.x'
 
     - name: Determine Version
       id: gitversion
-      uses: gittools/actions/gitversion/execute@v1.1.1
+      uses: gittools/actions/gitversion/execute@v3.0.0
       with:
-        useConfigFile: true 
+        useConfigFile: true
 
     - name: Restore Packages
       run: dotnet restore "${{ env.solution-path }}"

GitVersion.yml

@@ -3,15 +3,16 @@ next-version: 5.1.4
 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: '[/-](?<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: