From 80bcaab0997b8ace083babb34ae4fdc05902f031 Mon Sep 17 00:00:00 2001 From: Viktor Svyatokha Date: Sun, 30 Mar 2025 11:59:16 +1000 Subject: [PATCH 1/7] net9 --- .github/workflows/build-and-publish-nuget.yml | 11 ++++++----- .github/workflows/build-test.yml | 3 ++- .../Hangfire.Atoms.Tests.Web.csproj | 10 ++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-and-publish-nuget.yml b/.github/workflows/build-and-publish-nuget.yml index 6e50839..29a7e34 100644 --- a/.github/workflows/build-and-publish-nuget.yml +++ b/.github/workflows/build-and-publish-nuget.yml @@ -12,18 +12,20 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - + - name: Setup MSBuild Path uses: microsoft/setup-msbuild@v1.1 - + - name: Setup .NET uses: actions/setup-dotnet@v3 with: dotnet-version: | - 7.0.x + 8.0.x + 9.0.x + - name: Restore dependencies run: dotnet restore - + - name: Build run: msbuild .\Hangfire.Atoms.sln /t:Build /p:Configuration=Release @@ -32,4 +34,3 @@ jobs: - name: Push run: dotnet nuget push ./nupkgs/Hangfire.Atoms.${{ github.event.release.tag_name }}.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }} - diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 7a2bf3b..f080c42 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -22,7 +22,8 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 7.0.x + 8.0.x + 9.0.x - name: Restore dependencies run: dotnet restore - name: Build diff --git a/tests/Hangfire.Atoms.Tests.Web/Hangfire.Atoms.Tests.Web.csproj b/tests/Hangfire.Atoms.Tests.Web/Hangfire.Atoms.Tests.Web.csproj index 521798c..6bfbf0c 100644 --- a/tests/Hangfire.Atoms.Tests.Web/Hangfire.Atoms.Tests.Web.csproj +++ b/tests/Hangfire.Atoms.Tests.Web/Hangfire.Atoms.Tests.Web.csproj @@ -1,15 +1,13 @@  - net7.0 - 11 + net9.0 + latest - - - - + + From 98200910de073886c0db744f46f5b8ef976c5312 Mon Sep 17 00:00:00 2001 From: Viktor Svyatokha Date: Sun, 30 Mar 2025 11:59:25 +1000 Subject: [PATCH 2/7] wip --- src/Hangfire.Atoms/Hangfire.Atoms.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Hangfire.Atoms/Hangfire.Atoms.csproj b/src/Hangfire.Atoms/Hangfire.Atoms.csproj index a43723b..08b0e23 100644 --- a/src/Hangfire.Atoms/Hangfire.Atoms.csproj +++ b/src/Hangfire.Atoms/Hangfire.Atoms.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -16,8 +16,8 @@ - - + + From 63b89afa3fe19f54054bde6a55ddecdac76995ca Mon Sep 17 00:00:00 2001 From: Viktor Svyatokha Date: Sun, 30 Mar 2025 12:07:45 +1000 Subject: [PATCH 3/7] wip --- tests/Hangfire.Atoms.Tests.Web/Program.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/Hangfire.Atoms.Tests.Web/Program.cs b/tests/Hangfire.Atoms.Tests.Web/Program.cs index 3b0a3be..8e81ba0 100644 --- a/tests/Hangfire.Atoms.Tests.Web/Program.cs +++ b/tests/Hangfire.Atoms.Tests.Web/Program.cs @@ -3,6 +3,7 @@ using Hangfire; using Hangfire.Atoms; using Hangfire.Atoms.Tests.Web; +using Hangfire.MemoryStorage; using Hangfire.PostgreSql; using Microsoft.AspNetCore.Builder; @@ -11,9 +12,7 @@ builder.Services.AddHangfire(configuration => { - configuration.UsePostgreSqlStorage(connectionString); - configuration.UsePostgreSqlMetrics(); - //configuration.UseRedisStorage("192.168.5.32"); + configuration.UseMemoryStorage(); configuration.UseAtoms(); }); From 66e23ecc38cc32659fc9014cc286f3834be4ccef Mon Sep 17 00:00:00 2001 From: Viktor Svyatokha Date: Sun, 30 Mar 2025 12:36:42 +1000 Subject: [PATCH 4/7] wip --- tests/Hangfire.Atoms.Tests.Web/Program.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/Hangfire.Atoms.Tests.Web/Program.cs b/tests/Hangfire.Atoms.Tests.Web/Program.cs index 8e81ba0..4f3d9ed 100644 --- a/tests/Hangfire.Atoms.Tests.Web/Program.cs +++ b/tests/Hangfire.Atoms.Tests.Web/Program.cs @@ -4,11 +4,9 @@ using Hangfire.Atoms; using Hangfire.Atoms.Tests.Web; using Hangfire.MemoryStorage; -using Hangfire.PostgreSql; using Microsoft.AspNetCore.Builder; var builder = WebApplication.CreateBuilder(args); -var connectionString = Environment.GetEnvironmentVariable("Hangfire_PostgreSql_ConnectionString"); builder.Services.AddHangfire(configuration => { From 6c38473a93bfea0f99c5de8666c17d06454422db Mon Sep 17 00:00:00 2001 From: Viktor Svyatokha Date: Mon, 9 Feb 2026 14:17:51 +1000 Subject: [PATCH 5/7] Update CI actions and add .NET 10.0 --- .github/workflows/build-and-publish-nuget.yml | 7 ++++--- .github/workflows/build-test.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-publish-nuget.yml b/.github/workflows/build-and-publish-nuget.yml index 29a7e34..1decbb8 100644 --- a/.github/workflows/build-and-publish-nuget.yml +++ b/.github/workflows/build-and-publish-nuget.yml @@ -11,17 +11,18 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v6 - name: Setup MSBuild Path - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v2 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 8.0.x 9.0.x + 10.0.x - name: Restore dependencies run: dotnet restore diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index f080c42..898d964 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -15,15 +15,16 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - name: Setup MSBuild Path - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v2 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 8.0.x 9.0.x + 10.0.x - name: Restore dependencies run: dotnet restore - name: Build From f1e1c3c81fc7cc28041ce3cc41fe1ab1e392294a Mon Sep 17 00:00:00 2001 From: Viktor Svyatokha Date: Mon, 9 Feb 2026 14:27:11 +1000 Subject: [PATCH 6/7] bump base ver --- src/Hangfire.Atoms/Hangfire.Atoms.csproj | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Hangfire.Atoms/Hangfire.Atoms.csproj b/src/Hangfire.Atoms/Hangfire.Atoms.csproj index 08b0e23..a96c156 100644 --- a/src/Hangfire.Atoms/Hangfire.Atoms.csproj +++ b/src/Hangfire.Atoms/Hangfire.Atoms.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -16,7 +16,7 @@ - + @@ -35,9 +35,6 @@ - - AtomsDetailsPage.cshtml - AtomsDetailsPage.cshtml From 3510bbfb39d5544fbe8a5082c17ca1a630124260 Mon Sep 17 00:00:00 2001 From: Viktor Svyatokha Date: Mon, 9 Feb 2026 14:50:26 +1000 Subject: [PATCH 7/7] Disable Razor line pragmas in generated views --- src/Hangfire.Atoms/Dashboard/Pages/AtomDetailsPage.cshtml | 2 +- src/Hangfire.Atoms/Dashboard/Pages/AtomsPage.cshtml | 2 +- src/Hangfire.Atoms/Dashboard/Pages/TriggersPage.cshtml | 2 +- src/Hangfire.Atoms/Razor.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Hangfire.Atoms/Dashboard/Pages/AtomDetailsPage.cshtml b/src/Hangfire.Atoms/Dashboard/Pages/AtomDetailsPage.cshtml index 9410c39..b51ab96 100644 --- a/src/Hangfire.Atoms/Dashboard/Pages/AtomDetailsPage.cshtml +++ b/src/Hangfire.Atoms/Dashboard/Pages/AtomDetailsPage.cshtml @@ -1,4 +1,4 @@ -@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ +@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True DisableLinePragmas: true*@ @using System @using System.Collections.Generic @using System.Linq diff --git a/src/Hangfire.Atoms/Dashboard/Pages/AtomsPage.cshtml b/src/Hangfire.Atoms/Dashboard/Pages/AtomsPage.cshtml index 45bbab4..18a64ce 100644 --- a/src/Hangfire.Atoms/Dashboard/Pages/AtomsPage.cshtml +++ b/src/Hangfire.Atoms/Dashboard/Pages/AtomsPage.cshtml @@ -1,4 +1,4 @@ -@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ +@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True DisableLinePragmas: true*@ @using System.Collections.Generic @using Hangfire.Atoms @using Hangfire.Common diff --git a/src/Hangfire.Atoms/Dashboard/Pages/TriggersPage.cshtml b/src/Hangfire.Atoms/Dashboard/Pages/TriggersPage.cshtml index 2a0afe9..394f3f7 100644 --- a/src/Hangfire.Atoms/Dashboard/Pages/TriggersPage.cshtml +++ b/src/Hangfire.Atoms/Dashboard/Pages/TriggersPage.cshtml @@ -1,4 +1,4 @@ -@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ +@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True DisableLinePragmas: true*@ @using System @using System.Collections.Generic @using System.Linq diff --git a/src/Hangfire.Atoms/Razor.build b/src/Hangfire.Atoms/Razor.build index bd7b45e..47d3afd 100644 --- a/src/Hangfire.Atoms/Razor.build +++ b/src/Hangfire.Atoms/Razor.build @@ -4,6 +4,6 @@ Hangfire.Atoms true - $(MsBuildProjectDirectory)\ + true