Sync main → net9

.github/workflows/build.yml

@@ -1,11 +1,9 @@
 name: Build NuGet Packages
 
 on:
-  push:
-    branches:
-      - main
-      - net8
-      - net9
+  release:
+    types: [published]
+  workflow_dispatch:
 
 jobs:
   check-nuget:
@@ -95,7 +93,17 @@ jobs:
         run: dotnet nuget add source "$(pwd)/nupkgs" --name LocalNupkgs
 
       - name: Restore packages with local source
-        run: dotnet restore
+        run: |
+          dotnet restore src/TickerQ/TickerQ.csproj
+          dotnet restore src/TickerQ.EntityFrameworkCore/TickerQ.EntityFrameworkCore.csproj
+          dotnet restore src/TickerQ.Dashboard/TickerQ.Dashboard.csproj
+          dotnet restore src/TickerQ.Instrumentation.OpenTelemetry/TickerQ.Instrumentation.OpenTelemetry.csproj
+          dotnet restore src/TickerQ.Caching.StackExchangeRedis/TickerQ.Caching.StackExchangeRedis.csproj
+          dotnet restore hub/sdks/dotnet/TickerQ.SDK/TickerQ.SDK.csproj
+          dotnet restore hub/remoteExecutor/TickerQ.RemoteExecutor/TickerQ.RemoteExecutor.csproj
+          dotnet restore tests/TickerQ.Tests/TickerQ.Tests.csproj
+          dotnet restore tests/TickerQ.EntityFrameworkCore.Tests/TickerQ.EntityFrameworkCore.Tests.csproj
+          dotnet restore tests/TickerQ.Caching.StackExchangeRedis.Tests/TickerQ.Caching.StackExchangeRedis.Tests.csproj
 
       - name: Build TickerQ.SourceGenerator
         run: dotnet build src/TickerQ.SourceGenerator/TickerQ.SourceGenerator.csproj --configuration Release
@@ -109,6 +117,15 @@ jobs:
           dotnet build src/TickerQ.Caching.StackExchangeRedis/TickerQ.Caching.StackExchangeRedis.csproj --configuration Release
           dotnet build hub/sdks/dotnet/TickerQ.SDK/TickerQ.SDK.csproj --configuration Release
           dotnet build hub/remoteExecutor/TickerQ.RemoteExecutor/TickerQ.RemoteExecutor.csproj --configuration Release
+          dotnet build tests/TickerQ.Tests/TickerQ.Tests.csproj --configuration Release
+          dotnet build tests/TickerQ.EntityFrameworkCore.Tests/TickerQ.EntityFrameworkCore.Tests.csproj --configuration Release
+          dotnet build tests/TickerQ.Caching.StackExchangeRedis.Tests/TickerQ.Caching.StackExchangeRedis.Tests.csproj --configuration Release
+
+      - name: Run tests
+        run: |
+          dotnet test tests/TickerQ.Tests/ --configuration Release --no-build
+          dotnet test tests/TickerQ.EntityFrameworkCore.Tests/ --configuration Release --no-build
+          dotnet test tests/TickerQ.Caching.StackExchangeRedis.Tests/ --configuration Release --no-build
 
       - name: Pack other projects
         run: |
@@ -120,12 +137,11 @@ jobs:
           dotnet pack hub/sdks/dotnet/TickerQ.SDK/TickerQ.SDK.csproj --configuration Release --output ./nupkgs
           dotnet pack hub/remoteExecutor/TickerQ.RemoteExecutor/TickerQ.RemoteExecutor.csproj --configuration Release --output ./nupkgs
 
-      - name: Show .nupkg file sizes
+      - name: Show package file sizes
         run: |
           echo "📦 Package sizes:"
-          for pkg in ./nupkgs/*.nupkg; do
-            size=$(du -h "$pkg" | cut -f1)
-            echo " - $(basename "$pkg"): $size"
+          for pkg in ./nupkgs/*.nupkg ./nupkgs/*.snupkg; do
+            [ -f "$pkg" ] && size=$(du -h "$pkg" | cut -f1) && echo " - $(basename "$pkg"): $size"
           done
 
       - name: Upload nupkgs artifact
@@ -172,7 +188,7 @@ jobs:
                 'Accept': 'application/vnd.github.v3+json'
               },
               body: JSON.stringify({
-                ref: 'main',
+                ref: '${{ github.event.release.target_commitish || github.ref_name }}',
                 inputs: {
                   version: version,
                   artifact_id: artifactId
@@ -190,18 +206,10 @@ jobs:
       - name: Send Discord Notification
         if: always()
         run: |
-          # Safely handle the commit message
           REPO_NAME="${GITHUB_REPOSITORY#*/}"
-          BRANCH="${GITHUB_REF#refs/heads/}"
-
-          if [[ "${{ github.event.head_commit.message }}" =~ ^Merge\ pull\ request ]]; then
-            PR_BRANCH=$(echo "${{ github.event.head_commit.message }}" | sed -n "s/Merge pull request #[0-9]\+ from [^/]*\/\(.*\)/\1/p")
-            MESSAGE="📦 *${REPO_NAME}* | Branch: \`${BRANCH}\` | Merged from: \`${PR_BRANCH}\`"
-          else
-            # Use a shortened commit message to avoid issues
-            SHORT_MSG=$(echo "${{ github.event.head_commit.message }}" | head -n1)
-            MESSAGE="📦 *${REPO_NAME}* | Branch: \`${BRANCH}\` | Commit: \`${SHORT_MSG}\`"
-          fi
+          BRANCH="${{ github.event.release.target_commitish || github.ref_name }}"
+          TAG="${{ github.event.release.tag_name || 'manual' }}"
+          MESSAGE="📦 *${REPO_NAME}* | Branch: \`${BRANCH}\` | Release: \`${TAG}\`"
 
           # Determine status based on check-nuget and build results
           if [ "${{ needs.check-nuget.result }}" != "success" ]; then

.github/workflows/publish.yml

@@ -31,6 +31,19 @@ jobs:
         continue-on-error: true
         run: |
           for f in ./nupkgs/*.nupkg; do
+            echo "📦 Pushing $(basename "$f")..."
+            dotnet nuget push "$f" \
+              --source https://api.nuget.org/v3/index.json \
+              --api-key ${{ secrets.NUGET_API_KEY }} \
+              --skip-duplicate
+          done
+
+      - name: Publish symbols to NuGet
+        continue-on-error: true
+        run: |
+          for f in ./nupkgs/*.snupkg; do
+            [ -f "$f" ] || continue
+            echo "🔗 Pushing symbols $(basename "$f")..."
             dotnet nuget push "$f" \
               --source https://api.nuget.org/v3/index.json \
               --api-key ${{ secrets.NUGET_API_KEY }} \

.github/workflows/sync-version-branches.yml

@@ -1,9 +1,8 @@
 name: Sync Version Branches
 
 on:
-  push:
-    branches:
-      - main
+  release:
+    types: [published]
   workflow_dispatch:
     inputs:
       target_branches:
@@ -26,7 +25,7 @@ jobs:
       pull-requests: write
       issues: write
 
-    if: github.ref == 'refs/heads/main'
+    if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
 
     strategy:
       matrix:

.sync-exclude

@@ -9,5 +9,6 @@ src/TickerQ.EntityFrameworkCore/Infrastructure/BasePersistenceProvider.cs
 src/TickerQ.EntityFrameworkCore/Infrastructure/TickerQueryExtensions.cs
 src/TickerQ.EntityFrameworkCore/Customizer/CustomizerServiceDescriptor.cs
 
-# Solution file — main uses .slnx (net10+), older branches use .sln
-TickerQ.sln
+# Solution files — main uses .slnx (net10+), older branches use .sln
+TickerQ.slnx
+src/src.sln

samples/TickerQ.Sample.WorkerService/TickerQ.Sample.WorkerService.csproj

@@ -7,7 +7,13 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="$(DotNetVersion)" />
-    <PackageReference Include="TickerQ" Version="$(Version)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\TickerQ.SourceGenerator\TickerQ.SourceGenerator.csproj"
+                      OutputItemType="Analyzer"
+                      ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\src\TickerQ\TickerQ.csproj" />
   </ItemGroup>
 
 

src/Directory.Build.props

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net9.0</TargetFramework>
-        <Version>9.2.2</Version>
+        <Version>9.2.3</Version>
         <DotNetVersion>[9.0.0,10.0.0)</DotNetVersion>
         <DotNetAbstractionsVersion>[10.0.0,11.0.0)</DotNetAbstractionsVersion>
         <RepositoryUrl>https://github.com/arcenox-co/TickerQ</RepositoryUrl>
@@ -14,11 +14,23 @@
         <PackageIcon>icon.jpg</PackageIcon>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <LangVersion>default</LangVersion>
+
+        <!-- Source Link -->
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <Deterministic>true</Deterministic>
+        <ContinuousIntegrationBuild Condition="'$(CI)' == 'true'">true</ContinuousIntegrationBuild>
     </PropertyGroup>
 
     <ItemGroup>
         <None Include="..\..\icon.jpg" Pack="true" PackagePath="\" />
     </ItemGroup>
 
+    <ItemGroup>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.102" PrivateAssets="All" />
+    </ItemGroup>
+
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 </Project>

src/TickerQ.Dashboard/DependencyInjection/ServiceCollectionExtensions.cs

@@ -13,6 +13,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
 using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Routing;
 using TickerQ.Utilities.Entities;
 
 namespace TickerQ.Dashboard.DependencyInjection
@@ -344,6 +345,15 @@ private static void MapPathBaseAware(this IApplicationBuilder app, string basePa
                     context.Request.PathBase = originalPathBase.Add(matchedPath);
                     context.Request.Path = remainingPath;
 
+                    // Clear any endpoint matched by host-level routing so the branch's
+                    // own UseRouting() re-evaluates against dashboard endpoints.
+                    // Without this, host Map*() calls (e.g. MapStaticAssets().ShortCircuit())
+                    // can cause the branch's routing middleware to skip evaluation — the
+                    // EndpointRoutingMiddleware short-circuits when GetEndpoint() is non-null.
+                    // This results in 405 responses for SignalR/WebSocket requests (#456).
+                    context.SetEndpoint(null);
+                    context.Request.RouteValues?.Clear();
+
                     try
                     {
                         await branch(context);

src/TickerQ.Dashboard/Endpoints/DashboardEndpoints.cs

@@ -262,7 +262,7 @@ private static IResult GetOptions<TTimeTicker, TCronTicker>(
             IdleWorkerTimeOut = schedulerOptions.IdleWorkerTimeOut,
             CurrentMachine = schedulerOptions.NodeIdentifier,
             LastHostExceptionMessage = executionContext.LastHostExceptionMessage,
-            SchedulerTimeZone = schedulerOptions.SchedulerTimeZone?.Id
+            SchedulerTimeZone = ToIanaTimeZoneId(schedulerOptions.SchedulerTimeZone)
         }, dashboardOptions.DashboardJsonOptions);
     }
 
@@ -737,5 +737,24 @@ private static async Task<IResult> GetMachineJobs<TTimeTicker, TCronTicker>(
         return Results.Json(machineJobs.Select(x => new TupleResponse<string, int> { Item1 = x.Item1, Item2 = x.Item2 }).ToArray(), dashboardOptions.DashboardJsonOptions);
     }
 
+    internal static string? ToIanaTimeZoneId(TimeZoneInfo? timeZone)
+    {
+        if (timeZone == null)
+            return null;
+
+        var id = timeZone.Id;
+
+        // Already an IANA id (contains '/')
+        if (id.Contains('/') || id == "UTC")
+            return id;
+
+        // Convert Windows timezone id to IANA
+        if (TimeZoneInfo.TryConvertWindowsIdToIanaId(id, out var ianaId))
+            return ianaId;
+
+        // Fallback: return the original id
+        return id;
+    }
+
     #endregion
 }