Merge pull request #68 from IowaComputerGurus/feature/build-update

Updated Build

Author: mitchelsellers

.github/workflows/ci-build.yml

@@ -24,15 +24,13 @@ jobs:
         dotnet-version: 9.0.x
 
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v3.1.3
+      uses: gittools/actions/gitversion/setup@v4.2.0
       with:
-        versionSpec: '6.0.5'
+        versionSpec: '6.4.0'
 
     - name: Determine Version
       id: gitversion
-      uses: gittools/actions/gitversion/[email protected]
-      with:
-        useConfigFile: true 
+      uses: gittools/actions/gitversion/[email protected]
 
     - name: Restore Packages
       run: dotnet restore "${{ env.solution-path }}"
@@ -81,24 +79,22 @@ jobs:
           dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
           
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v3.1.3
+        uses: gittools/actions/gitversion/setup@v4.2.0
         with:
-          versionSpec: '6.0.5'
+          versionSpec: '6.4.0'
 
       - name: Determine Version
         id: gitversion
-        uses: gittools/actions/gitversion/[email protected]
-        with:
-          useConfigFile: true 
+        uses: gittools/actions/gitversion/[email protected]
 
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         shell: powershell
         run: |
-          .\.sonar\scanner\dotnet-sonarscanner begin /k:"IowaComputerGurus_netcore.utilities" /o:"iowacomputergurus-github" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
+          .\.sonar\scanner\dotnet-sonarscanner begin /k:"IowaComputerGurus_netcore.utilities" /o:"iowacomputergurus-github" /d:sonar.login="${{ env.SONAR_TOKEN }}"
           dotnet restore "${{ env.solution-path }}"
           dotnet build "${{ env.solution-path }}" --no-restore --configuration Release -p:version=${{ steps.gitversion.outputs.majorMinorPatch }}
           dotnet test "${{ env.solution-path }}" --no-build --configuration Release --collect "XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover --logger "trx;LogFileName=unittests.trx"
-          .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
+          .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ env.SONAR_TOKEN }}"

.github/workflows/release-build.yml

@@ -23,15 +23,13 @@ jobs:
         dotnet-version: 9.0.x
 
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v3.1.3
+      uses: gittools/actions/gitversion/setup@v4.2.0
       with:
-        versionSpec: '6.0.5'
+        versionSpec: '6.4.0'
 
     - name: Determine Version
       id: gitversion
-      uses: gittools/actions/gitversion/[email protected]
-      with:
-        useConfigFile: true 
+      uses: gittools/actions/gitversion/[email protected]
 
     - name: Restore Packages
       run: dotnet restore "${{ env.solution-path }}"

GitVersion.yml

@@ -17,7 +17,6 @@ branches:
   pull-request:
     regex: (pull|pull\-requests|pr)[/-]
     label: 'pr'
-    label-number-pattern: '[/-](?<number>\d+)[-/]'
     increment: Patch
     is-release-branch: false
     source-branches: []

src/NetCore.Utilities.Tests/NetCore.Utilities.Tests.csproj

@@ -8,15 +8,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>