Merge pull request #72 from IowaComputerGurus/feature/fix-build

Fixed build and updated dependencies
IowaComputerGurus · Oct 30, 2024 · 7b1ca23 · 7b1ca23
2 parents 97ab4e7 + 9c66749
commit 7b1ca23
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 27 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -21,16 +21,18 @@ jobs:
     - name: Ensure .NET Installed
       uses: actions/setup-dotnet@v3
       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.9.15
+      uses: gittools/actions/gitversion/execute@v3.0.0
       with:
-        useConfigFile: true 
+        useConfigFile: true
 
     - name: Restore Packages
       run: dotnet restore "${{ env.solution-path }}"
@@ -79,13 +81,15 @@ jobs:
           dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
           
       - 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.9.15
+        uses: gittools/actions/gitversion/execute@v3.0.0
         with:
-          useConfigFile: true 
+          useConfigFile: true
 
       - name: Build and analyze
         env:

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -20,16 +20,18 @@ jobs:
     - name: Ensure .NET Installed
       uses: actions/setup-dotnet@v3
       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.9.15
+      uses: gittools/actions/gitversion/execute@v3.0.0
       with:
-        useConfigFile: true 
+        useConfigFile: true
 
     - name: Restore Packages
       run: dotnet restore "${{ env.solution-path }}"

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -3,15 +3,16 @@ next-version: 5.2.0
 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:

diff --git a/src/AspNetCore.Utilities.Tests/AspNetCore.Utilities.Tests.csproj b/src/AspNetCore.Utilities.Tests/AspNetCore.Utilities.Tests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>ICG.AspNetCore.Utilities.Tests</RootNamespace>
     <OutputType>Library</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/AspNetCore.Utilities/AspNetCore.Utilities.csproj b/src/AspNetCore.Utilities/AspNetCore.Utilities.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>ICG.AspNetCore.Utilities</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -14,7 +14,7 @@
     <PackageId>ICG.AspNetCore.Utilities</PackageId>
     <Title>AspNetCore Utilities</Title>
     <Description>A collection of utilities designed to impove the unit-testability or speed development of AspNetCore development projects.</Description>
-    <Copyright>Copyright 2021, IowaComputerGurus, Subject to the MIT License</Copyright>
+    <Copyright>Copyright 2024, IowaComputerGurus, Subject to the MIT License</Copyright>
     <PackageProjectUrl>https://github.com/IowaComputerGurus/aspnetcore.utilities</PackageProjectUrl>
     <PackageTags>aspnetcore;utility;unit-testing</PackageTags>
     <RepositoryUrl>https://github.com/IowaComputerGurus/aspnetcore.utilities</RepositoryUrl>
@@ -37,8 +37,8 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>