From b36203702d9b04d9392857a8abbd71a68d2da60f Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Sun, 17 Sep 2023 10:49:39 +0200
Subject: [PATCH 1/4] Empty commit ...1


From 321c9112abf262ab566357eb3cb30101def2bc5b Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Sun, 17 Sep 2023 10:49:41 +0200
Subject: [PATCH 2/4] Empty commit ...2


From feb5c72cf897755c2ad780dd99e707fbfd2afa5f Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Sun, 17 Sep 2023 10:49:43 +0200
Subject: [PATCH 3/4] Empty commit ...3


From 8bfad94922451d7fcb0d1c807b5617dfc45c4adb Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Sun, 17 Sep 2023 11:23:03 +0200
Subject: [PATCH 4/4] fix

---
 .github/workflows/dotnet.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 20461a0a9c..2e1c1b2b9f 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -128,7 +128,8 @@ jobs:
       shell: pwsh
       env:
         # This contains the git tag name on release; in that case we build the docs without publishing.
-        DOCFX_SOURCE_BRANCH_NAME: ${{ github.base_ref || github.ref_name }}
+        #DOCFX_SOURCE_BRANCH_NAME: ${{ github.base_ref || github.ref_name }}
+        DOCFX_SOURCE_BRANCH_NAME: 'master'
       run: |
         Write-Host "Using docfx branch name: $env:DOCFX_SOURCE_BRANCH_NAME"
         cd docs
@@ -253,16 +254,17 @@ jobs:
     steps:
     - name: Download artifacts
       uses: actions/download-artifact@v3
-    - name: Publish to GitHub Packages
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      shell: pwsh
-      run: |
-        dotnet nuget add source --username 'json-api-dotnet' --password "$env:GITHUB_TOKEN" --store-password-in-clear-text --name 'github' 'https://nuget.pkg.github.com/json-api-dotnet/index.json'
-        dotnet nuget push "$env:GITHUB_WORKSPACE/packages/*.nupkg" --api-key "$env:GITHUB_TOKEN" --source 'github'
+#    - name: Publish to GitHub Packages
+#      env:
+#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#      shell: pwsh
+#      run: |
+#        dotnet nuget add source --username 'json-api-dotnet' --password "$env:GITHUB_TOKEN" --store-password-in-clear-text --name 'github' 'https://nuget.pkg.github.com/json-api-dotnet/index.json'
+#        dotnet nuget push "$env:GITHUB_WORKSPACE/packages/*.nupkg" --api-key "$env:GITHUB_TOKEN" --source 'github'
     - name: Find merged pull request
-      uses: actions-ecosystem/action-get-merged-pull-request@v1
       id: find_merged_pull_request
+      #if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+      uses: actions-ecosystem/action-get-merged-pull-request@v1
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
     # TODO: Remove test