diff --git a/.github/workflows/build-and-publish-nuget.yml b/.github/workflows/build-and-publish-nuget.yml index 6e50839..1decbb8 100644 --- a/.github/workflows/build-and-publish-nuget.yml +++ b/.github/workflows/build-and-publish-nuget.yml @@ -11,19 +11,22 @@ 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: | - 7.0.x + 8.0.x + 9.0.x + 10.0.x + - name: Restore dependencies run: dotnet restore - + - name: Build run: msbuild .\Hangfire.Atoms.sln /t:Build /p:Configuration=Release @@ -32,4 +35,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..898d964 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -15,14 +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: | - 7.0.x + 8.0.x + 9.0.x + 10.0.x - name: Restore dependencies run: dotnet restore - name: Build 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/Hangfire.Atoms.csproj b/src/Hangfire.Atoms/Hangfire.Atoms.csproj index a43723b..a96c156 100644 --- a/src/Hangfire.Atoms/Hangfire.Atoms.csproj +++ b/src/Hangfire.Atoms/Hangfire.Atoms.csproj @@ -16,8 +16,8 @@ - - + + @@ -35,9 +35,6 @@ - - AtomsDetailsPage.cshtml - AtomsDetailsPage.cshtml 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 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 - - - - + + diff --git a/tests/Hangfire.Atoms.Tests.Web/Program.cs b/tests/Hangfire.Atoms.Tests.Web/Program.cs index 3b0a3be..4f3d9ed 100644 --- a/tests/Hangfire.Atoms.Tests.Web/Program.cs +++ b/tests/Hangfire.Atoms.Tests.Web/Program.cs @@ -3,17 +3,14 @@ using Hangfire; using Hangfire.Atoms; using Hangfire.Atoms.Tests.Web; -using Hangfire.PostgreSql; +using Hangfire.MemoryStorage; using Microsoft.AspNetCore.Builder; var builder = WebApplication.CreateBuilder(args); -var connectionString = Environment.GetEnvironmentVariable("Hangfire_PostgreSql_ConnectionString"); builder.Services.AddHangfire(configuration => { - configuration.UsePostgreSqlStorage(connectionString); - configuration.UsePostgreSqlMetrics(); - //configuration.UseRedisStorage("192.168.5.32"); + configuration.UseMemoryStorage(); configuration.UseAtoms(); });