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

Develop #71

Merged
merged 31 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0f04ad0
HttpMethodsWhitelist and GeneralContains request filters added
mihaj Dec 4, 2020
e63c8eb
Merge branch 'main' into develop
mihaj Dec 4, 2020
dca752b
MultipartFormData and TextPlain content types added
mihaj Dec 9, 2020
7a77813
version bump
mihaj Dec 9, 2020
98ea929
Merge branch 'main' into develop
mihaj Dec 14, 2020
689d2ca
nuget updates
mihaj Dec 14, 2020
fb4315c
Merge branch 'main' into develop
mihaj Dec 14, 2020
553e7e6
maintenance updates
mihaj Jan 2, 2021
af95651
Hashing helper, refactorings
mihaj Feb 25, 2021
e23a2d3
Merge branch 'main' into develop
mihaj Feb 25, 2021
951a198
convert to pascal case string helper
mihaj Mar 4, 2021
3824c53
Merge branch 'main' into develop
mihaj Mar 4, 2021
6656840
updated dependencies and version bump
mihaj Aug 17, 2021
1379dc7
Merge branch 'main' into develop
mihaj Aug 17, 2021
9c84909
new content type support text/json
mihaj Oct 10, 2021
ad40ac3
Merge branch 'main' into develop
mihaj Oct 10, 2021
fa4d2ca
new content-type text/json (#57)
mihaj Oct 10, 2021
61c0519
Merge remote-tracking branch 'origin/develop' into develop
mihaj Oct 10, 2021
b916744
version bump
mihaj Oct 10, 2021
067fc68
Merge branch 'main' into develop
mihaj Oct 27, 2021
71f418d
format added to Property object, split class (#60)
mihaj Oct 27, 2021
10f5fa5
Merge remote-tracking branch 'origin/develop' into develop
mihaj Oct 27, 2021
e2c7634
Content type updates, Request Body content type as string (#62)
mihaj Nov 27, 2021
55ac826
Merge branch 'main' into develop
mihaj Nov 27, 2021
2144cc7
net 6 upgrade
mihaj Jan 29, 2022
983c233
Merge branch 'main' into develop
mihaj Jan 29, 2022
7d6fcc6
Upgrade to NET 7 (#67)
mihaj Jan 14, 2023
46931a2
Merge branch 'main' into develop
mihaj Jan 14, 2023
ba0a314
csproj update
mihaj Jan 14, 2023
694911c
net8 update
mihaj Mar 7, 2024
331b9b8
Merge branch 'main' into develop
mihaj Mar 7, 2024
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
14 changes: 7 additions & 7 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 10 additions & 10 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
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.3.14</Version>
<Version>0.3.15</Version>
</PropertyGroup>
</Project>
14 changes: 5 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -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/)
Expand All @@ -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:

Expand Down Expand Up @@ -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
Expand Down
25 changes: 17 additions & 8 deletions src/QAToolKit.Core.Test/QAToolKit.Core.Test.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
7 changes: 3 additions & 4 deletions src/QAToolKit.Core/QAToolKit.Core.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>5a2191e1-6682-437f-8ed2-de9324bfc4f4</ProjectGuid>
Expand All @@ -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>

Expand All @@ -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>
Loading