diff --git a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableVM.cs b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableVM.cs index 8fa29a9..8e46c1e 100644 --- a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableVM.cs +++ b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableVM.cs @@ -39,7 +39,7 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs AllMethods = deviceService.GetDriverMethods(Entity.DeviceId); } - if (AllMethods.Count() > 0) + if (AllMethods?.Count() > 0) AllMethods[0].Selected = true; } diff --git a/IoTGateway/IoTGateway.csproj b/IoTGateway/IoTGateway.csproj index e109773..6a24c64 100644 --- a/IoTGateway/IoTGateway.csproj +++ b/IoTGateway/IoTGateway.csproj @@ -7,7 +7,7 @@ zh-Hans,en true Linux - x86 + @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/IoTGateway/iotgateway.db b/IoTGateway/iotgateway.db index 2bfa900..ce9da74 100644 Binary files a/IoTGateway/iotgateway.db and b/IoTGateway/iotgateway.db differ diff --git a/Plugins/Drivers/DriverAllenBradley/DriverAllenBradley.csproj b/Plugins/Drivers/DriverAllenBradley/DriverAllenBradley.csproj index be5da79..d2e828e 100644 --- a/Plugins/Drivers/DriverAllenBradley/DriverAllenBradley.csproj +++ b/Plugins/Drivers/DriverAllenBradley/DriverAllenBradley.csproj @@ -9,7 +9,7 @@ - + diff --git a/Plugins/Drivers/DriverFanucHsl/DriverFanucHsl.csproj b/Plugins/Drivers/DriverFanucHsl/DriverFanucHsl.csproj index 2cfa84e..cb96cdd 100644 --- a/Plugins/Drivers/DriverFanucHsl/DriverFanucHsl.csproj +++ b/Plugins/Drivers/DriverFanucHsl/DriverFanucHsl.csproj @@ -9,7 +9,7 @@ - + diff --git a/Plugins/Drivers/DriverMitsubishi/DriverMitsubishi.csproj b/Plugins/Drivers/DriverMitsubishi/DriverMitsubishi.csproj index f87e0c2..42df9f2 100644 --- a/Plugins/Drivers/DriverMitsubishi/DriverMitsubishi.csproj +++ b/Plugins/Drivers/DriverMitsubishi/DriverMitsubishi.csproj @@ -9,7 +9,7 @@ - + diff --git a/Plugins/Drivers/DriverOPCUaClient/DriverOPCUaClient.csproj b/Plugins/Drivers/DriverOPCUaClient/DriverOPCUaClient.csproj index 5845e7c..037b055 100644 --- a/Plugins/Drivers/DriverOPCUaClient/DriverOPCUaClient.csproj +++ b/Plugins/Drivers/DriverOPCUaClient/DriverOPCUaClient.csproj @@ -9,7 +9,7 @@ - + diff --git a/Plugins/Drivers/DriverOmronFins/DriverOmronFins.csproj b/Plugins/Drivers/DriverOmronFins/DriverOmronFins.csproj index f87e0c2..42df9f2 100644 --- a/Plugins/Drivers/DriverOmronFins/DriverOmronFins.csproj +++ b/Plugins/Drivers/DriverOmronFins/DriverOmronFins.csproj @@ -9,7 +9,7 @@ - + diff --git a/Plugins/Plugin/DeviceThread.cs b/Plugins/Plugin/DeviceThread.cs index 77c5e95..6af2cf1 100644 --- a/Plugins/Plugin/DeviceThread.cs +++ b/Plugins/Plugin/DeviceThread.cs @@ -274,7 +274,7 @@ namespace Plugin //mysql会把一些符号转义，没找到原因，先临时处理下 private string DealMysqlStr(string Expression) { - return Expression.Replace("<", ">").Replace(">", "<").Replace("&", "&"); + return Expression.Replace("<", "<").Replace(">", ">").Replace("&", "&").Replace(""", "\""); } } diff --git a/Plugins/Plugin/Plugin.csproj b/Plugins/Plugin/Plugin.csproj index 57d1ccd..134114c 100644 --- a/Plugins/Plugin/Plugin.csproj +++ b/Plugins/Plugin/Plugin.csproj @@ -7,10 +7,10 @@ - + - - + + diff --git a/WalkingTec.Mvvm/WalkingTec.Mvvm.Mvc/WalkingTec.Mvvm.Mvc.csproj b/WalkingTec.Mvvm/WalkingTec.Mvvm.Mvc/WalkingTec.Mvvm.Mvc.csproj index 931b5f0..45ff515 100644 --- a/WalkingTec.Mvvm/WalkingTec.Mvvm.Mvc/WalkingTec.Mvvm.Mvc.csproj +++ b/WalkingTec.Mvvm/WalkingTec.Mvvm.Mvc/WalkingTec.Mvvm.Mvc.csproj @@ -64,7 +64,7 @@ - + diff --git a/drivers/net6.0/DriverAllenBradley.deps.json b/drivers/net6.0/DriverAllenBradley.deps.json index ff333fa..24bc0b9 100644 --- a/drivers/net6.0/DriverAllenBradley.deps.json +++ b/drivers/net6.0/DriverAllenBradley.deps.json @@ -8,21 +8,21 @@ ".NETCoreApp,Version=v6.0": { "DriverAllenBradley/1.0.0": { "dependencies": { - "IoTClient": "1.0.22", + "IoTClient": "1.0.28", "PluginInterface": "1.0.0" }, "runtime": { "DriverAllenBradley.dll": {} } }, - "IoTClient/1.0.22": { + "IoTClient/1.0.28": { "dependencies": { "System.IO.Ports": "4.6.0" }, "runtime": { "lib/netstandard2.0/IoTClient.dll": { - "assemblyVersion": "1.0.22.0", - "fileVersion": "1.0.22.0" + "assemblyVersion": "1.0.28.0", + "fileVersion": "1.0.28.0" } } }, @@ -140,12 +140,12 @@ "serviceable": false, "sha512": "" }, - "IoTClient/1.0.22": { + "IoTClient/1.0.28": { "type": "package", "serviceable": true, - "sha512": "sha512-UqkeoTFWpDiskvtuPiwdk7XLkvb2no1iJSE0sJusjccapbs6J5GPCf/0eGqu4ftlrHxG8E4fd7lgTA1R5Ztbgw==", - "path": "iotclient/1.0.22", - "hashPath": "iotclient.1.0.22.nupkg.sha512" + "sha512": "sha512-C9H2L6dkYE2zk3XPNhYIQgPzu+vfaDUHWao3xt4kR0/PxHO7LP94i2hnJqh+tmB/+k2wULKkdy+g1RbJEIxOvQ==", + "path": "iotclient/1.0.28", + "hashPath": "iotclient.1.0.28.nupkg.sha512" }, "Microsoft.NETCore.Platforms/3.0.0": { "type": "package", diff --git a/drivers/net6.0/DriverAllenBradley.dll b/drivers/net6.0/DriverAllenBradley.dll index e0e2d25..5cb0bee 100644 Binary files a/drivers/net6.0/DriverAllenBradley.dll and b/drivers/net6.0/DriverAllenBradley.dll differ diff --git a/drivers/net6.0/DriverAllenBradley.pdb b/drivers/net6.0/DriverAllenBradley.pdb index 07a9bb1..d80c410 100644 Binary files a/drivers/net6.0/DriverAllenBradley.pdb and b/drivers/net6.0/DriverAllenBradley.pdb differ diff --git a/drivers/net6.0/DriverFanuc.dll b/drivers/net6.0/DriverFanuc.dll index f49da96..75831e8 100644 Binary files a/drivers/net6.0/DriverFanuc.dll and b/drivers/net6.0/DriverFanuc.dll differ diff --git a/drivers/net6.0/DriverFanuc.pdb b/drivers/net6.0/DriverFanuc.pdb index 34c0f2d..d7d9cd9 100644 Binary files a/drivers/net6.0/DriverFanuc.pdb and b/drivers/net6.0/DriverFanuc.pdb differ diff --git a/drivers/net6.0/DriverFanucHsl.deps.json b/drivers/net6.0/DriverFanucHsl.deps.json index c8b68b1..2191676 100644 --- a/drivers/net6.0/DriverFanucHsl.deps.json +++ b/drivers/net6.0/DriverFanucHsl.deps.json @@ -8,7 +8,7 @@ ".NETCoreApp,Version=v6.0": { "DriverFanucHsl/1.0.0": { "dependencies": { - "HslCommunication": "11.0.0", + "HslCommunication": "11.0.2", "Newtonsoft.Json": "13.0.1", "PluginInterface": "1.0.0" }, @@ -16,15 +16,15 @@ "DriverFanucHsl.dll": {} } }, - "HslCommunication/11.0.0": { + "HslCommunication/11.0.2": { "dependencies": { "Newtonsoft.Json": "13.0.1", "System.IO.Ports": "4.7.0" }, "runtime": { "lib/netstandard2.1/HslCommunication.dll": { - "assemblyVersion": "11.0.0.0", - "fileVersion": "11.0.0.0" + "assemblyVersion": "11.0.2.0", + "fileVersion": "11.0.2.0" } } }, @@ -142,12 +142,12 @@ "serviceable": false, "sha512": "" }, - "HslCommunication/11.0.0": { + "HslCommunication/11.0.2": { "type": "package", "serviceable": true, - "sha512": "sha512-9JcbMka4dQ8251DCXIP9JExrIqmnt6b6/pX1ZFsdQ7/GQsPtfGMshvQDFUuSx8xf9+gADw3sFu5CDcpbFSQpZg==", - "path": "hslcommunication/11.0.0", - "hashPath": "hslcommunication.11.0.0.nupkg.sha512" + "sha512": "sha512-5nZiUlp9yoZXjV0M+qGbIlyp2Zoyo8wHL2BY7BXe0PW4J7CdCxnJt+my0K/T5+AyXreM+MO+HvC1K0HIKVH42A==", + "path": "hslcommunication/11.0.2", + "hashPath": "hslcommunication.11.0.2.nupkg.sha512" }, "Microsoft.NETCore.Platforms/3.1.0": { "type": "package", diff --git a/drivers/net6.0/DriverFanucHsl.dll b/drivers/net6.0/DriverFanucHsl.dll index 2f431ad..95c9d77 100644 Binary files a/drivers/net6.0/DriverFanucHsl.dll and b/drivers/net6.0/DriverFanucHsl.dll differ diff --git a/drivers/net6.0/DriverFanucHsl.pdb b/drivers/net6.0/DriverFanucHsl.pdb index fa7b7bf..a0dd914 100644 Binary files a/drivers/net6.0/DriverFanucHsl.pdb and b/drivers/net6.0/DriverFanucHsl.pdb differ diff --git a/drivers/net6.0/DriverMTConnect.dll b/drivers/net6.0/DriverMTConnect.dll index 112601f..bae5d0e 100644 Binary files a/drivers/net6.0/DriverMTConnect.dll and b/drivers/net6.0/DriverMTConnect.dll differ diff --git a/drivers/net6.0/DriverMTConnect.pdb b/drivers/net6.0/DriverMTConnect.pdb index 4b92902..cc9df59 100644 Binary files a/drivers/net6.0/DriverMTConnect.pdb and b/drivers/net6.0/DriverMTConnect.pdb differ diff --git a/drivers/net6.0/DriverMitsubishi.deps.json b/drivers/net6.0/DriverMitsubishi.deps.json index cf1704f..eebb04b 100644 --- a/drivers/net6.0/DriverMitsubishi.deps.json +++ b/drivers/net6.0/DriverMitsubishi.deps.json @@ -8,21 +8,21 @@ ".NETCoreApp,Version=v6.0": { "DriverMitsubishi/1.0.0": { "dependencies": { - "IoTClient": "1.0.22", + "IoTClient": "1.0.28", "PluginInterface": "1.0.0" }, "runtime": { "DriverMitsubishi.dll": {} } }, - "IoTClient/1.0.22": { + "IoTClient/1.0.28": { "dependencies": { "System.IO.Ports": "4.6.0" }, "runtime": { "lib/netstandard2.0/IoTClient.dll": { - "assemblyVersion": "1.0.22.0", - "fileVersion": "1.0.22.0" + "assemblyVersion": "1.0.28.0", + "fileVersion": "1.0.28.0" } } }, @@ -140,12 +140,12 @@ "serviceable": false, "sha512": "" }, - "IoTClient/1.0.22": { + "IoTClient/1.0.28": { "type": "package", "serviceable": true, - "sha512": "sha512-UqkeoTFWpDiskvtuPiwdk7XLkvb2no1iJSE0sJusjccapbs6J5GPCf/0eGqu4ftlrHxG8E4fd7lgTA1R5Ztbgw==", - "path": "iotclient/1.0.22", - "hashPath": "iotclient.1.0.22.nupkg.sha512" + "sha512": "sha512-C9H2L6dkYE2zk3XPNhYIQgPzu+vfaDUHWao3xt4kR0/PxHO7LP94i2hnJqh+tmB/+k2wULKkdy+g1RbJEIxOvQ==", + "path": "iotclient/1.0.28", + "hashPath": "iotclient.1.0.28.nupkg.sha512" }, "Microsoft.NETCore.Platforms/3.0.0": { "type": "package", diff --git a/drivers/net6.0/DriverMitsubishi.dll b/drivers/net6.0/DriverMitsubishi.dll index 31bec4b..a719058 100644 Binary files a/drivers/net6.0/DriverMitsubishi.dll and b/drivers/net6.0/DriverMitsubishi.dll differ diff --git a/drivers/net6.0/DriverMitsubishi.pdb b/drivers/net6.0/DriverMitsubishi.pdb index b824a76..323460d 100644 Binary files a/drivers/net6.0/DriverMitsubishi.pdb and b/drivers/net6.0/DriverMitsubishi.pdb differ diff --git a/drivers/net6.0/DriverModbusMaster.dll b/drivers/net6.0/DriverModbusMaster.dll index 78b613b..09f0c68 100644 Binary files a/drivers/net6.0/DriverModbusMaster.dll and b/drivers/net6.0/DriverModbusMaster.dll differ diff --git a/drivers/net6.0/DriverModbusMaster.pdb b/drivers/net6.0/DriverModbusMaster.pdb index 3fa7d09..c2be550 100644 Binary files a/drivers/net6.0/DriverModbusMaster.pdb and b/drivers/net6.0/DriverModbusMaster.pdb differ diff --git a/drivers/net6.0/DriverOPCUaClient.deps.json b/drivers/net6.0/DriverOPCUaClient.deps.json index 4d8bf23..a0c7218 100644 --- a/drivers/net6.0/DriverOPCUaClient.deps.json +++ b/drivers/net6.0/DriverOPCUaClient.deps.json @@ -8,13 +8,21 @@ ".NETCoreApp,Version=v6.0": { "DriverOPCUaClient/1.0.0": { "dependencies": { - "OPCFoundation.NetStandard.Opc.Ua.Client": "1.4.367.75", + "OPCFoundation.NetStandard.Opc.Ua.Client": "1.4.369.30", "PluginInterface": "1.0.0" }, "runtime": { "DriverOPCUaClient.dll": {} } }, + "Microsoft.Extensions.Logging.Abstractions/6.0.1": { + "runtime": { + "lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "assemblyVersion": "6.0.0.0", + "fileVersion": "6.0.322.12309" + } + } + }, "Newtonsoft.Json/13.0.1": { "runtime": { "lib/netstandard2.0/Newtonsoft.Json.dll": { @@ -23,49 +31,50 @@ } } }, - "OPCFoundation.NetStandard.Opc.Ua.Client/1.4.367.75": { + "OPCFoundation.NetStandard.Opc.Ua.Client/1.4.369.30": { "dependencies": { - "OPCFoundation.NetStandard.Opc.Ua.Configuration": "1.4.367.75", - "OPCFoundation.NetStandard.Opc.Ua.Core": "1.4.367.75" + "OPCFoundation.NetStandard.Opc.Ua.Configuration": "1.4.369.30", + "OPCFoundation.NetStandard.Opc.Ua.Core": "1.4.369.30" }, "runtime": { "lib/net6.0/Opc.Ua.Client.dll": { - "assemblyVersion": "1.4.367.0", - "fileVersion": "1.4.367.75" + "assemblyVersion": "1.4.369.0", + "fileVersion": "1.4.369.30" } } }, - "OPCFoundation.NetStandard.Opc.Ua.Configuration/1.4.367.75": { + "OPCFoundation.NetStandard.Opc.Ua.Configuration/1.4.369.30": { "dependencies": { - "OPCFoundation.NetStandard.Opc.Ua.Core": "1.4.367.75" + "OPCFoundation.NetStandard.Opc.Ua.Core": "1.4.369.30" }, "runtime": { "lib/net6.0/Opc.Ua.Configuration.dll": { - "assemblyVersion": "1.4.367.0", - "fileVersion": "1.4.367.75" + "assemblyVersion": "1.4.369.0", + "fileVersion": "1.4.369.30" } } }, - "OPCFoundation.NetStandard.Opc.Ua.Core/1.4.367.75": { + "OPCFoundation.NetStandard.Opc.Ua.Core/1.4.369.30": { "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Newtonsoft.Json": "13.0.1", - "OPCFoundation.NetStandard.Opc.Ua.Security.Certificates": "1.4.367.75" + "OPCFoundation.NetStandard.Opc.Ua.Security.Certificates": "1.4.369.30" }, "runtime": { "lib/net6.0/Opc.Ua.Core.dll": { - "assemblyVersion": "1.4.367.0", - "fileVersion": "1.4.367.75" + "assemblyVersion": "1.4.369.0", + "fileVersion": "1.4.369.30" } } }, - "OPCFoundation.NetStandard.Opc.Ua.Security.Certificates/1.4.367.75": { + "OPCFoundation.NetStandard.Opc.Ua.Security.Certificates/1.4.369.30": { "dependencies": { "System.Formats.Asn1": "6.0.0" }, "runtime": { "lib/net6.0/Opc.Ua.Security.Certificates.dll": { - "assemblyVersion": "1.4.367.0", - "fileVersion": "1.4.367.75" + "assemblyVersion": "1.4.369.0", + "fileVersion": "1.4.369.30" } } }, @@ -86,6 +95,13 @@ "serviceable": false, "sha512": "" }, + "Microsoft.Extensions.Logging.Abstractions/6.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==", + "path": "microsoft.extensions.logging.abstractions/6.0.1", + "hashPath": "microsoft.extensions.logging.abstractions.6.0.1.nupkg.sha512" + }, "Newtonsoft.Json/13.0.1": { "type": "package", "serviceable": true, @@ -93,33 +109,33 @@ "path": "newtonsoft.json/13.0.1", "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" }, - "OPCFoundation.NetStandard.Opc.Ua.Client/1.4.367.75": { + "OPCFoundation.NetStandard.Opc.Ua.Client/1.4.369.30": { "type": "package", "serviceable": true, - "sha512": "sha512-Y1BF7xoDS0LPz5ksbfsKJbMvbeE4sXazgHwadfSTtrCixOzxwzZrBVo0k+LmI5z13uzIq0mMOA6mTNcdgnAxzA==", - "path": "opcfoundation.netstandard.opc.ua.client/1.4.367.75", - "hashPath": "opcfoundation.netstandard.opc.ua.client.1.4.367.75.nupkg.sha512" + "sha512": "sha512-xJHIazzYwIjixJEm/3QSqobySQilJ6VDIAnkNsmSAn5N43AtB0mV5anLT+tg3BDPznYL5hIINIm/4Gt9kSWarQ==", + "path": "opcfoundation.netstandard.opc.ua.client/1.4.369.30", + "hashPath": "opcfoundation.netstandard.opc.ua.client.1.4.369.30.nupkg.sha512" }, - "OPCFoundation.NetStandard.Opc.Ua.Configuration/1.4.367.75": { + "OPCFoundation.NetStandard.Opc.Ua.Configuration/1.4.369.30": { "type": "package", "serviceable": true, - "sha512": "sha512-4VtYqVSpmm4Pxfy5w40GJxuVLSBeTeyZwUf8dPp//g3Op4D0NCl5M7NYS5LW7a8FFJZHeRBfLsnaKmNkRFRhTA==", - "path": "opcfoundation.netstandard.opc.ua.configuration/1.4.367.75", - "hashPath": "opcfoundation.netstandard.opc.ua.configuration.1.4.367.75.nupkg.sha512" + "sha512": "sha512-QXLG2eM4caw6Q9a50Pj3RjXFZa8lWQWu560+KtZ2NlHc4Bq4dRHkThK5JnP9yKcB6jsCSWKzIuh9fwoy+VO8Cw==", + "path": "opcfoundation.netstandard.opc.ua.configuration/1.4.369.30", + "hashPath": "opcfoundation.netstandard.opc.ua.configuration.1.4.369.30.nupkg.sha512" }, - "OPCFoundation.NetStandard.Opc.Ua.Core/1.4.367.75": { + "OPCFoundation.NetStandard.Opc.Ua.Core/1.4.369.30": { "type": "package", "serviceable": true, - "sha512": "sha512-6yyKF1Kp/doU1P9iVDZ5rIaw2DQJeG5ce8uEGRqX2HnvD+TBMgKXcs0t2WxRJ47ISwcGzrqjONt/XFDxPv1vQQ==", - "path": "opcfoundation.netstandard.opc.ua.core/1.4.367.75", - "hashPath": "opcfoundation.netstandard.opc.ua.core.1.4.367.75.nupkg.sha512" + "sha512": "sha512-SGFmPdZVFw42wLzi60Kdl4o3S6BFkNi02qgg1fr/3gDiYA5ZWdDAN0odZWtFoDK6eDQHSPjQv/r+nMBigoTuFw==", + "path": "opcfoundation.netstandard.opc.ua.core/1.4.369.30", + "hashPath": "opcfoundation.netstandard.opc.ua.core.1.4.369.30.nupkg.sha512" }, - "OPCFoundation.NetStandard.Opc.Ua.Security.Certificates/1.4.367.75": { + "OPCFoundation.NetStandard.Opc.Ua.Security.Certificates/1.4.369.30": { "type": "package", "serviceable": true, - "sha512": "sha512-Az6TN1I0WfZnbUZG3OHJ8PEKxAk+jEm7Tm198xhLahP+wuGOYXReZeqK1pJGZB/oXybExUFYfryRGjZxBgVqOA==", - "path": "opcfoundation.netstandard.opc.ua.security.certificates/1.4.367.75", - "hashPath": "opcfoundation.netstandard.opc.ua.security.certificates.1.4.367.75.nupkg.sha512" + "sha512": "sha512-SkyfvLeunJK008ysVg3Q3al77Q3rMJoqAti7MTjDnE/7viXy/IxSKGA24Foc+vIE4LmPqpdyKpgUE5j4nH+egQ==", + "path": "opcfoundation.netstandard.opc.ua.security.certificates/1.4.369.30", + "hashPath": "opcfoundation.netstandard.opc.ua.security.certificates.1.4.369.30.nupkg.sha512" }, "System.Formats.Asn1/6.0.0": { "type": "package", diff --git a/drivers/net6.0/DriverOPCUaClient.dll b/drivers/net6.0/DriverOPCUaClient.dll index a8c6550..60cb36e 100644 Binary files a/drivers/net6.0/DriverOPCUaClient.dll and b/drivers/net6.0/DriverOPCUaClient.dll differ diff --git a/drivers/net6.0/DriverOPCUaClient.pdb b/drivers/net6.0/DriverOPCUaClient.pdb index f72b656..b09bc6e 100644 Binary files a/drivers/net6.0/DriverOPCUaClient.pdb and b/drivers/net6.0/DriverOPCUaClient.pdb differ diff --git a/drivers/net6.0/DriverOmronFins.deps.json b/drivers/net6.0/DriverOmronFins.deps.json index 0755a52..b2841f2 100644 --- a/drivers/net6.0/DriverOmronFins.deps.json +++ b/drivers/net6.0/DriverOmronFins.deps.json @@ -8,21 +8,21 @@ ".NETCoreApp,Version=v6.0": { "DriverOmronFins/1.0.0": { "dependencies": { - "IoTClient": "1.0.22", + "IoTClient": "1.0.28", "PluginInterface": "1.0.0" }, "runtime": { "DriverOmronFins.dll": {} } }, - "IoTClient/1.0.22": { + "IoTClient/1.0.28": { "dependencies": { "System.IO.Ports": "4.6.0" }, "runtime": { "lib/netstandard2.0/IoTClient.dll": { - "assemblyVersion": "1.0.22.0", - "fileVersion": "1.0.22.0" + "assemblyVersion": "1.0.28.0", + "fileVersion": "1.0.28.0" } } }, @@ -140,12 +140,12 @@ "serviceable": false, "sha512": "" }, - "IoTClient/1.0.22": { + "IoTClient/1.0.28": { "type": "package", "serviceable": true, - "sha512": "sha512-UqkeoTFWpDiskvtuPiwdk7XLkvb2no1iJSE0sJusjccapbs6J5GPCf/0eGqu4ftlrHxG8E4fd7lgTA1R5Ztbgw==", - "path": "iotclient/1.0.22", - "hashPath": "iotclient.1.0.22.nupkg.sha512" + "sha512": "sha512-C9H2L6dkYE2zk3XPNhYIQgPzu+vfaDUHWao3xt4kR0/PxHO7LP94i2hnJqh+tmB/+k2wULKkdy+g1RbJEIxOvQ==", + "path": "iotclient/1.0.28", + "hashPath": "iotclient.1.0.28.nupkg.sha512" }, "Microsoft.NETCore.Platforms/3.0.0": { "type": "package", diff --git a/drivers/net6.0/DriverOmronFins.dll b/drivers/net6.0/DriverOmronFins.dll index 6f9d1a4..54c9ae8 100644 Binary files a/drivers/net6.0/DriverOmronFins.dll and b/drivers/net6.0/DriverOmronFins.dll differ diff --git a/drivers/net6.0/DriverOmronFins.pdb b/drivers/net6.0/DriverOmronFins.pdb index 8ef3473..247da65 100644 Binary files a/drivers/net6.0/DriverOmronFins.pdb and b/drivers/net6.0/DriverOmronFins.pdb differ diff --git a/drivers/net6.0/DriverSiemensS7.dll b/drivers/net6.0/DriverSiemensS7.dll index 0721160..6983787 100644 Binary files a/drivers/net6.0/DriverSiemensS7.dll and b/drivers/net6.0/DriverSiemensS7.dll differ diff --git a/drivers/net6.0/DriverSiemensS7.pdb b/drivers/net6.0/DriverSiemensS7.pdb index 9116e24..17e85f1 100644 Binary files a/drivers/net6.0/DriverSiemensS7.pdb and b/drivers/net6.0/DriverSiemensS7.pdb differ diff --git a/drivers/net6.0/DriverSimTcpClient.dll b/drivers/net6.0/DriverSimTcpClient.dll index dc48b9a..eaef7a4 100644 Binary files a/drivers/net6.0/DriverSimTcpClient.dll and b/drivers/net6.0/DriverSimTcpClient.dll differ diff --git a/drivers/net6.0/DriverSimTcpClient.pdb b/drivers/net6.0/DriverSimTcpClient.pdb index 2356cdf..6d97bb2 100644 Binary files a/drivers/net6.0/DriverSimTcpClient.pdb and b/drivers/net6.0/DriverSimTcpClient.pdb differ diff --git a/drivers/net6.0/HslCommunication.dll b/drivers/net6.0/HslCommunication.dll index aff2607..4b39da2 100644 Binary files a/drivers/net6.0/HslCommunication.dll and b/drivers/net6.0/HslCommunication.dll differ diff --git a/drivers/net6.0/IoTClient.dll b/drivers/net6.0/IoTClient.dll index 213be82..7ce7ee8 100644 Binary files a/drivers/net6.0/IoTClient.dll and b/drivers/net6.0/IoTClient.dll differ diff --git a/drivers/net6.0/Microsoft.Extensions.Logging.Abstractions.dll b/drivers/net6.0/Microsoft.Extensions.Logging.Abstractions.dll new file mode 100644 index 0000000..a42ea83 Binary files /dev/null and b/drivers/net6.0/Microsoft.Extensions.Logging.Abstractions.dll differ diff --git a/drivers/net6.0/Opc.Ua.Client.dll b/drivers/net6.0/Opc.Ua.Client.dll index 94d91ea..2291095 100644 Binary files a/drivers/net6.0/Opc.Ua.Client.dll and b/drivers/net6.0/Opc.Ua.Client.dll differ diff --git a/drivers/net6.0/Opc.Ua.Configuration.dll b/drivers/net6.0/Opc.Ua.Configuration.dll index 2b02246..97cbace 100644 Binary files a/drivers/net6.0/Opc.Ua.Configuration.dll and b/drivers/net6.0/Opc.Ua.Configuration.dll differ diff --git a/drivers/net6.0/Opc.Ua.Core.dll b/drivers/net6.0/Opc.Ua.Core.dll index db2fb2e..3a3d408 100644 Binary files a/drivers/net6.0/Opc.Ua.Core.dll and b/drivers/net6.0/Opc.Ua.Core.dll differ diff --git a/drivers/net6.0/Opc.Ua.Security.Certificates.dll b/drivers/net6.0/Opc.Ua.Security.Certificates.dll index d53e8f9..ddf2769 100644 Binary files a/drivers/net6.0/Opc.Ua.Security.Certificates.dll and b/drivers/net6.0/Opc.Ua.Security.Certificates.dll differ diff --git a/drivers/net6.0/PluginInterface.dll b/drivers/net6.0/PluginInterface.dll index 0889469..88b51dd 100644 Binary files a/drivers/net6.0/PluginInterface.dll and b/drivers/net6.0/PluginInterface.dll differ diff --git a/drivers/net6.0/PluginInterface.pdb b/drivers/net6.0/PluginInterface.pdb index b68877d..47a6b2e 100644 Binary files a/drivers/net6.0/PluginInterface.pdb and b/drivers/net6.0/PluginInterface.pdb differ diff --git a/drivers/net6.0/System.IO.Ports.dll b/drivers/net6.0/System.IO.Ports.dll index e2af6d1..6e8d9a7 100644 Binary files a/drivers/net6.0/System.IO.Ports.dll and b/drivers/net6.0/System.IO.Ports.dll differ diff --git a/drivers/net6.0/ref/DriverAllenBradley.dll b/drivers/net6.0/ref/DriverAllenBradley.dll deleted file mode 100644 index 45e9a39..0000000 Binary files a/drivers/net6.0/ref/DriverAllenBradley.dll and /dev/null differ diff --git a/drivers/net6.0/ref/DriverFanuc.dll b/drivers/net6.0/ref/DriverFanuc.dll deleted file mode 100644 index 54e6ae9..0000000 Binary files a/drivers/net6.0/ref/DriverFanuc.dll and /dev/null differ diff --git a/drivers/net6.0/ref/DriverFanucHsl.dll b/drivers/net6.0/ref/DriverFanucHsl.dll deleted file mode 100644 index 8fac7e6..0000000 Binary files a/drivers/net6.0/ref/DriverFanucHsl.dll and /dev/null differ diff --git a/drivers/net6.0/ref/DriverMTConnect.dll b/drivers/net6.0/ref/DriverMTConnect.dll deleted file mode 100644 index fc4ae42..0000000 Binary files a/drivers/net6.0/ref/DriverMTConnect.dll and /dev/null differ diff --git a/drivers/net6.0/ref/DriverMitsubishi.dll b/drivers/net6.0/ref/DriverMitsubishi.dll deleted file mode 100644 index 990f456..0000000 Binary files a/drivers/net6.0/ref/DriverMitsubishi.dll and /dev/null differ diff --git a/drivers/net6.0/ref/DriverModbusMaster.dll b/drivers/net6.0/ref/DriverModbusMaster.dll deleted file mode 100644 index e0c3da4..0000000 Binary files a/drivers/net6.0/ref/DriverModbusMaster.dll and /dev/null differ diff --git a/drivers/net6.0/ref/DriverOPCUaClient.dll b/drivers/net6.0/ref/DriverOPCUaClient.dll deleted file mode 100644 index c040f56..0000000 Binary files a/drivers/net6.0/ref/DriverOPCUaClient.dll and /dev/null differ diff --git a/drivers/net6.0/ref/DriverOmronFins.dll b/drivers/net6.0/ref/DriverOmronFins.dll deleted file mode 100644 index 39e372b..0000000 Binary files a/drivers/net6.0/ref/DriverOmronFins.dll and /dev/null differ diff --git a/drivers/net6.0/ref/DriverSiemensS7.dll b/drivers/net6.0/ref/DriverSiemensS7.dll deleted file mode 100644 index 6b6b272..0000000 Binary files a/drivers/net6.0/ref/DriverSiemensS7.dll and /dev/null differ diff --git a/drivers/net6.0/ref/DriverSimTcpClient.dll b/drivers/net6.0/ref/DriverSimTcpClient.dll deleted file mode 100644 index db489b0..0000000 Binary files a/drivers/net6.0/ref/DriverSimTcpClient.dll and /dev/null differ diff --git a/drivers/net6.0/runtimes/linux-arm/native/System.IO.Ports.Native.so b/drivers/net6.0/runtimes/linux-arm/native/System.IO.Ports.Native.so index ebe7e5c..926a0af 100644 Binary files a/drivers/net6.0/runtimes/linux-arm/native/System.IO.Ports.Native.so and b/drivers/net6.0/runtimes/linux-arm/native/System.IO.Ports.Native.so differ diff --git a/drivers/net6.0/runtimes/linux-arm64/native/System.IO.Ports.Native.so b/drivers/net6.0/runtimes/linux-arm64/native/System.IO.Ports.Native.so index 266e5d2..5b6888d 100644 Binary files a/drivers/net6.0/runtimes/linux-arm64/native/System.IO.Ports.Native.so and b/drivers/net6.0/runtimes/linux-arm64/native/System.IO.Ports.Native.so differ diff --git a/drivers/net6.0/runtimes/linux-x64/native/System.IO.Ports.Native.so b/drivers/net6.0/runtimes/linux-x64/native/System.IO.Ports.Native.so index 8af62f2..b609400 100644 Binary files a/drivers/net6.0/runtimes/linux-x64/native/System.IO.Ports.Native.so and b/drivers/net6.0/runtimes/linux-x64/native/System.IO.Ports.Native.so differ diff --git a/drivers/net6.0/runtimes/linux/lib/netstandard2.0/System.IO.Ports.dll b/drivers/net6.0/runtimes/linux/lib/netstandard2.0/System.IO.Ports.dll index 69712b6..1cf099b 100644 Binary files a/drivers/net6.0/runtimes/linux/lib/netstandard2.0/System.IO.Ports.dll and b/drivers/net6.0/runtimes/linux/lib/netstandard2.0/System.IO.Ports.dll differ diff --git a/drivers/net6.0/runtimes/osx-x64/native/System.IO.Ports.Native.dylib b/drivers/net6.0/runtimes/osx-x64/native/System.IO.Ports.Native.dylib index b4500b6..b7adfd5 100644 Binary files a/drivers/net6.0/runtimes/osx-x64/native/System.IO.Ports.Native.dylib and b/drivers/net6.0/runtimes/osx-x64/native/System.IO.Ports.Native.dylib differ diff --git a/drivers/net6.0/runtimes/osx/lib/netstandard2.0/System.IO.Ports.dll b/drivers/net6.0/runtimes/osx/lib/netstandard2.0/System.IO.Ports.dll index 20cf4c4..f2c4a5c 100644 Binary files a/drivers/net6.0/runtimes/osx/lib/netstandard2.0/System.IO.Ports.dll and b/drivers/net6.0/runtimes/osx/lib/netstandard2.0/System.IO.Ports.dll differ diff --git a/drivers/net6.0/runtimes/win/lib/netstandard2.0/System.IO.Ports.dll b/drivers/net6.0/runtimes/win/lib/netstandard2.0/System.IO.Ports.dll index 3e1d69b..6f162e2 100644 Binary files a/drivers/net6.0/runtimes/win/lib/netstandard2.0/System.IO.Ports.dll and b/drivers/net6.0/runtimes/win/lib/netstandard2.0/System.IO.Ports.dll differ diff --git a/iotgateway.db b/iotgateway.db index 2bfa900..ce9da74 100644 Binary files a/iotgateway.db and b/iotgateway.db differ