FSE_v1.3.4

3 files changed, 8 insertions, 20 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip
index f3d0a6a13..80fc9f226 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip
@@ -29,10 +29,10 @@
     <ROW Property="ExtractFilesFirst" Value="1"/>
     <ROW Property="LogoIcon" Value="externalui.ico" MultiBuildValue="DefaultBuild:machine_full_0UZ_icon.ico_1" Type="1" MsiKey="LogoIcon"/>
     <ROW Property="Manufacturer" Value="Twine Solutions LTD"/>
-    <ROW Property="ProductCode" Value="1033:{B0F6DD30-8730-4E83-B580-03708F3B2E83} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{80816EFE-FCB8-455B-98FF-11535E448DF6} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango FSE"/>
-    <ROW Property="ProductVersion" Value="1.3.3.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.3.4.0" Type="32"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{0E13CB0D-89F7-465E-9F56-F1CBD6773E6E}"/>
@@ -97,10 +97,6 @@
     <ROW Component="Microsoft.CodeAnalysis.Scripting.dll_1" ComponentId="{D262D06F-31E7-4CAE-9B99-6E0A8D0389EF}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.CodeAnalysis.Scripting.dll_1"/>
     <ROW Component="Microsoft.CodeAnalysis.Workspaces.dll" ComponentId="{49A621D3-E54C-46A2-8A72-BD89E56DE547}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.CodeAnalysis.Workspaces.dll"/>
     <ROW Component="Microsoft.CodeAnalysis.dll_1" ComponentId="{D74916F9-4E71-47FC-99FC-4535D7D867CE}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.CodeAnalysis.dll_1"/>
-    <ROW Component="Microsoft.Data.Edm.dll" ComponentId="{48D510EC-A662-45DF-9EE4-DDC38BC77EFC}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Edm.dll"/>
-    <ROW Component="Microsoft.Data.OData.dll" ComponentId="{0916ABDB-52AA-410D-899B-0E89ED90AD69}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.OData.dll"/>
-    <ROW Component="Microsoft.Data.Services.Client.dll" ComponentId="{259E96BC-E40A-4F26-A72F-E25D9582376E}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Services.Client.dll"/>
-    <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" ComponentId="{9639E91B-464A-4C60-9703-1AAF4503B269}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"/>
     <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" ComponentId="{C8FF51E6-B8BB-401D-BD03-58FD08E4C389}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
     <ROW Component="Microsoft.ML.Core.dll" ComponentId="{A4F31C02-9525-4D41-A19D-C45FAC3A98D1}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.ML.Core.dll"/>
     <ROW Component="Microsoft.ML.CpuMath.dll" ComponentId="{8EBA0173-143A-4AE6-A78B-3A97DFCDAE17}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.ML.CpuMath.dll"/>
@@ -270,7 +266,6 @@
     <ROW Component="System.Security.Cryptography.X509Certificates.dll" ComponentId="{00F4F6C1-6B4D-4DFD-BD59-72EE690FC246}" Directory_="APPDIR" Attributes="0" KeyPath="System.Security.Cryptography.X509Certificates.dll"/>
     <ROW Component="System.Security.Principal.dll" ComponentId="{127424E0-24F8-456F-BBEC-F23E331E1669}" Directory_="APPDIR" Attributes="0" KeyPath="System.Security.Principal.dll"/>
     <ROW Component="System.Security.SecureString.dll" ComponentId="{C40FA779-F72E-4CF2-9A42-368ADB1D05E4}" Directory_="APPDIR" Attributes="0" KeyPath="System.Security.SecureString.dll"/>
-    <ROW Component="System.Spatial.dll" ComponentId="{1CE4DC46-9EDC-4135-BFB5-AD976CC37C2F}" Directory_="APPDIR" Attributes="0" KeyPath="System.Spatial.dll"/>
     <ROW Component="System.Text.Encoding.CodePages.dll_1" ComponentId="{9E367053-E910-4CE6-BE25-3065F9E18374}" Directory_="APPDIR" Attributes="0" KeyPath="System.Text.Encoding.CodePages.dll_1"/>
     <ROW Component="System.Text.Encoding.Extensions.dll" ComponentId="{C177E423-71AE-4FB7-BDC1-1FFF650EFEBC}" Directory_="APPDIR" Attributes="0" KeyPath="System.Text.Encoding.Extensions.dll"/>
     <ROW Component="System.Text.Encoding.dll" ComponentId="{903DBCE1-0C97-4F99-BF85-41B54EF26B33}" Directory_="APPDIR" Attributes="0" KeyPath="System.Text.Encoding.dll"/>
@@ -302,6 +297,7 @@
     <ROW Component="Tango.CodeGeneration.dll" ComponentId="{E40950D1-CDD8-4F4E-B721-350D71AE2FDF}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.CodeGeneration.dll"/>
     <ROW Component="Tango.ColorConversion.dll" ComponentId="{037BA0C3-825A-4F36-8838-58E09596E690}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.ColorConversion.dll"/>
     <ROW Component="Tango.ColorPicker.dll" ComponentId="{4DC739B9-5960-4CF4-9911-BF25E7CC7308}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.ColorPicker.dll"/>
+    <ROW Component="Tango.Colorful.dll" ComponentId="{469E6F2F-3A4D-4CD1-9006-DC03E926C54E}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Colorful.dll"/>
     <ROW Component="Tango.Console.dll" ComponentId="{EA15B4D4-5171-4747-8F7D-0D21CF8CAFD3}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Console.dll"/>
     <ROW Component="Tango.Core.dll" ComponentId="{FEA537DB-7B1F-4B88-940A-9911A4D29057}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Core.dll"/>
     <ROW Component="Tango.DAL.Remote.dll" ComponentId="{62700DCA-5334-45BB-9B3F-1E60D8E1CB51}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.DAL.Remote.dll"/>
@@ -700,7 +696,6 @@
     <ROW File="Z.Expressions.Eval.dll" Component_="Z.Expressions.Eval.dll" FileName="ZEXPRE~1.DLL|Z.Expressions.Eval.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Z.Expressions.Eval.dll" SelfReg="false"/>
     <ROW File="ZSpitz.Util.dll" Component_="ZSpitz.Util.dll" FileName="ZSPITZ~1.DLL|ZSpitz.Util.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\ZSpitz.Util.dll" SelfReg="false"/>
     <ROW File="Google.Protobuf.xml" Component_="Dragablz.xml" FileName="GOOGLE~1.XML|Google.Protobuf.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Google.Protobuf.xml" SelfReg="false"/>
-    <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" FileName="MICRO~25.DLL|Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" SelfReg="false"/>
     <ROW File="Tango.ColorPicker.dll" Component_="Tango.ColorPicker.dll" FileName="TANGOC~1.DLL|Tango.ColorPicker.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.ColorPicker.dll" SelfReg="false"/>
     <ROW File="Tango.ColorPicker.pdb" Component_="Tango.ColorPicker.dll" FileName="TANGOC~1.PDB|Tango.ColorPicker.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.ColorPicker.pdb" SelfReg="false"/>
     <ROW File="Tango.FSE.UsersAndRoles.dll" Component_="Tango.FSE.UsersAndRoles.dll" FileName="TANGO~10.DLL|Tango.FSE.UsersAndRoles.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.FSE.UsersAndRoles.dll" SelfReg="false"/>
@@ -716,16 +711,11 @@
     <ROW File="Tango.FSE.Procedures.dll.config" Component_="Dragablz.xml" FileName="TANGOF~9.CON|Tango.FSE.Procedures.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.FSE.Procedures.dll.config" SelfReg="false"/>
     <ROW File="Tango.FSE.Procedures.pdb" Component_="Tango.FSE.Procedures.dll" FileName="TANGO~11.PDB|Tango.FSE.Procedures.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.FSE.Procedures.pdb" SelfReg="false"/>
     <ROW File="Tango.FSE.Procedures.xml" Component_="Dragablz.xml" FileName="TANGOF~2.XML|Tango.FSE.Procedures.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.FSE.Procedures.xml" SelfReg="false"/>
-    <ROW File="Microsoft.Data.Edm.dll" Component_="Microsoft.Data.Edm.dll" FileName="MICROS~2.DLL|Microsoft.Data.Edm.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Microsoft.Data.Edm.dll" SelfReg="false"/>
-    <ROW File="Microsoft.Data.OData.dll" Component_="Microsoft.Data.OData.dll" FileName="MICRO~21.DLL|Microsoft.Data.OData.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Microsoft.Data.OData.dll" SelfReg="false"/>
-    <ROW File="Microsoft.Data.Services.Client.dll" Component_="Microsoft.Data.Services.Client.dll" FileName="MICRO~24.DLL|Microsoft.Data.Services.Client.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Microsoft.Data.Services.Client.dll" SelfReg="false"/>
-    <ROW File="System.Spatial.dll" Component_="System.Spatial.dll" FileName="SYSTEM~2.DLL|System.Spatial.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\System.Spatial.dll" SelfReg="false"/>
     <ROW File="procdoc.chm" Component_="procdoc.chm" FileName="proc-doc.chm" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\proc-doc.chm" SelfReg="false"/>
     <ROW File="Tango.DAL.Remote.dll" Component_="Tango.DAL.Remote.dll" FileName="TANGOD~1.DLL|Tango.DAL.Remote.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.DAL.Remote.dll" SelfReg="false"/>
     <ROW File="Tango.DAL.Remote.dll.config" Component_="Dragablz.xml" FileName="TANGOD~1.CON|Tango.DAL.Remote.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.DAL.Remote.dll.config" SelfReg="false"/>
     <ROW File="Tango.DAL.Remote.pdb" Component_="Tango.DAL.Remote.dll" FileName="TANGOD~1.PDB|Tango.DAL.Remote.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.DAL.Remote.pdb" SelfReg="false"/>
     <ROW File="Tango.FSE.Common.xml" Component_="Dragablz.xml" FileName="TANGOF~1.XML|Tango.FSE.Common.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.FSE.Common.xml" SelfReg="false"/>
-    <ROW File="Tango.PPC.Shared.xml" Component_="Dragablz.xml" FileName="TANGOP~1.XML|Tango.PPC.Shared.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.PPC.Shared.xml" SelfReg="false"/>
     <ROW File="ZetaIpc.dll" Component_="ZetaIpc.dll" FileName="ZetaIpc.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\ZetaIpc.dll" SelfReg="false"/>
     <ROW File="Microsoft.ML.Core.dll" Component_="Microsoft.ML.Core.dll" FileName="MICRO~26.DLL|Microsoft.ML.Core.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Microsoft.ML.Core.dll" SelfReg="false"/>
     <ROW File="Microsoft.ML.CpuMath.dll" Component_="Microsoft.ML.CpuMath.dll" FileName="MICRO~27.DLL|Microsoft.ML.CpuMath.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Microsoft.ML.CpuMath.dll" SelfReg="false"/>
@@ -782,6 +772,8 @@
     <ROW File="turbojpeg.dll.meta" Component_="turbojpeg.dll.meta" FileName="TURBOJ~1.MET|turbojpeg.dll.meta" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\win7-x64\turbojpeg.dll.meta" SelfReg="false"/>
     <ROW File="turbojpeg.dll_1" Component_="turbojpeg.dll_1" FileName="TURBOJ~1.DLL|turbojpeg.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\win7-x86\turbojpeg.dll" SelfReg="false"/>
     <ROW File="turbojpeg.dll.meta_1" Component_="turbojpeg.dll.meta_1" FileName="TURBOJ~1.MET|turbojpeg.dll.meta" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\win7-x86\turbojpeg.dll.meta" SelfReg="false"/>
+    <ROW File="Tango.Colorful.dll" Component_="Tango.Colorful.dll" FileName="TANGOC~6.DLL|Tango.Colorful.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.Colorful.dll" SelfReg="false"/>
+    <ROW File="Tango.Colorful.pdb" Component_="Tango.Colorful.dll" FileName="TANGOC~6.PDB|Tango.Colorful.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.Colorful.pdb" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.AiRemoveFileComponent">
     <ROW RemoveFile="_" Options="3"/>
@@ -796,7 +788,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\FSE\Release" PackageFileName="Tango FSE v1.3.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Tango FSE v1.3.3"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\FSE\Release" PackageFileName="Tango FSE v1.3.4" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Tango FSE v1.3.4"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -1205,17 +1197,12 @@
     <ROW Feature_="TangoFSE" Component_="Z.EntityFramework.Plus.EF6.dll"/>
     <ROW Feature_="TangoFSE" Component_="Z.Expressions.Eval.dll"/>
     <ROW Feature_="TangoFSE" Component_="ZSpitz.Util.dll"/>
-    <ROW Feature_="TangoFSE" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"/>
     <ROW Feature_="TangoFSE" Component_="Tango.ColorPicker.dll"/>
     <ROW Feature_="TangoFSE" Component_="Tango.FSE.UsersAndRoles.dll"/>
     <ROW Feature_="TangoFSE" Component_="Tango.Visuals.dll"/>
     <ROW Feature_="TangoFSE" Component_="ffmpeg.exe"/>
     <ROW Feature_="TangoFSE" Component_="Tango.CSV.dll"/>
     <ROW Feature_="TangoFSE" Component_="Tango.FSE.Procedures.dll"/>
-    <ROW Feature_="TangoFSE" Component_="Microsoft.Data.Edm.dll"/>
-    <ROW Feature_="TangoFSE" Component_="Microsoft.Data.OData.dll"/>
-    <ROW Feature_="TangoFSE" Component_="Microsoft.Data.Services.Client.dll"/>
-    <ROW Feature_="TangoFSE" Component_="System.Spatial.dll"/>
     <ROW Feature_="TangoFSE" Component_="ZetaIpc.dll"/>
     <ROW Feature_="TangoFSE" Component_="procdoc.chm"/>
     <ROW Feature_="TangoFSE" Component_="Tango.DAL.Remote.dll"/>
@@ -1279,6 +1266,7 @@
     <ROW Feature_="TangoFSE" Component_="Tango.DataStore.EF.dll"/>
     <ROW Feature_="TangoFSE" Component_="Tango.DataStore.Remote.dll"/>
     <ROW Feature_="TangoFSE" Component_="Tango.FSE.MachineConfiguration.dll"/>
+    <ROW Feature_="TangoFSE" Component_="Tango.Colorful.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
     <ROW Name="Tango.FSE.LogViewer.UI.exe" SourcePath="..\..\Graphics\FSE\log_viewer_icon.ico" Index="0"/>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
index 11e51bfda..9966d9a28 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs
index 720c32845..265c63f6c 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango FSE")]
-[assembly: AssemblyVersion("1.3.3.0")] 
+[assembly: AssemblyVersion("1.3.4.0")]