From 6a82c07b1f52bf68810b33b8445e15aec8011e4c Mon Sep 17 00:00:00 2001 From: mimme Date: Sat, 10 Apr 2021 18:38:03 +0200 Subject: [PATCH 01/13] Switch to Github nuget source --- .github/workflows/build.yml | 13 ++++++++----- .../Scissors.HttpRequestInterceptor.csproj | 9 +++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c7e2f2..c29e49d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,8 +73,11 @@ jobs: shell: pwsh run: .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}" - - name: Publish NuGet - uses: brandedoutcast/publish-nuget@v2.5.5 - with: - PROJECT_FILE_PATH: .\src\HttpRequestInterceptor\Scissors.HttpRequestInterceptor.csproj - NUGET_KEY: ${{ secrets.NUGET_API_KEY }} + - name: Publish nuget package to GitHub + env: + SCISSONR_PAT: ${{ secrets.SCISSORS_PAT}} + shell: pwsh + run: | + cd src\HttpRequestInterceptor + dotnet pack --configuration Release + dotnet nuget push ".\src\HttpRequestInterceptor\bin\Release\*.nupkg" --api-key ${{ secrets.SCISSORS_PAT}} --source "github" diff --git a/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj b/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj index 7ff22e6..3b1197f 100644 --- a/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj +++ b/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj @@ -3,13 +3,14 @@ netstandard2.0 true + Scissors 1.0.0 + MirzaMerdovic + + Highly configurable implementation of DelegatingHandler that can be used for mocking the behavior of requests sent to specific routes. + https://github.com/MirzaMerdovic/HttpRequestInterceptor LICENSE - https://github.com/MirzaMerdovic/HttpRequestInterceptor - https://github.com/MirzaMerdovic/HttpRequestInterceptor.git httpclient webapi delegatinghandler interceptor - Highly configurable implementation of DelegatingHandler that can be used for mocking the behavior of requests sent to specific routes. - Mirza Merdovic From 5ccc1d6b515df3cda8399584c65e51aff9c69624 Mon Sep 17 00:00:00 2001 From: mimme Date: Sat, 10 Apr 2021 18:38:29 +0200 Subject: [PATCH 02/13] Fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c29e49d..90ef7b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,4 +80,4 @@ jobs: run: | cd src\HttpRequestInterceptor dotnet pack --configuration Release - dotnet nuget push ".\src\HttpRequestInterceptor\bin\Release\*.nupkg" --api-key ${{ secrets.SCISSORS_PAT}} --source "github" + dotnet nuget push ".\src\HttpRequestInterceptor\bin\Release\*.nupkg" --api-key ${{ secrets.SCISSORS_PAT}} --source "github" From d378b0586c259e38063c869dbae75f97f6d2cde9 Mon Sep 17 00:00:00 2001 From: mimme Date: Sat, 10 Apr 2021 18:50:37 +0200 Subject: [PATCH 03/13] Fix --- .../Scissors.HttpRequestInterceptor.csproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj b/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj index 3b1197f..60b6be3 100644 --- a/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj +++ b/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj @@ -2,11 +2,10 @@ netstandard2.0 - true + Scissors 1.0.0 - MirzaMerdovic - + Mirza Merdovic Highly configurable implementation of DelegatingHandler that can be used for mocking the behavior of requests sent to specific routes. https://github.com/MirzaMerdovic/HttpRequestInterceptor LICENSE From 7ba45f39bd6c24348d64390363b57c5cbc8d4e94 Mon Sep 17 00:00:00 2001 From: mimme Date: Sat, 10 Apr 2021 18:52:53 +0200 Subject: [PATCH 04/13] Fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 90ef7b6..3891173 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,4 +80,4 @@ jobs: run: | cd src\HttpRequestInterceptor dotnet pack --configuration Release - dotnet nuget push ".\src\HttpRequestInterceptor\bin\Release\*.nupkg" --api-key ${{ secrets.SCISSORS_PAT}} --source "github" + dotnet nuget push ".\src\HttpRequestInterceptor\bin\Release\*.nupkg" --api-key "${{ secrets.SCISSORS_PAT}}" --source "github" From 656176bdae7960ade7fdf94a039d8ce363f18583 Mon Sep 17 00:00:00 2001 From: mimme Date: Sat, 10 Apr 2021 18:56:31 +0200 Subject: [PATCH 05/13] Fix source --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3891173..8459032 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,4 +80,4 @@ jobs: run: | cd src\HttpRequestInterceptor dotnet pack --configuration Release - dotnet nuget push ".\src\HttpRequestInterceptor\bin\Release\*.nupkg" --api-key "${{ secrets.SCISSORS_PAT}}" --source "github" + dotnet nuget push ".\src\HttpRequestInterceptor\bin\Release\*.nupkg" --api-key "${{ secrets.SCISSORS_PAT}}" --source "https://nuget.pkg.github.com/MirzaMerdovic/index.json" From a6e6ea7b1c35ff418e82565a998863057c520886 Mon Sep 17 00:00:00 2001 From: mimme Date: Sat, 10 Apr 2021 19:19:08 +0200 Subject: [PATCH 06/13] Fix path --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8459032..d7402a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,4 +80,4 @@ jobs: run: | cd src\HttpRequestInterceptor dotnet pack --configuration Release - dotnet nuget push ".\src\HttpRequestInterceptor\bin\Release\*.nupkg" --api-key "${{ secrets.SCISSORS_PAT}}" --source "https://nuget.pkg.github.com/MirzaMerdovic/index.json" + dotnet nuget push ".\bin\Release\*.nupkg" --api-key "${{ secrets.SCISSORS_PAT}}" --source "https://nuget.pkg.github.com/MirzaMerdovic/index.json" From 4de577fbe2e57990472dfd67bee9afddd480d306 Mon Sep 17 00:00:00 2001 From: mimme Date: Sat, 10 Apr 2021 20:26:27 +0200 Subject: [PATCH 07/13] Fix pat --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d7402a6..fc62213 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,9 +75,9 @@ jobs: - name: Publish nuget package to GitHub env: - SCISSONR_PAT: ${{ secrets.SCISSORS_PAT}} + SCISSORS_PAT: ${{ secrets.SCISSORS_PAT }} shell: pwsh run: | cd src\HttpRequestInterceptor dotnet pack --configuration Release - dotnet nuget push ".\bin\Release\*.nupkg" --api-key "${{ secrets.SCISSORS_PAT}}" --source "https://nuget.pkg.github.com/MirzaMerdovic/index.json" + dotnet nuget push ".\bin\Release\*.nupkg" --api-key "${{ secrets.SCISSORS_PAT }}" --source "https://nuget.pkg.github.com/MirzaMerdovic/index.json" From f1ce5e872107d08bc74ca7179b3332b0004c13ff Mon Sep 17 00:00:00 2001 From: mimme Date: Sat, 10 Apr 2021 20:38:14 +0200 Subject: [PATCH 08/13] fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc62213..198aa27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,4 +80,4 @@ jobs: run: | cd src\HttpRequestInterceptor dotnet pack --configuration Release - dotnet nuget push ".\bin\Release\*.nupkg" --api-key "${{ secrets.SCISSORS_PAT }}" --source "https://nuget.pkg.github.com/MirzaMerdovic/index.json" + dotnet nuget push ".\bin\Release\*.nupkg" --source "https://nuget.pkg.github.com/MirzaMerdovic/index.json" --api-key "${{ secrets.SCISSORS_PAT }}" From 8e5f915dea2c76ada5233ce72005a584eb838121 Mon Sep 17 00:00:00 2001 From: mimme Date: Sat, 10 Apr 2021 21:27:26 +0200 Subject: [PATCH 09/13] Updated changelog --- .../Scissors.HttpRequestInterceptor.csproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj b/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj index 60b6be3..8c37ded 100644 --- a/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj +++ b/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj @@ -2,12 +2,11 @@ netstandard2.0 - Scissors - 1.0.0 + 1.0.1 Mirza Merdovic Highly configurable implementation of DelegatingHandler that can be used for mocking the behavior of requests sent to specific routes. - https://github.com/MirzaMerdovic/HttpRequestInterceptor + https://github.com/MirzaMerdovic/scissors LICENSE httpclient webapi delegatinghandler interceptor From 46ae2f1bb87d1c3cb789d88e58f8ad9c41c61e2e Mon Sep 17 00:00:00 2001 From: mimme Date: Sat, 10 Apr 2021 21:28:49 +0200 Subject: [PATCH 10/13] changelog --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6662be0..05ef598 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,4 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.0.0] ### Changes - Added action for pushing nuget package -- Renamed project to Scissors.HttpRequestInterceptor.* \ No newline at end of file +- Renamed project to Scissors.HttpRequestInterceptor.* + +## [1.0.1] +### Changes +- Switched from Nuget package source to GitHub \ No newline at end of file From 5e4b80b1c65e699155517b4cc47d508f406dfaf2 Mon Sep 17 00:00:00 2001 From: mimme Date: Sat, 10 Apr 2021 21:33:06 +0200 Subject: [PATCH 11/13] fix for nuget push --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 198aa27..3cf021c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,6 +74,7 @@ jobs: run: .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}" - name: Publish nuget package to GitHub + if: github.ref == 'refs/heads/branch-zero' env: SCISSORS_PAT: ${{ secrets.SCISSORS_PAT }} shell: pwsh From 4e395717d0ca1aa60fe385f47512d78b69a0327e Mon Sep 17 00:00:00 2001 From: mimme Date: Sat, 10 Apr 2021 21:38:51 +0200 Subject: [PATCH 12/13] ci fixes --- .github/workflows/build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3cf021c..6e5208b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: branches: - branch-zero pull_request: - types: [opened, synchronize, reopened] + jobs: build: name: Build @@ -14,7 +14,9 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.11 - - uses: actions/checkout@v2 + + - name: Checkout + uses: actions/checkout@v2 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis @@ -73,7 +75,7 @@ jobs: shell: pwsh run: .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}" - - name: Publish nuget package to GitHub + - name: Publish nupkg package to GitHub if: github.ref == 'refs/heads/branch-zero' env: SCISSORS_PAT: ${{ secrets.SCISSORS_PAT }} From 5ba5601aae587637752a0902ae721428da658794 Mon Sep 17 00:00:00 2001 From: mimme Date: Sat, 10 Apr 2021 21:44:42 +0200 Subject: [PATCH 13/13] CI fixes --- .github/workflows/build.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e5208b..09c9e6c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build +name: Scissors CI on: push: branches: @@ -43,8 +43,6 @@ jobs: dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner - name: Sonar Begin - env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} shell: pwsh run: > .\.sonar\scanner\dotnet-sonarscanner begin @@ -71,14 +69,11 @@ jobs: - name: Sonar End env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} shell: pwsh run: .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}" - name: Publish nupkg package to GitHub if: github.ref == 'refs/heads/branch-zero' - env: - SCISSORS_PAT: ${{ secrets.SCISSORS_PAT }} shell: pwsh run: | cd src\HttpRequestInterceptor