From 241c7f499ce87d0e4a4c8615b7d9d2d6bba862b9 Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Thu, 6 Jul 2023 23:58:33 -0500 Subject: [PATCH 01/15] adding support for `netstandard2.0` --- .github/workflows/cicd-actions.yml | 12 +++++++++--- NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj | 2 +- NullFX.CRC.Tests/NullFX.CRC.Tests.csproj | 2 +- NullFX.CRC/NullFX.CRC.csproj | 14 +++++++------- README.md | 2 +- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index 9f71686..ac8b490 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -26,10 +26,16 @@ jobs: 7.0.x - name: install dependencies run: dotnet restore - - name: build + - name: build source run: dotnet build - - name: test + - name: run tests run: dotnet test + - name: create nuget packages + run: dotnet pack -c Release -o ./out + - name: push nuget packages to github + run: dotnet nuget push ./out/*.nupkg -k ${GITHUB_TOKEN} -s https://nuget.pkg.github.com/nullfx/index.json + env: + GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} - name: Cache SonarCloud packages uses: actions/cache@v1 with: @@ -51,7 +57,7 @@ jobs: dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner - name: Build and analyze env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} shell: powershell run: | diff --git a/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj b/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj index 1cfbd3e..6134d7f 100644 --- a/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj +++ b/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj @@ -2,7 +2,7 @@ Exe - net47;net48;netcoreapp3.1;net6.0 + netstandard2.0;net47;net48;netcoreapp3.1;net6.0;net7.0 false 1.1.7 true diff --git a/NullFX.CRC.Tests/NullFX.CRC.Tests.csproj b/NullFX.CRC.Tests/NullFX.CRC.Tests.csproj index f040029..2f7f0ec 100644 --- a/NullFX.CRC.Tests/NullFX.CRC.Tests.csproj +++ b/NullFX.CRC.Tests/NullFX.CRC.Tests.csproj @@ -3,7 +3,7 @@ net7.0 false false - 1.1.7 + 1.1.8 true diff --git a/NullFX.CRC/NullFX.CRC.csproj b/NullFX.CRC/NullFX.CRC.csproj index 6584eb5..3961b68 100644 --- a/NullFX.CRC/NullFX.CRC.csproj +++ b/NullFX.CRC/NullFX.CRC.csproj @@ -1,10 +1,10 @@  - net40;net45;net46;net47;net48;netcoreapp3.1;net6.0;net7.0 + netstandard2.0;net40;net45;net46;net47;net48;netcoreapp3.1;net6.0;net7.0 NullFX.CRC NullFX CRC is a small set of CRC utilities (crc8, crc16, and crc32) written in C# and released under the MIT License - 2022 Steve Whitley + 2023 Steve Whitley true Steve Whitley NullFX Software @@ -12,18 +12,18 @@ https://github.com/nullfx/NullFX.CRC https://github.com/nullfx/NullFX.CRC README.md - 1.1.7 + 1.1.8 Steve Whitley NullFX CRC is a small set of CRC utilities (crc8, crc16, and crc32) written in C# and released under the MIT License NullFX CRC true true snupkg - 1.1.7.0 - 1.1.7.0 + 1.1.8.0 + 1.1.8.0 MIT - 1.1.7 - 1.1.7 + 1.1.8 + 1.1.8 Release;Debug True diff --git a/README.md b/README.md index 55d83ac..6e8c678 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ NullFX CRC is a small set of CRC utilities written in native C# released under t ## Install ```sh -dotnet add PROJECT package NullFX.CRC --version 1.1.7 +dotnet add PROJECT package NullFX.CRC --version 1.1.8 ``` ## Examples: From 4ea39a06013263c17b3bdf1c673b05e5ce452a3b Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 00:09:22 -0500 Subject: [PATCH 02/15] updated BenchmarkDotNet version --- NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj b/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj index 6134d7f..4014176 100644 --- a/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj +++ b/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj @@ -8,7 +8,7 @@ true - + From 1d00aafad4a4181da2f8f2c83b7cc45adf0054ba Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 00:46:11 -0500 Subject: [PATCH 03/15] added nuget delivery for github and nuget.org --- .github/workflows/cicd-actions.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index ac8b490..608f09f 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -36,6 +36,10 @@ jobs: run: dotnet nuget push ./out/*.nupkg -k ${GITHUB_TOKEN} -s https://nuget.pkg.github.com/nullfx/index.json env: GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} + - name: push nuget packages to nuget.org + run: dotnet nuget push ./out/*.nupkg --api-key ${NUGET_API_KEY} -s https://api.nuget.org/v3/index.json --skip-duplicate + env: + NUGET_API_KEY: ${{ secrets.NUGET_ORG_API_KEY }} - name: Cache SonarCloud packages uses: actions/cache@v1 with: From 91c9c3d4fabf7011d8da431f4cdb01033205d63c Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 00:55:41 -0500 Subject: [PATCH 04/15] added nuget delivery for github and nuget.org --- .github/workflows/cicd-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index 608f09f..3893204 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -27,7 +27,7 @@ jobs: - name: install dependencies run: dotnet restore - name: build source - run: dotnet build + run: dotnet build -c Release - name: run tests run: dotnet test - name: create nuget packages From d933fd98cd2e1a4feab00de55402c053983424b1 Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 01:12:27 -0500 Subject: [PATCH 05/15] added nuget delivery for github and nuget.org --- .github/workflows/cicd-actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index 3893204..024ed11 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -33,11 +33,11 @@ jobs: - name: create nuget packages run: dotnet pack -c Release -o ./out - name: push nuget packages to github - run: dotnet nuget push ./out/*.nupkg -k ${GITHUB_TOKEN} -s https://nuget.pkg.github.com/nullfx/index.json + run: dotnet nuget push ./out/*.nupkg -k ${GITHUB_TOKEN} -s "https://nuget.pkg.github.com/nullfx/index.json" env: GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} - name: push nuget packages to nuget.org - run: dotnet nuget push ./out/*.nupkg --api-key ${NUGET_API_KEY} -s https://api.nuget.org/v3/index.json --skip-duplicate + run: dotnet nuget push ./out/*.nupkg --skip-duplicate -k ${NUGET_API_KEY} -s ""https://api.nuget.org/v3/index.json" env: NUGET_API_KEY: ${{ secrets.NUGET_ORG_API_KEY }} - name: Cache SonarCloud packages From ac6a5eb8f367e4bc43ad4ed6514ac67014e231eb Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 01:13:55 -0500 Subject: [PATCH 06/15] added nuget delivery for github and nuget.org --- .github/workflows/cicd-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index 024ed11..0543c0a 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -37,7 +37,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} - name: push nuget packages to nuget.org - run: dotnet nuget push ./out/*.nupkg --skip-duplicate -k ${NUGET_API_KEY} -s ""https://api.nuget.org/v3/index.json" + run: dotnet nuget push ./out/*.nupkg --skip-duplicate -k ${NUGET_API_KEY} -s "https://api.nuget.org/v3/index.json" env: NUGET_API_KEY: ${{ secrets.NUGET_ORG_API_KEY }} - name: Cache SonarCloud packages From 060a6dc1b1df986f04850ef512acdb6905a40da0 Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 01:29:29 -0500 Subject: [PATCH 07/15] added nuget delivery for github and nuget.org --- .github/workflows/cicd-actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index 0543c0a..9ad29db 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -33,11 +33,11 @@ jobs: - name: create nuget packages run: dotnet pack -c Release -o ./out - name: push nuget packages to github - run: dotnet nuget push ./out/*.nupkg -k ${GITHUB_TOKEN} -s "https://nuget.pkg.github.com/nullfx/index.json" + run: dotnet nuget push ./out/*.nupkg -s "https://nuget.pkg.github.com/nullfx/index.json" -k ${GITHUB_TOKEN} env: GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} - name: push nuget packages to nuget.org - run: dotnet nuget push ./out/*.nupkg --skip-duplicate -k ${NUGET_API_KEY} -s "https://api.nuget.org/v3/index.json" + run: dotnet nuget push ./out/*.nupkg --skip-duplicate -s "https://api.nuget.org/v3/index.json" -k ${NUGET_API_KEY} env: NUGET_API_KEY: ${{ secrets.NUGET_ORG_API_KEY }} - name: Cache SonarCloud packages From c55b5586edbc32093ea444ca2f23b111fd2bfdd4 Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 01:35:38 -0500 Subject: [PATCH 08/15] added nuget delivery for github and nuget.org --- .github/workflows/cicd-actions.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index 9ad29db..e73b8f6 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -33,13 +33,9 @@ jobs: - name: create nuget packages run: dotnet pack -c Release -o ./out - name: push nuget packages to github - run: dotnet nuget push ./out/*.nupkg -s "https://nuget.pkg.github.com/nullfx/index.json" -k ${GITHUB_TOKEN} - env: - GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} + run: dotnet nuget push ./out/*.nupkg -s "https://nuget.pkg.github.com/nullfx/index.json" -k ${{ secrets.GIT_TOKEN }} - name: push nuget packages to nuget.org - run: dotnet nuget push ./out/*.nupkg --skip-duplicate -s "https://api.nuget.org/v3/index.json" -k ${NUGET_API_KEY} - env: - NUGET_API_KEY: ${{ secrets.NUGET_ORG_API_KEY }} + run: dotnet nuget push ./out/*.nupkg --skip-duplicate -s "https://api.nuget.org/v3/index.json" -k ${{ secrets.NUGET_ORG_API_KEY }} - name: Cache SonarCloud packages uses: actions/cache@v1 with: From e8282e026a909841fed002b2b4377a48e60c6c0a Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 02:19:20 -0500 Subject: [PATCH 09/15] adding automated build numbers and nuget packaging --- .github/workflows/cicd-actions.yml | 10 +++++++--- NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj | 3 ++- NullFX.CRC.Tests/NullFX.CRC.Tests.csproj | 3 ++- NullFX.CRC/NullFX.CRC.csproj | 11 ++++++----- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index e73b8f6..b0081a1 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -25,7 +25,11 @@ jobs: 6.0.x 7.0.x - name: install dependencies - run: dotnet restore + run: dotnet restore + - name: replace version tokens + uses: cschleiden/replace-tokens@v1.2 + with: + files: '["**/*.csproj"]' - name: build source run: dotnet build -c Release - name: run tests @@ -33,9 +37,9 @@ jobs: - name: create nuget packages run: dotnet pack -c Release -o ./out - name: push nuget packages to github - run: dotnet nuget push ./out/*.nupkg -s "https://nuget.pkg.github.com/nullfx/index.json" -k ${{ secrets.GIT_TOKEN }} + run: dotnet nuget push "./out/NullFX.CRC.$RELEASE_VERSION.nupkg" -s "https://nuget.pkg.github.com/nullfx/index.json" -k ${{ secrets.GIT_TOKEN }} - name: push nuget packages to nuget.org - run: dotnet nuget push ./out/*.nupkg --skip-duplicate -s "https://api.nuget.org/v3/index.json" -k ${{ secrets.NUGET_ORG_API_KEY }} + run: dotnet nuget push "./out/NullFX.CRC.$RELEASE_VERSION.nupkg" --skip-duplicate -s "https://api.nuget.org/v3/index.json" -k ${{ secrets.NUGET_ORG_API_KEY }} - name: Cache SonarCloud packages uses: actions/cache@v1 with: diff --git a/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj b/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj index 4014176..e903639 100644 --- a/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj +++ b/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj @@ -4,7 +4,8 @@ Exe netstandard2.0;net47;net48;netcoreapp3.1;net6.0;net7.0 false - 1.1.7 + + #{RELEASE_VERSION}# true diff --git a/NullFX.CRC.Tests/NullFX.CRC.Tests.csproj b/NullFX.CRC.Tests/NullFX.CRC.Tests.csproj index 2f7f0ec..002216d 100644 --- a/NullFX.CRC.Tests/NullFX.CRC.Tests.csproj +++ b/NullFX.CRC.Tests/NullFX.CRC.Tests.csproj @@ -3,7 +3,8 @@ net7.0 false false - 1.1.8 + + #{RELEASE_VERSION}# true diff --git a/NullFX.CRC/NullFX.CRC.csproj b/NullFX.CRC/NullFX.CRC.csproj index 3961b68..060d3f6 100644 --- a/NullFX.CRC/NullFX.CRC.csproj +++ b/NullFX.CRC/NullFX.CRC.csproj @@ -12,20 +12,21 @@ https://github.com/nullfx/NullFX.CRC https://github.com/nullfx/NullFX.CRC README.md - 1.1.8 Steve Whitley NullFX CRC is a small set of CRC utilities (crc8, crc16, and crc32) written in C# and released under the MIT License NullFX CRC true true snupkg - 1.1.8.0 - 1.1.8.0 MIT - 1.1.8 - 1.1.8 Release;Debug True + + #{RELEASE_VERSION}# + #{RELEASE_VERSION}#.0 + #{RELEASE_VERSION}#.0 + #{RELEASE_VERSION}# + #{RELEASE_VERSION}# From 7259a501e2de24a71b4214b1bbde9ae1524ad0e4 Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 02:21:57 -0500 Subject: [PATCH 10/15] adding automated build numbers and nuget packaging --- .github/workflows/cicd-actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index b0081a1..c9bc1fa 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -24,12 +24,12 @@ jobs: 3.1.x 6.0.x 7.0.x - - name: install dependencies - run: dotnet restore - name: replace version tokens uses: cschleiden/replace-tokens@v1.2 with: files: '["**/*.csproj"]' + - name: install dependencies + run: dotnet restore - name: build source run: dotnet build -c Release - name: run tests From d24dabc92402374b6c49bb957d1f95c69df1e9a0 Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 02:29:42 -0500 Subject: [PATCH 11/15] adding automated build numbers and nuget packaging --- .github/workflows/cicd-actions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index c9bc1fa..68bbbb4 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -28,6 +28,8 @@ jobs: uses: cschleiden/replace-tokens@v1.2 with: files: '["**/*.csproj"]' + env: + RELEASE_VERSION: ${{ var.RELEASE_VERSION }} - name: install dependencies run: dotnet restore - name: build source From 394ffe305b9cb7c8c5eb2044f9006e09312bbe65 Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 02:31:20 -0500 Subject: [PATCH 12/15] adding automated build numbers and nuget packaging --- .github/workflows/cicd-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index 68bbbb4..a6963b4 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -29,7 +29,7 @@ jobs: with: files: '["**/*.csproj"]' env: - RELEASE_VERSION: ${{ var.RELEASE_VERSION }} + RELEASE_VERSION: ${{ vars.RELEASE_VERSION }} - name: install dependencies run: dotnet restore - name: build source From 1418aa1ea8eaba9b214b98400d461e4b7864d5f6 Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 02:36:54 -0500 Subject: [PATCH 13/15] adding automated build numbers and nuget packaging --- .github/workflows/cicd-actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index a6963b4..e04e671 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -39,9 +39,9 @@ jobs: - name: create nuget packages run: dotnet pack -c Release -o ./out - name: push nuget packages to github - run: dotnet nuget push "./out/NullFX.CRC.$RELEASE_VERSION.nupkg" -s "https://nuget.pkg.github.com/nullfx/index.json" -k ${{ secrets.GIT_TOKEN }} + run: dotnet nuget push "./out/NullFX.CRC.${{ vars.RELEASE_VERSION }}.nupkg" -s "https://nuget.pkg.github.com/nullfx/index.json" -k ${{ secrets.GIT_TOKEN }} - name: push nuget packages to nuget.org - run: dotnet nuget push "./out/NullFX.CRC.$RELEASE_VERSION.nupkg" --skip-duplicate -s "https://api.nuget.org/v3/index.json" -k ${{ secrets.NUGET_ORG_API_KEY }} + run: dotnet nuget push "./out/NullFX.CRC.${{ vars.RELEASE_VERSION }}.nupkg" --skip-duplicate -s "https://api.nuget.org/v3/index.json" -k ${{ secrets.NUGET_ORG_API_KEY }} - name: Cache SonarCloud packages uses: actions/cache@v1 with: From 979b1f9fc0ec8b0dcc3a8c18bef19f3614b6c41e Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 02:49:35 -0500 Subject: [PATCH 14/15] adding automated build numbers and nuget packaging --- .github/workflows/cicd-actions.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index e04e671..8aeb07e 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -39,9 +39,13 @@ jobs: - name: create nuget packages run: dotnet pack -c Release -o ./out - name: push nuget packages to github - run: dotnet nuget push "./out/NullFX.CRC.${{ vars.RELEASE_VERSION }}.nupkg" -s "https://nuget.pkg.github.com/nullfx/index.json" -k ${{ secrets.GIT_TOKEN }} + run: dotnet nuget push "./out/NullFX.CRC.${{ vars.RELEASE_VERSION }}.nupkg" -s "https://nuget.pkg.github.com/nullfx/index.json" -k "$TOKEN" + env: + TOKEN: ${{ secrets.GIT_TOKEN }} - name: push nuget packages to nuget.org - run: dotnet nuget push "./out/NullFX.CRC.${{ vars.RELEASE_VERSION }}.nupkg" --skip-duplicate -s "https://api.nuget.org/v3/index.json" -k ${{ secrets.NUGET_ORG_API_KEY }} + run: dotnet nuget push "./out/NullFX.CRC.${{ vars.RELEASE_VERSION }}.nupkg" --skip-duplicate -s "https://api.nuget.org/v3/index.json" -k "$TOKEN" + env: + TOKEN: ${{ secrets.NUGET_ORG_API_KEY }} - name: Cache SonarCloud packages uses: actions/cache@v1 with: From 23736a08d772485a931d3f63e1d9cc124aee88b2 Mon Sep 17 00:00:00 2001 From: Steve Whitley Date: Fri, 7 Jul 2023 02:56:37 -0500 Subject: [PATCH 15/15] adding automated build numbers and nuget packaging --- .github/workflows/cicd-actions.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml index 8aeb07e..9ecd34a 100644 --- a/.github/workflows/cicd-actions.yml +++ b/.github/workflows/cicd-actions.yml @@ -39,13 +39,9 @@ jobs: - name: create nuget packages run: dotnet pack -c Release -o ./out - name: push nuget packages to github - run: dotnet nuget push "./out/NullFX.CRC.${{ vars.RELEASE_VERSION }}.nupkg" -s "https://nuget.pkg.github.com/nullfx/index.json" -k "$TOKEN" - env: - TOKEN: ${{ secrets.GIT_TOKEN }} + run: dotnet nuget push "./out/NullFX.CRC.${{ vars.RELEASE_VERSION }}.nupkg" -s "https://nuget.pkg.github.com/nullfx/index.json" -k "${{ secrets.GITHUB_TOKEN }}" - name: push nuget packages to nuget.org - run: dotnet nuget push "./out/NullFX.CRC.${{ vars.RELEASE_VERSION }}.nupkg" --skip-duplicate -s "https://api.nuget.org/v3/index.json" -k "$TOKEN" - env: - TOKEN: ${{ secrets.NUGET_ORG_API_KEY }} + run: dotnet nuget push "./out/NullFX.CRC.${{ vars.RELEASE_VERSION }}.nupkg" --skip-duplicate -s "https://api.nuget.org/v3/index.json" -k "${{ secrets.NUGET_ORG_API_KEY }}" - name: Cache SonarCloud packages uses: actions/cache@v1 with: @@ -67,7 +63,7 @@ jobs: dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner - name: Build and analyze env: - GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} # Needed to get PR information, if any + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} shell: powershell run: |