Merge branch 'main' into feature/distinct-until-changed

Author: dsyme

.gitattributes

@@ -0,0 +1 @@
+.github/workflows/*.lock.yml linguist-generated=true merge=ours

.github/workflows/build.yaml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: checkout-code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -28,7 +28,7 @@ jobs:
     steps:
       # checkout the code
       - name: checkout-code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.github/workflows/main.yaml

@@ -12,7 +12,7 @@ jobs:
     steps:
       # checkout the code
       - name: checkout-code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       # setup dotnet based on global.json
@@ -31,7 +31,7 @@ jobs:
     steps:
       # checkout the code
       - name: checkout-code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       # setup dotnet based on global.json
@@ -44,7 +44,7 @@ jobs:
         shell: cmd
         run: ./build.cmd ci -release
       - name: Publish test results - release
-        uses: dorny/test-reporter@v1
+        uses: dorny/test-reporter@v2
         if: always()
         with:
           name: Report release tests

.github/workflows/publish.yaml

@@ -5,14 +5,18 @@ on:
     branches:
       - main
 
+permissions:
+  #contents: write      # for peaceiris/actions-gh-pages
+  id-token: write      # for NuGet trusted publishing
+
 jobs:
   publish:
     name: Publish nuget (if new version)
     runs-on: windows-latest
     steps:
       # checkout the code
       - name: checkout-code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       # setup dotnet based on global.json
@@ -24,13 +28,11 @@ jobs:
         # very important, since we use cmd scripts, the default is psh, and a bug prevents errorlevel to bubble
         shell: cmd
         run: ./build.cmd
-      - name: Nuget publish
-        # skip-duplicate ensures that the 409 error received when the package was already published,
-        # will just issue a warning and won't have the GH action fail.
-        # NUGET_PUBLISH_TOKEN_TASKSEQ is valid until approx. 11 Dec 2024 and will need to be updated by then:
-        # - log in to Nuget.org using 'abelbraaksma' admin account and then refresh the token in Nuget
-        # - copy the token
-        # - go to https://github.com/fsprojects/FSharp.Control.TaskSeq/settings/secrets/actions
-        # - select button "Add repository secret" or update the existing one under "Repository secrets"
-        # - rerun the job
-        run: dotnet nuget push packages\FSharp.Control.TaskSeq.*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_PUBLISH_TOKEN_TASKSEQ }} --skip-duplicate
+      - name: Obtain NuGet key
+        # this hash is v1.1.0
+        uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544
+        id: login
+        with:
+            user: dsyme
+      - name: Publish NuGets (if this version not published before)
+        run: dotnet nuget push packages\FSharp.Control.TaskSeq.*.nupkg -s https://www.nuget.org/api/v2/package -k ${{ steps.login.outputs.NUGET_API_KEY }} --skip-duplicate