diff --git a/SCADA/Program/.vs/DataExchange/v15/.suo b/SCADA/Program/.vs/DataExchange/v15/.suo index 4c6a324..8257380 100644 Binary files a/SCADA/Program/.vs/DataExchange/v15/.suo and b/SCADA/Program/.vs/DataExchange/v15/.suo differ diff --git a/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-shm b/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-shm new file mode 100644 index 0000000..c76b380 Binary files /dev/null and b/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-shm differ diff --git a/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-wal b/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-wal new file mode 100644 index 0000000..eb15d65 Binary files /dev/null and b/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3/storage.ide-wal differ diff --git a/SCADA/Program/BatchCoreService/BatchCoreService.csproj b/SCADA/Program/BatchCoreService/BatchCoreService.csproj index dccb7d1..0f0d727 100644 --- a/SCADA/Program/BatchCoreService/BatchCoreService.csproj +++ b/SCADA/Program/BatchCoreService/BatchCoreService.csproj @@ -16,7 +16,7 @@ 512 - x86 + AnyCPU true full false @@ -24,6 +24,7 @@ DEBUG;TRACE prompt 4 + ManagedMinimumRules.ruleset x86 diff --git a/SCADA/Program/BatchCoreService/bin/Debug/BatchCoreService.exe b/SCADA/Program/BatchCoreService/bin/Debug/BatchCoreService.exe index 9da04da..f718c3b 100644 Binary files a/SCADA/Program/BatchCoreService/bin/Debug/BatchCoreService.exe and b/SCADA/Program/BatchCoreService/bin/Debug/BatchCoreService.exe differ diff --git a/SCADA/Program/BatchCoreService/bin/Debug/BatchCoreService.pdb b/SCADA/Program/BatchCoreService/bin/Debug/BatchCoreService.pdb index 8c0e759..51326fa 100644 Binary files a/SCADA/Program/BatchCoreService/bin/Debug/BatchCoreService.pdb and b/SCADA/Program/BatchCoreService/bin/Debug/BatchCoreService.pdb differ diff --git a/SCADA/Program/BatchCoreService/bin/Debug/ClientDriver.dll b/SCADA/Program/BatchCoreService/bin/Debug/ClientDriver.dll index ffb1908..ae41c92 100644 Binary files a/SCADA/Program/BatchCoreService/bin/Debug/ClientDriver.dll and b/SCADA/Program/BatchCoreService/bin/Debug/ClientDriver.dll differ diff --git a/SCADA/Program/BatchCoreService/bin/Debug/ClientDriver.pdb b/SCADA/Program/BatchCoreService/bin/Debug/ClientDriver.pdb index bf44607..cb1b6f7 100644 Binary files a/SCADA/Program/BatchCoreService/bin/Debug/ClientDriver.pdb and b/SCADA/Program/BatchCoreService/bin/Debug/ClientDriver.pdb differ diff --git a/SCADA/Program/BatchCoreService/bin/Debug/DataHelper.dll b/SCADA/Program/BatchCoreService/bin/Debug/DataHelper.dll index bc853ce..fca336a 100644 Binary files a/SCADA/Program/BatchCoreService/bin/Debug/DataHelper.dll and b/SCADA/Program/BatchCoreService/bin/Debug/DataHelper.dll differ diff --git a/SCADA/Program/BatchCoreService/bin/Debug/DataHelper.pdb b/SCADA/Program/BatchCoreService/bin/Debug/DataHelper.pdb index 2cdb6f1..68807a0 100644 Binary files a/SCADA/Program/BatchCoreService/bin/Debug/DataHelper.pdb and b/SCADA/Program/BatchCoreService/bin/Debug/DataHelper.pdb differ diff --git a/SCADA/Program/BatchCoreService/bin/Debug/DataService.dll b/SCADA/Program/BatchCoreService/bin/Debug/DataService.dll index 3acd617..b5e3b74 100644 Binary files a/SCADA/Program/BatchCoreService/bin/Debug/DataService.dll and b/SCADA/Program/BatchCoreService/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/BatchCoreService/bin/Debug/DataService.pdb b/SCADA/Program/BatchCoreService/bin/Debug/DataService.pdb index d051107..4d93a6a 100644 Binary files a/SCADA/Program/BatchCoreService/bin/Debug/DataService.pdb and b/SCADA/Program/BatchCoreService/bin/Debug/DataService.pdb differ diff --git a/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csproj.CoreCompileInputs.cache b/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csproj.CoreCompileInputs.cache index f55d097..466af25 100644 --- a/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6080cfe8593c0c9d5fcccfeb8c3640052bd437c5 +f1b2727345e782f110271ee82700b9082ed28e49 diff --git a/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csprojResolveAssemblyReference.cache b/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csprojResolveAssemblyReference.cache index b251850..4eb7dca 100644 Binary files a/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csprojResolveAssemblyReference.cache and b/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csprojResolveAssemblyReference.cache differ diff --git a/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.exe b/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.exe index 9da04da..f718c3b 100644 Binary files a/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.exe and b/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.exe differ diff --git a/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.pdb b/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.pdb index 8c0e759..51326fa 100644 Binary files a/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.pdb and b/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.pdb differ diff --git a/SCADA/Program/BatchCoreService/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SCADA/Program/BatchCoreService/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 7cc3e87..f1ec240 100644 Binary files a/SCADA/Program/BatchCoreService/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SCADA/Program/BatchCoreService/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SCADA/Program/BatchCoreTest/BatchCoreTest.csproj b/SCADA/Program/BatchCoreTest/BatchCoreTest.csproj index b49662e..f349e23 100644 --- a/SCADA/Program/BatchCoreTest/BatchCoreTest.csproj +++ b/SCADA/Program/BatchCoreTest/BatchCoreTest.csproj @@ -18,7 +18,7 @@ 4 - x86 + AnyCPU true full false diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.exe b/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.exe index edd8c7d..479fe01 100644 Binary files a/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.exe and b/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.exe differ diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.pdb b/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.pdb index da74bb9..d3be59b 100644 Binary files a/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.pdb and b/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.pdb differ diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.dll b/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.dll index ffb1908..ae41c92 100644 Binary files a/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.dll and b/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.dll differ diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.pdb b/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.pdb index bf44607..cb1b6f7 100644 Binary files a/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.pdb and b/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.pdb differ diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/DataHelper.dll b/SCADA/Program/BatchCoreTest/bin/Debug/DataHelper.dll index bc853ce..fca336a 100644 Binary files a/SCADA/Program/BatchCoreTest/bin/Debug/DataHelper.dll and b/SCADA/Program/BatchCoreTest/bin/Debug/DataHelper.dll differ diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/DataHelper.pdb b/SCADA/Program/BatchCoreTest/bin/Debug/DataHelper.pdb index 2cdb6f1..68807a0 100644 Binary files a/SCADA/Program/BatchCoreTest/bin/Debug/DataHelper.pdb and b/SCADA/Program/BatchCoreTest/bin/Debug/DataHelper.pdb differ diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/DataService.dll b/SCADA/Program/BatchCoreTest/bin/Debug/DataService.dll index 3acd617..b5e3b74 100644 Binary files a/SCADA/Program/BatchCoreTest/bin/Debug/DataService.dll and b/SCADA/Program/BatchCoreTest/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/DataService.pdb b/SCADA/Program/BatchCoreTest/bin/Debug/DataService.pdb index d051107..4d93a6a 100644 Binary files a/SCADA/Program/BatchCoreTest/bin/Debug/DataService.pdb and b/SCADA/Program/BatchCoreTest/bin/Debug/DataService.pdb differ diff --git a/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.CoreCompileInputs.cache b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.CoreCompileInputs.cache index ca81e0d..3806595 100644 --- a/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8f870430d75db9ee8143342a2c25b6532a883ca4 +fbe2c61a02ac318c9b69cee677c37ec534f30ae7 diff --git a/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.FileListAbsolute.txt b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.FileListAbsolute.txt index 5df191c..93ef8b3 100644 --- a/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.FileListAbsolute.txt +++ b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.FileListAbsolute.txt @@ -14,3 +14,4 @@ C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\BatchCoreTest\obj\x86\Deb C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\BatchCoreTest\obj\x86\Debug\BatchCoreTest.csproj.CoreCompileInputs.cache C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\BatchCoreTest\obj\x86\Debug\BatchCoreTest.exe C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\BatchCoreTest\obj\x86\Debug\BatchCoreTest.pdb +C:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\BatchCoreTest\obj\x86\Debug\BatchCoreTest.csprojResolveAssemblyReference.cache diff --git a/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csprojResolveAssemblyReference.cache b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..08e1a83 Binary files /dev/null and b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csprojResolveAssemblyReference.cache differ diff --git a/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.exe b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.exe index edd8c7d..479fe01 100644 Binary files a/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.exe and b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.exe differ diff --git a/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.pdb b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.pdb index da74bb9..d3be59b 100644 Binary files a/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.pdb and b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.pdb differ diff --git a/SCADA/Program/BatchCoreTest/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SCADA/Program/BatchCoreTest/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index be415f3..11e1d0d 100644 Binary files a/SCADA/Program/BatchCoreTest/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SCADA/Program/BatchCoreTest/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.dll b/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.dll index ffb1908..ae41c92 100644 Binary files a/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.dll and b/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.dll differ diff --git a/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.pdb b/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.pdb index bf44607..cb1b6f7 100644 Binary files a/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.pdb and b/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.pdb differ diff --git a/SCADA/Program/ClientDriver/bin/Debug/DataService.dll b/SCADA/Program/ClientDriver/bin/Debug/DataService.dll index 3acd617..b5e3b74 100644 Binary files a/SCADA/Program/ClientDriver/bin/Debug/DataService.dll and b/SCADA/Program/ClientDriver/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/ClientDriver/bin/Debug/DataService.pdb b/SCADA/Program/ClientDriver/bin/Debug/DataService.pdb index d051107..4d93a6a 100644 Binary files a/SCADA/Program/ClientDriver/bin/Debug/DataService.pdb and b/SCADA/Program/ClientDriver/bin/Debug/DataService.pdb differ diff --git a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csproj.CoreCompileInputs.cache b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csproj.CoreCompileInputs.cache index 1fc5a7a..5d0e956 100644 --- a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -cdb102875275746ea5fdcda2488150436e2946b9 +9ea32ef344283842082bc819e3e1a99b74130c34 diff --git a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csprojResolveAssemblyReference.cache b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csprojResolveAssemblyReference.cache index ac4564d..11719f3 100644 Binary files a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csprojResolveAssemblyReference.cache and b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csprojResolveAssemblyReference.cache differ diff --git a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.dll b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.dll index ffb1908..ae41c92 100644 Binary files a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.dll and b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.dll differ diff --git a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.pdb b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.pdb index bf44607..cb1b6f7 100644 Binary files a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.pdb and b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.pdb differ diff --git a/SCADA/Program/CoreTest/Example.csproj b/SCADA/Program/CoreTest/Example.csproj index acfe045..66ebb40 100644 --- a/SCADA/Program/CoreTest/Example.csproj +++ b/SCADA/Program/CoreTest/Example.csproj @@ -17,7 +17,7 @@ 4 - x86 + AnyCPU true full false @@ -42,26 +42,10 @@ ..\..\dll\DynamicDataDisplay.dll - - False - bin\Microsoft.Expression.Controls.dll - - - False - bin\Microsoft.Expression.Drawing.dll - - - False - bin\Microsoft.Expression.Interactions.dll - - - False - bin\System.Windows.Interactivity.dll - diff --git a/SCADA/Program/CoreTest/bin/Debug/ClientDriver.dll b/SCADA/Program/CoreTest/bin/Debug/ClientDriver.dll index ffb1908..ae41c92 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/ClientDriver.dll and b/SCADA/Program/CoreTest/bin/Debug/ClientDriver.dll differ diff --git a/SCADA/Program/CoreTest/bin/Debug/ClientDriver.pdb b/SCADA/Program/CoreTest/bin/Debug/ClientDriver.pdb index bf44607..cb1b6f7 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/ClientDriver.pdb and b/SCADA/Program/CoreTest/bin/Debug/ClientDriver.pdb differ diff --git a/SCADA/Program/CoreTest/bin/Debug/CoreTest.exe b/SCADA/Program/CoreTest/bin/Debug/CoreTest.exe index 595090c..5acbfdc 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/CoreTest.exe and b/SCADA/Program/CoreTest/bin/Debug/CoreTest.exe differ diff --git a/SCADA/Program/CoreTest/bin/Debug/CoreTest.pdb b/SCADA/Program/CoreTest/bin/Debug/CoreTest.pdb index 61a7b12..d201cc3 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/CoreTest.pdb and b/SCADA/Program/CoreTest/bin/Debug/CoreTest.pdb differ diff --git a/SCADA/Program/CoreTest/bin/Debug/DataHelper.dll b/SCADA/Program/CoreTest/bin/Debug/DataHelper.dll index bc853ce..fca336a 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/DataHelper.dll and b/SCADA/Program/CoreTest/bin/Debug/DataHelper.dll differ diff --git a/SCADA/Program/CoreTest/bin/Debug/DataHelper.pdb b/SCADA/Program/CoreTest/bin/Debug/DataHelper.pdb index 2cdb6f1..68807a0 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/DataHelper.pdb and b/SCADA/Program/CoreTest/bin/Debug/DataHelper.pdb differ diff --git a/SCADA/Program/CoreTest/bin/Debug/DataService.dll b/SCADA/Program/CoreTest/bin/Debug/DataService.dll index 3acd617..b5e3b74 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/DataService.dll and b/SCADA/Program/CoreTest/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/CoreTest/bin/Debug/DataService.pdb b/SCADA/Program/CoreTest/bin/Debug/DataService.pdb index d051107..4d93a6a 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/DataService.pdb and b/SCADA/Program/CoreTest/bin/Debug/DataService.pdb differ diff --git a/SCADA/Program/CoreTest/bin/Debug/HMIControl.dll b/SCADA/Program/CoreTest/bin/Debug/HMIControl.dll index d4bc881..80366a0 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/HMIControl.dll and b/SCADA/Program/CoreTest/bin/Debug/HMIControl.dll differ diff --git a/SCADA/Program/CoreTest/bin/Debug/HMIControl.pdb b/SCADA/Program/CoreTest/bin/Debug/HMIControl.pdb index d675661..accd826 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/HMIControl.pdb and b/SCADA/Program/CoreTest/bin/Debug/HMIControl.pdb differ diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.exe b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.exe index 595090c..5acbfdc 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.exe and b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.exe differ diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.pdb b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.pdb index 61a7b12..d201cc3 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.pdb and b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.pdb differ diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.cache b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.cache index 936d586..8901514 100644 --- a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.cache +++ b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.cache @@ -4,16 +4,16 @@ winexe C# .cs -C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\ +C:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\ CoreTest none false DEBUG;TRACE -C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\App.xaml +C:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\CoreTest\App.xaml 101478603885 22-724079516 -18-1296519801 +18-1548234193 AlarmSet.xaml;Guage.xaml;Login.xaml;MainWindow.xaml;MaterialRecivingLine.xaml;RuntimeChart.xaml;SiloProductLine.xaml;StartDevice.xaml;TagMonitor.xaml;Trend.xaml; False diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.cache b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.cache index 4c9691b..38f25a8 100644 --- a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.cache +++ b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.cache @@ -4,17 +4,17 @@ winexe C# .cs -C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\ +C:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\ CoreTest none false DEBUG;TRACE -C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\App.xaml +C:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\CoreTest\App.xaml 101478603885 23468961942 -18-1296519801 +18-432263835 AlarmSet.xaml;Guage.xaml;Login.xaml;MainWindow.xaml;MaterialRecivingLine.xaml;RuntimeChart.xaml;SiloProductLine.xaml;StartDevice.xaml;TagMonitor.xaml;Trend.xaml; -True +False diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.lref b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.lref deleted file mode 100644 index 49617d9..0000000 --- a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.lref +++ /dev/null @@ -1,8 +0,0 @@ -C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\GeneratedInternalTypeHelper.g.i.cs - -FC:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\AlarmSet.xaml;; -FC:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\Guage.xaml;; -FC:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\MainWindow.xaml;; -FC:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\TagMonitor.xaml;; -FC:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\Trend.xaml;; - diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.lref b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.lref index 42d1259..93d1026 100644 --- a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.lref +++ b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.lref @@ -1,8 +1,8 @@ -C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs +C:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs -FC:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\AlarmSet.xaml;; -FC:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\Guage.xaml;; -FC:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\MainWindow.xaml;; -FC:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\TagMonitor.xaml;; -FC:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\Trend.xaml;; +FC:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\CoreTest\AlarmSet.xaml;; +FC:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\CoreTest\Guage.xaml;; +FC:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\CoreTest\MainWindow.xaml;; +FC:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\CoreTest\TagMonitor.xaml;; +FC:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\CoreTest\Trend.xaml;; diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SCADA/Program/CoreTest/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index e68fd74..c8b224c 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SCADA/Program/CoreTest/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/Example.csproj.CoreCompileInputs.cache b/SCADA/Program/CoreTest/obj/x86/Debug/Example.csproj.CoreCompileInputs.cache index 0a3edd3..fa18658 100644 --- a/SCADA/Program/CoreTest/obj/x86/Debug/Example.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/CoreTest/obj/x86/Debug/Example.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -5318ee07a41f3aa39afacd0709de27f42868fcd2 +cbfcb323c084da99bed7fe68a3300c0f30a640d3 diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/Example.csprojResolveAssemblyReference.cache b/SCADA/Program/CoreTest/obj/x86/Debug/Example.csprojResolveAssemblyReference.cache index eb4d29b..5398c62 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Debug/Example.csprojResolveAssemblyReference.cache and b/SCADA/Program/CoreTest/obj/x86/Debug/Example.csprojResolveAssemblyReference.cache differ diff --git a/SCADA/Program/DataExchange.sln b/SCADA/Program/DataExchange.sln index 196a3f4..b24d6a0 100644 --- a/SCADA/Program/DataExchange.sln +++ b/SCADA/Program/DataExchange.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27004.2009 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OPCDriver", "OPCDriver\OPCDriver.csproj", "{054DB7AC-EB2C-439F-80D4-63E823B279C8}" EndProject @@ -63,8 +63,8 @@ Global {0EC75DA7-20C7-4986-82E5-DB011C6E961B}.Debug|Any CPU.Build.0 = Debug|Any CPU {0EC75DA7-20C7-4986-82E5-DB011C6E961B}.Debug|Itanium.ActiveCfg = Debug|Itanium {0EC75DA7-20C7-4986-82E5-DB011C6E961B}.Debug|Itanium.Build.0 = Debug|Itanium - {0EC75DA7-20C7-4986-82E5-DB011C6E961B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {0EC75DA7-20C7-4986-82E5-DB011C6E961B}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {0EC75DA7-20C7-4986-82E5-DB011C6E961B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0EC75DA7-20C7-4986-82E5-DB011C6E961B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {0EC75DA7-20C7-4986-82E5-DB011C6E961B}.Debug|x64.ActiveCfg = Debug|x64 {0EC75DA7-20C7-4986-82E5-DB011C6E961B}.Debug|x64.Build.0 = Debug|x64 {0EC75DA7-20C7-4986-82E5-DB011C6E961B}.Debug|x86.ActiveCfg = Debug|x86 @@ -167,8 +167,8 @@ Global {755C5459-BCA4-4729-A93C-0C73A41BDF3C}.Debug|Any CPU.Build.0 = Debug|Any CPU {755C5459-BCA4-4729-A93C-0C73A41BDF3C}.Debug|Itanium.ActiveCfg = Debug|Itanium {755C5459-BCA4-4729-A93C-0C73A41BDF3C}.Debug|Itanium.Build.0 = Debug|Itanium - {755C5459-BCA4-4729-A93C-0C73A41BDF3C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {755C5459-BCA4-4729-A93C-0C73A41BDF3C}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {755C5459-BCA4-4729-A93C-0C73A41BDF3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {755C5459-BCA4-4729-A93C-0C73A41BDF3C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {755C5459-BCA4-4729-A93C-0C73A41BDF3C}.Debug|x64.ActiveCfg = Debug|x64 {755C5459-BCA4-4729-A93C-0C73A41BDF3C}.Debug|x64.Build.0 = Debug|x64 {755C5459-BCA4-4729-A93C-0C73A41BDF3C}.Debug|x86.ActiveCfg = Debug|x86 @@ -187,8 +187,8 @@ Global {8965E389-6466-4B30-BD43-83C909044637}.Debug|Any CPU.Build.0 = Debug|Any CPU {8965E389-6466-4B30-BD43-83C909044637}.Debug|Itanium.ActiveCfg = Debug|Itanium {8965E389-6466-4B30-BD43-83C909044637}.Debug|Itanium.Build.0 = Debug|Itanium - {8965E389-6466-4B30-BD43-83C909044637}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {8965E389-6466-4B30-BD43-83C909044637}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {8965E389-6466-4B30-BD43-83C909044637}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8965E389-6466-4B30-BD43-83C909044637}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {8965E389-6466-4B30-BD43-83C909044637}.Debug|x64.ActiveCfg = Debug|x64 {8965E389-6466-4B30-BD43-83C909044637}.Debug|x64.Build.0 = Debug|x64 {8965E389-6466-4B30-BD43-83C909044637}.Debug|x86.ActiveCfg = Debug|x86 @@ -281,4 +281,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {69C0B91D-AF9B-4DE7-A458-8ACC936D4BE2} + EndGlobalSection EndGlobal diff --git a/SCADA/Program/DataHelper/DataHelper.csproj b/SCADA/Program/DataHelper/DataHelper.csproj index 19f6a52..28b04ae 100644 --- a/SCADA/Program/DataHelper/DataHelper.csproj +++ b/SCADA/Program/DataHelper/DataHelper.csproj @@ -112,7 +112,7 @@ DEBUG;TRACE true full - x86 + AnyCPU bin\Debug\DataHelper.dll.CodeAnalysisLog.xml true GlobalSuppressions.cs diff --git a/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll b/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll index 4a1dc67..fca336a 100644 Binary files a/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll and b/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll.config b/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll.config index e26dd03..a1d2313 100644 --- a/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll.config +++ b/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll.config @@ -1,9 +1,9 @@ - + - - + + - + \ No newline at end of file diff --git a/SCADA/Program/DataHelper/bin/Debug/DataHelper.pdb b/SCADA/Program/DataHelper/bin/Debug/DataHelper.pdb index f9281c6..68807a0 100644 Binary files a/SCADA/Program/DataHelper/bin/Debug/DataHelper.pdb and b/SCADA/Program/DataHelper/bin/Debug/DataHelper.pdb differ diff --git a/SCADA/Program/DataHelper/bin/Debug/DataService.dll b/SCADA/Program/DataHelper/bin/Debug/DataService.dll index e316e86..b5e3b74 100644 Binary files a/SCADA/Program/DataHelper/bin/Debug/DataService.dll and b/SCADA/Program/DataHelper/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/DataHelper/bin/Debug/DataService.pdb b/SCADA/Program/DataHelper/bin/Debug/DataService.pdb index 35bbe8d..4d93a6a 100644 Binary files a/SCADA/Program/DataHelper/bin/Debug/DataService.pdb and b/SCADA/Program/DataHelper/bin/Debug/DataService.pdb differ diff --git a/SCADA/Program/DataHelper/bin/x86/Debug/DataHelper.dll b/SCADA/Program/DataHelper/bin/x86/Debug/DataHelper.dll index bc853ce..8115ff2 100644 Binary files a/SCADA/Program/DataHelper/bin/x86/Debug/DataHelper.dll and b/SCADA/Program/DataHelper/bin/x86/Debug/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/bin/x86/Debug/DataHelper.pdb b/SCADA/Program/DataHelper/bin/x86/Debug/DataHelper.pdb index 2cdb6f1..2ce923c 100644 Binary files a/SCADA/Program/DataHelper/bin/x86/Debug/DataHelper.pdb and b/SCADA/Program/DataHelper/bin/x86/Debug/DataHelper.pdb differ diff --git a/SCADA/Program/DataHelper/bin/x86/Debug/DataService.dll b/SCADA/Program/DataHelper/bin/x86/Debug/DataService.dll index 3acd617..ddfb1c4 100644 Binary files a/SCADA/Program/DataHelper/bin/x86/Debug/DataService.dll and b/SCADA/Program/DataHelper/bin/x86/Debug/DataService.dll differ diff --git a/SCADA/Program/DataHelper/bin/x86/Debug/DataService.pdb b/SCADA/Program/DataHelper/bin/x86/Debug/DataService.pdb index d051107..a12906e 100644 Binary files a/SCADA/Program/DataHelper/bin/x86/Debug/DataService.pdb and b/SCADA/Program/DataHelper/bin/x86/Debug/DataService.pdb differ diff --git a/SCADA/Program/DataHelper/obj/Debug/DataHelper.csproj.CoreCompileInputs.cache b/SCADA/Program/DataHelper/obj/Debug/DataHelper.csproj.CoreCompileInputs.cache index 6b85426..02d022a 100644 --- a/SCADA/Program/DataHelper/obj/Debug/DataHelper.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/DataHelper/obj/Debug/DataHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a9e2b14000cda020bceead90a03e7707b164fdc8 +4aebc7cc6bed2f31edb1136400f9bfa4b087c5e3 diff --git a/SCADA/Program/DataHelper/obj/Debug/DataHelper.csprojResolveAssemblyReference.cache b/SCADA/Program/DataHelper/obj/Debug/DataHelper.csprojResolveAssemblyReference.cache index 4ace89c..b378608 100644 Binary files a/SCADA/Program/DataHelper/obj/Debug/DataHelper.csprojResolveAssemblyReference.cache and b/SCADA/Program/DataHelper/obj/Debug/DataHelper.csprojResolveAssemblyReference.cache differ diff --git a/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll b/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll index 4a1dc67..fca336a 100644 Binary files a/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll and b/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/obj/Debug/DataHelper.pdb b/SCADA/Program/DataHelper/obj/Debug/DataHelper.pdb index f9281c6..68807a0 100644 Binary files a/SCADA/Program/DataHelper/obj/Debug/DataHelper.pdb and b/SCADA/Program/DataHelper/obj/Debug/DataHelper.pdb differ diff --git a/SCADA/Program/DataHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SCADA/Program/DataHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 578ce29..5951431 100644 Binary files a/SCADA/Program/DataHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SCADA/Program/DataHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csproj.CoreCompileInputs.cache b/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csproj.CoreCompileInputs.cache index 6b85426..02d022a 100644 --- a/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a9e2b14000cda020bceead90a03e7707b164fdc8 +4aebc7cc6bed2f31edb1136400f9bfa4b087c5e3 diff --git a/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csprojResolveAssemblyReference.cache b/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csprojResolveAssemblyReference.cache index a5ed487..ad5af0f 100644 Binary files a/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csprojResolveAssemblyReference.cache and b/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csprojResolveAssemblyReference.cache differ diff --git a/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.dll b/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.dll index bc853ce..8115ff2 100644 Binary files a/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.dll and b/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.pdb b/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.pdb index 2cdb6f1..2ce923c 100644 Binary files a/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.pdb and b/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.pdb differ diff --git a/SCADA/Program/DataHelper/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SCADA/Program/DataHelper/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index bfb9a83..7293687 100644 Binary files a/SCADA/Program/DataHelper/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SCADA/Program/DataHelper/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SCADA/Program/DataService/DataService.csproj b/SCADA/Program/DataService/DataService.csproj index b811665..983bb94 100644 --- a/SCADA/Program/DataService/DataService.csproj +++ b/SCADA/Program/DataService/DataService.csproj @@ -93,7 +93,7 @@ true GlobalSuppressions.cs prompt - MinimumRecommendedRules.ruleset + ..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Team Tools\Static Analysis Tools\Rule Sets\MinimumRecommendedRules.ruleset ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets true ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules diff --git a/SCADA/Program/DataService/bin/Debug/DataService.dll b/SCADA/Program/DataService/bin/Debug/DataService.dll index 3acd617..b5e3b74 100644 Binary files a/SCADA/Program/DataService/bin/Debug/DataService.dll and b/SCADA/Program/DataService/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/DataService/bin/Debug/DataService.pdb b/SCADA/Program/DataService/bin/Debug/DataService.pdb index d051107..4d93a6a 100644 Binary files a/SCADA/Program/DataService/bin/Debug/DataService.pdb and b/SCADA/Program/DataService/bin/Debug/DataService.pdb differ diff --git a/SCADA/Program/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache b/SCADA/Program/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache index aeb820d..8f27afa 100644 --- a/SCADA/Program/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -37366c5428b821d56d9c45d667247ca4584c98a4 +7374bf6f6afbd55e516cd27b0122952ca2562b4d diff --git a/SCADA/Program/DataService/obj/Debug/DataService.dll b/SCADA/Program/DataService/obj/Debug/DataService.dll index e316e86..b5e3b74 100644 Binary files a/SCADA/Program/DataService/obj/Debug/DataService.dll and b/SCADA/Program/DataService/obj/Debug/DataService.dll differ diff --git a/SCADA/Program/DataService/obj/Debug/DataService.pdb b/SCADA/Program/DataService/obj/Debug/DataService.pdb index 35bbe8d..4d93a6a 100644 Binary files a/SCADA/Program/DataService/obj/Debug/DataService.pdb and b/SCADA/Program/DataService/obj/Debug/DataService.pdb differ diff --git a/SCADA/Program/DataService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SCADA/Program/DataService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 4ee2b9e..357c2d2 100644 Binary files a/SCADA/Program/DataService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SCADA/Program/DataService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SCADA/Program/DataService/obj/x86/Debug/DataService.csproj.CoreCompileInputs.cache b/SCADA/Program/DataService/obj/x86/Debug/DataService.csproj.CoreCompileInputs.cache index aeb820d..8f27afa 100644 --- a/SCADA/Program/DataService/obj/x86/Debug/DataService.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/DataService/obj/x86/Debug/DataService.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -37366c5428b821d56d9c45d667247ca4584c98a4 +7374bf6f6afbd55e516cd27b0122952ca2562b4d diff --git a/SCADA/Program/DataService/obj/x86/Debug/DataService.dll b/SCADA/Program/DataService/obj/x86/Debug/DataService.dll index 3acd617..ddfb1c4 100644 Binary files a/SCADA/Program/DataService/obj/x86/Debug/DataService.dll and b/SCADA/Program/DataService/obj/x86/Debug/DataService.dll differ diff --git a/SCADA/Program/DataService/obj/x86/Debug/DataService.pdb b/SCADA/Program/DataService/obj/x86/Debug/DataService.pdb index d051107..a12906e 100644 Binary files a/SCADA/Program/DataService/obj/x86/Debug/DataService.pdb and b/SCADA/Program/DataService/obj/x86/Debug/DataService.pdb differ diff --git a/SCADA/Program/FileDriver/bin/Debug/DataService.dll b/SCADA/Program/FileDriver/bin/Debug/DataService.dll index 3acd617..b5e3b74 100644 Binary files a/SCADA/Program/FileDriver/bin/Debug/DataService.dll and b/SCADA/Program/FileDriver/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/FileDriver/bin/Debug/DataService.pdb b/SCADA/Program/FileDriver/bin/Debug/DataService.pdb index d051107..4d93a6a 100644 Binary files a/SCADA/Program/FileDriver/bin/Debug/DataService.pdb and b/SCADA/Program/FileDriver/bin/Debug/DataService.pdb differ diff --git a/SCADA/Program/FileDriver/bin/Debug/FileDriver.dll b/SCADA/Program/FileDriver/bin/Debug/FileDriver.dll index 1d6b88b..372ade4 100644 Binary files a/SCADA/Program/FileDriver/bin/Debug/FileDriver.dll and b/SCADA/Program/FileDriver/bin/Debug/FileDriver.dll differ diff --git a/SCADA/Program/FileDriver/bin/Debug/FileDriver.pdb b/SCADA/Program/FileDriver/bin/Debug/FileDriver.pdb index b2a6bf2..d094e04 100644 Binary files a/SCADA/Program/FileDriver/bin/Debug/FileDriver.pdb and b/SCADA/Program/FileDriver/bin/Debug/FileDriver.pdb differ diff --git a/SCADA/Program/FileDriver/obj/Debug/FileDriver.csproj.CoreCompileInputs.cache b/SCADA/Program/FileDriver/obj/Debug/FileDriver.csproj.CoreCompileInputs.cache index 4086fb0..4adcce7 100644 --- a/SCADA/Program/FileDriver/obj/Debug/FileDriver.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/FileDriver/obj/Debug/FileDriver.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e2af3000a18187d07bdeb999fc919c83061410fc +adb797c36e5e129b89b0aa2e48ee353ce11bd102 diff --git a/SCADA/Program/FileDriver/obj/Debug/FileDriver.csproj.FileListAbsolute.txt b/SCADA/Program/FileDriver/obj/Debug/FileDriver.csproj.FileListAbsolute.txt index 56a0b28..af2558e 100644 --- a/SCADA/Program/FileDriver/obj/Debug/FileDriver.csproj.FileListAbsolute.txt +++ b/SCADA/Program/FileDriver/obj/Debug/FileDriver.csproj.FileListAbsolute.txt @@ -5,3 +5,4 @@ C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\FileDriver\bin\Debug\Data C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\FileDriver\obj\Debug\FileDriver.csproj.CoreCompileInputs.cache C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\FileDriver\obj\Debug\FileDriver.dll C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\FileDriver\obj\Debug\FileDriver.pdb +C:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\FileDriver\obj\Debug\FileDriver.csprojResolveAssemblyReference.cache diff --git a/SCADA/Program/FileDriver/obj/Debug/FileDriver.csprojResolveAssemblyReference.cache b/SCADA/Program/FileDriver/obj/Debug/FileDriver.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..28a6ac4 Binary files /dev/null and b/SCADA/Program/FileDriver/obj/Debug/FileDriver.csprojResolveAssemblyReference.cache differ diff --git a/SCADA/Program/FileDriver/obj/Debug/FileDriver.dll b/SCADA/Program/FileDriver/obj/Debug/FileDriver.dll index 1d6b88b..372ade4 100644 Binary files a/SCADA/Program/FileDriver/obj/Debug/FileDriver.dll and b/SCADA/Program/FileDriver/obj/Debug/FileDriver.dll differ diff --git a/SCADA/Program/FileDriver/obj/Debug/FileDriver.pdb b/SCADA/Program/FileDriver/obj/Debug/FileDriver.pdb index b2a6bf2..d094e04 100644 Binary files a/SCADA/Program/FileDriver/obj/Debug/FileDriver.pdb and b/SCADA/Program/FileDriver/obj/Debug/FileDriver.pdb differ diff --git a/SCADA/Program/HMIControl/bin/Debug/DataHelper.dll b/SCADA/Program/HMIControl/bin/Debug/DataHelper.dll index bc853ce..fca336a 100644 Binary files a/SCADA/Program/HMIControl/bin/Debug/DataHelper.dll and b/SCADA/Program/HMIControl/bin/Debug/DataHelper.dll differ diff --git a/SCADA/Program/HMIControl/bin/Debug/DataHelper.pdb b/SCADA/Program/HMIControl/bin/Debug/DataHelper.pdb index 2cdb6f1..68807a0 100644 Binary files a/SCADA/Program/HMIControl/bin/Debug/DataHelper.pdb and b/SCADA/Program/HMIControl/bin/Debug/DataHelper.pdb differ diff --git a/SCADA/Program/HMIControl/bin/Debug/DataService.dll b/SCADA/Program/HMIControl/bin/Debug/DataService.dll index 3acd617..b5e3b74 100644 Binary files a/SCADA/Program/HMIControl/bin/Debug/DataService.dll and b/SCADA/Program/HMIControl/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/HMIControl/bin/Debug/DataService.pdb b/SCADA/Program/HMIControl/bin/Debug/DataService.pdb index d051107..4d93a6a 100644 Binary files a/SCADA/Program/HMIControl/bin/Debug/DataService.pdb and b/SCADA/Program/HMIControl/bin/Debug/DataService.pdb differ diff --git a/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.dll b/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.dll index a517014..3c7f43c 100644 Binary files a/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.dll and b/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.dll differ diff --git a/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.pdb b/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.pdb index 32d14f6..bf28321 100644 Binary files a/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.pdb and b/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.pdb differ diff --git a/SCADA/Program/HMIControl/bin/Debug/HMIControl.dll b/SCADA/Program/HMIControl/bin/Debug/HMIControl.dll index d4bc881..80366a0 100644 Binary files a/SCADA/Program/HMIControl/bin/Debug/HMIControl.dll and b/SCADA/Program/HMIControl/bin/Debug/HMIControl.dll differ diff --git a/SCADA/Program/HMIControl/bin/Debug/HMIControl.pdb b/SCADA/Program/HMIControl/bin/Debug/HMIControl.pdb index d675661..accd826 100644 Binary files a/SCADA/Program/HMIControl/bin/Debug/HMIControl.pdb and b/SCADA/Program/HMIControl/bin/Debug/HMIControl.pdb differ diff --git a/SCADA/Program/HMIControl/bin/Debug/Microsoft.Expression.Controls.xml b/SCADA/Program/HMIControl/bin/Debug/Microsoft.Expression.Controls.xml deleted file mode 100644 index aaaf85b..0000000 --- a/SCADA/Program/HMIControl/bin/Debug/Microsoft.Expression.Controls.xml +++ /dev/null @@ -1,557 +0,0 @@ - - - - Microsoft.Expression.Controls - - - - - Called before the polylines are looped over. - - - - - Computes the value used when LayoutPath.Capacity is set to Auto. - - - - - Checks whether or not the polylines should continue being looped over. - - - - - Called before a new polyline is marched. - - - - - Called when a polyline is completed. - - The remaining arclength in the polyline. - - - - Called when a step is successfully completed. - - The actual step distance. - This may be different than Step if another polyline has been wrapped to. - - - - Distributes the children of a path panel along a given layout path. - - The path panel. - The index of the path in pathPanel.LayoutPaths. - The index of the first child to be laid out on this path. - The index of the next child to be distributed. If childIndex is returned, this function has done nothing. - - - - The index of the next child to be arranged. - - - - - The distance in arc length that will be used for layout. - - - - - The distance in arc length to walk along the current polyline. - - - - - The total number of elements to be arranged on the LayoutPath. - - - - - Distributes the children of a path panel along a layout path. - Even distribution means that there is equal arclength between the centers of all - the elements on the path. - - - - - Specifies which path layout properties have changed. - - - - - Provides data for the event. - - - - - Initializes a new instance of the class. - - The data for the event. - - - - Gets the properties changed in a event. - - - - - Encapsulates the data needed to update a . - - - - - Gets or sets the index of the path on which an element is arranged. - - - - - Gets or sets the index of an element in a collection of elements. - - - - - Gets or sets the index of an element on a path. - - - - - Gets or sets the offset of an element proportional to the total length of a collection of paths. - - - - - Gets or sets the offset of an element proportional to the length of a path. - - - - - Gets or sets the angle perpendicular to the path at an element's location. - - - - - Gets or sets the angle perpendicular to the path at an element's location if the element is oriented to the path. - - - - - Gets or sets whether or not an element is arranged on a path. - - - - - Represents an element that is arranged by a . - - - Implementing this interface enables to set these properties when the element is arranged. - This interface is not intended for general implementation. - - - - - Updates the properties based on the given and raises the event. - - The data needed to update the . - - - - Occurs when one or more of the properties change. - - - This event is raised whenever the item’s position along the path is updated. This can occur due to changes in the properties on the or changes to . - - - - - Gets the index of the path on which the item is arranged. - - - - - Gets the index of the item in a collection of items. - - - - - Gets the index of the item on the path on which it is arranged. - - - - - Gets the offset of the item proportional to the total length of a collection of paths. - - - - - Gets the offset of the item proportional to the length of the path on which it is arranged. - - - - - Gets the angle perpendicular to the path at the item's location. - - - - - Gets the angle perpendicular to the path at the items's location if the item is oriented to the path. - - - - - Gets or sets whether or not the item is arranged on the path. - - - - - Converts a representing whether or not an element is arranged to a value used to scale the element. - - - - - Throws a exception in all cases. - - The target data being passed to the source. - The of data expected by the source object. - An optional parameter to be used in the converter logic. - The culture of the conversion. - The value to be passed to the source object. - - - - Converts the specified to a . - - The source data being passed to the target. - The of data expected by the target dependency property. - An optional parameter to be used in the converter logic. - The culture of the conversion. - If the is true, 1 is returned. Else, 0 is returned. - - - - Specifies the distribution of a . - - - - - Specifies the orientation of elements on a . - - - - - Specifies the method for altering the on an open path. - - - - - Describes a path along which elements are arranged. - - - - - Ideally, we want to cache the Bezier curves before flattening, because transform will affect flattening. - That requires us to cache curves that we don't support very well yet. Instead, we cache the flatten points - in distribution strategy and transform them on demand. - - - - - Gets or sets the element that defines the path. - - - - - Gets or sets whether items are laid out evenly or with a fixed padding. - - - - - Gets or sets the maximum number of items displayed on the . - - - - - Gets or sets the distance in pixels along the arc length of the between two items. - - - - - Gets or sets the orientation of the items. - - - This property is supported on , but not . - - - - - Gets or sets the distance from the start of the to place the first item. - - - - - Gets or sets the percentage of the that participates in layout. - - - - - Gets or set the method to alter on an open path. - - - - - Gets the computed Capacity. - - - - - Gets whether or not the is valid in the context. - A is not valid if it is a descendant of the in which it is used. - - - - - Distributes the children of a layout path based on the size of the children and a given padding between the children. - The distance in arclength between children is determined by the padding plus the sum of the radii of the children's bounding boxes. - - - - - Contains a list of items that are laid out along one or more paths. - - - - - Initializes a new instance of the class. - - - - - Creates the element used to display a specified item. - - A corresponding to a specified item. - - - - Determines if the specified item is (or is eligible to be) its own item container. - - true if the item is its own item container; otherwise, false. - The specified item. - - - - Positions child elements. - - The size that this object should use to arrange its child elements. - The actual size used. - - - - Gets or sets a collection of objects that define the path(s) used for layout. - - - - - Gets or sets the index to use within the list of items. - - - - - Gets or sets whether the item index wraps to the beginning of the collection when StartItemIndex is greater than 0. - - - - - Represents an item in a . - - - - - Initializes a new instance of the class. - - - - - For a description of this member, see . - - - - - For a description of this member, see . - - - - - For a description of this member, see . - - - - - For a description of this member, see . - - - - - For a description of this member, see . - - - - - For a description of this member, see . - - - - - For a description of this member, see . - - - - - For a description of this member, see . - - - - - For a description of this member, see . - - - - - For a description of this member, see . - - - - - Arranges child elements along one or more path. - - - can be used as an alternative to when selection is not necessary. - The property is not supported on . - - - - - Initializes a new instance of the class. - - - - - Measures the size required for child elements. - - The available size that this element can give to child elements. - The size that this element determines it needs during layout, based on its calculations of child element sizes. - - - - Positions child elements. - - The size that this object should use to arrange its child elements. - The actual size used. - - - - Arranges the child at the given index at a particular location on a LayoutPath. - - An index from the range 0 to PathPanel.Count. - The index of the layout path on which to arrange the child. - The polyline in the layout path. - The location on the polyline. - The index of the child on the LayoutPath. - - - - Calculates the radius of the bounding circle for the child at the given index. - - An index from the range 0 to PathPanel.Count. - - - - Gets or sets a collection of objects that define the path(s) used for layout. - - - - - Gets or sets the index to use within the list of items. - - - - - Gets or sets whether the item index wraps to the beginning of the collection when is greater than 0. - - - - - The subset of LayoutPaths that are attached and not collapsed. - - - - - Count is the number of Children that the PathPanel will lay out. - If StartItemIndex > 0 and WrapItems is false, then this can be less than PathPanel.Children.Count - - - - - Gets the panel that contains the containers of an ItemsControl. - - The ItemsControl. - - The panel that contains the containers of an ItemsControl, or null - if the panel could not be found. - - - is null. - - - - - Traverses a tree by accepting an initial value and a function that - retrieves the child nodes of a node. - - The type of the stream. - The initial node. - A function that retrieves the child - nodes of a node. - A predicate that evaluates a node - and returns a value indicating whether that node and it's children - should be traversed. - A stream of nodes. - - - - Get the visual tree children of an element. - - The element. - The visual tree children of an element. - - is null. - - - - - Get the visual tree children of an element and the element itself. - - The element. - - The visual tree children of an element and the element itself. - - - - - Retrieves all the logical children of a framework element using a - breadth-first search. For performance reasons this method manually - manages the stack instead of using recursion. - - The parent framework element. - The logical children of the framework element. - - - - Retrieves all the logical descendents of a framework element using a - breadth-first search. For performance reasons this method manually - manages the stack instead of using recursion. - - The parent framework element. - The logical children of the framework element. - - - diff --git a/SCADA/Program/HMIControl/bin/Debug/Microsoft.Expression.Drawing.xml b/SCADA/Program/HMIControl/bin/Debug/Microsoft.Expression.Drawing.xml deleted file mode 100644 index f396802..0000000 --- a/SCADA/Program/HMIControl/bin/Debug/Microsoft.Expression.Drawing.xml +++ /dev/null @@ -1,1770 +0,0 @@ - - - - Microsoft.Expression.Drawing - - - - - Renders a callout shape supporting several shapes combined with a callout arrow. - - - - - Provides a base class of a composite shape that derives from and implements . - - - implements interface, - and supports rendering a geometry similar to , but the geometry can be rendered outside the layout boundary. - - A typical implementation has a customized default template in generic.xaml which template-binds most shape properties to a . - It should also extend the property to customize the appearance of the . - - This class also supports showing content together with the shape. - - - - - Provides an interface to describe the parameters of a Shape. - - - This interface is the data for communication between Shape and GeometrySource. - Typically, a concrete implementation of IShape will implement this interface and pass it into - GeometrySource.UpdateGeometry(), which will then consume the shape as a read-only data provider. - - - - - Provides the necessary interface to define a Shape. - Both primitive and composite shapes need to match this interface, although they might derive from different types of FrameworkElement. - - - - - Invalidates the geometry for a . After the invalidation, the will recompute the geometry, which will occur asynchronously. - - - - Gets or sets the that specifies how to paint the interior of the shape. - A that describes how the shape's interior is painted. The default is null. - - - Gets or sets the that specifies how the outline is painted. - A that specifies how the outline is painted. - - - Gets or sets the width of the stroke outline. - The width of the outline, in pixels. - - - Gets or sets a enumeration value that describes how the shape fills its allocated space. - One of the enumeration values. The default value at runtime depends on the type of . - - - - Gets the rendered geometry presented by the rendering engine. - - - - - Gets the margin between logical bounds and actual geometry bounds. - This can be either positive (as in ) or negative (as in ). - - - - - Occurs when RenderedGeometry is changed. - - - - - Extends how the shape is drawn with creating geometry source. - - - - - Invalidates the geometry for a . After the invalidation, the will recompute the geometry, which will occur asynchronously. - - - - Provides the behavior for the Arrange portion of a Silverlight layout pass. Classes can override this method to define their own Arrange pass behavior. - The actual size used once the element is arranged in layout. - The final area within the parent that this object should use to arrange itself and its children. - will recompute the Geometry when it's invalidated and update the RenderedGeometry and GeometryMargin. - - - - Transforms a string content into with center alignment and multiple line support. - - - Use template-binding to instead of to enable this method. - - - - - Gets or sets the that specifies how to paint the interior of the shape. - - A that describes how the shape's interior is painted. - - - Gets or sets the that specifies how the outline is painted. - A that specifies how the outline is painted. - - - Gets or sets the width of the stroke outline. - The width of the outline, in pixels. - - - Gets or sets a enumeration value that describes how the shape fills its allocated space. - One of the enumeration values. - - - Gets or sets a enumeration value that describes the at the start of a . - A value of the enumeration that specifies the shape at the start of a . - - - Gets or sets a enumeration value that describes the at the end of a line. - One of the enumeration values for . - - - Gets or sets a enumeration value that specifies the type of join that is used at the vertices of a . - A value of the enumeration that specifies the join appearance. - - - Gets or sets a limit on the ratio of the miter length to half the of a element. - The limit on the ratio of the miter length to the of a element. This value is always a positive number that is greater than or equal to 1. - - - Gets or sets a collection of values that indicate the pattern of dashes and gaps that is used to outline shapes. - A collection of values that specify the pattern of dashes and gaps. - - - Gets or sets a enumeration value that specifies how the ends of a dash are drawn. - One of the enumeration values for . The default is . - - - Gets or sets a that specifies the distance within the dash pattern where a dash begins. - A that represents the distance within the dash pattern where a dash begins. The default value is 0. - - - - Gets the rendered geometry presented by the rendering engine. - - - - - Gets the margin between the logical bounds and the actual geometry bounds. - This can be either positive (as in ) or negative (as in ). - - - - - Gets or sets the internal content that converts a string into a center-aligned, multiple-line TextBlock. - - - - - Occurs when RenderedGeometry is changed. - - - - - Gets or sets the position of the callout relative to the top and left corner. - - - - - Gets or sets the callout style. - - - - - Provides a base class of a composite shape that derives from and implements . - - - implements interface, - and supports rendering a geometry similar to , but the geometry can be rendered outside the layout boundary. - - A typical implementation has a customized default template in generic.xaml which template-binds most shape properties to a . - It should also extend the property to customize the appearance of the . - - - - - Extends how the shape is drawn with creating geometry source. - - - - - Invalidates the geometry for a . After the invalidation, the will recompute the geometry, which will occur asynchronously. - - - - Provides the behavior for the Arrange portion of a Silverlight layout pass. Classes can override this method to define their own Arrange pass behavior. - The actual size used once the element is arranged in layout. - The final area within the parent that this object should use to arrange itself and its children. - will recompute the Geometry when it's invalidated and update the RenderedGeometry and GeometryMargin. - - - - Gets or sets the that specifies how to paint the interior of the shape. - - A that describes how the shape's interior is painted. - - - Gets or sets the that specifies how the outline is painted. - A that specifies how the outline is painted. - - - Gets or sets the width of the stroke outline. - The width of the outline, in pixels. - - - Gets or sets a enumeration value that describes how the shape fills its allocated space. - One of the enumeration values. - - - Gets or sets a enumeration value that describes the at the start of a . - A value of the enumeration that specifies the shape at the start of a . - - - Gets or sets a enumeration value that describes the at the end of a line. - One of the enumeration values for . - - - Gets or sets a enumeration value that specifies the type of join that is used at the vertices of a . - A value of the enumeration that specifies the join appearance. - - - Gets or sets a limit on the ratio of the miter length to half the of a element. - The limit on the ratio of the miter length to the of a element. This value is always a positive number that is greater than or equal to 1. - - - Gets or sets a collection of values that indicate the pattern of dashes and gaps that is used to outline shapes. - A collection of values that specify the pattern of dashes and gaps. - - - Gets or sets a enumeration value that specifies how the ends of a dash are drawn. - One of the enumeration values for . The default is . - - - Gets or sets a that specifies the distance within the dash pattern where a dash begins. - A that represents the distance within the dash pattern where a dash begins. The default value is 0. - - - - Gets the rendered geometry presented by the rendering engine. - - - - - Gets the margin between the logical bounds and the actual geometry bounds. - This can be either positive (as in ) or negative (as in ). - - - - - Occurs when RenderedGeometry is changed. - - - - - Renders a bent line segment with optional arrow heads on both ends. - - - - Provides the behavior for the Measure pass of Silverlight layout. Classes can override this method to define their own Measure pass behavior. - The size that this object determines it requires during layout, based on its calculations of child object allotted sizes, or possibly on other considerations such as fixed container size. - The available size that this object can give to child objects. Infinity () can be specified as a value to indicate that the object will size to whatever content is available. - - A default can render at anysize. - The will stretch to the layout boundary and render to the outside if necessary. - - - - - Gets or sets the amount of bend for the arrow. - - The bend amount between 0 and 1. - - - - Gets or sets how the arrow head is rendered at the start of the line. - - - - - Gets or sets how the arrow head is rendered at the end of the line. - - - - - Gets or sets from which corner to start drawing the arrow. - - - - - Gets or sets the length of the arrow in pixels. - - - - - Provides an items control that displays one selected item, and allows panning between items using touch gestures. - - - - - The constructor for PanningItems. - - - - - Called when the PanningItems template is applied. - - - - - Gets or sets the orientation of items in the control. - - - - - Gets or sets the flick tolerance. This can be a value between 0 and 1. - It represents the percentage of the size of the PanningItems needed to be covered by the flick gesture to trigger an items change. - - - - - Gets or sets the item before the selected item. - - - - - Gets or sets the item after the selected item. - - - - - Gets or sets whether the contents of the items control will loop, so that the first item will follow the last item. - - - - - Gets or sets the value of the slider controlling the panning motion. - - - - - Helper class to work with PathGeometry. - - - - - Converts a string in the path mini-language into a PathGeometry. - - A string in the path mini-language. - - - - Converts the given geometry into a single PathGeometry. - - - - - Updates the given geometry as PathGeometry with a polyline matching a given point list. - - - - - Parses abbreviated geometry sytax. - - - - - Helper class to convert an ArcSegment to BezierSegment(s). - - - Helper class to work with PathSegment and all variations. - - - Strategy classes to handle different types of PathSegment. - - - - - Converts an arc segment into Bezier format. - Returns BezierSegment, PolyBezierSegment, LineSegment, or null. - When returning null, the arc degenerates into the start point. - - - - - Avoid calling the three-parameter constructor, since it always sets a local value for IsStroked. - - - - - - - Updates the SegmentCollection with a given polyline matching a given point list. - Tries to keep changes minimum and returns false if nothing has been changed. - - - - - Updates the collection[index] segment with a poly-Bezier segment matching a given point list. - A given point list must contain 3*N points for N Bezier segments. - - - - - Tests if a given path segment is empty. - - - - - Gets the point count in a given path segment. - - - - - Gets the last point of a given path segment. - - - - - Gets the point of a given index in a given segment. - If input is (-1), returns the last point. - - - - - Flattens a given segment and adds resulting points into a given point list. - - The segment to be flatten. - The resulting points list. - The start point of the segment. - The error tolerance. Must be positive. Can be zero. Fallback to default tolerance. - - - - ArcToBezier, computes the Bezier approximation of an arc. - - - This utility computes the Bezier approximation for an elliptical arc as - it is defined in the SVG arc spec. The ellipse from which the arc is - carved is axis-aligned in its own coordinates, and defined there by its - x and y radii. The rotation angle defines how the ellipse's axes are - rotated relative to the x axis. The start and end points define one of 4 - possible arcs; the sweep and large-arc flags determine which one of - these arcs will be chosen. - - Returning cPieces = 0 indicates a line instead of an arc - cPieces = -1 indicates that the arc degenerates to a point - - - - - Gets the number of Bezier arcs, and sine/cosine of each. - - - This is a private utility used by ArcToBezier. Breaks the arc into - pieces so that no piece will span more than 90 degrees. The input - points are on the unit circle. - - - - - GetBezierDistance returns the distance as a fraction of the radius. - - - Get the distance from a circular arc's end points to the control points - of the Bezier arc that approximates it, as a fraction of the arc's - radius. - - Since the result is relative to the arc's radius, it depends strictly on - the arc's angle. The arc is assumed to be of 90 degrees or less, so the - angle is determined by the cosine of that angle, which is derived from - rDot = the dot product of two radius vectors. We need the Bezier curve - that agrees with the arc's points and tangents at the ends and midpoint. - Here we compute the distance from the curve's endpoints to its control - points. - - Since we are looking for the relative distance, we can work on the unit - circle. Place the center of the circle at the origin, and put the X axis - as the bisector between the 2 vectors. Let a be the angle between the - vectors. Then the X coordinates of the 1st and last points are cos(a/2). - Let x be the X coordinate of the 2nd and 3rd points. At t=1/2 we have a - point at (1,0). But the terms of the polynomial there are all equal: - - (1-t)^3 = t*(1-t)^2 = t^2*(1-t) = t^3 = 1/8, - - so from the Bezier formula there we have: - - 1 = (1/8) * (cos(a/2) + 3x + 3x + cos(a/2)), - - hence - - x = (4 - cos(a/2)) / 3 - - The X difference between that and the 1st point is: - - DX = x - cos(a/2) = 4(1 - cos(a/2)) / 3. - - But DX = distance / sin(a/2), hence the distance is - - dist = (4/3)*(1 - cos(a/2)) / sin(a/2). - - Rather than the angle a, we are given rDot = R^2 * cos(a), so we - multiply top and bottom by R: - - dist = (4/3)*(R - Rcos(a/2)) / Rsin(a/2) - - and use some trig: - ________________ - cos(a/2) = \/(1 + cos(a)) / 2 - ______________________ - R*cos(a/2) = \/(R^2 + R^2 cos(a)) / 2 - ________________ - = \/(R^2 + rDot) / 2 - - Let A = (R^2 + rDot)/2. - ____________________ - R*sin(a/2) = \/R^2 - R^2 cos^2(a/2) - _______ - = \/R^2 - A - - so: - _ - 4 R - \/A - dist = - * ------------ - 3 _______ - \/R^2 - A - - History: - 5/29/2001 MichKa - Created it. - - - - - Returns false if the radius is too small compared to the chord length (returns true on NaNs) - radius is modified to the value that is accepted. - - - - - A utility class to flatten Bezier curves. - - - - - Flattens a Bezier cubic curve and adds the resulting polyline to the third parameter. - - The four Bezier cubic control points. - The maximum distance between two corresponding points on the true curve - and on the flattened polyline. Must be strictly positive. - Where to add the flattened polyline. - True to skip the first control point when adding the flattened polyline. - Where to add the value of the Bezier curve parameter associated with - each of the polyline vertices. - If is empty, the first control point - and its associated parameter are always added. - - - - Flattens a Bezier quadratic curve and adds the resulting polyline to the third parameter. - Uses degree elevation for Bezier curves to reuse the code for the cubic case. - - The three Bezier quadratic control points. - The maximum distance between two corresponding points on the true curve - and on the flattened polyline. Must be strictly positive. - Where to add the flattened polyline. - Whether to skip the first control point when adding the flattened polyline. - Where to add the value of the Bezier curve parameter associated with - each of the polyline vertices. - If is empty, the first control point and - its associated parameter are always added. - - - - Extension methods that support non-geometry types. - - - - - Allows the application of an action delegate (often a very simple lambda) against an entire sequence. - - - - - Allows the application of an action delegate (often a very simple lambda) against an entire sequence. - - - - - Allows the application of an action delegate (often a very simple lambda) against an entire sequence with the index of each item. - - - - - Ensures the count of a list to a given count. Creates with a given factory or removes items when necessary. - If Input IList is a List, AddRange or RemoveRange is used when there's no factory. - - - - - Ensures the count of a list is at least the given count. Creates with a given factory. - - - - - Add a range of items to the end of a collection. - If a collection is a list, List.AddRange is used. - - - - - Gets the last item of a given list. - - - - - Removes the last item from the given list. - - - - - Makes a copy of obj and all it's public properties, including all collection properties. - - - - - Sets the value if different. Avoids setting a local value if possible. - Returns true when the value has been changed. - - - - - Clears the dependency property when it is locally set on the given dependency object. - Returns false if the dependeny property is not locally set. - - - - - Finds all visual descendants of a given type and condition using breadth-first search. - - - - - Gets all visual children in IEnumerable. - - - - - Unifies the interface of PropertyMetadata in WPF and Silverlight. - Provides the necessary notification about render, arrange, or measure. - - - - - This private Ctor should only be used by AttachCallback. - - - - - Chain InternalCallback() to attach the instance of DrawingPropertyMetadata on property callback. - In Silverlight, the property metadata is thrown away after setting. Use callback to remember it. - - - - - Before chaining the original callback, trigger DrawingPropertyChangedEvent. - - - - - Extension methods for geometry-related data structures (Point/Vector/Size/Rect). - - - - - Resizes the rectangle to a relative size while keeping the center invariant. - - - - - Gets the difference vector between two points. - - - - - Memberwise plus for Point. - - - - - Memberwise minus for Point. - - - - - Converts a string of mini-languages to a . - - See: Path Markup Syntax(http://msdn.microsoft.com/en-us/library/cc189041(VS.95).aspx) - The string of path mini-languages for describing geometric paths. - A converted from the the path mini-languages. - - - - Flattens a and adds result points to a given . - - The input . - The point list to which result points will append. - A positive number specifying the maximum allowed error from the result points to the input path figure. A Value of zero allows the algorithm to pick the tolerance automatically. - - - - Gets the normalized arc in a (0,0)(1,1) box. - Zero degrees is mapped to [0.5, 0] (up), and clockwise. - - - - - Gets the absolute arc point in a given bound with a given relative radius. - - - - - Gets the angle on an arc relative to a (0,0)(1,1) box. - Zero degrees is mapped to [0.5, 0] (up), and clockwise. - - - - - Gets the angle on an arc from a given absolute point relative to a bound. - - - - - Computes the transform that moves "Rect from" to "Rect to". - - - - - Computes the transform from the coordinate space of one UIElement to another. - - The source element. - The destination element. - The transform between the UIElements, or null if it cannot be computed. - - - - Maps a relative point to an absolute point using the mapping from a given bound to a (0,0)(1,1) box. - - - - - Maps an absolute point to a relative point using the mapping from a (0,0)(1,1) box to a given bound. - - - - - Computes the bound after stretching within a given logical bound. - If stretch to uniform, use given aspectRatio. - If aspectRatio is empty, it's equivalent to Fill. - If stretch is None, it's equivalent to Fill or Uniform. - - - - - Returns the mid point of two points. - - The first point. - The second point. - The mid point between and . - - - - Returns the dot product of two vectors. - - The first vector. - The second vector. - The dot product of and . - - - - Returns the dot product of two points. - - - - - Returns the distance between two points. - - The first point. - The second point. - The distance between and . - - - - Returns the square of the distance between two points. - - The first point. - The second point. - The square of the distance between and . - - - - Determinant of the cross product. Equivalent to directional area. - - - - - Computes the normal direction vector of given line segments. - - - - - Computes the perpendicular vector, 90-degrees, counter-clockwise. - Vector to the right perpendicular results in a vector to up. - - - - - Returns whether the two geometries are identical. - - - - - Ensures the value is an instance of result type (T). If not, replace with a new instance of type (T). - - - - - Ensures the list[index] is an instance of result type (T). If not, replace with a new instance of type (T). - - - - - Helper class that provides static properties and methods related to floating point arithmetic. - - - - - The minimum distance to consider that two values are same. - Note: internal floating point in MIL/SL is float, not double. - - - - - The value of the angle of a full circle. - - - - - The inner radius for a pentagram polygon shape, at precision of three digits in percentage. - (1 - Sin36 * Sin72 / Sin54) / (Cos36) ^ 2, which is 0.47210998990512996761913067272407 - - - - - Determines whether a System.Double value is small enough to be considered - equivalent to zero. - - - True if value is smaller than DoubleTolerance; - otherwise, False. - - - - Returns the value that's within the given range. - A given min/max that is null equals no limit. - - - - - Computes the Euclidean norm of the vector (x, y). - - The first component. - The second component. - The Euclidean norm of the vector (x, y). - - - - Computes a real number from the mantissa and exponent. - - - - The value of x * 2^exp if successful. - - - - Tests a double. - - The double to test. - True if x is not a NaN and is not equal to plus or minus infinity; - otherwise, False. - - - - Helper class to work with PathFigure. - - - - - Flattens the given figure and adds result points to the given point list. - - The error tolerance. Must be positive. Can be zero. Fallback to default tolerance. - - - - Iterates all segments inside a given figure, and returns the correct start point for each segment. - - - - - Synchronizes the figure to the given list of points as a single polyline segment. - Tries to keep the change to a minimum and returns false if nothing has been changed. - - - - - Synchronizes the given figure to be a closed ellipse with two arc segments. - - - - - A Tuple data structure for PathSegment and the corresponding StartPoint. - - - - - Represents a polyline with a list of connecting points. - A closed polygon is represented by repeating the first point at the end. - The differences, normals, angles, and lengths are computed on demand. - - - - - Constructs a polyline with two or more points. - - - - - The forward difference vector of polyline. - Points[i] + Differences[i] = Points[i+1] - - - - Compute the normal vector of given location (lerp(index, index+1, fraction). - If the location is within range of cornerRadius, interpolate the normal direction. - - The range of normal smoothless. If zero, no smoothness and return the exact normal on index. - - - - The polyline is closed when the first and last points are repeated. - - - - - The count of points in this polyline. - - - - - The total arc length of this polyline. - - - - - The point array of this polyline. - - - - - The length between line segments, Points[i] to Points[i+1]. - - - - - The list of normal vectors for each segment. - Normals[i] is the normal of segment p[i] to p[i + 1]. - Normals[N-1] == Normals[N-2]. - - - - - The list of Cos(angle) between two line segments on point p[i]. - Note: The value is cos(angle) = Dot(u, v). Not in degrees. - - - - - The list of accumulated length from points[i] to points[0]. - - - - - The data structure to communicate with the PathMarch algorithm. - - - - - Gets the interpolated position of this MarchLocation on a given point list. - - - - - Get the interpolated normal direction of this MarchLocation on a given normal vector list. - - - - - Gets the arc length of this MarchLocation to the start of the entire polyline. - - - - - The reason why this location is sampled. - - - - - The index of the point on a polyline point list. - - - - - Ratio: [0, 1], which is always before / (before + after). - - - - - Arc length before a stop point. Non-negative and less than Length[index]. - - - - - Arc length after the stop point. Non-negative and less than Length[index]. - - - - - Remaining length within a step to hit next stop. Positive to go forward. Negative to go backward. - - - - - Helper class to work with list of points - - - - - March the given polyline with a given interval and output each stop through callback. - - The polyline points to march on. - The arc length to march before stopping at the first point. - The max angle between edges to be considered a corner vertex. - Callback when marching algorithm stop at a point. The callback returns the arc length for next stop. - If the asked length is negative, march backwards. If callback returns NaN, finish marching. - - - - Reorders the given list of polylines so that the polyline with a given arc length in the list is the first. - Polylines that preceded this line are concatenated to the end of the list, with the first polyline at the very end. - - A list of polylines. - The arc length in the entire list of polylines at which to find the start line. - The arc length into that line is returned in this variable. - The reordered and wrapped list. - - - - A random generator that supports uniform and Gaussian distributions. - - - - - Generates a pair of independent, standard, normally distributed random numbers, - zero expectation, unit variance, using polar form of the Box-Muller transformation. - - - - - Private constructor. Force to use factory methods. - - - - - Creates a line segment - - - - - Creates a cubic bezier segment from quatratic curve (3 control points) - - - - - Creates a cubic bezier segment with 4 control points. - - - - - Control points of path segment. Length is variant. - Line segment has 2 points, Cubic bezier has 4 points. - - - - - Compares two transforms for an exact match. Transforms with the same value but different structure (e.g. Translate(0,0) and Rotate(0) are not considered equivalent). - - The first transform. - The second transform. - - - - - Specifies the unit of thickness. - - - - - Unit in pixels. - - - - - Unit in percentage relative to the bounding box. - - - - - Provides the base class of a source of geometry. - Generates and caches the geometry based on the input parameters and the layout bounds. - - - A typical implementation will extend the UpdateCachedGeometry() to update this.cachedGeometry. - This base class will then handle the invalidation, pipeline to the geometry effects, and then cache relative to the layout bounds. - An implementation should try to reuse the cached geometry as much as possible to avoid reconstruction in the rendering thread. - An implementation can extend the ComputeLogicalBounds to handle Stretch differently. - - The type of geometry source parameter on which the base class is working on. - - - - Provides an interface to describe the source of a geometry. - - - This interface is designed to expose the geometry source in a non-generic way. - Typical implementation should subclass GeometrySource instead of implementing this interface directly. - - - - - Notifies that the geometry has been invalidated because of external changes. - - - Geometry is typically invalidated when parameters are changed. - If any geometry has been invalidated externally, the geometry will be recomputed even if the layout bounds change. - - - - - Update the geometry using the given parameters and the layout bounds. - Returns false if nothing has been updated. - - - - - Gets or sets the resulting geometry after the latest UpdateGeometry(). - - - - - Gets the bounding box where the geometry should stretch to. - The actual geometry might be smaller or larger than this. - should already take stroke thickness and stretch into consideration. - - - - - Gets the actual bounds of FrameworkElement. - includes logical bounds, stretch, and stroke thickness. - - - - - Specifics the geometry from the previous geometry effect process. - - - - - Notifies that the geometry has been invalidated because of external changes. - - - The geometry is typically invalidated when parameters are changed. - If any geometry has been invalidated externally, the geometry will be recomputed regardless if the layout bounds change. - - - - - Update the geometry based on the given parameters and layoutBounds. - Returns false if the geometry hasn't been changed. - - - - - Extends the way to provide geometry by implementing this function. - Returns true when any of the geometry is changed. - - - - - Extends the way to handle stretch mode. - The default is to always use Stretch.Fill and center stroke. - - - - - Apply the geometry effect when dirty or forced and update this.Geometry. - Otherwise, keep this.Geometry as this.cachedGeometry. - - - - - Gets or sets the resulting geometry after the latest UpdateGeometry(). - - - - - Gets the bounding box that the geometry should stretch to. - The actual geometry might be smaller or larger than this. - should already take stroke thickness and stretch into consideration. - - - - - - Gets the actual bounds of FrameworkElement. - includes logical bounds, stretch and stroke thickness. - - - - - - Arc recognizes Stretch.None as the same as Stretch.Fill, assuming aspect ratio = 1:1. - - - - - Normalize thickness, both relative to the bounding box and the absolute pixel. - Relative thickness = 0 -> full circle radius or clamped. - Relative thickness = 1 -> shrank to a dot, or degenerated. - - - - - The arc is degenerated to a line pointing to center / normal inward. - - - - - Compute a list of angle pairs, defining the ranges in which arc sample should locate. - The return value have 2, 4, or 6 double values, each pair defines a range and they are in the order - to span the angles from given start to end angles. The ranges will break at the self-intersect angle. - If input start/end are within the invalid range between self intersect angle, it will be moved to neighboring self intersect. - - - - - Move angle to 0-90 range. - - - - - Compute all pieces of inner curves with each pair of input angles, and connect them with poly Bezier segments. - The new segments are output to given figure.Segments list from the given index. The start point is output seperately. - - - - - Compute one piece of inner curve with given angle range, and output one piece of smooth curve in format of poly Beizer semgents. - - - - - Compute the parameter (angle) of the self-intersect point for given ellipse with given thickness. - The result is always in first quadrant, and might be 0 or 90 indicating no self-intersect. - Basic algorithm is to binary search for the angle that sample point is not in first quadrant. - - - - - Specifies the direction the arrow points. - - - - - The arrow points to the left. - - - - - The arrow points to the right. - - - - - The arrow points up. - - - - - The arrow points down. - - - - - B - /| - / C--D - A | - \ C--D - \| - B - Algorithm only uses Width/Height assuming top-left at 0,0. - - - - - Specifies the rendering style of a callout shape. - - - - - A rectangular callout. - - - - - A rectangular callout with rounded corners. - - - - - A oval-shaped callout. - - - - - A cloud-shaped callout. - - - - - Updates the edge line, and then connects to the anchor point if necessary. - - - - - Updates the polyline segment, and then connects start, anchor, and end points with the callout style. - - - - - Updates the line segment to a given point. - - - - - Computes the corner points in a clockwise direction, with eight points for the four corners. - - - - - The corner arc is always smaller than a 90-degree arc. - - - - - Provides the base class for GeometryEffect that transforms a geometry into another geometry. - - - This class provides the basic implementation of processing the rendered geometry of a IShape before it's passed to rendering. - A typical implementation will extend the virtual function to transform the input geometry. - is typically attached to as an attached property and activated when geometry is updated. - The of a will replace the rendered geometry in . - - - - - Gets the geometry effect as an attached property on a given dependency object. - - - - - Sets the geometry effect as an attached property on a given dependency object. - - - - - Makes a deep copy of the using its current values. - - - - - Makes a deep copy of the geometry effect. Implements CloneCurrentValue in Silverlight. - - A clone of the current instance of the geometry effect. - - - - Tests if the given geometry effect is equivalent to the current instance. - - A geometry effect to compare with. - Returns true when two effects render with the same appearance. - - - - Specifics the geometry from the previous geometry effect process. - - - - - Invalidates the geometry effect without actually computing the geometry. - Notifies all parent shapes or effects to invalidate accordingly. - - - - - Processes the geometry effect on a given input geometry. - Stores the result in GeometryEffect.OutputGeometry. - - Returns false if nothing has been changed. - - - - Extends the way of updating cachedGeometry based on a given input geometry. - - - - - Notified when detached from a parent chain. - - - - - Notified when attached to a parent chain. - - - - - Invalidates the geometry on a given dependency object when - the object is a valid parent type (IShape or GeometryEffect). - - - - - Implement the Freezable in WPF. - - - - - The default geometry effect that only passes through the input geometry. - - - - - Gets the output geometry of this geometry effect. - - - - - Parent can be either IShape or GeometryEffectGroup. - - - - - Provides the conversion between string and geometry effects. - - - This class enables the brief syntax in XAML like GeometryEffect="Sketch". - Creates a clone of the instance of the geometry effect so it can be used as a resource. - - - - - Builds a preset list of supported geometry effects. - - - - - A GeometryEffect that can be converted from a string type. - - - - - A GeometryEffect that can be converted to a string type. - - - - - Converts a string to a geometry effect. The fallback value is null. - - - - - Converts a geometry effect into a string. The fallback value is null. - - - - - Specifies the reason of being called. - - - - - Geometry has been invalidated because a property has been changed. - - - - - Geometry has been invalidated because a property is being animated. - - - - - Geometry has been invalidated because a child has been invalidated. - - - - - Geometry has been invalidated because a parent has been invalidated. - - - - - Geometry has been invalidated because a new template has been applied. - - - - - Provides helper extension methods to work with IGeometrySource and parameters. - - - - - Specifies the arrow head type. - - - - - No arrow head. - - - - - A triangle arrow head. - - - - - A stealth triangle arrow head. - - - - - An open triangle arrow head. - - - - - An oval arrow head. - - - - - Specifies the corner location. - - - - - On the top left of the bounding box. - - - - - On the top right of the bounding box. - - - - - On the bottom right of the bounding box. - - - - - On the bottom left of the bounding box. - - - - - Polygon recognizes Stretch.None as the same as Stretch.Fill. - - - - - A geometry effect that transforms any geometry into a Sketch style as in SketchFlow. - - - - - Makes a deep copy of the geometry effect. - - A clone of the current instance of the geometry effect. - - - - Tests if the given geometry effect is equivalent to the current instance. - - A geometry effect to compare with. - Returns true when two effects render with the same appearance. - - - - Updating cachedGeometry based on the given input geometry. - - An input geometry. - Returns true when anything on cachedGeometry has been updated. - - - - Use the same random seed on creation to keep visual flickering to a minimum. - - - - - Iterates all simple segments in given path figure including the closing chord. - - - - - Renders an arc shape supporting Arc, Ring, and Pie mode controlled by ArcThickness. - - - - - Platform-neutral implementation of Shape deriving from WPF:Shape or SL:Path. - - - Provides the WPF implementation of Shape that derives from the platform Shape. - - - - - Extends how the shape is drawn with creating geometry source. - - - - - Invalidates the geometry for a . After the invalidation, the will recompute the geometry, which will occur asynchronously. - - - - Provides the behavior for the Measure portion of Silverlight layout pass. Classes can override this method to define their own Measure pass behavior. - The size that this object determines it requires during layout, based on its calculations of child object allotted sizes, or possibly on other considerations such as fixed container size. - The available size that this object can provide to child objects. Infinity () can be specified as a value to indicate that the object will size to whatever content is available. - - In WPF, measure override works from Shape.DefiningGeometry which is not always as expected - see bug 99497 for details where WPF is not having correct measure by default. - - In Silverlight, measure override on Path does not work the same as primitive shape works. - - We should return the smallest size this shape can correctly render without clipping. - By default a shape can render as small as a dot, therefore returning the strokethickness. - - - - Provides the behavior for the Arrange portion of Silverlight layout pass. Classes can override this method to define their own Arrange pass behavior. - The actual size used once the element is arranged in layout. - The final area within the parent that this object should use to arrange itself and its children. - will recompute the Geometry when it's invalidated and update the RenderedGeometry and GeometryMargin. - - - - Occurs when RenderedGeometry is changed. - - - - - Gets the margin between logical bounds and actual geometry bounds. - This can be either positive (as in ) or negative (as in ). - - - - - Gets or sets the start angle. - - The start angle in degrees. Zero degrees is pointing up. - - - - Gets or sets the end angle. - - The end angle in degrees. Zero degrees is pointing up. - - - - Gets or sets the arc thickness. - - The arc thickness in pixels or percentage depending on "ArcThicknessUnit". - - - - Gets or sets the arc thickness unit. - - The arc thickness unit in pixels or percentage. - - - - Renders a block arrow shape that supports resizable arrow head and body. - - - - - Gets or sets the orientation. - - The orientation where the arrow is pointing to. - - - - Gets or sets the arrow head angle. - - The arrow head angle in degrees. - - - - Gets or sets the size of the arrow body. - - The size of the arrow body in pixels. - - - - Renders a regular polygon shape or corresponding star shape with variable number of points. - - - - - Gets or sets the number of points of the . - - - - - Gets or sets the the distance between the center and the innermost point. - - The distance between the center and the innermost point. - - - diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.CoreCompileInputs.cache b/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.CoreCompileInputs.cache index 8bf4c96..e8ed0d0 100644 --- a/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -2d34f3c48377e829bc59c8978eca470276110c8a +a4c554bb3e565264e5920b60215824b2813fbdf9 diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt b/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt index 2bc133e..359b7ff 100644 --- a/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt +++ b/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt @@ -10,6 +10,3 @@ C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIC C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csproj.CoreCompileInputs.cache C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.dll C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.pdb -C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Microsoft.Expression.Controls.xml -C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Microsoft.Expression.Drawing.xml -C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csprojResolveAssemblyReference.cache diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl.csprojResolveAssemblyReference.cache b/SCADA/Program/HMIControl/obj/Debug/HMIControl.csprojResolveAssemblyReference.cache deleted file mode 100644 index e92d1dd..0000000 Binary files a/SCADA/Program/HMIControl/obj/Debug/HMIControl.csprojResolveAssemblyReference.cache and /dev/null differ diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll b/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll index d4bc881..80366a0 100644 Binary files a/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll and b/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll differ diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl.pdb b/SCADA/Program/HMIControl/obj/Debug/HMIControl.pdb index d675661..accd826 100644 Binary files a/SCADA/Program/HMIControl/obj/Debug/HMIControl.pdb and b/SCADA/Program/HMIControl/obj/Debug/HMIControl.pdb differ diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.cache b/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.cache index bcb7c68..f48cecb 100644 --- a/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.cache +++ b/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.cache @@ -4,7 +4,7 @@ library C# .cs -C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\ +C:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\ HMIControl none false @@ -13,7 +13,7 @@ DEBUG;TRACE 1-731644535 90-512523173 -11-893121224 +11287584230 Themes\Generic.xaml; False diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.lref b/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.lref index 5df5c75..bab9694 100644 --- a/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.lref +++ b/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.lref @@ -1,4 +1,4 @@ -C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\GeneratedInternalTypeHelper.g.cs +C:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\GeneratedInternalTypeHelper.g.cs -FC:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\HMIControl\Themes\Generic.xaml;; +FC:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\HMIControl\Themes\Generic.xaml;; diff --git a/SCADA/Program/LinkableControlDesignTime/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SCADA/Program/LinkableControlDesignTime/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 4551930..57834f1 100644 Binary files a/SCADA/Program/LinkableControlDesignTime/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SCADA/Program/LinkableControlDesignTime/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.dll b/SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.dll index a517014..3c7f43c 100644 Binary files a/SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.dll and b/SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.dll differ diff --git a/SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.pdb b/SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.pdb index 32d14f6..bf28321 100644 Binary files a/SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.pdb and b/SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.pdb differ diff --git a/SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.CoreCompileInputs.cache b/SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.CoreCompileInputs.cache index 77b8bd7..fc8b0e2 100644 --- a/SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99cbb2638a4fa4cfd4f7f9645febb014f2625cf2 +b9d6034d4461021ad5adadff79425fce4cb2e7c2 diff --git a/SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csprojResolveAssemblyReference.cache b/SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csprojResolveAssemblyReference.cache index 5d263cc..46722f4 100644 Binary files a/SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csprojResolveAssemblyReference.cache and b/SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csprojResolveAssemblyReference.cache differ diff --git a/SCADA/Program/ModbusDriver/bin/Debug/DataService.dll b/SCADA/Program/ModbusDriver/bin/Debug/DataService.dll index 3acd617..b5e3b74 100644 Binary files a/SCADA/Program/ModbusDriver/bin/Debug/DataService.dll and b/SCADA/Program/ModbusDriver/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/ModbusDriver/bin/Debug/DataService.pdb b/SCADA/Program/ModbusDriver/bin/Debug/DataService.pdb index d051107..4d93a6a 100644 Binary files a/SCADA/Program/ModbusDriver/bin/Debug/DataService.pdb and b/SCADA/Program/ModbusDriver/bin/Debug/DataService.pdb differ diff --git a/SCADA/Program/ModbusDriver/bin/Debug/ModbusDriver.dll b/SCADA/Program/ModbusDriver/bin/Debug/ModbusDriver.dll index e0c1f7b..f3fa420 100644 Binary files a/SCADA/Program/ModbusDriver/bin/Debug/ModbusDriver.dll and b/SCADA/Program/ModbusDriver/bin/Debug/ModbusDriver.dll differ diff --git a/SCADA/Program/ModbusDriver/bin/Debug/ModbusDriver.pdb b/SCADA/Program/ModbusDriver/bin/Debug/ModbusDriver.pdb index c862eb8..18e5313 100644 Binary files a/SCADA/Program/ModbusDriver/bin/Debug/ModbusDriver.pdb and b/SCADA/Program/ModbusDriver/bin/Debug/ModbusDriver.pdb differ diff --git a/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csproj.CoreCompileInputs.cache b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csproj.CoreCompileInputs.cache index 7b3616a..4ffa981 100644 --- a/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d8d2f037fbd09115fd082e3970353bfa8db1fbb3 +d8a3ffd2f3df8493569f3b8907dfbacfcf3ca3c5 diff --git a/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csproj.FileListAbsolute.txt b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csproj.FileListAbsolute.txt index 2cc60ba..496a53d 100644 --- a/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csproj.FileListAbsolute.txt +++ b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csproj.FileListAbsolute.txt @@ -5,3 +5,4 @@ C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\ModbusDriver\bin\Debug\Da C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\ModbusDriver\obj\Debug\ModbusDriver.csproj.CoreCompileInputs.cache C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\ModbusDriver\obj\Debug\ModbusDriver.dll C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\ModbusDriver\obj\Debug\ModbusDriver.pdb +C:\Users\topmail\Source\Repos\SharpSCADA\SCADA\Program\ModbusDriver\obj\Debug\ModbusDriver.csprojResolveAssemblyReference.cache diff --git a/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csprojResolveAssemblyReference.cache b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..9bb0ac8 Binary files /dev/null and b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csprojResolveAssemblyReference.cache differ diff --git a/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.dll b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.dll index e0c1f7b..f3fa420 100644 Binary files a/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.dll and b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.dll differ diff --git a/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.pdb b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.pdb index c862eb8..18e5313 100644 Binary files a/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.pdb and b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.pdb differ diff --git a/SCADA/Program/OPCDriver/bin/Debug/DataService.dll b/SCADA/Program/OPCDriver/bin/Debug/DataService.dll index 3acd617..b5e3b74 100644 Binary files a/SCADA/Program/OPCDriver/bin/Debug/DataService.dll and b/SCADA/Program/OPCDriver/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/OPCDriver/bin/Debug/DataService.pdb b/SCADA/Program/OPCDriver/bin/Debug/DataService.pdb index d051107..4d93a6a 100644 Binary files a/SCADA/Program/OPCDriver/bin/Debug/DataService.pdb and b/SCADA/Program/OPCDriver/bin/Debug/DataService.pdb differ diff --git a/SCADA/Program/OPCDriver/bin/Debug/OPCDriver.dll b/SCADA/Program/OPCDriver/bin/Debug/OPCDriver.dll index c464dde..0b788bd 100644 Binary files a/SCADA/Program/OPCDriver/bin/Debug/OPCDriver.dll and b/SCADA/Program/OPCDriver/bin/Debug/OPCDriver.dll differ diff --git a/SCADA/Program/OPCDriver/bin/Debug/OPCDriver.pdb b/SCADA/Program/OPCDriver/bin/Debug/OPCDriver.pdb index 185eab5..e49432c 100644 Binary files a/SCADA/Program/OPCDriver/bin/Debug/OPCDriver.pdb and b/SCADA/Program/OPCDriver/bin/Debug/OPCDriver.pdb differ diff --git a/SCADA/Program/OPCDriver/bin/Debug/OPCLib.dll b/SCADA/Program/OPCDriver/bin/Debug/OPCLib.dll index ca1b8ad..8f98835 100644 Binary files a/SCADA/Program/OPCDriver/bin/Debug/OPCLib.dll and b/SCADA/Program/OPCDriver/bin/Debug/OPCLib.dll differ diff --git a/SCADA/Program/OPCDriver/bin/Debug/OPCLib.pdb b/SCADA/Program/OPCDriver/bin/Debug/OPCLib.pdb index 64467d2..46e8966 100644 Binary files a/SCADA/Program/OPCDriver/bin/Debug/OPCLib.pdb and b/SCADA/Program/OPCDriver/bin/Debug/OPCLib.pdb differ diff --git a/SCADA/Program/OPCDriver/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SCADA/Program/OPCDriver/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 9dd9513..c731eca 100644 Binary files a/SCADA/Program/OPCDriver/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SCADA/Program/OPCDriver/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csproj.CoreCompileInputs.cache b/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csproj.CoreCompileInputs.cache index fb82ca4..7af70fe 100644 --- a/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d0303af627124edca7f06e91560758c170e87d06 +0c63b581bc79dfb3b59e442a31618c522319aa87 diff --git a/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csprojResolveAssemblyReference.cache b/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csprojResolveAssemblyReference.cache index 1df8178..b3ca5df 100644 Binary files a/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csprojResolveAssemblyReference.cache and b/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csprojResolveAssemblyReference.cache differ diff --git a/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.dll b/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.dll index c464dde..0b788bd 100644 Binary files a/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.dll and b/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.dll differ diff --git a/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.pdb b/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.pdb index 185eab5..e49432c 100644 Binary files a/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.pdb and b/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.pdb differ diff --git a/SCADA/Program/OPCLib/bin/Debug/OPCLib.dll b/SCADA/Program/OPCLib/bin/Debug/OPCLib.dll index 4956da2..8f98835 100644 Binary files a/SCADA/Program/OPCLib/bin/Debug/OPCLib.dll and b/SCADA/Program/OPCLib/bin/Debug/OPCLib.dll differ diff --git a/SCADA/Program/OPCLib/bin/Debug/OPCLib.pdb b/SCADA/Program/OPCLib/bin/Debug/OPCLib.pdb index 1135e69..46e8966 100644 Binary files a/SCADA/Program/OPCLib/bin/Debug/OPCLib.pdb and b/SCADA/Program/OPCLib/bin/Debug/OPCLib.pdb differ diff --git a/SCADA/Program/OPCLib/bin/x86/Debug/OPCLib.dll b/SCADA/Program/OPCLib/bin/x86/Debug/OPCLib.dll index ca1b8ad..e51b30d 100644 Binary files a/SCADA/Program/OPCLib/bin/x86/Debug/OPCLib.dll and b/SCADA/Program/OPCLib/bin/x86/Debug/OPCLib.dll differ diff --git a/SCADA/Program/OPCLib/bin/x86/Debug/OPCLib.pdb b/SCADA/Program/OPCLib/bin/x86/Debug/OPCLib.pdb index 64467d2..2a38de9 100644 Binary files a/SCADA/Program/OPCLib/bin/x86/Debug/OPCLib.pdb and b/SCADA/Program/OPCLib/bin/x86/Debug/OPCLib.pdb differ diff --git a/SCADA/Program/OPCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SCADA/Program/OPCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 0b939b5..c3be8d8 100644 Binary files a/SCADA/Program/OPCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SCADA/Program/OPCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.CoreCompileInputs.cache b/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.CoreCompileInputs.cache index 90649cc..bbaa6d6 100644 --- a/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -94ff0d6d679902c55acc4d7bab4ef7f597b4e0d5 +ebdb88781fc4426d5a4b46df7379bb768a97aaec diff --git a/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.FileListAbsolute.txt b/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.FileListAbsolute.txt index 8e3c3fe..309220d 100644 --- a/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.FileListAbsolute.txt +++ b/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.FileListAbsolute.txt @@ -3,4 +3,3 @@ C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\OPCLib\bin\Debug\OPCLib.p C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\OPCLib\obj\Debug\OPCLib.csproj.CoreCompileInputs.cache C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\OPCLib\obj\Debug\OPCLib.dll C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\OPCLib\obj\Debug\OPCLib.pdb -C:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\OPCLib\obj\Debug\OPCLib.csprojResolveAssemblyReference.cache diff --git a/SCADA/Program/OPCLib/obj/Debug/OPCLib.csprojResolveAssemblyReference.cache b/SCADA/Program/OPCLib/obj/Debug/OPCLib.csprojResolveAssemblyReference.cache deleted file mode 100644 index 39706cc..0000000 Binary files a/SCADA/Program/OPCLib/obj/Debug/OPCLib.csprojResolveAssemblyReference.cache and /dev/null differ diff --git a/SCADA/Program/OPCLib/obj/Debug/OPCLib.dll b/SCADA/Program/OPCLib/obj/Debug/OPCLib.dll index 4956da2..8f98835 100644 Binary files a/SCADA/Program/OPCLib/obj/Debug/OPCLib.dll and b/SCADA/Program/OPCLib/obj/Debug/OPCLib.dll differ diff --git a/SCADA/Program/OPCLib/obj/Debug/OPCLib.pdb b/SCADA/Program/OPCLib/obj/Debug/OPCLib.pdb index 1135e69..46e8966 100644 Binary files a/SCADA/Program/OPCLib/obj/Debug/OPCLib.pdb and b/SCADA/Program/OPCLib/obj/Debug/OPCLib.pdb differ diff --git a/SCADA/Program/OPCLib/obj/OPCLib.csproj.UnmanagedRegistration.cache b/SCADA/Program/OPCLib/obj/OPCLib.csproj.UnmanagedRegistration.cache deleted file mode 100644 index 76fac7b..0000000 Binary files a/SCADA/Program/OPCLib/obj/OPCLib.csproj.UnmanagedRegistration.cache and /dev/null differ diff --git a/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.csproj.CoreCompileInputs.cache b/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.csproj.CoreCompileInputs.cache index 90649cc..bbaa6d6 100644 --- a/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -94ff0d6d679902c55acc4d7bab4ef7f597b4e0d5 +ebdb88781fc4426d5a4b46df7379bb768a97aaec diff --git a/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.dll b/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.dll index ca1b8ad..e51b30d 100644 Binary files a/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.dll and b/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.dll differ diff --git a/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.pdb b/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.pdb index 64467d2..2a38de9 100644 Binary files a/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.pdb and b/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.pdb differ diff --git a/SCADA/Program/SiemensPLCDriver/bin/Debug/DataService.dll b/SCADA/Program/SiemensPLCDriver/bin/Debug/DataService.dll index 3acd617..b5e3b74 100644 Binary files a/SCADA/Program/SiemensPLCDriver/bin/Debug/DataService.dll and b/SCADA/Program/SiemensPLCDriver/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/bin/Debug/DataService.pdb b/SCADA/Program/SiemensPLCDriver/bin/Debug/DataService.pdb index d051107..4d93a6a 100644 Binary files a/SCADA/Program/SiemensPLCDriver/bin/Debug/DataService.pdb and b/SCADA/Program/SiemensPLCDriver/bin/Debug/DataService.pdb differ diff --git a/SCADA/Program/SiemensPLCDriver/bin/Debug/SiemensPLCDriver.dll b/SCADA/Program/SiemensPLCDriver/bin/Debug/SiemensPLCDriver.dll index 0ce6e6b..af10220 100644 Binary files a/SCADA/Program/SiemensPLCDriver/bin/Debug/SiemensPLCDriver.dll and b/SCADA/Program/SiemensPLCDriver/bin/Debug/SiemensPLCDriver.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/bin/Debug/SiemensPLCDriver.pdb b/SCADA/Program/SiemensPLCDriver/bin/Debug/SiemensPLCDriver.pdb index 009e2b6..b6f25cc 100644 Binary files a/SCADA/Program/SiemensPLCDriver/bin/Debug/SiemensPLCDriver.pdb and b/SCADA/Program/SiemensPLCDriver/bin/Debug/SiemensPLCDriver.pdb differ diff --git a/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.csproj.CoreCompileInputs.cache b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.csproj.CoreCompileInputs.cache index a08feb0..9b55066 100644 --- a/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -437f4b93648d81a32c0c8125bce17d49f83fad41 +f8ddefec72dd0c427dd9cfdf82450a14c07684ff diff --git a/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.csprojResolveAssemblyReference.cache b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.csprojResolveAssemblyReference.cache index b822084..71be3e8 100644 Binary files a/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.csprojResolveAssemblyReference.cache and b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.csprojResolveAssemblyReference.cache differ diff --git a/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.dll b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.dll index 0ce6e6b..af10220 100644 Binary files a/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.dll and b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.pdb b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.pdb index 009e2b6..b6f25cc 100644 Binary files a/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.pdb and b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.pdb differ diff --git a/SCADA/Program/TagConfig/TagConfig/TagConfig.csproj b/SCADA/Program/TagConfig/TagConfig/TagConfig.csproj index ce509ab..e642226 100644 --- a/SCADA/Program/TagConfig/TagConfig/TagConfig.csproj +++ b/SCADA/Program/TagConfig/TagConfig/TagConfig.csproj @@ -15,7 +15,7 @@ Client - x86 + AnyCPU true full false diff --git a/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataHelper.dll b/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataHelper.dll index bc853ce..fca336a 100644 Binary files a/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataHelper.dll and b/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataHelper.dll differ diff --git a/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataHelper.pdb b/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataHelper.pdb index 2cdb6f1..68807a0 100644 Binary files a/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataHelper.pdb and b/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataHelper.pdb differ diff --git a/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataService.dll b/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataService.dll index 3acd617..b5e3b74 100644 Binary files a/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataService.dll and b/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataService.pdb b/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataService.pdb index d051107..4d93a6a 100644 Binary files a/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataService.pdb and b/SCADA/Program/TagConfig/TagConfig/bin/Debug/DataService.pdb differ diff --git a/SCADA/Program/TagConfig/TagConfig/bin/Debug/TagConfig.exe b/SCADA/Program/TagConfig/TagConfig/bin/Debug/TagConfig.exe index fe47fba..cf2e1de 100644 Binary files a/SCADA/Program/TagConfig/TagConfig/bin/Debug/TagConfig.exe and b/SCADA/Program/TagConfig/TagConfig/bin/Debug/TagConfig.exe differ diff --git a/SCADA/Program/TagConfig/TagConfig/bin/Debug/TagConfig.pdb b/SCADA/Program/TagConfig/TagConfig/bin/Debug/TagConfig.pdb index 0aa98fe..b551d5c 100644 Binary files a/SCADA/Program/TagConfig/TagConfig/bin/Debug/TagConfig.pdb and b/SCADA/Program/TagConfig/TagConfig/bin/Debug/TagConfig.pdb differ diff --git a/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8b74730..8069b4b 100644 Binary files a/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csproj.CoreCompileInputs.cache b/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csproj.CoreCompileInputs.cache index 69a4b6d..82b383c 100644 --- a/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csproj.CoreCompileInputs.cache +++ b/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -37d92840f4663fb94537a6f798279f10d4cee9e0 +ac35042466c7745c59cd284a38c2e3fc5c6b23ec diff --git a/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csprojResolveAssemblyReference.cache b/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csprojResolveAssemblyReference.cache index 38a4a2e..c035b87 100644 Binary files a/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csprojResolveAssemblyReference.cache and b/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csprojResolveAssemblyReference.cache differ diff --git a/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.exe b/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.exe index fe47fba..cf2e1de 100644 Binary files a/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.exe and b/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.exe differ diff --git a/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.pdb b/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.pdb index 0aa98fe..b551d5c 100644 Binary files a/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.pdb and b/SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.pdb differ