Merge branch 'develop'

Author: varndellwagglebee

.github/workflows/nbgv_dotnet_pack.yml

@@ -42,6 +42,9 @@ on:
       NUGET_API_KEY:
         description: "API key for pushing to NuGet.org"
         required: true
+      GH_TOKEN:
+        description: "GitHub token (falls back to github.token)"
+        required: false
 jobs:
   pack:
     runs-on: ubuntu-latest
@@ -70,13 +73,11 @@ jobs:
 
       - name: 📦 Pack
         run: |
-          # symbols/source only when caller asks
           EXTRA_FLAGS=""
           if [ "${{ inputs.force_dev_prerelease }}" = "true" ]; then
             EXTRA_FLAGS="--include-symbols --include-source"
           fi
 
-          # PublicRelease strips commit-height *only* on Release builds
           PUBLIC_RELEASE_FLAG=""
           if [ "${{ inputs.build_configuration }}" = "Release" ]; then
             PUBLIC_RELEASE_FLAG="-p:PublicRelease=true"
@@ -87,6 +88,8 @@ jobs:
                       --output ./artifacts \
                       $PUBLIC_RELEASE_FLAG \
                       $EXTRA_FLAGS
+                      -p:PackageVersion=${{ inputs.semver2 }} \
+                      -p:PackageReleaseNotes="https://github.com/${{ github.repository }}/releases/tag/${{ inputs.tag_name }}"
 
       - name: 🚀 Publish to NuGet
         if: ${{ inputs.push_after_pack }}
@@ -139,3 +142,12 @@ jobs:
                 --api-key "$NUGET_API_KEY"
             done <<< "$to_delete"
           done
+
+      - name: 🚀 Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name:  ${{ inputs.tag_name }}
+          body_path: release-notes.md
+          prerelease: ${{ contains(inputs.semver2, '-') }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN || github.token }}

.github/workflows/nbgv_prepare_release.yml

@@ -70,25 +70,36 @@ jobs:
           [ "$INC" = "patch" ] && INC=revision
           echo "inc=$INC" >> "$GITHUB_OUTPUT"
 
-      # 5️⃣  Install NBGV CLI 
+      # 5️⃣  Install the NBGV CLI
       - name: 🔧 Install NBGV CLI
         run: dotnet tool install -g nbgv --version 3.8.38-alpha
 
-      - name: ⚙️  Configure Git for commits
-        run: |
-          git config user.name  "release-bot"
-          git config user.email "release-bot@users.noreply.github.com"
-
-      # 6️⃣  Bump version and create the release branch
+      # 6️⃣  Prepare the release branch with an explicit patch bump
       - name: 🛠️  Prepare release branch
         id: prep_release
         run: |
+          set -euo pipefail
+
+          # Determine a prerelease tag only for non-main branches
           TAG_ARG=""
           if [[ "${{ inputs.target_branch }}" != "main" && "${{ inputs.target_branch }}" != "master" ]]; then
-            TAG_ARG="dev"   # or whatever prerelease you want
+            TAG_ARG="dev"
           fi
 
-          nbgv prepare-release $TAG_ARG -p .
+          # 1) Read the current SemVer2 (e.g. "1.0.0")  
+          CURRENT=$(nbgv get-version -v SemVer2)
+
+          # 2) Split and bump the patch segment
+          IFS='.' read -r MAJ MIN PATCH <<< "$CURRENT"
+          NEXT="$MAJ.$MIN.$((PATCH + 1))"
+          echo "Calculated next version: $NEXT"
+
+          # 3) Call prepare-release with --nextVersion
+          nbgv prepare-release $TAG_ARG \
+                 --nextVersion "$NEXT" \
+                 -p .
+
+          # 4) Expose the branch name for downstream jobs
           echo "branch=$(git rev-parse --abbrev-ref HEAD)" >> "$GITHUB_OUTPUT"
 
       # 7️⃣  Resolve the exact tag & SemVer2