Skip to content

Commit e22562d

Browse files
mihajmihaj
authored
Upgrade to .NET 7
1 parent 1ed8d02 commit e22562d

File tree

7 files changed

+30
-45
lines changed

7 files changed

+30
-45
lines changed

‎.github/workflows/codeql-analysis.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,10 @@ jobs:
1818
steps:
1919
- name: Checkout repository
2020
uses: actions/checkout@v2
21-
- name: Setup .NET Core 3.1
21+
- name: Setup .NET Core 7.0
2222
uses: actions/setup-dotnet@v1
2323
with:
24-
dotnet-version: '3.1.x'
25-
- name: Setup .NET Core 6.0
26-
uses: actions/setup-dotnet@v1
27-
with:
28-
dotnet-version: '6.0.x'
24+
dotnet-version: '7.0.x'
2925
- name: Initialize CodeQL
3026
uses: github/codeql-action/init@v1
3127
with:

‎.github/workflows/dotnet-core.yml

+4-12
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,10 @@ jobs:
1515
os: [ ubuntu-latest, windows-latest, macos-latest ]
1616
steps:
1717
- uses: actions/checkout@v2
18-
- name: Setup .NET Core 3.1
18+
- name: Setup .NET Core 7.0
1919
uses: actions/setup-dotnet@v1
2020
with:
21-
dotnet-version: '3.1.x'
22-
- name: Setup .NET Core 6.0
23-
uses: actions/setup-dotnet@v1
24-
with:
25-
dotnet-version: '6.0.x'
21+
dotnet-version: '7.0.x'
2622
- name: Install dependencies
2723
run: dotnet restore
2824
- name: Build
@@ -43,14 +39,10 @@ jobs:
4339
runs-on: ubuntu-latest
4440
steps:
4541
- uses: actions/checkout@v2
46-
- name: Setup .NET Core 3.1
47-
uses: actions/setup-dotnet@v1
48-
with:
49-
dotnet-version: '3.1.x'
50-
- name: Setup .NET Core 6.0
42+
- name: Setup .NET Core 7.0
5143
uses: actions/setup-dotnet@v1
5244
with:
53-
dotnet-version: '6.0.x'
45+
dotnet-version: '7.0.x'
5446
- name: Pack NuGet
5547
uses: brandedoutcast/publish-nuget@v2.5.5
5648
with:

‎.github/workflows/sonarqube-analysis.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@ jobs:
1212
- uses: actions/checkout@v2
1313
with:
1414
fetch-depth: 0
15-
- name: Setup .NET Core 3.1
15+
- name: Setup .NET Core 7.0
1616
uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: '3.1.x'
19-
- name: Setup .NET Core 6.0
20-
uses: actions/setup-dotnet@v1
21-
with:
22-
dotnet-version: '6.0.x'
18+
dotnet-version: '7.0.x'
2319
- name: SonarScanner for .NET Core with pull request decoration support
24-
uses: highbyte/sonarscan-dotnet@v2.1.2
20+
uses: highbyte/sonarscan-dotnet@v2.2.1
2521
with:
2622
sonarProjectKey: qatoolkit_qatoolkit-core-net
2723
sonarProjectName: qatoolkit_qatoolkit-core-net

‎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.13</Version>
3+
<Version>0.3.14</Version>
44
</PropertyGroup>
55
</Project>

‎README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
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+
=======
1114
Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `netcoreapp3.1`, `net6.0`
15+
>>>>>>> main
1216
1317
Get in touch with me on:
1418

@@ -77,7 +81,9 @@ To-do
7781

7882
MIT License
7983

80-
Copyright (c) 2020-2021 Miha Jakovac
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
8187

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

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

+9-15
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

99
<ItemGroup>
10-
<PackageReference Include="coverlet.msbuild" Version="3.1.0">
11-
<PrivateAssets>all</PrivateAssets>
12-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13-
</PackageReference>
14-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
17-
<PackageReference Include="murmurhash" Version="1.0.3" />
18-
<PackageReference Include="xunit" Version="2.4.1" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
20-
<PrivateAssets>all</PrivateAssets>
21-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22-
</PackageReference>
23-
<PackageReference Include="coverlet.collector" Version="3.1.0">
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"/>
17+
<PackageReference Include="coverlet.collector" Version="3.2.0">
2418
<PrivateAssets>all</PrivateAssets>
2519
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2620
</PackageReference>

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

+4-3
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;netcoreapp3.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.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;net6</PackageTags>
22+
<PackageTags>qatoolkit-core-net;.net;c#;f#;dotnet;netstandard;net7</PackageTags>
2323
<Configurations>Debug;Release</Configurations>
2424
</PropertyGroup>
2525

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

3636
<ItemGroup>
3737
<PackageReference Include="murmurhash" Version="1.0.3" />
38-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
38+
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
39+
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
3940
</ItemGroup>
4041
</Project>

0 commit comments

Comments
 (0)