Merge pull request #33 from jcdcdev/dev/v17

jcdcdev · web-flow · commit 3a45985a69fe · 2025-12-26T23:39:45.000Z
17.0.1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Build
-        uses: jcdcdev/jcdcdev.Umbraco.Github.Build@v17
+        uses: jcdcdev/jcdcdev.Umbraco.GitHub.Build@v17
         with:
           project-name: Umbraco.Community.SimpleTrees
           project-path: src/Umbraco.Community.SimpleTrees/Umbraco.Community.SimpleTrees.csproj
diff --git a/.github/workflows/create-pr.yml b/.github/workflows/create-pr.yml
@@ -8,7 +8,7 @@ on:
         default: false
         type: boolean
   schedule:
-    - cron: '0 2 * * *'
+    - cron: "0 2 * * *"
 jobs:
   get-branches:
     outputs:
@@ -34,7 +34,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-          branch: ${{fromJson(needs.get-branches.outputs.branches)}}
+        branch: ${{fromJson(needs.get-branches.outputs.branches)}}
     runs-on: ubuntu-latest
     env:
       DRY_RUN: ${{ contains(github.event.inputs.dry-run, 'true') }}
@@ -43,25 +43,49 @@ jobs:
         run: |
           TARGET=$(echo ${{ matrix.branch }} | sed 's/dev\///')
           SOURCE=${{ matrix.branch }}
+          # Extract major version from TARGET by removing all non-digit characters
+          MAJOR_VERSION=$(echo "$TARGET" | tr -dc '0-9')
 
           if [ -z "$TARGET" ]; then
             echo "TARGET is empty"
             exit 1
           fi
-        
+
           if [ -z "$SOURCE" ]; then
             echo "SOURCE is empty"
             exit 1
           fi
 
+          if [ -z "$MAJOR_VERSION" ]; then
+            echo "MAJOR_VERSION is empty"
+            exit 1
+          fi
+
+          ACTION_VERSION="1"
+          if [[ "$MAJOR_VERSION" -lt "17" ]]; then
+            ACTION_VERSION="0"
+          fi
+
           echo "SOURCE=$SOURCE"
           echo "TARGET=$TARGET"
+          echo "ACTION_VERSION=$ACTION_VERSION"
 
+          echo "ACTION_VERSION=$ACTION_VERSION" >> $GITHUB_ENV
           echo "SOURCE=$SOURCE" >> $GITHUB_ENV
           echo "TARGET=$TARGET" >> $GITHUB_ENV
-      - name: Create Pull Request
-        id: create-pull-request 
-        uses: jcdcdev/jcdcdev.GitHub.CreatePullRequest@main
+      - name: Create Pull Request - Action v0
+        if: ${{ env.ACTION_VERSION == '0' }}
+        id: create-pull-request-v0
+        uses: jcdcdev/jcdcdev.GitHub.CreatePullRequest@v0
+        with:
+          source-branch: ${{ env.SOURCE }}
+          target-branch: ${{ env.TARGET }}
+          dry-run: ${{ env.DRY_RUN }}
+          github-token: ${{ secrets.JCDC_BOT_TOKEN }}
+      - name: Create Pull Request - Action v1
+        if: ${{ env.ACTION_VERSION == '1' }}
+        id: create-pull-request-v1
+        uses: jcdcdev/jcdcdev.GitHub.CreatePullRequest@v1
         with:
           source-branch: ${{ env.SOURCE }}
           target-branch: ${{ env.TARGET }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Build
         id: build
-        uses: jcdcdev/jcdcdev.Umbraco.Github.Build@v17
+        uses: jcdcdev/jcdcdev.Umbraco.GitHub.Build@v17
         with:
           project-name: Umbraco.Community.SimpleTrees
           project-path: src/Umbraco.Community.SimpleTrees/Umbraco.Community.SimpleTrees.csproj
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
@@ -8,7 +8,7 @@ on:
         default: false
         type: boolean
   schedule:
-    - cron: '30 23,11 * * *'
+    - cron: "30 23,11 * * *"
 jobs:
   get-refs:
     runs-on: ubuntu-latest
@@ -36,7 +36,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-          ref:  ${{fromJson(needs.get-refs.outputs.refs) }}
+        ref: ${{fromJson(needs.get-refs.outputs.refs) }}
     steps:
       - name: Update README
         uses: jcdcdev/jcdcdev.Umbraco.GitHub.PackageReadme@main
@@ -47,4 +47,3 @@ jobs:
           nuget-readme-filepath: ${{ env.NUGET_README_FILEPATH }}
           branch: ${{ matrix.ref }}
           api-key: ${{ secrets.SECURITY_POLICY_API_KEY }}
-      
diff --git a/.github/workflows/update-security-policy.yml b/.github/workflows/update-security-policy.yml
@@ -8,7 +8,7 @@ on:
         default: false
         type: boolean
   schedule:
-    - cron: '0 23,11 * * *'
+    - cron: "0 23,11 * * *"
 jobs:
   get-refs:
     runs-on: ubuntu-latest
@@ -35,7 +35,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-          ref:  ${{fromJson(needs.get-refs.outputs.refs) }}
+        ref: ${{fromJson(needs.get-refs.outputs.refs) }}
     steps:
       - name: Update Security Policy
         uses: jcdcdev/jcdcdev.Umbraco.GitHub.PackageSecurity@main
@@ -45,4 +45,3 @@ jobs:
           security-policy-filepath: ${{ env.SECURITY_POLICY_FILEPATH }}
           security-policy-api-key: ${{ secrets.SECURITY_POLICY_API_KEY }}
           branch: ${{ matrix.ref }}
-      
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -0,0 +1,94 @@
+workflow: ""
+
+assembly-versioning-scheme: MajorMinorPatch
+assembly-file-versioning-scheme: MajorMinorPatch
+tag-prefix: "[vV]?"
+tag-pre-release-weight: 60000
+commit-message-incrementing: Enabled
+commit-date-format: "yyyy-MM-dd"
+mode: ContinuousDelivery
+label: "{BranchName}"
+increment: Inherit
+prevent-increment:
+  of-merged-branch: false
+  when-branch-merged: false
+  when-current-commit-tagged: true
+track-merge-target: false
+track-merge-message: true
+regex: ""
+source-branches: []
+is-source-branch-for: []
+tracks-release-branches: false
+is-release-branch: false
+is-main-branch: false
+
+ignore:
+  commits-before: 2025-11-25T00:00:00Z
+  sha: []
+  paths: []
+
+strategies:
+  - MergeMessage
+  - TaggedCommit
+  - Fallback
+
+branches:
+  vX-release:
+    regex: '^v(?<BranchName>\d+)$'
+    mode: ContinuousDeployment
+    label: ""
+    increment: Patch
+    is-main-branch: true
+    prevent-increment:
+      of-merged-branch: true
+    source-branches: []
+    pre-release-weight: 55000
+
+  dev-vX:
+    regex: '^dev\/v(?<BranchName>\d+)$'
+    mode: ContinuousDelivery
+    label: "alpha"
+    increment: Patch
+    source-branches: [vX-release]
+    is-main-branch: false
+    pre-release-weight: 30000
+
+  main:
+    regex: ^master$|^main$
+    mode: ContinuousDelivery
+    label: ""
+    increment: Patch
+    is-main-branch: true
+    prevent-increment:
+      of-merged-branch: true
+    source-branches: []
+    pre-release-weight: 55000
+
+  pull-request:
+    mode: ContinuousDelivery
+    label: PullRequest{Number}
+    increment: Inherit
+    prevent-increment:
+      of-merged-branch: false
+      when-current-commit-tagged: false
+    track-merge-message: true
+    regex: ^(pull-requests|pull|pr)[\/-](?<Number>\d*)
+    source-branches:
+      - main
+      - vX-release
+      - dev-vX
+    pre-release-weight: 30000
+
+  unknown:
+    mode: ContinuousDelivery
+    label: "{BranchName}"
+    increment: Inherit
+    prevent-increment:
+      when-current-commit-tagged: true
+    regex: (?<BranchName>.+)
+    source-branches:
+      - main
+      - vX-release
+      - dev-vX
+      - pull-request
+    pre-release-weight: 0
diff --git a/src/Umbraco.Community.SimpleTrees.Client/package-lock.json b/src/Umbraco.Community.SimpleTrees.Client/package-lock.json
diff --git a/src/Umbraco.Community.SimpleTrees.Client/package.json b/src/Umbraco.Community.SimpleTrees.Client/package.json
