diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4494688..92c9234 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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 \ No newline at end of file + uses: github/codeql-action/analyze@v2.16.3 \ No newline at end of file diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 5856b41..2ffe0aa 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -14,11 +14,11 @@ 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 @@ -26,10 +26,10 @@ jobs: - 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: @@ -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: diff --git a/.github/workflows/sonarqube-analysis.yml b/.github/workflows/sonarqube-analysis.yml deleted file mode 100644 index 8dda5a3..0000000 --- a/.github/workflows/sonarqube-analysis.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Sonarqube Analyze -on: - push: - branches: - - main - pull_request: - types: [opened, synchronize, reopened] -jobs: - sonarcloud: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Setup .NET Core 7.0 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '7.0.x' - - name: SonarScanner for .NET Core with pull request decoration support - uses: highbyte/sonarscan-dotnet@v2.2.1 - with: - sonarProjectKey: qatoolkit_qatoolkit-core-net - sonarProjectName: qatoolkit_qatoolkit-core-net - sonarOrganization: qatoolkit - dotnetBuildArguments: ./src/QAToolKit.Core/QAToolKit.Core.csproj - dotnetTestArguments: ./src/QAToolKit.Core.Test/QAToolKit.Core.Test.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=opencover - sonarBeginArguments: /d:sonar.verbose="true" /d:sonar.language="cs" /d:sonar.cs.opencover.reportsPaths="**/*.opencover.xml" - sonarHostname: "https://sonarcloud.io" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 8fd71e3..9496389 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,5 @@ - 0.3.14 + 0.3.15 \ No newline at end of file diff --git a/README.md b/README.md index f263bf2..d52823f 100644 --- a/README.md +++ b/README.md @@ -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/) @@ -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: @@ -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 diff --git a/src/QAToolKit.Core.Test/QAToolKit.Core.Test.csproj b/src/QAToolKit.Core.Test/QAToolKit.Core.Test.csproj index 87627be..6cf84f0 100644 --- a/src/QAToolKit.Core.Test/QAToolKit.Core.Test.csproj +++ b/src/QAToolKit.Core.Test/QAToolKit.Core.Test.csproj @@ -1,19 +1,28 @@  - net7.0 + net8.0 latest false - - - - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/QAToolKit.Core/QAToolKit.Core.csproj b/src/QAToolKit.Core/QAToolKit.Core.csproj index 0dd2b75..fc83bd4 100644 --- a/src/QAToolKit.Core/QAToolKit.Core.csproj +++ b/src/QAToolKit.Core/QAToolKit.Core.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netstandard2.1;net7.0 + netstandard2.0;netstandard2.1;net8.0 true latest 5a2191e1-6682-437f-8ed2-de9324bfc4f4 @@ -19,7 +19,7 @@ https://github.com/qatoolkit/qatoolkit-core-net qatoolkit-64x64.png https://github.com/qatoolkit/qatoolkit-core-net - qatoolkit-core-net;.net;c#;f#;dotnet;netstandard;net7 + qatoolkit-core-net;.net;c#;f#;dotnet;netstandard;net8 Debug;Release @@ -35,7 +35,6 @@ - - +