diff --git a/BackupS7/BackupS7.csproj b/BackupS7/BackupS7.csproj index c6a72a8b..b83be9c5 100644 --- a/BackupS7/BackupS7.csproj +++ b/BackupS7/BackupS7.csproj @@ -8,7 +8,7 @@ AnyCPU - + diff --git a/DotNetDatenbankProtokollerV2/ConfigurationTool/JFK-ProtokollerConfigurationTool.csproj b/DotNetDatenbankProtokollerV2/ConfigurationTool/JFK-ProtokollerConfigurationTool.csproj index ad7b8a41..746a9591 100644 --- a/DotNetDatenbankProtokollerV2/ConfigurationTool/JFK-ProtokollerConfigurationTool.csproj +++ b/DotNetDatenbankProtokollerV2/ConfigurationTool/JFK-ProtokollerConfigurationTool.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/DotNetDatenbankProtokollerV2/DotNetSimaticDatabaseProtokollerService/JFK-ProtokollerService.csproj b/DotNetDatenbankProtokollerV2/DotNetSimaticDatabaseProtokollerService/JFK-ProtokollerService.csproj index 46844c51..c383e98a 100644 --- a/DotNetDatenbankProtokollerV2/DotNetSimaticDatabaseProtokollerService/JFK-ProtokollerService.csproj +++ b/DotNetDatenbankProtokollerV2/DotNetSimaticDatabaseProtokollerService/JFK-ProtokollerService.csproj @@ -20,6 +20,7 @@ + \ No newline at end of file diff --git a/DotNetDatenbankProtokollerV2/ProtokollerLibrary/Databases/PostgreSQL/PostgreSQLStorage.cs b/DotNetDatenbankProtokollerV2/ProtokollerLibrary/Databases/PostgreSQL/PostgreSQLStorage.cs index e9b513bc..b21b7183 100644 --- a/DotNetDatenbankProtokollerV2/ProtokollerLibrary/Databases/PostgreSQL/PostgreSQLStorage.cs +++ b/DotNetDatenbankProtokollerV2/ProtokollerLibrary/Databases/PostgreSQL/PostgreSQLStorage.cs @@ -83,7 +83,7 @@ public override void CreateOrModify_TablesAndFields(string dataTable, DatasetCon } catch (Npgsql.PostgresException ex) { - if (ex.Code != "42P04") + if (ex.SqlState != "42P04") { Logging.LogText("Database could not be created. Storage: " + myConfig.Name, ex, Logging.LogLevel.Error); throw ex; @@ -103,7 +103,7 @@ public override void CreateOrModify_TablesAndFields(string dataTable, DatasetCon } catch (Npgsql.PostgresException ex) { - if (ex.Code == "42P01") + if (ex.SqlState == "42P01") { try { diff --git a/DotNetDatenbankProtokollerV2/ProtokollerLibrary/JFK-ProtokollerLibrary.csproj b/DotNetDatenbankProtokollerV2/ProtokollerLibrary/JFK-ProtokollerLibrary.csproj index 4774a563..16f35592 100644 --- a/DotNetDatenbankProtokollerV2/ProtokollerLibrary/JFK-ProtokollerLibrary.csproj +++ b/DotNetDatenbankProtokollerV2/ProtokollerLibrary/JFK-ProtokollerLibrary.csproj @@ -10,14 +10,14 @@ - - + + - - - - - + + + + + diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV13/DotNetSiemensPLCToolBoxLibrary.TIAV13.csproj b/DotNetSiemensPLCToolBoxLibrary.TIAV13/DotNetSiemensPLCToolBoxLibrary.TIAV13.csproj index 0c2987ba..6d8a14da 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV13/DotNetSiemensPLCToolBoxLibrary.TIAV13.csproj +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV13/DotNetSiemensPLCToolBoxLibrary.TIAV13.csproj @@ -22,7 +22,7 @@ snupkg - + diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV14SP1/DotNetSiemensPLCToolBoxLibrary.TIAV14SP1.csproj b/DotNetSiemensPLCToolBoxLibrary.TIAV14SP1/DotNetSiemensPLCToolBoxLibrary.TIAV14SP1.csproj index 23d27cb5..59c81830 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV14SP1/DotNetSiemensPLCToolBoxLibrary.TIAV14SP1.csproj +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV14SP1/DotNetSiemensPLCToolBoxLibrary.TIAV14SP1.csproj @@ -23,7 +23,7 @@ snupkg - + diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV15/DotNetSiemensPLCToolBoxLibrary.TIAV15.csproj b/DotNetSiemensPLCToolBoxLibrary.TIAV15/DotNetSiemensPLCToolBoxLibrary.TIAV15.csproj index 759d64d6..62ef7c4f 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV15/DotNetSiemensPLCToolBoxLibrary.TIAV15.csproj +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV15/DotNetSiemensPLCToolBoxLibrary.TIAV15.csproj @@ -23,7 +23,7 @@ snupkg - + diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV15_1/DotNetSiemensPLCToolBoxLibrary.TIAV15_1.csproj b/DotNetSiemensPLCToolBoxLibrary.TIAV15_1/DotNetSiemensPLCToolBoxLibrary.TIAV15_1.csproj index ce7070c1..ddf9de10 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV15_1/DotNetSiemensPLCToolBoxLibrary.TIAV15_1.csproj +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV15_1/DotNetSiemensPLCToolBoxLibrary.TIAV15_1.csproj @@ -23,7 +23,7 @@ snupkg - + diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV16/DotNetSiemensPLCToolBoxLibrary.TIAV16.csproj b/DotNetSiemensPLCToolBoxLibrary.TIAV16/DotNetSiemensPLCToolBoxLibrary.TIAV16.csproj index 3da086c0..eef72082 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV16/DotNetSiemensPLCToolBoxLibrary.TIAV16.csproj +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV16/DotNetSiemensPLCToolBoxLibrary.TIAV16.csproj @@ -23,7 +23,7 @@ snupkg - + diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV17/DotNetSiemensPLCToolBoxLibrary.TIAV17.csproj b/DotNetSiemensPLCToolBoxLibrary.TIAV17/DotNetSiemensPLCToolBoxLibrary.TIAV17.csproj index d4c790f5..cc359fb7 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV17/DotNetSiemensPLCToolBoxLibrary.TIAV17.csproj +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV17/DotNetSiemensPLCToolBoxLibrary.TIAV17.csproj @@ -23,7 +23,7 @@ snupkg - + diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV18/DotNetSiemensPLCToolBoxLibrary.TIAV18.csproj b/DotNetSiemensPLCToolBoxLibrary.TIAV18/DotNetSiemensPLCToolBoxLibrary.TIAV18.csproj index 78b2fef9..519b3e6b 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV18/DotNetSiemensPLCToolBoxLibrary.TIAV18.csproj +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV18/DotNetSiemensPLCToolBoxLibrary.TIAV18.csproj @@ -23,7 +23,7 @@ snupkg - + diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV19/DotNetSiemensPLCToolBoxLibrary.TIAV19.csproj b/DotNetSiemensPLCToolBoxLibrary.TIAV19/DotNetSiemensPLCToolBoxLibrary.TIAV19.csproj index 6fff09b5..7f5a65c1 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV19/DotNetSiemensPLCToolBoxLibrary.TIAV19.csproj +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV19/DotNetSiemensPLCToolBoxLibrary.TIAV19.csproj @@ -23,7 +23,7 @@ snupkg - + diff --git a/LibNoDaveConnectionLibrary.WinForms/DotNetSiemensPLCToolBoxLibrary.WinForms.csproj b/LibNoDaveConnectionLibrary.WinForms/DotNetSiemensPLCToolBoxLibrary.WinForms.csproj index e8ebdce7..44a43b08 100644 --- a/LibNoDaveConnectionLibrary.WinForms/DotNetSiemensPLCToolBoxLibrary.WinForms.csproj +++ b/LibNoDaveConnectionLibrary.WinForms/DotNetSiemensPLCToolBoxLibrary.WinForms.csproj @@ -2,7 +2,7 @@ false Library - netcoreapp3.0;net461 + net6.0-windows;net461 true @@ -22,13 +22,13 @@ snupkg - + - + - - + + diff --git a/LibNoDaveConnectionLibrary/DotNetSiemensPLCToolBoxLibrary.csproj b/LibNoDaveConnectionLibrary/DotNetSiemensPLCToolBoxLibrary.csproj index e55c57f6..b1bc6050 100644 --- a/LibNoDaveConnectionLibrary/DotNetSiemensPLCToolBoxLibrary.csproj +++ b/LibNoDaveConnectionLibrary/DotNetSiemensPLCToolBoxLibrary.csproj @@ -23,7 +23,7 @@ snupkg - + @@ -38,7 +38,7 @@ - + SHARPZIPLIB;NETSTANDARD @@ -47,6 +47,6 @@ 5.0.0 - + \ No newline at end of file diff --git a/S7ProjectBlockComparer/S7ProjectBlockComparer.csproj b/S7ProjectBlockComparer/S7ProjectBlockComparer.csproj index 35527261..33d8b155 100644 --- a/S7ProjectBlockComparer/S7ProjectBlockComparer.csproj +++ b/S7ProjectBlockComparer/S7ProjectBlockComparer.csproj @@ -2,7 +2,7 @@ false WinExe - net462 + net48 true @@ -14,8 +14,8 @@ - - + + diff --git a/SimpleTcpSocketWPF/SimpleTcpSocketWPF.csproj b/SimpleTcpSocketWPF/SimpleTcpSocketWPF.csproj index 93aa5b11..543b9644 100644 --- a/SimpleTcpSocketWPF/SimpleTcpSocketWPF.csproj +++ b/SimpleTcpSocketWPF/SimpleTcpSocketWPF.csproj @@ -2,12 +2,12 @@ false WinExe - net461 + net48 true true - + diff --git a/WPFToolboxForPLCs/WPFToolboxForSiemensPLCs.csproj b/WPFToolboxForPLCs/WPFToolboxForSiemensPLCs.csproj index 6f491338..2a1a03d1 100644 --- a/WPFToolboxForPLCs/WPFToolboxForSiemensPLCs.csproj +++ b/WPFToolboxForPLCs/WPFToolboxForSiemensPLCs.csproj @@ -18,7 +18,7 @@ - + diff --git a/WPFVarTab/WPFVarTab.csproj b/WPFVarTab/WPFVarTab.csproj index 93e51aa4..b718c72b 100644 --- a/WPFVarTab/WPFVarTab.csproj +++ b/WPFVarTab/WPFVarTab.csproj @@ -13,8 +13,8 @@ - - + +