Skip to content

Commit ef77a73

Browse files
authored
Upgrade to .NET 7
1 parent 507cdf4 commit ef77a73

File tree

7 files changed

+25
-41
lines changed

7 files changed

+25
-41
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 6 deletions
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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v2
19-
- name: Setup .NET Core 3.1
19+
- name: Setup .NET Core 7.0
2020
uses: actions/setup-dotnet@v1
2121
with:
22-
dotnet-version: '3.1.x'
23-
- name: Setup .NET Core 6.0
24-
uses: actions/setup-dotnet@v1
25-
with:
26-
dotnet-version: '6.0.x'
22+
dotnet-version: '7.0.x'
2723
- name: Install dependencies
2824
run: dotnet restore
2925
- name: Build
@@ -44,14 +40,10 @@ jobs:
4440
runs-on: ubuntu-latest
4541
steps:
4642
- uses: actions/checkout@v2
47-
- name: Setup .NET Core 3.1
48-
uses: actions/setup-dotnet@v1
49-
with:
50-
dotnet-version: '3.1.x'
51-
- name: Setup .NET Core 6.0
43+
- name: Setup .NET Core 7.0
5244
uses: actions/setup-dotnet@v1
5345
with:
54-
dotnet-version: '6.0.x'
46+
dotnet-version: '7.0.x'
5547
- name: Pack NuGet
5648
uses: brandedoutcast/publish-nuget@v2.5.5
5749
with:

.github/workflows/sonarqube-analysis.yml

Lines changed: 3 additions & 7 deletions
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-auth-net
2723
sonarProjectName: qatoolkit_qatoolkit-auth-net

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>0.2.8</Version>
3+
<Version>0.2.9</Version>
44
</PropertyGroup>
55
</Project>

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Currently it supports next Identity providers and Oauth2 flows:
1919
- [client credentials flow](https://identityserver4.readthedocs.io/en/latest/quickstarts/1_client_credentials.html)
2020
- [resource owner password]()
2121

22-
Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `netcoreapp3.1`, `net5.0`.
22+
Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `net7.0`.
2323

2424
Get in touch with me on:
2525

@@ -178,7 +178,7 @@ var token = await auth.GetAccessToken();
178178

179179
MIT License
180180

181-
Copyright (c) 2020-2021 Miha Jakovac
181+
Copyright (c) 2020-2023 Miha Jakovac
182182

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

src/QAToolKit.Auth.Test/QAToolKit.Auth.Test.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
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">
10+
<PackageReference Include="coverlet.msbuild" Version="3.2.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</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="NSubstitute" Version="4.3.0" />
18-
<PackageReference Include="xunit" Version="2.4.1" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
14+
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
17+
<PackageReference Include="NSubstitute" Version="4.4.0" />
18+
<PackageReference Include="xunit" Version="2.4.2" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>
23-
<PackageReference Include="coverlet.collector" Version="3.1.0">
23+
<PackageReference Include="coverlet.collector" Version="3.2.0">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>

src/QAToolKit.Auth/QAToolKit.Auth.csproj

Lines changed: 4 additions & 4 deletions
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>120c5172-ddca-442c-bfab-2101519f6f2d</ProjectGuid>
@@ -19,7 +19,7 @@
1919
<PackageProjectUrl>https://github.com/qatoolkit/qatoolkit-auth-net</PackageProjectUrl>
2020
<PackageIcon>qatoolkit-64x64.png</PackageIcon>
2121
<RepositoryUrl>https://github.com/qatoolkit/qatoolkit-auth-net</RepositoryUrl>
22-
<PackageTags>qatoolkit-auth-net;.net;c#;f#;dotnet;netstandard;net6;authentication;authorization</PackageTags>
22+
<PackageTags>qatoolkit-auth-net;.net;c#;f#;dotnet;netstandard;net7;authentication;authorization</PackageTags>
2323
<Configurations>Debug;Release</Configurations>
2424
</PropertyGroup>
2525

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

3636
<ItemGroup>
3737
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
38-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
39-
<PackageReference Include="QAToolKit.Core" Version="0.3.13" />
38+
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
39+
<PackageReference Include="QAToolKit.Core" Version="0.3.14" />
4040
</ItemGroup>
4141
</Project>

0 commit comments

Comments
 (0)