From a00e864af7478e62a1bea5c2e5e1b9315239bd9d Mon Sep 17 00:00:00 2001 From: Eugene Fox Date: Thu, 26 Sep 2024 04:14:45 +0300 Subject: [PATCH] Patches (#23) * Bump Microsoft.NET.Test.Sdk from 17.6.0 to 17.11.1 (#22) Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.6.0 to 17.11.1. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.6.0...v17.11.1) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update README.md * Update pr-workflow.yml * Update release-workflow.yml --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/pr-workflow.yml | 14 ++++++++++++++ .github/workflows/release-workflow.yml | 16 +++++++++++----- README.md | 8 +++++--- SimpleOTP.Tests/SimpleOTP.Tests.csproj | 2 +- 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pr-workflow.yml b/.github/workflows/pr-workflow.yml index ea56659..f4b8366 100644 --- a/.github/workflows/pr-workflow.yml +++ b/.github/workflows/pr-workflow.yml @@ -38,3 +38,17 @@ jobs: - run: dotnet restore - run: dotnet build --no-restore - run: dotnet test --no-restore --verbosity normal + + - run: dotnet pack --no-restore --configuration Debug + + - name: Drop SimpleOTP + uses: actions/upload-artifact@main + with: + name: SimpleOTP + path: libraries/SimpleOTP/bin/Debug/EugeneFox.SimpleOTP*.*nupkg + + - name: Drop SimpleOTP.DependencyInjection + uses: actions/upload-artifact@main + with: + name: SimpleOTP.DependencyInjection + path: libraries/SimpleOTP.DependencyInjection/bin/Debug/EugeneFox.SimpleOTP.DependencyInjection*.*nupkg diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml index 08a991f..0938dd1 100644 --- a/.github/workflows/release-workflow.yml +++ b/.github/workflows/release-workflow.yml @@ -20,11 +20,17 @@ jobs: - run: dotnet restore - run: dotnet pack - - name: Drop artifacts + - name: Drop SimpleOTP uses: actions/upload-artifact@main with: - name: packages - path: libraries/**/Release/EugeneFox.SimpleOTP*.?nupkg + name: SimpleOTP + path: libraries/SimpleOTP/bin/Release/EugeneFox.SimpleOTP*.*nupkg + + - name: Drop SimpleOTP.DependencyInjection + uses: actions/upload-artifact@main + with: + name: SimpleOTP.DependencyInjection + path: libraries/SimpleOTP.DependencyInjection/bin/Release/EugeneFox.SimpleOTP.DependencyInjection*.*nupkg publish-nuget: runs-on: ubuntu-latest @@ -32,7 +38,7 @@ jobs: steps: - uses: actions/download-artifact@main with: - name: packages + merge-multiple: true - name: Publish NuGet and symbols uses: edumserrano/nuget-push@v1.2.2 @@ -46,7 +52,7 @@ jobs: steps: - uses: actions/download-artifact@main with: - name: packages + merge-multiple: true - name: dotnet nuget push run: dotnet nuget push *.nupkg -k ${{ secrets.GITHUB_TOKEN }} -s https://nuget.pkg.github.com/xfox111/index.json --skip-duplicate --no-symbols diff --git a/README.md b/README.md index 16d6468..6fa9088 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,8 @@ Feature-rich and flexible .NET library for implementation of OTP authenticators | Package | Info | Download | | --- | --- | --- | -| `EugeneFox.SimpleOTP` | [![Nuget](https://img.shields.io/nuget/v/EugeneFox.SimpleOTP)][nuget]
[![Nuget](https://img.shields.io/nuget/dt/EugeneFox.SimpleOTP)][nuget] | [NuGet Gallery][nuget]
[GitHub Releases](https://github.com/xfox111/SimpleOTP/releases/latest) | -| `EugeneFox.SimpleOTP.DependencyInjection` | [![Nuget](https://img.shields.io/nuget/v/EugeneFox.SimpleOTP.DependencyInjection)][nuget-di]
[![Nuget](https://img.shields.io/nuget/dt/EugeneFox.SimpleOTP.DependencyInjection)][nuget-di] | [NuGet Gallery][nuget-di]
[GitHub Releases](https://github.com/xfox111/SimpleOTP/releases/latest) | +| `EugeneFox.SimpleOTP` | [![Nuget](https://img.shields.io/nuget/v/EugeneFox.SimpleOTP)][nuget]
[![Nuget](https://img.shields.io/nuget/dt/EugeneFox.SimpleOTP)][nuget] | [NuGet Gallery][nuget]
[GitHub NuGet Registry][ghnr] | +| `EugeneFox.SimpleOTP.DependencyInjection` | [![Nuget](https://img.shields.io/nuget/v/EugeneFox.SimpleOTP.DependencyInjection)][nuget-di]
[![Nuget](https://img.shields.io/nuget/dt/EugeneFox.SimpleOTP.DependencyInjection)][nuget-di] | [NuGet Gallery][nuget-di]
[GitHub NuGet Registry][ghnr-di] | Use these commands to install SimpleOTP package in your project: ```bash @@ -36,7 +36,7 @@ Please refer to [project's Wiki](https://github.com/XFox111/SimpleOTP/wiki) for ## Contributing [![GitHub issues](https://img.shields.io/github/issues/xfox111/SimpleOTP)](https://github.com/xfox111/SimpleOTP/issues) -[![CI](https://github.com/XFox111/SimpleOTP/actions/workflows/cd_pipeline.yaml/badge.svg)](https://github.com/XFox111/SimpleOTP/actions/workflows/cd_pipeline.yaml) +[![CI](https://github.com/XFox111/SimpleOTP/actions/workflows/release-workflow.yml/badge.svg)](https://github.com/XFox111/SimpleOTP/actions/workflows/cd_pipeline.yaml) [![GitHub repo size](https://img.shields.io/github/repo-size/xfox111/SimpleOTP?label=repo%20size)](https://github.com/xfox111/SimpleOTP) There are many ways in which you can participate in the project, for example: @@ -59,4 +59,6 @@ If you are interested in fixing issues and contributing directly to the code bas [otpauth-ID]: https://www.ietf.org/archive/id/draft-linuxgemini-otpauth-uri-00.html [nuget]: https://www.nuget.org/packages/EugeneFox.SimpleOTP [nuget-di]: https://www.nuget.org/packages/EugeneFox.SimpleOTP.DependencyInjection +[ghnr]: https://github.com/XFox111/SimpleOTP/pkgs/nuget/EugeneFox.SimpleOTP +[ghnr-di]: https://github.com/XFox111/SimpleOTP/pkgs/nuget/EugeneFox.SimpleOTP.DependencyInjection [mit]: https://github.com/XFox111/SimpleOTP/blob/main/LICENSE diff --git a/SimpleOTP.Tests/SimpleOTP.Tests.csproj b/SimpleOTP.Tests/SimpleOTP.Tests.csproj index ce29b71..55c2120 100644 --- a/SimpleOTP.Tests/SimpleOTP.Tests.csproj +++ b/SimpleOTP.Tests/SimpleOTP.Tests.csproj @@ -10,7 +10,7 @@ - +