Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.NET 8 update #21

Merged
merged 21 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

62 changes: 31 additions & 31 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,40 @@ jobs:
os: [ ubuntu-latest, windows-latest, macos-latest ]

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core 7.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.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
with:
# Artifact name
name: qatoolkit-auth-net.zip
# A file, directory or wildcard pattern that describes what to upload
path: src/QAToolKit.Auth/bin/
- uses: actions/checkout@v4.1.1
- name: Setup .NET Core 8.0
uses: actions/setup-dotnet@v4
with:
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@v4.3.1
with:
# Artifact name
name: qatoolkit-auth-net-${{ matrix.os }}.zip
# A file, directory or wildcard pattern that describes what to upload
path: src/QAToolKit.Auth/bin/
deploy:
name: Pack and Push Nuget
needs: build
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
with:
dotnet-version: '7.0.x'
- name: Pack NuGet
uses: brandedoutcast/publish-nuget@v2.5.5
with:
# Filepath of the project to be packaged, relative to root of repository
PROJECT_FILE_PATH: src/QAToolKit.Auth/QAToolKit.Auth.csproj
VERSION_FILE_PATH: Directory.Build.props
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
TAG_COMMIT: true
- uses: actions/checkout@v4.1.1
- name: Setup .NET Core 8.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Pack NuGet
uses: brandedoutcast/publish-nuget@v2.5.5
with:
# Filepath of the project to be packaged, relative to root of repository
PROJECT_FILE_PATH: src/QAToolKit.Auth/QAToolKit.Auth.csproj
VERSION_FILE_PATH: Directory.Build.props
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
TAG_COMMIT: true
31 changes: 0 additions & 31 deletions .github/workflows/sonarqube-analysis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<Version>0.2.9</Version>
<Version>0.2.10</Version>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Currently it supports next Identity providers and Oauth2 flows:
- [client credentials flow](https://identityserver4.readthedocs.io/en/latest/quickstarts/1_client_credentials.html)
- [resource owner password]()

Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `net7.0`.
Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `net8.0`.

Get in touch with me on:

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

MIT License

Copyright (c) 2020-2023 Miha Jakovac
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
Expand Down
18 changes: 9 additions & 9 deletions src/QAToolKit.Auth.Test/QAToolKit.Auth.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<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.msbuild" Version="3.2.0">
<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="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="NSubstitute" Version="4.4.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<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="NSubstitute" Version="5.1.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">
<PackageReference Include="coverlet.collector" Version="6.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions src/QAToolKit.Auth/QAToolKit.Auth.csproj
Original file line number Diff line number Diff line change
@@ -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>120c5172-ddca-442c-bfab-2101519f6f2d</ProjectGuid>
Expand All @@ -19,7 +19,7 @@
<PackageProjectUrl>https://github.com/qatoolkit/qatoolkit-auth-net</PackageProjectUrl>
<PackageIcon>qatoolkit-64x64.png</PackageIcon>
<RepositoryUrl>https://github.com/qatoolkit/qatoolkit-auth-net</RepositoryUrl>
<PackageTags>qatoolkit-auth-net;.net;c#;f#;dotnet;netstandard;net7;authentication;authorization</PackageTags>
<PackageTags>qatoolkit-auth-net;.net;c#;f#;dotnet;netstandard;net8;authentication;authorization</PackageTags>
<Configurations>Debug;Release</Configurations>
</PropertyGroup>

Expand All @@ -35,7 +35,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="QAToolKit.Core" Version="0.3.14" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="QAToolKit.Core" Version="0.3.15" />
</ItemGroup>
</Project>