PPC_v1.2.5

3 files changed, 7 insertions, 70 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 9453b5c13..5fe5afe5a 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 fddb0fccf..00c6db16f 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
@@ -45,22 +45,8 @@
     <ROW Directory="SHORTCUTDIR" Directory_Parent="TARGETDIR" DefaultDir="SHORTC~1|SHORTCUTDIR" IsPseudoRoot="1"/>
     <ROW Directory="SQLExaminer_Dir" Directory_Parent="APPDIR" DefaultDir="SQLEXA~1|SQLExaminer" DirectoryOptions="3"/>
     <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
-    <ROW Directory="alpine.3.9x64_Dir" Directory_Parent="lib_Dir" DefaultDir="ALPINE~1.9-X|alpine.3.9-x64" DirectoryOptions="3"/>
-    <ROW Directory="alpinex64_Dir" Directory_Parent="lib_Dir" DefaultDir="ALPINE~1|alpine-x64" DirectoryOptions="3"/>
-    <ROW Directory="debian.9x64_Dir" Directory_Parent="lib_Dir" DefaultDir="DEBIAN~1.9-X|debian.9-x64" DirectoryOptions="3"/>
-    <ROW Directory="debianarm64_Dir" Directory_Parent="lib_Dir" DefaultDir="DEBIAN~1|debian-arm64" DirectoryOptions="3"/>
-    <ROW Directory="fedorax64_Dir" Directory_Parent="lib_Dir" DefaultDir="FEDORA~1|fedora-x64" DirectoryOptions="3"/>
-    <ROW Directory="lib_Dir" Directory_Parent="APPDIR" DefaultDir="lib" DirectoryOptions="3"/>
-    <ROW Directory="linuxx64_Dir" Directory_Parent="lib_Dir" DefaultDir="LINUX-~1|linux-x64" DirectoryOptions="3"/>
-    <ROW Directory="osx_Dir" Directory_Parent="lib_Dir" DefaultDir="osx" DirectoryOptions="3"/>
-    <ROW Directory="rhelx64_Dir" Directory_Parent="lib_Dir" DefaultDir="rhel-x64" DirectoryOptions="3"/>
-    <ROW Directory="ubuntu.16.04arm64_Dir" Directory_Parent="lib_Dir" DefaultDir="UBUNTU~1.04-|ubuntu.16.04-arm64" DirectoryOptions="3"/>
-    <ROW Directory="ubuntu.18.04x64_Dir" Directory_Parent="lib_Dir" DefaultDir="UBUNTU~2.04-|ubuntu.18.04-x64" DirectoryOptions="3"/>
-    <ROW Directory="win32_Dir" Directory_Parent="lib_Dir" DefaultDir="win32" DirectoryOptions="3"/>
     <ROW Directory="win7x64_Dir" Directory_Parent="APPDIR" DefaultDir="win7-x64" DirectoryOptions="3"/>
     <ROW Directory="win7x86_Dir" Directory_Parent="APPDIR" DefaultDir="win7-x86" DirectoryOptions="3"/>
-    <ROW Directory="x64_Dir" Directory_Parent="win32_Dir" DefaultDir="x64" DirectoryOptions="3"/>
-    <ROW Directory="x86_Dir" Directory_Parent="win32_Dir" DefaultDir="x86" DirectoryOptions="3"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
     <ROW Component="AI_CustomARPName" ComponentId="{EE79DF51-F4B7-472B-8A12-4685CDAAE068}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName" Options="1"/>
@@ -201,7 +187,6 @@
     <ROW Component="Tango.PPC.MachineSettings.dll" ComponentId="{1FD6EEEA-0DE3-4ED2-A3BB-033E5F0E1F4D}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.MachineSettings.dll"/>
     <ROW Component="Tango.PPC.Maintenance.dll" ComponentId="{F5E90747-F99F-493B-8CA5-0929FBE77C13}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.Maintenance.dll"/>
     <ROW Component="Tango.PPC.Packages.Auth2.dll" ComponentId="{9D638EFF-9BDF-4903-AFB5-8015EB34B6F2}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.Auth2.dll"/>
-    <ROW Component="Tango.PPC.Packages.CefInstaller.dll" ComponentId="{EB7A5008-6488-43B7-97E1-3B6E43315BBB}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.CefInstaller.dll"/>
     <ROW Component="Tango.PPC.Packages.JobRunsStartTimePatch.dll" ComponentId="{F680010B-E063-428A-84C7-1FEB9E253502}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.JobRunsStartTimePatch.dll"/>
     <ROW Component="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" ComponentId="{B588371F-F16E-495E-83EC-CA7089242B07}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" Type="0"/>
     <ROW Component="Tango.PPC.Packages.SamplePostPackage.dll" ComponentId="{B5384C95-9D5A-48EE-A938-DBFE32FC2E25}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.SamplePostPackage.dll"/>
@@ -228,28 +213,14 @@
     <ROW Component="Tango.WiFi.dll" ComponentId="{8082C9BD-5BDB-4C52-BCA6-E8604D4D232B}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.WiFi.dll"/>
     <ROW Component="WebRtc.NET.dll" ComponentId="{11563A6C-E1FC-4578-8BDD-8A8C30677126}" Directory_="APPDIR" Attributes="0" KeyPath="WebRtc.NET.dll"/>
     <ROW Component="WindowsInput.dll" ComponentId="{916884AD-CD7D-4AB0-8B3B-A2205ACFBDF4}" Directory_="APPDIR" Attributes="0" KeyPath="WindowsInput.dll"/>
-    <ROW Component="git2106a5f2.dll" ComponentId="{6FF033EA-FA6D-46E3-8BAC-ACF8E58ECA32}" Directory_="x64_Dir" Attributes="256" KeyPath="git2106a5f2.dll"/>
-    <ROW Component="git2106a5f2.dll_1" ComponentId="{820A696D-246B-4C9C-A4D0-FE5233D91931}" Directory_="x86_Dir" Attributes="0" KeyPath="git2106a5f2.dll_1"/>
-    <ROW Component="libgit2106a5f2.dylib" ComponentId="{F477C4C4-1FCC-45F7-A415-F44C45229395}" Directory_="osx_Dir" Attributes="0" KeyPath="libgit2106a5f2.dylib" Type="0"/>
-    <ROW Component="libgit2106a5f2.so" ComponentId="{40FB6E4B-5B7B-4CAF-B913-A9026876C2B6}" Directory_="alpinex64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_1" ComponentId="{CC29599F-8275-4140-85F1-0EB01A19DBA7}" Directory_="alpine.3.9x64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_1" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_2" ComponentId="{57C74BD5-3442-4D8F-8F4D-0FB538CD6497}" Directory_="debianarm64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_2" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_3" ComponentId="{EF568E0F-CB24-41CF-BB97-28E0F1EE3FDE}" Directory_="debian.9x64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_3" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_4" ComponentId="{06CA451E-96BA-426B-91D6-5F8FC9CDB024}" Directory_="fedorax64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_4" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_5" ComponentId="{BE66CDCE-0644-4CAC-AE4F-9892D784CAA4}" Directory_="linuxx64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_5" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_6" ComponentId="{726C86FC-6C15-445F-B877-5911CA108742}" Directory_="rhelx64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_6" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_7" ComponentId="{DA0E2B82-325E-47B0-B9E5-86BD72ED39BE}" Directory_="ubuntu.16.04arm64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_7" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_8" ComponentId="{9568C112-4E7D-468E-9BAB-6BB9BFC1C264}" Directory_="ubuntu.18.04x64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_8" Type="0"/>
     <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="{B478DD6D-C6E9-4E97-AA32-B55043FD6DF8}" Directory_="win7x64_Dir" Attributes="256" KeyPath="turbojpeg.dll"/>
-    <ROW Component="turbojpeg.dll.meta" ComponentId="{A23A0095-43FB-4BA2-9C9B-645B2687FF76}" Directory_="win7x64_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta" Type="0"/>
-    <ROW Component="turbojpeg.dll.meta_1" ComponentId="{FBEF5332-37EB-400D-A351-EBBA000CFF6C}" Directory_="win7x86_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta_1" Type="0"/>
-    <ROW Component="turbojpeg.dll_1" ComponentId="{0B6886FB-4BBD-4C48-A62F-2D4E438CD9CB}" Directory_="win7x86_Dir" Attributes="0" KeyPath="turbojpeg.dll_1"/>
     <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="{BE9A5A00-9444-4500-B12B-09334F87EB17}" Directory_="win7x64_Dir" Attributes="0"/>
+    <ROW Component="win7x86" ComponentId="{6173EB37-D10F-4B57-8C20-63AB19CF6D7E}" 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"/>
@@ -462,8 +433,6 @@
     <ROW File="Tango.PPC.Maintenance.dll" Component_="Tango.PPC.Maintenance.dll" FileName="TANGO~11.DLL|Tango.PPC.Maintenance.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Maintenance.dll" SelfReg="false"/>
     <ROW File="Tango.PPC.Maintenance.dll.config" Component_="CommandLine.xml" FileName="TANGO~13.CON|Tango.PPC.Maintenance.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Maintenance.dll.config" SelfReg="false"/>
     <ROW File="Tango.PPC.Maintenance.pdb" Component_="Tango.PPC.Maintenance.dll" FileName="TANGO~15.PDB|Tango.PPC.Maintenance.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Maintenance.pdb" SelfReg="false"/>
-    <ROW File="Tango.PPC.Packages.CefInstaller.dll" Component_="Tango.PPC.Packages.CefInstaller.dll" FileName="TANGOP~3.DLL|Tango.PPC.Packages.CefInstaller.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.CefInstaller.dll" SelfReg="false"/>
-    <ROW File="Tango.PPC.Packages.CefInstaller.pdb" Component_="Tango.PPC.Packages.CefInstaller.dll" FileName="TANGOP~3.PDB|Tango.PPC.Packages.CefInstaller.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.CefInstaller.pdb" SelfReg="false"/>
     <ROW File="Tango.PPC.Browser.dll" Component_="Tango.PPC.Browser.dll" FileName="TANGO~12.DLL|Tango.PPC.Browser.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Browser.dll" SelfReg="false"/>
     <ROW File="Tango.PPC.Browser.dll.config" Component_="CommandLine.xml" FileName="TANGO~14.CON|Tango.PPC.Browser.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Browser.dll.config" SelfReg="false"/>
     <ROW File="Tango.PPC.Browser.pdb" Component_="Tango.PPC.Browser.dll" FileName="TANGO~16.PDB|Tango.PPC.Browser.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Browser.pdb" SelfReg="false"/>
@@ -524,25 +493,6 @@
     <ROW File="Tango.DataStore.Remote.pdb" Component_="Tango.DataStore.Remote.dll" FileName="TANGOD~6.PDB|Tango.DataStore.Remote.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.DataStore.Remote.pdb" SelfReg="false"/>
     <ROW File="Tango.DataStore.Editing.dll" Component_="Tango.DataStore.Editing.dll" FileName="TANGOD~7.DLL|Tango.DataStore.Editing.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.DataStore.Editing.dll" SelfReg="false"/>
     <ROW File="Tango.DataStore.Editing.pdb" Component_="Tango.DataStore.Editing.dll" FileName="TANGOD~7.PDB|Tango.DataStore.Editing.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.DataStore.Editing.pdb" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so" Component_="libgit2106a5f2.so" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\alpine-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_1" Component_="libgit2106a5f2.so_1" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\alpine.3.9-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_2" Component_="libgit2106a5f2.so_2" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\debian-arm64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_3" Component_="libgit2106a5f2.so_3" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\debian.9-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_4" Component_="libgit2106a5f2.so_4" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\fedora-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_5" Component_="libgit2106a5f2.so_5" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\linux-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.dylib" Component_="libgit2106a5f2.dylib" FileName="LIBGIT~1.DYL|libgit2-106a5f2.dylib" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\osx\libgit2-106a5f2.dylib" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_6" Component_="libgit2106a5f2.so_6" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\rhel-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_7" Component_="libgit2106a5f2.so_7" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\ubuntu.16.04-arm64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_8" Component_="libgit2106a5f2.so_8" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\ubuntu.18.04-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="git2106a5f2.dll" Component_="git2106a5f2.dll" FileName="GIT2-1~1.DLL|git2-106a5f2.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\win32\x64\git2-106a5f2.dll" SelfReg="false"/>
-    <ROW File="git2106a5f2.pdb" Component_="git2106a5f2.dll" FileName="GIT2-1~1.PDB|git2-106a5f2.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\win32\x64\git2-106a5f2.pdb" SelfReg="false"/>
-    <ROW File="git2106a5f2.dll_1" Component_="git2106a5f2.dll_1" FileName="GIT2-1~1.DLL|git2-106a5f2.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\win32\x86\git2-106a5f2.dll" SelfReg="false"/>
-    <ROW File="git2106a5f2.pdb_1" Component_="git2106a5f2.dll_1" FileName="GIT2-1~1.PDB|git2-106a5f2.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\win32\x86\git2-106a5f2.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="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"/>
     <ATTRIBUTE name="DontAddFileAttributes" value="true"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
@@ -620,6 +570,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]"/>
@@ -766,7 +718,6 @@
     <ROW Feature_="MainFeature" Component_="Tango.PPC.Jobs.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.PPC.MachineSettings.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.PPC.Maintenance.dll"/>
-    <ROW Feature_="MainFeature" Component_="Tango.PPC.Packages.CefInstaller.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.PPC.Packages.SamplePostPackage.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.PPC.Packages.SamplePrePackage.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.PPC.Storage.dll"/>
@@ -825,22 +776,8 @@
     <ROW Feature_="MainFeature" Component_="Tango.DataStore.Lite.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.DataStore.Remote.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.DataStore.Editing.dll"/>
-    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so"/>
-    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_1"/>
-    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_2"/>
-    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_3"/>
-    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_4"/>
-    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_5"/>
-    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.dylib"/>
-    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_6"/>
-    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_7"/>
-    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_8"/>
-    <ROW Feature_="MainFeature" Component_="git2106a5f2.dll"/>
-    <ROW Feature_="MainFeature" Component_="git2106a5f2.dll_1"/>
-    <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_="win7x86"/>
+    <ROW Feature_="MainFeature" Component_="win7x64"/>
   </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/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>