.NET 8 update

qatoolkit · Mar 7, 2024 · 66c42db · 66c42db
1 parent e22562d
commit 66c42db
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 70 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -17,16 +17,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
-    - name: Setup .NET Core 7.0
-      uses: actions/setup-dotnet@v1
+      uses: actions/checkout@v4.1.1
+    - name: Setup .NET Core 8.0
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'        
+        dotnet-version: '8.0.x'        
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2.16.3
       with:
         languages: ${{ matrix.language }}
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2.16.3
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2.16.3
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -14,22 +14,22 @@ jobs:
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET Core 7.0
-      uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v4.1.1
+    - name: Setup .NET Core 8.0
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
     - name: Install dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --configuration Release --no-restore
     - name: Test
       run: dotnet test --no-restore --verbosity normal
     - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v2.2.0
+      uses: actions/upload-artifact@v4.3.1
       with:
         # Artifact name
-        name: qatoolkit-core-net.zip
+        name: qatoolkit-core-net-${{ matrix.os }}.zip
         # A file, directory or wildcard pattern that describes what to upload
         path: src/QAToolKit.Core/bin/
   deploy:
@@ -38,11 +38,11 @@ jobs:
     if: github.event_name == 'release'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET Core 7.0
-      uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v4.1.1
+    - name: Setup .NET Core 8.0
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
     - name: Pack NuGet
       uses: brandedoutcast/publish-nuget@v2.5.5
       with:

diff --git a/.github/workflows/sonarqube-analysis.yml b/.github/workflows/sonarqube-analysis.yml
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>0.3.14</Version>
+    <Version>0.3.15</Version>
   </PropertyGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # QAToolKit Core library
-[![Build .NET Library](https://github.com/qatoolkit/qatoolkit-core-net/workflows/.NET%20Core/badge.svg?branch=main)](https://github.com/qatoolkit/qatoolkit-core-net/actions)
+[![Build .NET Library](https://github.com/qatoolkit/qatoolkit-core-net/actions/workflows/dotnet-core.yml/badge.svg)](https://github.com/qatoolkit/qatoolkit-core-net/actions/workflows/dotnet-core.yml)
 [![CodeQL](https://github.com/qatoolkit/qatoolkit-core-net/workflows/CodeQL%20Analyze/badge.svg)](https://github.com/qatoolkit/qatoolkit-core-net/security/code-scanning)
 [![Sonarcloud Quality gate](https://github.com/qatoolkit/qatoolkit-core-net/workflows/Sonarqube%20Analyze/badge.svg)](https://sonarcloud.io/dashboard?id=qatoolkit_qatoolkit-core-net)
 [![NuGet package](https://img.shields.io/nuget/v/QAToolKit.Core?label=QAToolKit.Core)](https://www.nuget.org/packages/QAToolKit.Core/)
@@ -8,11 +8,7 @@
 ## Description
 `QAToolKit.Core` is a .NET Standard 2.1 library, that contains core objects and functions of the toolkit. It's normally not used as a standalone library but is a dependency for other QAToolKit libraries.
 
-<<<<<<< HEAD
-Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `net7.0`
-=======
-Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `netcoreapp3.1`, `net6.0`
->>>>>>> main
+Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `netcoreapp3.1`, `net8.0`
 
 Get in touch with me on:
 
@@ -81,9 +77,9 @@ To-do
 
 MIT License
 
-Copyright (c) 2020-2023 Miha Jakovac
-Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `net7.0`
-Copyright (c) 2020-2023 Miha Jakovac
+Copyright (c) 2020-2024 Miha Jakovac
+Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `net8.0`
+Copyright (c) 2020-2024 Miha Jakovac
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/QAToolKit.Core.Test/QAToolKit.Core.Test.csproj b/src/QAToolKit.Core.Test/QAToolKit.Core.Test.csproj
@@ -1,19 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0"/>
-    <PackageReference Include="coverlet.msbuild" Version="3.2.0"/>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5"/>
+    <PackageReference Include="coverlet.collector" Version="6.0.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.msbuild" Version="6.0.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/QAToolKit.Core/QAToolKit.Core.csproj b/src/QAToolKit.Core/QAToolKit.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<LangVersion>latest</LangVersion>
 		<ProjectGuid>5a2191e1-6682-437f-8ed2-de9324bfc4f4</ProjectGuid>
@@ -19,7 +19,7 @@
 		<PackageProjectUrl>https://github.com/qatoolkit/qatoolkit-core-net</PackageProjectUrl>
 		<PackageIcon>qatoolkit-64x64.png</PackageIcon>
 		<RepositoryUrl>https://github.com/qatoolkit/qatoolkit-core-net</RepositoryUrl>
-		<PackageTags>qatoolkit-core-net;.net;c#;f#;dotnet;netstandard;net7</PackageTags>
+		<PackageTags>qatoolkit-core-net;.net;c#;f#;dotnet;netstandard;net8</PackageTags>
 		<Configurations>Debug;Release</Configurations>
 	</PropertyGroup>
 
@@ -35,7 +35,6 @@
 
 	<ItemGroup>
 	  <PackageReference Include="murmurhash" Version="1.0.3" />
-	  <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-	  <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+	  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
 </Project>