testtset

SCADA/Program/BatchCoreService/BatchCoreService.csproj

@@ -16,7 +16,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -24,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>

SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-6080cfe8593c0c9d5fcccfeb8c3640052bd437c5
+f1b2727345e782f110271ee82700b9082ed28e49

SCADA/Program/BatchCoreTest/BatchCoreTest.csproj

@@ -18,7 +18,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>

SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-8f870430d75db9ee8143342a2c25b6532a883ca4
+fbe2c61a02ac318c9b69cee677c37ec534f30ae7

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

SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-cdb102875275746ea5fdcda2488150436e2946b9
+9ea32ef344283842082bc819e3e1a99b74130c34

SCADA/Program/CoreTest/Example.csproj

@@ -17,7 +17,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -42,26 +42,10 @@
     <Reference Include="DynamicDataDisplay">
       <HintPath>..\..\dll\DynamicDataDisplay.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Expression.Controls, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Microsoft.Expression.Controls.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Expression.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Microsoft.Expression.Drawing.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Microsoft.Expression.Interactions.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xaml">

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

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
 

SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.lref

@@ -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;;
-

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\AlarmSet.xaml;;
-FC:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\Guage.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\MainWindow.xaml;;
-FC:\Users\topmail\source\repos\SharpSCADA\SCADA\Program\CoreTest\TagMonitor.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\Trend.xaml;;
 

SCADA/Program/CoreTest/obj/x86/Debug/Example.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-5318ee07a41f3aa39afacd0709de27f42868fcd2
+cbfcb323c084da99bed7fe68a3300c0f30a640d3

SCADA/Program/DataExchange.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
+# Visual Studio 15
-VisualStudioVersion = 14.0.25420.1
+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.ActiveCfg = Debug|Any CPU
-		{0EC75DA7-20C7-4986-82E5-DB011C6E961B}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{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.ActiveCfg = Debug|Any CPU
-		{755C5459-BCA4-4729-A93C-0C73A41BDF3C}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{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.ActiveCfg = Debug|Any CPU
-		{8965E389-6466-4B30-BD43-83C909044637}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{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

SCADA/Program/DataHelper/DataHelper.csproj

@@ -112,7 +112,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <CodeAnalysisLogFile>bin\Debug\DataHelper.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>

SCADA/Program/DataHelper/bin/Debug/DataHelper.dll.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   
 <system.data>
@@ -6,4 +6,4 @@
       <remove invariant="MySql.Data.MySqlClient" />
       <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
     </DbProviderFactories>
-  </system.data><startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
+  </system.data></configuration>

SCADA/Program/DataHelper/obj/Debug/DataHelper.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-a9e2b14000cda020bceead90a03e7707b164fdc8
+4aebc7cc6bed2f31edb1136400f9bfa4b087c5e3

SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-a9e2b14000cda020bceead90a03e7707b164fdc8
+4aebc7cc6bed2f31edb1136400f9bfa4b087c5e3

SCADA/Program/DataService/DataService.csproj

@@ -93,7 +93,7 @@
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Team Tools\Static Analysis Tools\Rule Sets\MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>

SCADA/Program/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-37366c5428b821d56d9c45d667247ca4584c98a4
+7374bf6f6afbd55e516cd27b0122952ca2562b4d

SCADA/Program/DataService/obj/x86/Debug/DataService.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-37366c5428b821d56d9c45d667247ca4584c98a4
+7374bf6f6afbd55e516cd27b0122952ca2562b4d

SCADA/Program/FileDriver/obj/Debug/FileDriver.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-e2af3000a18187d07bdeb999fc919c83061410fc
+adb797c36e5e129b89b0aa2e48ee353ce11bd102

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