Fix stale CI workflows and add wildcard branch targeting

.github/dependabot.yml

@@ -0,0 +1,37 @@
+version: 2
+updates:
+  - package-ecosystem: "nuget"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      nuget-dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "npm"
+    directory: "/uSync.Backoffice.Management.Client/usync-assets"
+    schedule:
+      interval: "weekly"
+    groups:
+      npm-dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "npm"
+    directory: "/uSync.History/history-client"
+    schedule:
+      interval: "weekly"
+    groups:
+      npm-dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/codeql-2.yml

@@ -13,12 +13,22 @@ name: "CodeQL Advanced"
 
 on:
   push:
-    branches: [ "v16/main", "v17/main" ]
+    branches: [ "*/main" ]
+    paths-ignore:
+      - "**.md"
+      - "docs/**"
   pull_request:
-    branches: [ "v16/main", "v17/main" ]
+    branches: [ "*/main" ]
+    paths-ignore:
+      - "**.md"
+      - "docs/**"
   schedule:
     - cron: '33 8 * * 0'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze (${{ matrix.language }})

.github/workflows/dotnet-build.yml

@@ -1,41 +1,52 @@
-name: v16 - PR Project Build and Test
+name: PR Project Build and Test
 permissions:
   contents: read
   pull-requests: write
-  
+
 on:
   pull_request:
-    branches: [v16/main]
+    branches: [ "*/main" ]
+    paths-ignore:
+      - "**.md"
+      - "docs/**"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
   config: Release
   out_folder: ./build-out/
+  solution_name: ./uSync.slnx
+  test_project: ./uSync.Tests/uSync.Tests.csproj
+  schema_gen_project: ./uSync.SchemaGenerator/uSync.SchemaGenerator.csproj
 
 jobs:
   build-project:
     runs-on: windows-latest
 
-    env:
-      solution_name: ./uSync.sln
-      test_project: ./uSync.Tests/uSync.tests.csproj
-      schema_gen_project: ./uSync.SchemaGenerator/uSync.SchemaGenerator.csproj
-
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
           cache: true
           cache-dependency-path: "**/packages.lock.json"
 
+      # the client project's build runs `npm run build` via an MSBuild target,
+      # so node needs to be available before the dotnet build step below.
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+
       - name: restore
-        run: dotnet restore ${{ env.solution_name}} --locked-mode
+        run: dotnet restore ${{ env.solution_name }} --locked-mode
 
       - name: build
         run: dotnet build ${{ env.solution_name }} -c ${{ env.config }} -p:ContinuousIntegrationBuild=true
 
       - name: test
-        run: dotnet test ${{ env.solution_name }}
+        run: dotnet test ${{ env.test_project }} -c ${{ env.config }}
 
       - name: Generate AppSettings Schema
-        run: dotnet run -c ${{env.Config}} --project ${{ env.schema_gen_project}}
+        run: dotnet run -c ${{ env.config }} --project ${{ env.schema_gen_project }}

.github/workflows/package-build.yml

@@ -1,15 +1,25 @@
-name: v16 - Build and Package.
+name: Build and Package
 permissions:
   contents: read
   pull-requests: write
-  
+
 on:
   push:
-    branches: [v16/main]
+    branches: [ "*/main" ]
+    paths-ignore:
+      - "**.md"
+      - "docs/**"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   config: Release
   out_folder: ./build-out/
+  solution_name: ./uSync.slnx
+  test_project: ./uSync.Tests/uSync.Tests.csproj
+  schema_gen_project: ./uSync.SchemaGenerator/uSync.SchemaGenerator.csproj
 
 jobs:
   version:
@@ -45,30 +55,31 @@ jobs:
 
     needs: version
 
-    env:
-      solution_name: ./uSync.sln
-      test_project: ./uSync.Tests/uSync.tests.csproj
-      schema_gen_project: ./uSync.SchemaGenerator/uSync.SchemaGenerator.csproj
-
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
           cache: true
           cache-dependency-path: "**/packages.lock.json"
 
+      # the client project's build runs `npm run build` via an MSBuild target,
+      # so node needs to be available before the dotnet build step below.
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+
       - name: restore
-        run: dotnet restore ${{ env.solution_name}} --locked-mode
+        run: dotnet restore ${{ env.solution_name }} --locked-mode
 
       - name: build
         run: dotnet build ${{ env.solution_name }} -c ${{ env.config }} -p:ContinuousIntegrationBuild=true
 
       - name: test
-        run: dotnet test ${{ env.solution_name }}
+        run: dotnet test ${{ env.test_project }} -c ${{ env.config }}
 
       - name: Generate AppSettings Schema
-        run: dotnet run -c ${{env.Config}} --project ${{ env.schema_gen_project}}
+        run: dotnet run -c ${{ env.config }} --project ${{ env.schema_gen_project }}
 
   package-up:
     runs-on: windows-latest
@@ -79,10 +90,14 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
           cache: true
           cache-dependency-path: "**/packages.lock.json"
 
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+
       - name: version
         run: |
           echo "Version: ${{ needs.version.outputs.version_string}}"
@@ -100,31 +115,45 @@ jobs:
         run: npm run build
 
       - name: restore
-        run: dotnet restore ${{ env.solution_name}} --locked-mode
+        run: dotnet restore ${{ env.solution_name }} --locked-mode
 
       - name: package uSync.Core
         run: dotnet pack ./uSync.Core/uSync.Core.csproj -c ${{env.config}} --output ${{env.out_folder}} /p:version=${{ needs.version.outputs.version_string }}
 
-      - name: package uSync.Backoffice
-        run: dotnet pack ./uSync.Backoffice/uSync.Backoffice.csproj -c ${{env.config}} --output ${{env.out_folder}} /p:version=${{ needs.version.outputs.version_string }}
+      - name: package uSync.AutoTemplates
+        run: dotnet pack ./uSync.AutoTemplates/uSync.AutoTemplates.csproj -c ${{env.config}} --output ${{env.out_folder}} /p:version=${{ needs.version.outputs.version_string }}
+
+      - name: package uSync.BackOffice
+        run: dotnet pack ./uSync.BackOffice/uSync.BackOffice.csproj -c ${{env.config}} --output ${{env.out_folder}} /p:version=${{ needs.version.outputs.version_string }}
 
       - name: package uSync.Backoffice.Management.Api
         run: dotnet pack ./uSync.Backoffice.Management.Api/uSync.Backoffice.Management.Api.csproj -c ${{env.config}} --output ${{env.out_folder}} /p:version=${{ needs.version.outputs.version_string }}
 
       - name: package uSync.Backoffice.Management.Client
         run: dotnet pack ./uSync.Backoffice.Management.Client/uSync.Backoffice.Management.Client.csproj -c ${{env.config}} --output ${{env.out_folder}} /p:version=${{ needs.version.outputs.version_string }}
 
-      - name: package uSync.Backoffice.Targets
-        run: dotnet pack ./uSync.Backoffice.Targets/uSync.Backoffice.Targets.csproj -c ${{env.config}} --output ${{env.out_folder}} /p:version=${{ needs.version.outputs.version_string }}
+      - name: package uSync.BackOffice.Targets
+        run: dotnet pack ./uSync.BackOffice.Targets/uSync.BackOffice.Targets.csproj -c ${{env.config}} --output ${{env.out_folder}} /p:version=${{ needs.version.outputs.version_string }}
 
       - name: package uSync.Community.Contrib
         run: dotnet pack ./uSync.Community.Contrib/uSync.Community.Contrib.csproj -c ${{env.config}} --output ${{env.out_folder}} /p:version=${{ needs.version.outputs.version_string }}
 
       - name: package uSync.Community.DataTypeSerializers
         run: dotnet pack ./uSync.Community.DataTypeSerializers/uSync.Community.DataTypeSerializers.csproj -c ${{env.config}} --output ${{env.out_folder}} /p:version=${{ needs.version.outputs.version_string }}
 
+      - name: package uSync.Extend
+        run: dotnet pack ./uSync.Extend/uSync.Extend.csproj -c ${{env.config}} --output ${{env.out_folder}} /p:version=${{ needs.version.outputs.version_string }}
+
+      - name: package uSync.History
+        run: dotnet pack ./uSync.History/uSync.History.csproj -c ${{env.config}} --output ${{env.out_folder}} /p:version=${{ needs.version.outputs.version_string }}
+
+      - name: package uSync (meta package)
+        run: dotnet pack ./uSync/uSync.csproj -c ${{env.config}} --output ${{env.out_folder}} /p:version=${{ needs.version.outputs.version_string }}
+
+      # NOTE: intentionally no `dotnet nuget push` / `npm publish` step here - this
+      # workflow only builds artifacts for review, it does not auto-release to nuget.org.
       - name: Upload nuget file as build artifact
         uses: actions/upload-artifact@v4
         with:
           name: Nuget Build Output
-          path: ${{env.OUT_FOLDER}}
+          path: ${{ env.out_folder }}

GitVersion.yml

@@ -1,11 +1,11 @@
-next-version: 15.0.0
+next-version: 18.0.0
 assembly-versioning-scheme: MajorMinorPatch
 mode: ContinuousDeployment
 branches:
   main:
     mode: ContinuousDeployment
     tag: ""
-    regex: ^v15\/main$
+    regex: ^v[0-9]+\/main$
   pull-request:
     mode: ContinuousDeployment
 ignore:

NuGet.Config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<!-- when we want to fetch from the yet to be released versions, fetch the umbraco stuff from the pre-release feeed -->
+	<!--
 	<packageSources>
 		<add key="UmbracoPrerelease" value="https://www.myget.org/F/umbracoprereleases/api/v3/index.json" />
 	</packageSources>
@@ -13,6 +14,6 @@
 			<package pattern="Umbraco.*" />
 		</packageSource>
 	</packageSourceMapping>
-
+	-->
 
 </configuration>

uSync.slnx

@@ -20,9 +20,6 @@
     <Project Path="uSync.AutoTemplates/uSync.AutoTemplates.csproj" />
     <Project Path="uSync.SchemaGenerator/uSync.SchemaGenerator.csproj" />
   </Folder>
-  <Folder Name="/WebSites/">
-    <Project Path="uSyncSource.Site/uSyncSource.Site.csproj" />
-  </Folder>
   <Project Path="uSync.Backoffice.Management.Api/uSync.Backoffice.Management.Api.csproj" />
   <Project Path="uSync.Backoffice.Management.Client/uSync.Backoffice.Management.Client.csproj" />
   <Project Path="uSync.BackOffice.Targets/uSync.BackOffice.Targets.csproj" />