diff options
4 files changed, 8 insertions, 5 deletions
diff --git a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer-cache/cacheIndex.txt Binary files differindex a603ff06b..5fe5afe5a 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer-cache/cacheIndex.txt +++ b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer-cache/cacheIndex.txt diff --git a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip index bd2123d11..8338621c4 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:{30AC5C61-FED2-4AFC-9E54-D7B94CD2FCEF} " Type="16"/> + <ROW Property="ProductCode" Value="1033:{D0752EE1-3C54-46E7-8082-CFE1708B297D} " Type="16"/> <ROW Property="ProductLanguage" Value="1033"/> <ROW Property="ProductName" Value="Twine X4"/> - <ROW Property="ProductVersion" Value="2.2.3.0" Type="32" TargetFile="Tango.PPC.UI.exe"/> + <ROW Property="ProductVersion" Value="2.2.4.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="-"/> @@ -75,6 +75,7 @@ <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.Platform.dll" ComponentId="{F3BD6431-D8D8-4A6D-B8CF-7B085505C301}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.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"/> @@ -672,6 +673,7 @@ <ROW File="System.Xml.XPath.dll" Component_="System.Xml.XPath.dll" FileName="SYST~108.DLL|System.Xml.XPath.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Xml.XPath.dll" SelfReg="false"/> <ROW File="System.Xml.XPath.XDocument.dll" Component_="System.Xml.XPath.XDocument.dll" FileName="SYST~109.DLL|System.Xml.XPath.XDocument.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Xml.XPath.XDocument.dll" 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="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" FileName="MICRO~39.DLL|Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" SelfReg="false"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent"> <ROW BootstrOptKey="GlobalOptions" DownloadFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\prerequisites" Options="2"/> @@ -680,7 +682,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.2.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="TwineX4 Installer_v2.2.3"/> + <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Eureka" PackageFileName="TwineX4 Installer_v2.2.4" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="TwineX4 Installer_v2.2.4"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent"> <ROW Path="<AI_DICTS>ui.ail"/> @@ -1052,6 +1054,7 @@ <ROW Feature_="MainFeature" Component_="System.Xml.XmlSerializer.dll"/> <ROW Feature_="MainFeature" Component_="System.Xml.XPath.dll"/> <ROW Feature_="MainFeature" Component_="System.Xml.XPath.XDocument.dll"/> + <ROW Feature_="MainFeature" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.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 3daa9b549..00dacd706 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.2.3.0")] +[assembly: AssemblyVersion("2.2.4.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> |