merge

app/TaskFlow.sln

@@ -5,35 +5,60 @@ VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\SetupVS19.wixproj", "{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TaskFlow", "TaskFlow\TaskFlow.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "taskFLOW", "TaskFlow\taskFLOW.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		CD_ROM|Any CPU = CD_ROM|Any CPU
 		CD_ROM|x86 = CD_ROM|x86
+		Debug|Any CPU = Debug|Any CPU
 		Debug|x86 = Debug|x86
+		DVD-5|Any CPU = DVD-5|Any CPU
 		DVD-5|x86 = DVD-5|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x86 = Release|x86
+		SingleImage|Any CPU = SingleImage|Any CPU
 		SingleImage|x86 = SingleImage|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.CD_ROM|Any CPU.ActiveCfg = Debug|x86
+		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.CD_ROM|Any CPU.Build.0 = Debug|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.CD_ROM|x86.ActiveCfg = Release|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.CD_ROM|x86.Build.0 = Release|x86
+		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Debug|Any CPU.Build.0 = Debug|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Debug|x86.ActiveCfg = Debug|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Debug|x86.Build.0 = Debug|x86
+		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.DVD-5|Any CPU.ActiveCfg = Debug|x86
+		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.DVD-5|Any CPU.Build.0 = Debug|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.DVD-5|x86.ActiveCfg = Debug|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.DVD-5|x86.Build.0 = Debug|x86
+		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Release|Any CPU.ActiveCfg = Release|x86
+		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Release|Any CPU.Build.0 = Release|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Release|x86.ActiveCfg = Release|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Release|x86.Build.0 = Release|x86
+		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.SingleImage|Any CPU.ActiveCfg = Debug|x86
+		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.SingleImage|Any CPU.Build.0 = Debug|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.SingleImage|x86.ActiveCfg = Release|x86
 		{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.SingleImage|x86.Build.0 = Release|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.CD_ROM|Any CPU.ActiveCfg = Release|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.CD_ROM|Any CPU.Build.0 = Release|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.CD_ROM|x86.ActiveCfg = Debug|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.CD_ROM|x86.Build.0 = Debug|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Debug|Any CPU.Build.0 = Debug|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Debug|x86.ActiveCfg = Debug|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Debug|x86.Build.0 = Debug|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.DVD-5|Any CPU.ActiveCfg = Debug|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.DVD-5|Any CPU.Build.0 = Debug|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.DVD-5|x86.ActiveCfg = Debug|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.DVD-5|x86.Build.0 = Debug|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Release|Any CPU.ActiveCfg = Release|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Release|Any CPU.Build.0 = Release|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Release|x86.ActiveCfg = Release|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Release|x86.Build.0 = Release|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|Any CPU.ActiveCfg = Release|x86
+		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|Any CPU.Build.0 = Release|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.ActiveCfg = Debug|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.Build.0 = Debug|x86
 	EndGlobalSection

app/TaskFlow/App.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
@@ -8,6 +8,9 @@
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
       <section name="DD_ProcessManager.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     </sectionGroup>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
   <applicationSettings>
     <DD_ProcessManager.My.MySettings>
@@ -29,31 +32,40 @@
         <value>Custom/Digital Data</value>
       </setting>
       <setting name="TouchUI" serializeAs="String">
-        <value></value>
+        <value>
+        </value>
       </setting>
       <setting name="TouchScaleFactor" serializeAs="String">
-        <value></value>
+        <value>
+        </value>
       </setting>
       <setting name="DirectX" serializeAs="String">
-        <value></value>
+        <value>
+        </value>
       </setting>
       <setting name="RegisterUserSkins" serializeAs="String">
-        <value></value>
+        <value>
+        </value>
       </setting>
       <setting name="FontBehavior" serializeAs="String">
-        <value></value>
+        <value>
+        </value>
       </setting>
       <setting name="DefaultAppFont" serializeAs="String">
-        <value></value>
+        <value>
+        </value>
       </setting>
       <setting name="DPIAwarenessMode" serializeAs="String">
-        <value></value>
+        <value>
+        </value>
       </setting>
       <setting name="CompactUI" serializeAs="String">
-        <value></value>
+        <value>
+        </value>
       </setting>
       <setting name="RegisterBonusSkins" serializeAs="String">
-        <value></value>
+        <value>
+        </value>
       </setting>
       <setting name="CustomPaletteCollection" serializeAs="Xml">
         <value>
@@ -146,7 +158,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.3.1.0" newVersion="14.3.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -172,6 +184,41 @@
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.1.0" newVersion="14.3.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14.Imaging" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.1.0" newVersion="14.3.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <entityFramework>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+      <provider invariantName="FirebirdSql.Data.FirebirdClient" type="EntityFramework.Firebird.FbProviderServices, EntityFramework.Firebird" />
+    </providers>
+    <defaultConnectionFactory type="EntityFramework.Firebird.FbConnectionFactory, EntityFramework.Firebird" />
+  </entityFramework>
 </configuration>