Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded .net9, Upgraded Quartz 3.13, Upgraded JsonSubTypes 2.0.1 #155

Merged
merged 3 commits into from
Nov 30, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/[email protected]
with:
dotnet-version: 6.0.100
dotnet-version: 9.0.100
- name: Install dependencies
run: dotnet restore ./src/SilkierQuartz/SilkierQuartz.csproj
- name: Build
Expand Down
1 change: 1 addition & 0 deletions SilkierQuartz.sln
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.gitattributes = .gitattributes
.gitignore = .gitignore
.travis.yml = .travis.yml
.github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml
LICENSE = LICENSE
src\SilkierQuartz\Content\Images\logo.png = src\SilkierQuartz\Content\Images\logo.png
README.md = README.md
Expand Down
2 changes: 1 addition & 1 deletion sample/example.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down
16 changes: 8 additions & 8 deletions sample2/sample2.csproj
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>aspnet-WebApplication1-A527D1EB-9052-4CB4-84DF-96A390FE8CC1</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
<GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>1591</NoWarn>

<Version>8.0.1</Version>
<Version>9.0.0</Version>
<Product>SilkierQuartz</Product>
<Title>Quartz.NET plugin to persist recent job execution history</Title>
<Authors>Jan Lucansky,Maikebing</Authors>
Expand All @@ -16,7 +16,7 @@
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Copyright>Copyright © 2018 Jan Lucansky, Copyright © 2020 Maikebing</Copyright>
<Copyright>Copyright © 2018 Jan Lucansky, Copyright © 2024 Maikebing</Copyright>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/jlucansky/SilkierQuartz</RepositoryUrl>
<PackageId>SilkierQuartz.Plugins.RecentHistory</PackageId>
Expand Down
17 changes: 13 additions & 4 deletions src/SilkierQuartz/SilkierQuartz.csproj
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
<GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>1591</NoWarn>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>

<Version>8.0.1</Version>
<Version>9.0.0</Version>
<Product>SilkierQuartz</Product>
<Title>Web management tool for Quartz.NET</Title>
<Authors>Jan Lucansky, Yanhong Ma, mukmyash</Authors>
<PackageProjectUrl>https://github.com/maikebing/SilkierQuartz</PackageProjectUrl>
<PackageIconUrl></PackageIconUrl>
<Description>Powerful, easy to use web management tool for Quartz.NET</Description>
<PackageTags>quartz;web;ui</PackageTags>
<AssemblyVersion>1.0.8.1</AssemblyVersion>
<FileVersion>1.0.8.1</FileVersion>
<AssemblyVersion>1.0.9.0</AssemblyVersion>
<FileVersion>1.0.9.0</FileVersion>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Copyright>Copyright © 2024 Jan Lucansky, Yanhong Ma, mukmyash</Copyright>
<RepositoryType>git</RepositoryType>
Expand Down Expand Up @@ -77,6 +77,10 @@
<Optimize>False</Optimize>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0|AnyCPU'">
<Optimize>False</Optimize>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Quartz.Plugins.RecentHistory\Quartz.Plugins.RecentHistory.csproj" />
</ItemGroup>
Expand All @@ -87,6 +91,11 @@
<PackageReference Include="Quartz" Version="3.13.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9'">
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="9.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8'">
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.*" />
Expand Down
6 changes: 3 additions & 3 deletions test/QuartzHostedServiceUnitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace SilkierQuartz.Test
public class QuartzHostedServiceUnitTest
{
[Fact(DisplayName = "Install JobFactory (For DI)")]
public async void IServiceCollectionExtensions_Register_HostedService()
public async Task IServiceCollectionExtensions_Register_HostedService()
{
var serviceProvider = A.Fake<IServiceProvider>();
A.CallTo(() => serviceProvider.GetService(typeof(IEnumerable<IScheduleJob>))).Returns(null);
Expand All @@ -34,7 +34,7 @@ public async void IServiceCollectionExtensions_Register_HostedService()


[Fact(DisplayName = "All Registered Job")]
public async void IServiceCollectionExtensions_Register_RegisterJob()
public async Task IServiceCollectionExtensions_Register_RegisterJob()
{
// Registered jobs
var scheduleJobc = new List<IScheduleJob>();
Expand Down Expand Up @@ -69,7 +69,7 @@ public async void IServiceCollectionExtensions_Register_RegisterJob()
}

[Fact(DisplayName = "Started all registered Job with specified ITrigger")]
public async void IServiceCollectionExtensions_Register_RegisterJob_ITrigger()
public async Task IServiceCollectionExtensions_Register_RegisterJob_ITrigger()
{
// Registered jobas
var scheduleJobc = new List<IScheduleJob>();
Expand Down
8 changes: 4 additions & 4 deletions test/SilkierQuartz.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FakeItEasy" Version="8.3.0" />
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="FluentAssertions" Version="7.0.0-alpha.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.4.0-beta.1.build3958" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading