PPC_v1.8.0

5 files changed, 38 insertions, 25 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
index 5fe5afe5a..993ced97e 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index 1700d83b3..15532ddd0 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
@@ -18,10 +18,10 @@
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{E545808E-0A50-4B6E-B321-C861574CD98E} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{B1CAB4DE-703D-4A43-AB88-60A33987A26B} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.7.18.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.8.0.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -77,8 +77,12 @@
     <ROW Component="Microsoft.Azure.Common.NetFramework.dll" ComponentId="{894F089D-C807-489A-8523-388645F4D876}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.Common.NetFramework.dll"/>
     <ROW Component="Microsoft.Azure.Common.dll" ComponentId="{4A8F7880-DE1E-4E8F-80E5-6DE1E14B4702}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.Common.dll"/>
     <ROW Component="Microsoft.Azure.ResourceManager.dll" ComponentId="{A00E27AE-9ED8-413F-9975-8C0B2D4C7BBE}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.ResourceManager.dll"/>
+    <ROW Component="Microsoft.Data.Edm.dll" ComponentId="{09ADCAA2-2E92-41F9-853E-98C26567F294}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Edm.dll"/>
+    <ROW Component="Microsoft.Data.OData.dll" ComponentId="{92F36CF8-8141-4B2E-BD84-F7E897BC56D0}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.OData.dll"/>
+    <ROW Component="Microsoft.Data.Services.Client.dll" ComponentId="{05C9694A-5A1E-41B6-8B4A-0DA28CA82383}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Services.Client.dll"/>
     <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" ComponentId="{4E807C1E-3E7D-4317-A035-1B27AD10B0B8}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
     <ROW Component="Microsoft.ServiceBus.dll" ComponentId="{E66AEAAE-74EA-4AAC-829A-61A0F319FC7C}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.ServiceBus.dll"/>
+    <ROW Component="Microsoft.SqlServer.AzureStorageEnum.dll" ComponentId="{C6FB060B-CB8D-4DE2-90F4-CEABC4DFCC14}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.SqlServer.AzureStorageEnum.dll"/>
     <ROW Component="Microsoft.SqlServer.ConnectionInfo.dll" ComponentId="{133DC46D-3543-4919-B1DE-63F7EADC5B0F}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.SqlServer.ConnectionInfo.dll"/>
     <ROW Component="Microsoft.SqlServer.Diagnostics.STrace.dll" ComponentId="{1CA699BA-7D0E-42BD-B046-4BC50F8D993C}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.SqlServer.Diagnostics.STrace.dll"/>
     <ROW Component="Microsoft.SqlServer.Dmf.Common.dll" ComponentId="{A279AEE9-E55D-41C2-8107-0DCC882D899A}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.SqlServer.Dmf.Common.dll"/>
@@ -136,6 +140,7 @@
     <ROW Component="System.Reactive.Interfaces.dll" ComponentId="{C23DD172-ACE0-4811-90D6-0C2F38B2C27E}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Interfaces.dll"/>
     <ROW Component="System.Reactive.Linq.dll" ComponentId="{572F229C-22E6-4934-BDB9-68600F354F67}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Linq.dll"/>
     <ROW Component="System.Reactive.PlatformServices.dll" ComponentId="{84B191EA-72B0-4FA8-B352-AEF6BBD48F31}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.PlatformServices.dll"/>
+    <ROW Component="System.Spatial.dll" ComponentId="{635889B2-4FD1-45D7-9596-90AA1BAD3FBF}" Directory_="APPDIR" Attributes="0" KeyPath="System.Spatial.dll"/>
     <ROW Component="System.Web.Http.WebHost.dll" ComponentId="{9F1DD6B2-3514-4C62-AACA-EE7368ECB36B}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.WebHost.dll"/>
     <ROW Component="System.Web.Http.dll" ComponentId="{0ABCDC64-DE4A-4994-B4C8-3B0146F68F09}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.dll"/>
     <ROW Component="System.Web.Razor.dll" ComponentId="{231E534C-FAF8-41DD-A21F-B5CACF6AB05F}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Razor.dll"/>
@@ -213,13 +218,12 @@
     <ROW Component="mscoree.dll" ComponentId="{85F439D0-8FD0-4B99-888D-336C7A125E3D}" Directory_="APPDIR" Attributes="0" KeyPath="mscoree.dll"/>
     <ROW Component="msvcp140d.dll" ComponentId="{69E32675-9ACF-4C23-A495-300B78913B66}" Directory_="APPDIR" Attributes="0" KeyPath="msvcp140d.dll"/>
     <ROW Component="protobufnet.dll" ComponentId="{163F1E17-6462-4ABE-BC86-E055F7690139}" Directory_="APPDIR" Attributes="0" KeyPath="protobufnet.dll"/>
-    <ROW Component="turbojpeg.dll" ComponentId="{406A3EFD-3D69-48D6-9302-9FBA3BC5D980}" Directory_="win7x64_Dir" Attributes="256" KeyPath="turbojpeg.dll"/>
-    <ROW Component="turbojpeg.dll.meta" ComponentId="{C64E400B-6C26-404D-82FC-F04127365BDB}" Directory_="win7x64_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta" Type="0"/>
-    <ROW Component="turbojpeg.dll.meta_1" ComponentId="{3C8A5860-F04F-4CA9-838E-4E2DF9B0FE67}" Directory_="win7x86_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta_1" Type="0"/>
-    <ROW Component="turbojpeg.dll_1" ComponentId="{2F6B6281-CEDE-49D5-98B2-361C6E7A5429}" Directory_="win7x86_Dir" Attributes="0" KeyPath="turbojpeg.dll_1"/>
+    <ROW Component="rc.exe" ComponentId="{665BCCC9-C6A4-44D7-BB22-3A1E3A1170AE}" Directory_="APPDIR" Attributes="256" KeyPath="rc.exe"/>
     <ROW Component="ucrtbased.dll" ComponentId="{B8D025EA-CD16-4EE7-A3E7-713E2BE82BF3}" Directory_="APPDIR" Attributes="0" KeyPath="ucrtbased.dll"/>
     <ROW Component="vcruntime140.dll" ComponentId="{144594CC-D19B-45E4-A420-7A1BBB122EE3}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140.dll"/>
     <ROW Component="vcruntime140d.dll" ComponentId="{7653420C-C6C3-4F31-97E8-D6DE417D3DF2}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140d.dll"/>
+    <ROW Component="win7x64" ComponentId="{293E0C76-4301-4717-B716-067CAE445FF0}" Directory_="win7x64_Dir" Attributes="0"/>
+    <ROW Component="win7x86" ComponentId="{5FE0380D-7180-44F5-9C80-42F47B77EB0B}" Directory_="win7x86_Dir" Attributes="0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
     <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0"/>
@@ -486,12 +490,14 @@
     <ROW File="HiraokaHyperTools.PdfSharp.Xps.dll" Component_="HiraokaHyperTools.PdfSharp.Xps.dll" FileName="HIRAOK~2.DLL|HiraokaHyperTools.PdfSharp.Xps.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\HiraokaHyperTools.PdfSharp.Xps.dll" SelfReg="false"/>
     <ROW File="Tango.PDF.dll" Component_="Tango.PDF.dll" FileName="TANGO~17.DLL|Tango.PDF.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PDF.dll" SelfReg="false"/>
     <ROW File="Tango.PDF.pdb" Component_="Tango.PDF.dll" FileName="TANGO~18.PDB|Tango.PDF.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PDF.pdb" SelfReg="false"/>
-    <ROW File="LibGit2Sharp.dll.config" Component_="CommandLine.xml" FileName="LIBGIT~1.CON|LibGit2Sharp.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\LibGit2Sharp.dll.config" SelfReg="false"/>
     <ROW File="Tango.ColorLib_v6.dll" Component_="Tango.ColorLib_v6.dll" FileName="TANGO~18.DLL|Tango.ColorLib_v6.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.ColorLib_v6.dll" SelfReg="false"/>
-    <ROW File="turbojpeg.dll" Component_="turbojpeg.dll" FileName="TURBOJ~1.DLL|turbojpeg.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x64\turbojpeg.dll" SelfReg="false"/>
-    <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\PPC\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\PPC\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\PPC\Release\win7-x86\turbojpeg.dll.meta" SelfReg="false"/>
+    <ROW File="GetVersionTag.bat" Component_="CommandLine.xml" FileName="GETVER~1.BAT|GetVersionTag.bat" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\GetVersionTag.bat" SelfReg="false"/>
+    <ROW File="Microsoft.Data.Edm.dll" Component_="Microsoft.Data.Edm.dll" FileName="MICROS~5.DLL|Microsoft.Data.Edm.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Data.Edm.dll" SelfReg="false"/>
+    <ROW File="Microsoft.Data.OData.dll" Component_="Microsoft.Data.OData.dll" FileName="MICROS~6.DLL|Microsoft.Data.OData.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Data.OData.dll" SelfReg="false"/>
+    <ROW File="Microsoft.Data.Services.Client.dll" Component_="Microsoft.Data.Services.Client.dll" FileName="MICROS~7.DLL|Microsoft.Data.Services.Client.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Data.Services.Client.dll" SelfReg="false"/>
+    <ROW File="Microsoft.SqlServer.AzureStorageEnum.dll" Component_="Microsoft.SqlServer.AzureStorageEnum.dll" FileName="MICROS~9.DLL|Microsoft.SqlServer.AzureStorageEnum.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.SqlServer.AzureStorageEnum.dll" SelfReg="false"/>
+    <ROW File="rc.exe" Component_="rc.exe" FileName="rc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\rc.exe" SelfReg="false" DigSign="true"/>
+    <ROW File="System.Spatial.dll" Component_="System.Spatial.dll" FileName="SYSTE~11.DLL|System.Spatial.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Spatial.dll" SelfReg="false"/>
     <ATTRIBUTE name="DontAddFileAttributes" value="true"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
@@ -501,7 +507,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\PPC" PackageFileName="PPC Installer_v1.7.18 [Coats]" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.7.18 [Coats]"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v1.8.0" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.8.0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -569,6 +575,8 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
     <ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR" ManualDelete="false"/>
     <ROW Directory_="APPDIR" Component_="APPDIR" ManualDelete="true"/>
+    <ROW Directory_="win7x64_Dir" Component_="win7x64" ManualDelete="false"/>
+    <ROW Directory_="win7x86_Dir" Component_="win7x86" ManualDelete="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
     <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
@@ -770,10 +778,14 @@
     <ROW Feature_="MainFeature" Component_="HiraokaHyperTools.PdfSharp.Xps.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.PDF.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.ColorLib_v6.dll"/>
-    <ROW Feature_="MainFeature" Component_="turbojpeg.dll"/>
-    <ROW Feature_="MainFeature" Component_="turbojpeg.dll.meta"/>
-    <ROW Feature_="MainFeature" Component_="turbojpeg.dll_1"/>
-    <ROW Feature_="MainFeature" Component_="turbojpeg.dll.meta_1"/>
+    <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_="rc.exe"/>
+    <ROW Feature_="MainFeature" Component_="System.Spatial.dll"/>
+    <ROW Feature_="MainFeature" Component_="win7x64"/>
+    <ROW Feature_="MainFeature" Component_="win7x86"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
     <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1502"/>
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 53aebff54..abe50222f 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("1.7.18.0")]
+[assembly: AssemblyVersion("1.8.0.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>
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index ef4e3dc1d..647c6f5f8 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -4601,7 +4601,8 @@ Global
 		{D74E49AA-4C6B-4427-BEFF-D7CE2690D059}.Debug|x64.Build.0 = Debug|x64
 		{D74E49AA-4C6B-4427-BEFF-D7CE2690D059}.Debug|x86.ActiveCfg = Debug|Win32
 		{D74E49AA-4C6B-4427-BEFF-D7CE2690D059}.Debug|x86.Build.0 = Debug|Win32
-		{D74E49AA-4C6B-4427-BEFF-D7CE2690D059}.Release|Any CPU.ActiveCfg = Release|Win32
+		{D74E49AA-4C6B-4427-BEFF-D7CE2690D059}.Release|Any CPU.ActiveCfg = Debug|Win32
+		{D74E49AA-4C6B-4427-BEFF-D7CE2690D059}.Release|Any CPU.Build.0 = Debug|Win32
 		{D74E49AA-4C6B-4427-BEFF-D7CE2690D059}.Release|ARM.ActiveCfg = Release|Win32
 		{D74E49AA-4C6B-4427-BEFF-D7CE2690D059}.Release|ARM64.ActiveCfg = Release|Win32
 		{D74E49AA-4C6B-4427-BEFF-D7CE2690D059}.Release|x64.ActiveCfg = Release|x64
@@ -4782,12 +4783,12 @@ Global
 		{D74E49AA-4C6B-4427-BEFF-D7CE2690D059} = {7181F9DE-0760-46B7-AD8F-BDBCAEDEF1B7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		BuildVersion_UseGlobalSettings = False
-		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
-		BuildVersion_StartDate = 2000/1/1
-		BuildVersion_UpdateFileVersion = False
-		BuildVersion_UpdateAssemblyVersion = True
-		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
 		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
+		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
+		BuildVersion_UpdateAssemblyVersion = True
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_StartDate = 2000/1/1
+		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
+		BuildVersion_UseGlobalSettings = False
 	EndGlobalSection
 EndGlobal