Eureka Installer.

3 files changed, 42 insertions, 5 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip
index 0f5d18e4d..c3a8d6868 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip
@@ -15,10 +15,10 @@
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="ExtractFilesFirst" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine Solutions LTD"/>
-    <ROW Property="ProductCode" Value="1033:{7C39CD1B-D09C-4B9C-B2A5-D0A9330857FD} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{1F5BA036-DCA1-46C2-9871-B075E1B3A078} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Twine X4"/>
-    <ROW Property="ProductVersion" Value="2.0.1.0" Type="32" TargetFile="Tango.PPC.UI.exe"/>
+    <ROW Property="ProductVersion" Value="2.0.2.0" Type="32" TargetFile="Tango.PPC.UI.exe"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{4D8FDA03-F63E-4002-9A96-4BDE65B04355}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -51,11 +51,13 @@
     <ROW Component="EFCache.dll" ComponentId="{3BFE31B3-158C-47AA-80A9-9FE8E6EB67F5}" Directory_="APPDIR" Attributes="0" KeyPath="EFCache.dll"/>
     <ROW Component="EntityFramework.SqlServer.dll" ComponentId="{728B6CE9-DD44-42CA-8884-95BD5A3466AA}" Directory_="APPDIR" Attributes="0" KeyPath="EntityFramework.SqlServer.dll"/>
     <ROW Component="EntityFramework.dll" ComponentId="{67C07F0F-D157-4DA1-B657-991509D43F57}" Directory_="APPDIR" Attributes="0" KeyPath="EntityFramework.dll"/>
+    <ROW Component="FluentFTP.dll" ComponentId="{C3DD16E3-01F3-4EA6-8BAE-C76FE5BEB694}" Directory_="APPDIR" Attributes="0" KeyPath="FluentFTP.dll"/>
     <ROW Component="FontAwesome.WPF.dll" ComponentId="{DD74F47C-D1FA-42A6-A3CF-715E58B66310}" Directory_="APPDIR" Attributes="0" KeyPath="FontAwesome.WPF.dll"/>
     <ROW Component="GetVersionTag.bat" ComponentId="{E2BA3D62-2C11-409E-8679-8284CDEB99A9}" Directory_="APPDIR" Attributes="0" KeyPath="GetVersionTag.bat" Type="0"/>
     <ROW Component="Google.Protobuf.dll" ComponentId="{43B7CE55-F225-4BD1-97E4-850FD5C984AF}" Directory_="APPDIR" Attributes="0" KeyPath="Google.Protobuf.dll"/>
     <ROW Component="HiraokaHyperTools.PdfSharp.Xps.dll" ComponentId="{9DECD027-E42B-406A-9E63-814E1C379A6B}" Directory_="APPDIR" Attributes="0" KeyPath="HiraokaHyperTools.PdfSharp.Xps.dll"/>
     <ROW Component="HiraokaHyperTools.PdfSharpWPF.dll" ComponentId="{2557B339-79A2-48A7-9E6C-636EF55C295F}" Directory_="APPDIR" Attributes="0" KeyPath="HiraokaHyperTools.PdfSharpWPF.dll"/>
+    <ROW Component="Hyak.Common.dll" ComponentId="{F48428A8-0279-429A-B60A-DF76A70E47E8}" Directory_="APPDIR" Attributes="0" KeyPath="Hyak.Common.dll"/>
     <ROW Component="Interop.MSDASC.dll" ComponentId="{F02E80A8-BDDA-4435-9089-6BC46F362BC5}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="Interop.MSDASC.dll"/>
     <ROW Component="Ionic.Zip.dll" ComponentId="{5EA483CE-3D94-4644-8945-A64E3895B695}" Directory_="APPDIR" Attributes="0" KeyPath="Ionic.Zip.dll"/>
     <ROW Component="JWT.dll" ComponentId="{CBA6AA40-B344-44C8-B54C-94B57A26DF9F}" Directory_="APPDIR" Attributes="0" KeyPath="JWT.dll"/>
@@ -64,8 +66,15 @@
     <ROW Component="LiteDB.dll" ComponentId="{19DC3560-1C92-492E-BD9B-DC36E71185B2}" Directory_="APPDIR" Attributes="0" KeyPath="LiteDB.dll"/>
     <ROW Component="Microsoft.AspNet.SignalR.Client.dll" ComponentId="{8359389B-8413-48E3-9361-27D8DB9744EB}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.AspNet.SignalR.Client.dll"/>
     <ROW Component="Microsoft.Azure.ActiveDirectory.GraphClient.dll" ComponentId="{3925347D-F3C9-4305-B16A-0ED7EC469370}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.ActiveDirectory.GraphClient.dll"/>
+    <ROW Component="Microsoft.Azure.Common.NetFramework.dll" ComponentId="{1A6C9C10-4CBB-4035-BECD-57E7DCA5D682}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.Common.NetFramework.dll"/>
+    <ROW Component="Microsoft.Azure.Common.dll" ComponentId="{9C75A42B-E2D9-42AC-8E0D-9DD77F7909F5}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.Common.dll"/>
+    <ROW Component="Microsoft.Azure.ResourceManager.dll" ComponentId="{6F437382-182A-4715-AAB3-2FB0862F73C2}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.ResourceManager.dll"/>
+    <ROW Component="Microsoft.Data.Edm.dll" ComponentId="{B99E42BE-BF1B-4ABF-AE7E-6BBE29B9A120}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Edm.dll"/>
+    <ROW Component="Microsoft.Data.OData.dll" ComponentId="{6A9CCDC9-9F38-48A3-931B-A0FD4FC04142}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.OData.dll"/>
+    <ROW Component="Microsoft.Data.Services.Client.dll" ComponentId="{C7C4F083-FDF1-45A7-8787-58F0788A3467}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Services.Client.dll"/>
     <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" ComponentId="{33A72E59-DC78-457D-AD80-7BE99191B663}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
     <ROW Component="Microsoft.ServiceBus.dll" ComponentId="{C08F188F-0E73-4FEB-9B56-849D9604E6F4}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.ServiceBus.dll"/>
+    <ROW Component="Microsoft.SqlServer.AzureStorageEnum.dll" ComponentId="{F3633EB3-CB5B-407D-8501-CDDFEAB5AC6F}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.SqlServer.AzureStorageEnum.dll"/>
     <ROW Component="Microsoft.SqlServer.ConnectionInfo.dll" ComponentId="{380CCB99-BE98-425C-A111-9BDF520EB71C}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.SqlServer.ConnectionInfo.dll"/>
     <ROW Component="Microsoft.SqlServer.Diagnostics.STrace.dll" ComponentId="{76B98EF0-711F-4BF4-B463-837C27237626}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.SqlServer.Diagnostics.STrace.dll"/>
     <ROW Component="Microsoft.SqlServer.Dmf.Common.dll" ComponentId="{4EEF836D-0983-4FC1-8A80-2E6741CE5D99}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.SqlServer.Dmf.Common.dll"/>
@@ -117,12 +126,14 @@
     <ROW Component="System.Data.SQLite.EF6.dll" ComponentId="{0DFB0FC1-0100-419F-B556-188FEE5F1DF3}" Directory_="APPDIR" Attributes="0" KeyPath="System.Data.SQLite.EF6.dll"/>
     <ROW Component="System.Data.SQLite.Linq.dll" ComponentId="{2F09659A-7493-4421-B722-CDAFA4EAB33A}" Directory_="APPDIR" Attributes="0" KeyPath="System.Data.SQLite.Linq.dll"/>
     <ROW Component="System.Data.SQLite.dll" ComponentId="{FA4C9531-DADE-4B95-BEDB-778B1D7BDBF0}" Directory_="APPDIR" Attributes="0" KeyPath="System.Data.SQLite.dll"/>
+    <ROW Component="System.IO.Compression.FileSystem.dll" ComponentId="{F165C128-766B-415D-995A-0EF0EAFCB426}" Directory_="APPDIR" Attributes="0" KeyPath="System.IO.Compression.FileSystem.dll"/>
     <ROW Component="System.IdentityModel.Tokens.Jwt.dll" ComponentId="{5C3A6074-5479-472B-B87D-BF6C17F5A610}" Directory_="APPDIR" Attributes="0" KeyPath="System.IdentityModel.Tokens.Jwt.dll"/>
     <ROW Component="System.Net.Http.Formatting.dll" ComponentId="{EFB30A9E-95D8-4092-8172-0D1B9896ACA0}" Directory_="APPDIR" Attributes="0" KeyPath="System.Net.Http.Formatting.dll"/>
     <ROW Component="System.Reactive.Core.dll" ComponentId="{62E95FC6-34DB-4CCA-98FA-340519D8B00A}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Core.dll"/>
     <ROW Component="System.Reactive.Interfaces.dll" ComponentId="{F8ADD7D3-7FA5-4D5A-B6AF-7865E656DF18}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Interfaces.dll"/>
     <ROW Component="System.Reactive.Linq.dll" ComponentId="{CB3B39C5-A09D-41C3-BD3D-2418EDEE1B7E}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Linq.dll"/>
     <ROW Component="System.Reactive.PlatformServices.dll" ComponentId="{FD7A1A65-6497-4392-AA5E-032B1CEAAD0B}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.PlatformServices.dll"/>
+    <ROW Component="System.Spatial.dll" ComponentId="{AB00DDF9-EDFC-4D58-ACEB-22F491765FB0}" Directory_="APPDIR" Attributes="0" KeyPath="System.Spatial.dll"/>
     <ROW Component="System.Web.Http.WebHost.dll" ComponentId="{18DD2F13-E03E-4535-BBDF-3621387564FC}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.WebHost.dll"/>
     <ROW Component="System.Web.Http.dll" ComponentId="{02EE2ED8-EDE7-4DDA-BBCE-77D0998E3815}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.dll"/>
     <ROW Component="System.Web.Razor.dll" ComponentId="{58F85C46-451E-4EE8-8CCF-2052C92FDD1A}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Razor.dll"/>
@@ -144,6 +155,7 @@
     <ROW Component="Tango.Core.dll" ComponentId="{03FFCE4B-103D-471C-9BC4-BA61F308CD50}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Core.dll"/>
     <ROW Component="Tango.DataStore.EF.dll" ComponentId="{0C314E44-E58A-471E-99AB-2AFD99078A99}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.DataStore.EF.dll"/>
     <ROW Component="Tango.DataStore.Editing.dll" ComponentId="{D639C94D-6CA8-495B-B539-5DDD5DB39910}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.DataStore.Editing.dll"/>
+    <ROW Component="Tango.DataStore.Lite.dll" ComponentId="{7CAAB878-0A1E-48E0-AA3E-0E8AF9C2278B}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.DataStore.Lite.dll"/>
     <ROW Component="Tango.DataStore.Remote.dll" ComponentId="{1D14AA13-DFB1-44F8-B462-9D3018593209}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.DataStore.Remote.dll"/>
     <ROW Component="Tango.DataStore.dll" ComponentId="{3AF6B88E-E0FE-4891-92A4-9689590258F4}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.DataStore.dll"/>
     <ROW Component="Tango.Documents.dll" ComponentId="{E5AB4E1D-1AA5-4B59-B12F-A307742242BB}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Documents.dll"/>
@@ -440,6 +452,19 @@
     <ROW File="Tango.PPC.Updater.exe.config" Component_="GetVersionTag.bat" FileName="TANGO~11.CON|Tango.PPC.Updater.exe.config" Attributes="0" SourcePath="..\Build\PPC\Eureka\Tango.PPC.Updater.exe.config" SelfReg="false"/>
     <ROW File="Tango.PPC.Updater.pdb" Component_="Tango.PPC.Updater.exe" FileName="TANGO~15.PDB|Tango.PPC.Updater.pdb" Attributes="0" SourcePath="..\Build\PPC\Eureka\Tango.PPC.Updater.pdb" SelfReg="false"/>
     <ROW File="LibGit2Sharp.dll.config" Component_="GetVersionTag.bat" FileName="LIBGIT~1.CON|LibGit2Sharp.dll.config" Attributes="0" SourcePath="..\Build\PPC\Eureka\LibGit2Sharp.dll.config" SelfReg="false"/>
+    <ROW File="FluentFTP.dll" Component_="FluentFTP.dll" FileName="FLUENT~1.DLL|FluentFTP.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\FluentFTP.dll" SelfReg="false"/>
+    <ROW File="Hyak.Common.dll" Component_="Hyak.Common.dll" FileName="HYAKCO~1.DLL|Hyak.Common.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Hyak.Common.dll" SelfReg="false"/>
+    <ROW File="Microsoft.Azure.Common.dll" Component_="Microsoft.Azure.Common.dll" FileName="MICROS~3.DLL|Microsoft.Azure.Common.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Azure.Common.dll" SelfReg="false"/>
+    <ROW File="Microsoft.Azure.Common.NetFramework.dll" Component_="Microsoft.Azure.Common.NetFramework.dll" FileName="MICROS~4.DLL|Microsoft.Azure.Common.NetFramework.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Azure.Common.NetFramework.dll" SelfReg="false"/>
+    <ROW File="Microsoft.Azure.ResourceManager.dll" Component_="Microsoft.Azure.ResourceManager.dll" FileName="MICROS~5.DLL|Microsoft.Azure.ResourceManager.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Azure.ResourceManager.dll" SelfReg="false"/>
+    <ROW File="Microsoft.Data.Edm.dll" Component_="Microsoft.Data.Edm.dll" FileName="MICRO~34.DLL|Microsoft.Data.Edm.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Data.Edm.dll" SelfReg="false"/>
+    <ROW File="Microsoft.Data.OData.dll" Component_="Microsoft.Data.OData.dll" FileName="MICRO~35.DLL|Microsoft.Data.OData.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Data.OData.dll" SelfReg="false"/>
+    <ROW File="Microsoft.Data.Services.Client.dll" Component_="Microsoft.Data.Services.Client.dll" FileName="MICRO~36.DLL|Microsoft.Data.Services.Client.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Data.Services.Client.dll" SelfReg="false"/>
+    <ROW File="Microsoft.SqlServer.AzureStorageEnum.dll" Component_="Microsoft.SqlServer.AzureStorageEnum.dll" FileName="MICRO~37.DLL|Microsoft.SqlServer.AzureStorageEnum.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.SqlServer.AzureStorageEnum.dll" SelfReg="false"/>
+    <ROW File="System.IO.Compression.FileSystem.dll" Component_="System.IO.Compression.FileSystem.dll" FileName="SYSTE~10.DLL|System.IO.Compression.FileSystem.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.IO.Compression.FileSystem.dll" SelfReg="false"/>
+    <ROW File="System.Spatial.dll" Component_="System.Spatial.dll" FileName="SYSTE~15.DLL|System.Spatial.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Spatial.dll" SelfReg="false"/>
+    <ROW File="Tango.DataStore.Lite.dll" Component_="Tango.DataStore.Lite.dll" FileName="TANGOD~7.DLL|Tango.DataStore.Lite.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Tango.DataStore.Lite.dll" SelfReg="false"/>
+    <ROW File="Tango.DataStore.Lite.pdb" Component_="Tango.DataStore.Lite.dll" FileName="TANGOD~7.PDB|Tango.DataStore.Lite.pdb" Attributes="0" SourcePath="..\Build\PPC\Eureka\Tango.DataStore.Lite.pdb" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
     <ROW BootstrOptKey="GlobalOptions" DownloadFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\prerequisites" Options="2"/>
@@ -448,7 +473,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\Eureka" PackageFileName="TwineX4 Installer_v2.0.1" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="TwineX4 Installer_v2.0.1"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Eureka" PackageFileName="TwineX4 Installer_v2.0.2" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="TwineX4 Installer_v2.0.2"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -706,6 +731,18 @@
     <ROW Feature_="MainFeature" Component_="SHORTCUTDIR"/>
     <ROW Feature_="MainFeature" Component_="Packages"/>
     <ROW Feature_="MainFeature" Component_="Tango.PPC.Updater.exe"/>
+    <ROW Feature_="MainFeature" Component_="FluentFTP.dll"/>
+    <ROW Feature_="MainFeature" Component_="Hyak.Common.dll"/>
+    <ROW Feature_="MainFeature" Component_="Microsoft.Azure.Common.dll"/>
+    <ROW Feature_="MainFeature" Component_="Microsoft.Azure.Common.NetFramework.dll"/>
+    <ROW Feature_="MainFeature" Component_="Microsoft.Azure.ResourceManager.dll"/>
+    <ROW Feature_="MainFeature" Component_="Microsoft.Data.Edm.dll"/>
+    <ROW Feature_="MainFeature" Component_="Microsoft.Data.OData.dll"/>
+    <ROW Feature_="MainFeature" Component_="Microsoft.Data.Services.Client.dll"/>
+    <ROW Feature_="MainFeature" Component_="Microsoft.SqlServer.AzureStorageEnum.dll"/>
+    <ROW Feature_="MainFeature" Component_="System.IO.Compression.FileSystem.dll"/>
+    <ROW Feature_="MainFeature" Component_="System.Spatial.dll"/>
+    <ROW Feature_="MainFeature" Component_="Tango.DataStore.Lite.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
     <ROW Name="Tango.PPC.UI.exe" SourcePath="..\Build\PPC\Eureka\Tango.PPC.UI.exe" Index="0"/>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 1a7c11764..642a5b02f 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.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 PPC Application")] 
-[assembly: AssemblyVersion("2.0.1.0")]
+[assembly: AssemblyVersion("2.0.2.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>