quartznet · lahma · Dec 16, 2023 · Dec 16, 2023 · Dec 16, 2023 · Dec 16, 2023
diff --git a/build/Build.cs b/build/Build.cs
@@ -134,18 +134,11 @@ protected override void OnBuildInitialized()
         .After(Compile)
         .Executes(() =>
         {
-            var framework = "";
-            if (!IsRunningOnWindows)
-            {
-                framework = "net8.0";
-            }
-
             var testProjects = new[] { "Quartz.Tests.Unit", "Quartz.Tests.AspNetCore" };
             DotNetTest(s => s
                 .EnableNoRestore()
                 .EnableNoBuild()
                 .SetConfiguration(Configuration)
-                .SetFramework(framework)
                 .SetLoggers(GitHubActions.Instance is not null ? new[] { "GitHubActions" } : Array.Empty<string>())
                 .CombineWith(testProjects, (_, testProject) => _
                     .SetProjectFile(Solution.GetAllProjects(testProject).First())
@@ -207,7 +200,6 @@ void RunPsqlAsQuartznetUser(string parameters)
                 .EnableNoRestore()
                 .EnableNoBuild()
                 .SetConfiguration(Configuration)
-                .SetFramework("net6.0")
                 .SetLoggers("GitHubActions")
                 .SetFilter("TestCategory!=db-firebird&TestCategory!=db-oracle&TestCategory!=db-mysql&TestCategory!=db-sqlserver")
                 .CombineWith(integrationTestProjects, (_, testProject) => _

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -52,14 +52,6 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
-    <DefineConstants>$(DefineConstants);REMOTING</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <DefineConstants>$(DefineConstants);DIAGNOSTICS_SOURCE</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="..\quartz-logo-small.png" Pack="true" Visible="false" PackagePath=""/>
   </ItemGroup>

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -2,16 +2,6 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net472' ">
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="2.1.1" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" />
-    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" />
-  </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.7" />
     <PackageVersion Include="AspNetCore.HealthChecks.UI" Version="8.0.0" />
@@ -25,14 +15,17 @@
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.18" />
     <PackageVersion Include="Microsoft.Data.SQLite" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.2" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="MySqlConnector" Version="2.3.1" />
     <PackageVersion Include="NSwag.AspNetCore" Version="14.0.0-preview010" />
@@ -46,7 +39,6 @@
     <PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.7.0" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Quartz" Version="1.0.0-alpha.3" />
-    <PackageVersion Include="OpenTracing" Version="0.12.1" />
     <PackageVersion Include="Oracle.ManagedDataAccess" Version="21.12.0" />
     <PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.120" />
     <PackageVersion Include="Serilog" Version="3.1.1" />

diff --git a/src/Quartz.AspNetCore/Quartz.AspNetCore.csproj b/src/Quartz.AspNetCore/Quartz.AspNetCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Quartz.NET ASP.NET Core integration; $(Description)</Description>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Quartz</RootNamespace>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <Authors>Lewis Zou, Marko Lahma, Quartz.NET</Authors>

diff --git a/src/Quartz.Benchmark/Quartz.Benchmark.csproj b/src/Quartz.Benchmark/Quartz.Benchmark.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0;net48</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <!-- Necessary to run benchmarks on .NET 6.0+ -->
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>

diff --git a/src/Quartz.Examples/Quartz.Examples.csproj b/src/Quartz.Examples/Quartz.Examples.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net472</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);MA0004</NoWarn>

diff --git a/src/Quartz.HttpClient/Quartz.HttpClient.csproj b/src/Quartz.HttpClient/Quartz.HttpClient.csproj
@@ -2,15 +2,13 @@
 
   <PropertyGroup>
     <AssemblyTitle>Quartz.NET HTTP client</AssemblyTitle>
-    <TargetFrameworks>netstandard2.0;net8.0;</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Quartz</RootNamespace>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" />
-    <PackageReference Include="System.Net.Http.Json" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
-    <PackageReference Include="System.Reflection.Emit" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Quartz.Jobs/Quartz.Jobs.csproj b/src/Quartz.Jobs/Quartz.Jobs.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Quartz.NET Jobs; $(Description)</Description>
-    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Quartz</RootNamespace>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <PackageReadmeFile>quartz-jobs.md</PackageReadmeFile>

diff --git a/src/Quartz.Plugins.TimeZoneConverter/Quartz.Plugins.TimeZoneConverter.csproj b/src/Quartz.Plugins.TimeZoneConverter/Quartz.Plugins.TimeZoneConverter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Quartz</RootNamespace>
     <Title>Quartz.NET TimeZoneConverter integration</Title>
     <Description>Quartz.NET TimeZoneConverter integration https://github.com/mj1856/TimeZoneConverter; $(Description)</Description>

diff --git a/src/Quartz.Plugins/Quartz.Plugins.csproj b/src/Quartz.Plugins/Quartz.Plugins.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Quartz.NET Plugins; $(Description)</Description>
-    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Quartz</RootNamespace>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <PackageReadmeFile>quartz-plugins.md</PackageReadmeFile>

diff --git a/src/Quartz.Serialization.Newtonsoft/Quartz.Serialization.Newtonsoft.csproj b/src/Quartz.Serialization.Newtonsoft/Quartz.Serialization.Newtonsoft.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Quartz</RootNamespace>
     <Title>Quartz.NET JSON Serialization</Title>
     <Description>Quartz.NET JSON Serialization Support; $(Description)</Description>

diff --git a/src/Quartz.Serialization.SystemTextJson/Quartz.Serialization.SystemTextJson.csproj b/src/Quartz.Serialization.SystemTextJson/Quartz.Serialization.SystemTextJson.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Quartz</RootNamespace>
     <Title>Quartz.NET System.Text.Json Serialization</Title>
     <Description>Quartz.NET System.Text.Json Serialization Support; $(Description)</Description>

diff --git a/src/Quartz.Server/Quartz.Server.csproj b/src/Quartz.Server/Quartz.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net8.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -13,10 +13,6 @@
     <Content Include="log4net.config" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Quartz\Quartz.csproj" />
     <ProjectReference Include="..\Quartz.Serialization.Newtonsoft\Quartz.Serialization.Newtonsoft.csproj" />

diff --git a/src/Quartz.Tests.Integration/Impl/AdoJobStore/Common/DbMetadataTest.cs b/src/Quartz.Tests.Integration/Impl/AdoJobStore/Common/DbMetadataTest.cs
@@ -50,25 +50,6 @@ public void TestDbMetadataMySql()
         TestDbMetadata("MySqlConnector");
     }
 
-#if NETFRAMEWORK
-
-    [Test]
-    [Category("db-oracle")]
-    public void TestDbMetadataOracleODP()
-    {
-        TestDbMetadata("OracleODP");
-    }
-
-    [Test]
-    [Category("db-oracle")]
-    public void TestDbMetadataOracleODPManaged()
-    {
-        var provider = TestDbMetadata("OracleODPManaged");
-        var command = (Oracle.ManagedDataAccess.Client.OracleCommand) provider.CreateCommand();
-        Assert.That(command.BindByName, Is.True, "bind by name should default to true");
-    }
-#endif
-
     private static DbProvider TestDbMetadata(string dbname, bool hashCustomBinaryType = true)
     {
         DbProvider dbp = new DbProvider(dbname, "foo");

diff --git a/src/Quartz.Tests.Integration/Quartz.Tests.Integration.csproj b/src/Quartz.Tests.Integration/Quartz.Tests.Integration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net472</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>disable</Nullable>
     <NoWarn>SYSLIB0011;CAC001</NoWarn>
@@ -25,6 +25,7 @@
     <PackageReference Include="MySqlConnector" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="Npgsql" />
+    <PackageReference Include="Oracle.ManagedDataAccess.Core" />
     <PackageReference Include="System.Data.SQLite.Core" />
     <PackageReference Include="NUnit3TestAdapter" />
   </ItemGroup>
@@ -35,15 +36,6 @@
     <ProjectReference Include="..\Quartz.Serialization.Newtonsoft\Quartz.Serialization.Newtonsoft.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <PackageReference Include="Oracle.ManagedDataAccess.Core" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
-    <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="Oracle.ManagedDataAccess" />
-  </ItemGroup>
-
   <ItemGroup>
     <GlobalPackageReference Remove="Meziantou.Analyzer" />
   </ItemGroup>

diff --git a/...ts.Unit/Extensions/DependencyInjection/QuartzHttpClientServiceCollectionExtensionsTest.cs b/...ts.Unit/Extensions/DependencyInjection/QuartzHttpClientServiceCollectionExtensionsTest.cs
@@ -1,7 +1,3 @@
-#if NETFRAMEWORK
-using System.Net.Http;
-#endif
-
 using FakeItEasy;
 
 using FluentAssertions;

diff --git a/src/Quartz.Tests.Unit/Impl/AdoJobStore/StdAdoDelegateTest.cs b/src/Quartz.Tests.Unit/Impl/AdoJobStore/StdAdoDelegateTest.cs
@@ -477,14 +477,6 @@ protected override void SetParameter(string parameterName, DbParameter value)
 
     public override object SyncRoot => throw new NotImplementedException();
 
-#if NETFRAMEWORK
-    public override bool IsFixedSize => throw new NotImplementedException();
-
-    public override bool IsReadOnly => throw new NotImplementedException();
-
-    public override bool IsSynchronized => throw new NotImplementedException();
-#endif
-
     public override int IndexOf(string parameterName)
     {
         throw new NotImplementedException();

diff --git a/src/Quartz.Tests.Unit/JobDetailTest.cs b/src/Quartz.Tests.Unit/JobDetailTest.cs
@@ -28,10 +28,6 @@
 using Quartz.Simpl;
 using Quartz.Util;
 
-#if REMOTING
-using Quartz.Tests.Unit.Utils;
-#endif
-
 namespace Quartz.Tests.Unit;
 
 /// <author>Marko Lahma (.NET)</author>
@@ -59,20 +55,6 @@ public void TestClone()
         Assert.AreEqual(jobDetail, clonedJobDetail);
     }
 
-#if REMOTING
-        [Test]
-        public void JobDetailsShouldBeSerializable()
-        {
-            JobDetailImpl original = new JobDetailImpl("name", "group", typeof (NoOpJob));
-
-            JobDetailImpl cloned = original.DeepClone();
-
-            Assert.That(cloned.Name, Is.EqualTo(original.Name));
-            Assert.That(cloned.Group, Is.EqualTo(original.Group));
-            Assert.That(cloned.Key, Is.EqualTo(original.Key));
-        }
-#endif
-
     [Test]
     public void SettingKeyShouldAlsoSetNameAndGroup()
     {

diff --git a/src/Quartz.Tests.Unit/Quartz.Tests.Unit.csproj b/src/Quartz.Tests.Unit/Quartz.Tests.Unit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net472</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>disable</Nullable>
     <NoWarn>SYSLIB0011;CS0618</NoWarn>

diff --git a/src/Quartz.Tests.Unit/QuartzHostedServiceTests.cs b/src/Quartz.Tests.Unit/QuartzHostedServiceTests.cs
@@ -4,11 +4,7 @@
 using Quartz.Impl.Matchers;
 using Quartz.Spi;
 
-#if NET6_OR_GREATER
 using Lifetime = Microsoft.Extensions.Hosting.IHostApplicationLifetime;
-#else
-using Lifetime = Microsoft.Extensions.Hosting.IApplicationLifetime;
-#endif
 
 namespace Quartz.Tests.Unit;