diff --git a/Modbus.Net/Modbus.Net.BigEndian3412/Modbus.Net.BigEndian3412.csproj b/Modbus.Net/Modbus.Net.BigEndian3412/Modbus.Net.BigEndian3412.csproj
index 162b91f..56b1cf7 100644
--- a/Modbus.Net/Modbus.Net.BigEndian3412/Modbus.Net.BigEndian3412.csproj
+++ b/Modbus.Net/Modbus.Net.BigEndian3412/Modbus.Net.BigEndian3412.csproj
@@ -6,7 +6,7 @@
Modbus.Net.BigEndian3412
Modbus.Net.BigEndian3412
Modbus.Net.BigEndian3412
- 1.4.1
+ 1.4.2
Chris L.(Luo Sheng)
Hangzhou Delian Science Technology Co.,Ltd.
Modbus.Net.Modbus
diff --git a/Modbus.Net/Modbus.Net.Modbus.NA200H/Modbus.Net.Modbus.NA200H.csproj b/Modbus.Net/Modbus.Net.Modbus.NA200H/Modbus.Net.Modbus.NA200H.csproj
index 2f1ae6e..1587249 100644
--- a/Modbus.Net/Modbus.Net.Modbus.NA200H/Modbus.Net.Modbus.NA200H.csproj
+++ b/Modbus.Net/Modbus.Net.Modbus.NA200H/Modbus.Net.Modbus.NA200H.csproj
@@ -6,7 +6,7 @@
Modbus.Net.Modbus.NA200H
Modbus.Net.Modbus.NA200H
Modbus.Net.Modbus.NA200H
- 1.4.1
+ 1.4.2
Chris L.(Luo Sheng)
Hangzhou Delian Science Technology Co.,Ltd.
Modbus.Net.Modbus
diff --git a/Modbus.Net/Modbus.Net.Modbus.SelfDefinedSample/Modbus.Net.Modbus.SelfDefinedSample.csproj b/Modbus.Net/Modbus.Net.Modbus.SelfDefinedSample/Modbus.Net.Modbus.SelfDefinedSample.csproj
index dadfb9b..feb9f26 100644
--- a/Modbus.Net/Modbus.Net.Modbus.SelfDefinedSample/Modbus.Net.Modbus.SelfDefinedSample.csproj
+++ b/Modbus.Net/Modbus.Net.Modbus.SelfDefinedSample/Modbus.Net.Modbus.SelfDefinedSample.csproj
@@ -6,7 +6,7 @@
Modbus.Net.Modbus.SelfDefinedSample
Modbus.Net.Modbus.SelfDefinedSample
Modbus.Net.Modbus.SelfDefinedSample
- 1.4.1
+ 1.4.2
Chris L.(Luo Sheng)
Hangzhou Delian Science Technology Co.,Ltd.
Modbus.Net.Modbus
diff --git a/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj b/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj
index 3a5ecb1..1e0e453 100644
--- a/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj
+++ b/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj
@@ -6,7 +6,7 @@
Modbus.Net.Modbus
Modbus.Net.Modbus
Modbus.Net.Modbus
- 1.4.1
+ 1.4.2
Chris L.(Luo Sheng)
Hangzhou Delian Science Technology Co.,Ltd.
Modbus.Net.Modbus
diff --git a/Modbus.Net/Modbus.Net.Opc/Modbus.Net.Opc.csproj b/Modbus.Net/Modbus.Net.Opc/Modbus.Net.Opc.csproj
index f077582..e8d15dc 100644
--- a/Modbus.Net/Modbus.Net.Opc/Modbus.Net.Opc.csproj
+++ b/Modbus.Net/Modbus.Net.Opc/Modbus.Net.Opc.csproj
@@ -6,7 +6,7 @@
Modbus.Net.Opc
Modbus.Net.Opc
Modbus.Net.Opc
- 1.4.1
+ 1.4.2
Chris L.(Luo Sheng)
Hangzhou Delian Science Technology Co.,Ltd.
Modbus.Net.Opc
diff --git a/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj b/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj
index 8573f74..3ef6ebb 100644
--- a/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj
+++ b/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj
@@ -6,7 +6,7 @@
Modbus.Net.Siemens
Modbus.Net.Siemens
Modbus.Net.Siemens
- 1.4.1
+ 1.4.2
Chris L.(Luo Sheng)
Hangzhou Delian Science Technology Co.,Ltd.
Modbus.Net Siemens Profinet Implementation
diff --git a/Modbus.Net/Modbus.Net/Job/JobChainingJobLIstenerWithDataMapRepeated.cs b/Modbus.Net/Modbus.Net/Job/JobChainingJobLIstenerWithDataMapRepeated.cs
index dcec7b2..345d7d5 100644
--- a/Modbus.Net/Modbus.Net/Job/JobChainingJobLIstenerWithDataMapRepeated.cs
+++ b/Modbus.Net/Modbus.Net/Job/JobChainingJobLIstenerWithDataMapRepeated.cs
@@ -13,6 +13,9 @@ namespace Modbus.Net
///
public class JobChainingJobLIstenerWithDataMapRepeated : JobChainingJobListenerWithDataMap
{
+ ///
+ /// Job repeat count, -1 means infinity, 0 means 1 time.
+ ///
protected int RepeatCount { get; set; }
///
diff --git a/Modbus.Net/Modbus.Net/Modbus.Net.csproj b/Modbus.Net/Modbus.Net/Modbus.Net.csproj
index 8b62c00..ef5cb65 100644
--- a/Modbus.Net/Modbus.Net/Modbus.Net.csproj
+++ b/Modbus.Net/Modbus.Net/Modbus.Net.csproj
@@ -6,7 +6,7 @@
Modbus.Net
Modbus.Net
Modbus.Net
- 1.4.1
+ 1.4.2
Modbus.Net
Chris L.(Luo Sheng)
Hangzhou Delian Science Technology Co.,Ltd.
diff --git a/Samples/MachineJob/ConsoleLogProvider.cs b/Samples/MachineJob/ConsoleLogProvider.cs
index 9288d8b..1d9f1a0 100644
--- a/Samples/MachineJob/ConsoleLogProvider.cs
+++ b/Samples/MachineJob/ConsoleLogProvider.cs
@@ -1,15 +1,22 @@
using Quartz.Logging;
+using System.Configuration;
namespace MachineJob
{
// simple log provider to get something to the console
public class ConsoleLogProvider : ILogProvider
{
+ private readonly IConfigurationRoot configuration = new ConfigurationBuilder()
+ .SetBasePath(Directory.GetCurrentDirectory())
+ .AddJsonFile("appsettings.json")
+ .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT") ?? "Production"}.json", true)
+ .Build();
+
public Logger GetLogger(string name)
{
return (level, func, exception, parameters) =>
{
- if (func != null)
+ if (level >= configuration.GetSection("Quartz").GetValue("LogLevel") && func != null)
{
Console.WriteLine("[" + DateTime.Now.ToLongTimeString() + "] [" + level + "] " + func(), parameters);
}
diff --git a/Samples/MachineJob/DatabaseWrite.cs b/Samples/MachineJob/DatabaseWrite.cs
index 35b6f46..7e0d87c 100644
--- a/Samples/MachineJob/DatabaseWrite.cs
+++ b/Samples/MachineJob/DatabaseWrite.cs
@@ -15,7 +15,7 @@ namespace MachineJob
private static readonly string connectionString = configuration.GetConnectionString("DatabaseWriteConnectionString")!;
- public DbSet DatabaseWrites { get; set; }
+ public DbSet? DatabaseWrites { get; set; }
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
diff --git a/Samples/MachineJob/appsettings.Development.json b/Samples/MachineJob/appsettings.Development.json
index a576829..84216e9 100644
--- a/Samples/MachineJob/appsettings.Development.json
+++ b/Samples/MachineJob/appsettings.Development.json
@@ -1,7 +1,21 @@
{
"Serilog": {
"MinimumLevel": {
- "Default": "Debug"
+ "Default": "Debug",
+ "Override": {
+ "Microsoft": "Debug",
+ "Microsoft.Hosting.Lifetime": "Debug"
+ }
}
+ },
+ "Logging": {
+ "LogLevel": {
+ "Default": "Debug",
+ "Microsoft": "Debug",
+ "Microsoft.Hosting.Lifetime": "Debug"
+ }
+ },
+ "Quartz": {
+ "LogLevel": "Debug"
}
}
diff --git a/Samples/MachineJob/appsettings.Production.json b/Samples/MachineJob/appsettings.Production.json
index e1facf6..8e0045d 100644
--- a/Samples/MachineJob/appsettings.Production.json
+++ b/Samples/MachineJob/appsettings.Production.json
@@ -1,7 +1,21 @@
{
"Serilog": {
"MinimumLevel": {
- "Default": "Error"
+ "Default": "Error",
+ "Override": {
+ "Microsoft": "Error",
+ "Microsoft.Hosting.Lifetime": "Error"
+ }
}
+ },
+ "Logging": {
+ "LogLevel": {
+ "Default": "Error",
+ "Microsoft": "Error",
+ "Microsoft.Hosting.Lifetime": "Error"
+ }
+ },
+ "Quartz": {
+ "LogLevel": "Error"
}
}
diff --git a/Samples/MachineJob/appsettings.json b/Samples/MachineJob/appsettings.json
index 9762107..ca147e3 100644
--- a/Samples/MachineJob/appsettings.json
+++ b/Samples/MachineJob/appsettings.json
@@ -8,6 +8,16 @@
}
}
},
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft": "Information",
+ "Microsoft.Hosting.Lifetime": "Information"
+ }
+ },
+ "Quartz": {
+ "LogLevel": "Info"
+ },
"ConnectionStrings": {
"DatabaseWriteConnectionString": "Server=127.0.0.1; User ID=root; Password=123456; Database=modbusnettest;"
},
@@ -216,8 +226,7 @@
"Name": "Test10"
}
],
- "AddressMapOpc":
- [
+ "AddressMapOpc": [
{
"Area": "Random",
"Address": "Real4",
diff --git a/Technosoftware/DaAeHdaClient.Com/Technosoftware.DaAeHdaClient.Com.csproj b/Technosoftware/DaAeHdaClient.Com/Technosoftware.DaAeHdaClient.Com.csproj
index 3f2a46e..971ca1f 100644
--- a/Technosoftware/DaAeHdaClient.Com/Technosoftware.DaAeHdaClient.Com.csproj
+++ b/Technosoftware/DaAeHdaClient.Com/Technosoftware.DaAeHdaClient.Com.csproj
@@ -9,6 +9,14 @@
AnyCPU
+
+ 1701;1702;CA1416;
+
+
+
+ 1701;1702;CA1416;
+
+