Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions .github/workflows/build-and-publish-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 }}

10 changes: 6 additions & 4 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Hangfire.Atoms/Dashboard/Pages/AtomDetailsPage.cshtml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Hangfire.Atoms/Dashboard/Pages/AtomsPage.cshtml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Hangfire.Atoms/Dashboard/Pages/TriggersPage.cshtml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 2 additions & 5 deletions src/Hangfire.Atoms/Hangfire.Atoms.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Hangfire.Core" Version="[1.7.19,1.8)" />
<PackageReference Include="RazorGenerator.MsBuild" Version="2.5.0" PrivateAssets="All" />
<PackageReference Include="Hangfire.Core" Version="[1.8.16,1.9)"/>
<PackageReference Include="RazorGenerator.MsBuild" Version="2.5.0" PrivateAssets="All"/>
</ItemGroup>

<!-- Full MSBuild is required to generate Razor classes -->
Expand All @@ -35,9 +35,6 @@
</Target>

<ItemGroup>
<Compile Update="Dashboard\Pages\AtomsDetailsPage.cshtml.cs">
<DependentUpon>AtomsDetailsPage.cshtml</DependentUpon>
</Compile>
<Compile Update="Dashboard\Pages\AtomsDetailsPage.cs">
<DependentUpon>AtomsDetailsPage.cshtml</DependentUpon>
</Compile>
Expand Down
2 changes: 1 addition & 1 deletion src/Hangfire.Atoms/Razor.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<PropertyGroup>
<RootNamespace>Hangfire.Atoms</RootNamespace>
<GeneratePrettyNames>true</GeneratePrettyNames>
<RazorViewsCodeGenDirectory>$(MsBuildProjectDirectory)\</RazorViewsCodeGenDirectory>
<DisableLinePragmas>true</DisableLinePragmas>
</PropertyGroup>
</Project>
10 changes: 4 additions & 6 deletions tests/Hangfire.Atoms.Tests.Web/Hangfire.Atoms.Tests.Web.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>11</LangVersion>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="HangFire" Version="1.7.32" />
<PackageReference Include="Hangfire.Core" Version="1.7.32" />
<PackageReference Include="Hangfire.PostgreSql.ahydrax" Version="1.7.5" />
<PackageReference Include="Hangfire.Redis.StackExchange" Version="1.8.6" />
<PackageReference Include="HangFire" Version="1.8.18" />
<PackageReference Include="Hangfire.MemoryStorage" Version="1.8.1.1" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 2 additions & 5 deletions tests/Hangfire.Atoms.Tests.Web/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});

Expand Down
Loading