Skip to content

Commit 66c42db

Browse files
mihajmihaj
authored
.NET 8 update
1 parent e22562d commit 66c42db

File tree

7 files changed

+43
-70
lines changed

7 files changed

+43
-70
lines changed

‎.github/workflows/codeql-analysis.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ jobs:
1717

1818
steps:
1919
- name: Checkout repository
20-
uses: actions/checkout@v2
21-
- name: Setup .NET Core 7.0
22-
uses: actions/setup-dotnet@v1
20+
uses: actions/checkout@v4.1.1
21+
- name: Setup .NET Core 8.0
22+
uses: actions/setup-dotnet@v4
2323
with:
24-
dotnet-version: '7.0.x'
24+
dotnet-version: '8.0.x'
2525
- name: Initialize CodeQL
26-
uses: github/codeql-action/init@v1
26+
uses: github/codeql-action/init@v2.16.3
2727
with:
2828
languages: ${{ matrix.language }}
2929
- name: Autobuild
30-
uses: github/codeql-action/autobuild@v1
30+
uses: github/codeql-action/autobuild@v2.16.3
3131
- name: Perform CodeQL Analysis
32-
uses: github/codeql-action/analyze@v1
32+
uses: github/codeql-action/analyze@v2.16.3

‎.github/workflows/dotnet-core.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ jobs:
1414
matrix:
1515
os: [ ubuntu-latest, windows-latest, macos-latest ]
1616
steps:
17-
- uses: actions/checkout@v2
18-
- name: Setup .NET Core 7.0
19-
uses: actions/setup-dotnet@v1
17+
- uses: actions/checkout@v4.1.1
18+
- name: Setup .NET Core 8.0
19+
uses: actions/setup-dotnet@v4
2020
with:
21-
dotnet-version: '7.0.x'
21+
dotnet-version: '8.0.x'
2222
- name: Install dependencies
2323
run: dotnet restore
2424
- name: Build
2525
run: dotnet build --configuration Release --no-restore
2626
- name: Test
2727
run: dotnet test --no-restore --verbosity normal
2828
- name: Upload a Build Artifact
29-
uses: actions/upload-artifact@v2.2.0
29+
uses: actions/upload-artifact@v4.3.1
3030
with:
3131
# Artifact name
32-
name: qatoolkit-core-net.zip
32+
name: qatoolkit-core-net-${{ matrix.os }}.zip
3333
# A file, directory or wildcard pattern that describes what to upload
3434
path: src/QAToolKit.Core/bin/
3535
deploy:
@@ -38,11 +38,11 @@ jobs:
3838
if: github.event_name == 'release'
3939
runs-on: ubuntu-latest
4040
steps:
41-
- uses: actions/checkout@v2
42-
- name: Setup .NET Core 7.0
43-
uses: actions/setup-dotnet@v1
41+
- uses: actions/checkout@v4.1.1
42+
- name: Setup .NET Core 8.0
43+
uses: actions/setup-dotnet@v4
4444
with:
45-
dotnet-version: '7.0.x'
45+
dotnet-version: '8.0.x'
4646
- name: Pack NuGet
4747
uses: brandedoutcast/publish-nuget@v2.5.5
4848
with:

‎.github/workflows/sonarqube-analysis.yml

-31
This file was deleted.

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>0.3.14</Version>
3+
<Version>0.3.15</Version>
44
</PropertyGroup>
55
</Project>

‎README.md

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# QAToolKit Core library
2-
[![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)
2+
[![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)
33
[![CodeQL](https://github.com/qatoolkit/qatoolkit-core-net/workflows/CodeQL%20Analyze/badge.svg)](https://github.com/qatoolkit/qatoolkit-core-net/security/code-scanning)
44
[![Sonarcloud Quality gate](https://github.com/qatoolkit/qatoolkit-core-net/workflows/Sonarqube%20Analyze/badge.svg)](https://sonarcloud.io/dashboard?id=qatoolkit_qatoolkit-core-net)
55
[![NuGet package](https://img.shields.io/nuget/v/QAToolKit.Core?label=QAToolKit.Core)](https://www.nuget.org/packages/QAToolKit.Core/)
@@ -8,11 +8,7 @@
88
## Description
99
`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.
1010

11-
<<<<<<< HEAD
12-
Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `net7.0`
13-
=======
14-
Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `netcoreapp3.1`, `net6.0`
15-
>>>>>>> main
11+
Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `netcoreapp3.1`, `net8.0`
1612

1713
Get in touch with me on:
1814

@@ -81,9 +77,9 @@ To-do
8177

8278
MIT License
8379

84-
Copyright (c) 2020-2023 Miha Jakovac
85-
Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `net7.0`
86-
Copyright (c) 2020-2023 Miha Jakovac
80+
Copyright (c) 2020-2024 Miha Jakovac
81+
Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `net8.0`
82+
Copyright (c) 2020-2024 Miha Jakovac
8783

8884
Permission is hereby granted, free of charge, to any person obtaining a copy
8985
of this software and associated documentation files (the "Software"), to deal

‎src/QAToolKit.Core.Test/QAToolKit.Core.Test.csproj

+17-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="coverlet.collector" Version="3.2.0"/>
11-
<PackageReference Include="coverlet.msbuild" Version="3.2.0"/>
12-
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
15-
<PackageReference Include="xunit" Version="2.4.2" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5"/>
10+
<PackageReference Include="coverlet.collector" Version="6.0.1">
11+
<PrivateAssets>all</PrivateAssets>
12+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13+
</PackageReference>
14+
<PackageReference Include="coverlet.msbuild" Version="6.0.1">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
</PackageReference>
18+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
21+
<PackageReference Include="xunit" Version="2.7.0" />
22+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
23+
<PrivateAssets>all</PrivateAssets>
24+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25+
</PackageReference>
1726
<PackageReference Include="coverlet.collector" Version="3.2.0">
1827
<PrivateAssets>all</PrivateAssets>
1928
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/QAToolKit.Core/QAToolKit.Core.csproj

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<LangVersion>latest</LangVersion>
77
<ProjectGuid>5a2191e1-6682-437f-8ed2-de9324bfc4f4</ProjectGuid>
@@ -19,7 +19,7 @@
1919
<PackageProjectUrl>https://github.com/qatoolkit/qatoolkit-core-net</PackageProjectUrl>
2020
<PackageIcon>qatoolkit-64x64.png</PackageIcon>
2121
<RepositoryUrl>https://github.com/qatoolkit/qatoolkit-core-net</RepositoryUrl>
22-
<PackageTags>qatoolkit-core-net;.net;c#;f#;dotnet;netstandard;net7</PackageTags>
22+
<PackageTags>qatoolkit-core-net;.net;c#;f#;dotnet;netstandard;net8</PackageTags>
2323
<Configurations>Debug;Release</Configurations>
2424
</PropertyGroup>
2525

@@ -35,7 +35,6 @@
3535

3636
<ItemGroup>
3737
<PackageReference Include="murmurhash" Version="1.0.3" />
38-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
39-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
38+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
4039
</ItemGroup>
4140
</Project>

0 commit comments

Comments
 (0)