Updated version

Updated setup Added SCPUser.exe
SafinWasi · Aug 18, 2016 · b98aabe · b98aabe
1 parent a5fab17
commit b98aabe
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 33 deletions.
diff --git a/Installer/ScpToolkit Setup.aip b/Installer/ScpToolkit Setup.aip
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="12.4.2" version="12.8" Modules="enterprise" RootPath="." Language="en" Id="{4A610BC3-7F32-44FC-9153-310AC8708D94}">
+<DOCUMENT Type="Advanced Installer" CreateVersion="12.4.2" version="13.0" Modules="enterprise" RootPath="." Language="en" Id="{4A610BC3-7F32-44FC-9153-310AC8708D94}">
   <COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
     <ROW Name="HiddenItems" Value="SerValComponent;AutorunComponent;MultipleInstancesComponent;MsiJavaComponent;MsiExtComponent;MsiDriverPackagesComponent;ActSyncAppComponent;MsiMergeModsComponent;DictionaryComponent;MsiEnvComponent;ScheduledTasksComponent;CPLAppletComponent;GameUxComponent;FirewallExceptionComponent;UserAccountsComponent;WebApplicationsComponent;MsiOdbcDataSrcComponent;SqlConnectionComponent;SharePointSlnComponent;SilverlightSlnComponent;MsiDirectEditorComponent"/>
   </COMPONENT>
@@ -309,7 +309,6 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
     <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="1" PackageFolder="Setup Files" PackageFileName="ScpToolkit_Setup" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExeIconPath="..\ScpControlPanel\Dual Shock 3.ico" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" MsiPackageType="AI_ALL"/>
-    <ATTRIBUTE name="CurrentBuild" value="DefaultBuild"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -361,7 +360,7 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiAssemblyNameComponent">
     <ROW Component_="ScpService.exe" Name="Name" Value="ScpService" Sync="false"/>
     <ROW Component_="ScpService.exe" Name="Culture" Value="neutral" Sync="false"/>
-    <ROW Component_="ScpService.exe" Name="Version" Value="1.6.241.16023" Sync="true"/>
+    <ROW Component_="ScpService.exe" Name="Version" Value="1.7.277.16117" Sync="true"/>
     <ROW Component_="ScpService.exe" Name="ProcessorArchitecture" Value="MSIL" Sync="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
@@ -476,6 +475,7 @@
     <ROW Action="AI_DeleteRCadLzma" Type="51" Source="AI_DeleteRLzma" Target="[AI_SETUPEXEPATH]"/>
     <ROW Action="AI_DeleteRLzma" Type="1281" Source="lzmaextractor.dll" Target="DeleteLZMAFiles"/>
     <ROW Action="AI_DpiContentScale" Type="1" Source="aicustact.dll" Target="DpiContentScale"/>
+    <ROW Action="AI_EnableDebugLog" Type="321" Source="aicustact.dll" Target="EnableDebugLog"/>
     <ROW Action="AI_EstimateExtractFiles" Type="1" Source="Prereq.dll" Target="EstimateExtractFiles"/>
     <ROW Action="AI_ExtractCadLzma" Type="51" Source="AI_ExtractLzma" Target="[AI_SETUPEXEPATH]"/>
     <ROW Action="AI_ExtractFiles" Type="1025" Source="Prereq.dll" Target="ExtractSourceFiles" AdditionalSeq="AI_DATA_SETTER"/>
@@ -501,6 +501,7 @@
     <ROW Action="AI_ResolveLocalizedCredentials" Type="1" Source="aicustact.dll" Target="GetLocalizedCredentials"/>
     <ROW Action="AI_RollbackTasks" Type="11521" Source="aischeduler.dll" Target="DeleteTasks" WithoutSeq="true"/>
     <ROW Action="AI_RollbackTasks2" Type="11521" Source="aischeduler2.dll" Target="DeleteTasks" WithoutSeq="true"/>
+    <ROW Action="AI_RunFinishActions" Type="1" Source="aicustact.dll" Target="RunFinishActions" WithoutSeq="true"/>
     <ROW Action="AI_SETPROGRAMFILES" Type="51" Source="AI_ProgramFiles" Target="[ProgramFilesFolder]"/>
     <ROW Action="AI_SETPROGRAMFILES64" Type="51" Source="AI_ProgramFiles" Target="[ProgramFiles64Folder]"/>
     <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
@@ -539,7 +540,7 @@
     <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="747"/>
     <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1501"/>
     <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1399"/>
-    <ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
+    <ROW Action="AI_ResolveKnownFolders" Sequence="54"/>
     <ROW Action="AI_REDIRECT_32BIT_FOLDER" Condition="NOT VersionNT64 AND NOT AI_Disable32BitRedirection" Sequence="798"/>
     <ROW Action="AI_REDIRECT_32BIT_SH_FOLDER" Condition="NOT VersionNT64 AND NOT AI_Disable32BitRedirection" Sequence="799"/>
     <ROW Action="AI_SETPROGRAMFILES64" Condition="VersionNT64" Sequence="748"/>
@@ -552,7 +553,7 @@
     <ROW Action="AI_NativeImageUnInstall" Condition="DISABLEROLLBACK &lt;&gt; 1" Sequence="6252"/>
     <ROW Action="AI_NativeImageUnInstallCommit" Condition="DISABLEROLLBACK = 1" Sequence="6251"/>
     <ROW Action="AI_ConfigPermissions" Condition="REMOVE &lt;&gt; &quot;ALL&quot;" Sequence="5851"/>
-    <ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/>
+    <ROW Action="AI_ResolveLocalizedCredentials" Sequence="52"/>
     <ROW Action="ScpTrayApp.exe" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) ) AND ( !ScpToolkitTrayNotifications = 3 )" Sequence="6601"/>
     <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99" Builds="DefaultBuild"/>
     <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="101" Builds="DefaultBuild"/>
@@ -577,11 +578,12 @@
     <ROW Action="AI_UninstallTasks" Condition="REMOVE=&quot;ALL&quot;" Sequence="1698"/>
     <ROW Action="AI_ProcessTasks2" Condition="(VersionNT &gt;= 600) AND (REMOVE&lt;&gt;&quot;ALL&quot;)" Sequence="1624"/>
     <ROW Action="AI_UninstallTasks2" Condition="(VersionNT &gt;= 600) AND (REMOVE=&quot;ALL&quot;)" Sequence="1699"/>
+    <ROW Action="AI_EnableDebugLog" Sequence="51"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
     <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="747"/>
-    <ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
-    <ROW Action="AI_DpiContentScale" Sequence="52"/>
+    <ROW Action="AI_ResolveKnownFolders" Sequence="54"/>
+    <ROW Action="AI_DpiContentScale" Sequence="53"/>
     <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99"/>
     <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="102"/>
     <ROW Action="AI_SETPROGRAMFILES64" Condition="VersionNT64" Sequence="748"/>
@@ -590,7 +592,8 @@
     <ROW Action="MaintenanceTypeDlg" Condition="AI_MAINT" Sequence="1250" SeqType="3" MsiKey="MaintenanceTypeDlg"/>
     <ROW Action="AI_ChooseTextStyles" Sequence="73"/>
     <ROW Action="AI_AppSearchEx" Sequence="101"/>
-    <ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/>
+    <ROW Action="AI_ResolveLocalizedCredentials" Sequence="52"/>
+    <ROW Action="AI_EnableDebugLog" Sequence="51"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
     <ROW Condition="( Version9X OR ( NOT VersionNT64 ) OR ( VersionNT64 AND ((VersionNT64 &lt;&gt; 502) OR (ServicePackLevel &lt;&gt; 2) OR (MsiNTProductType &lt;&gt; 1)) AND ((VersionNT64 &lt;&gt; 502) OR (ServicePackLevel &lt;&gt; 2) OR (MsiNTProductType = 1)) ) )" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNT64Display]." DescriptionLocId="AI.LaunchCondition.NoSpecificNT64" IsPredefined="true" Builds="DefaultBuild"/>

diff --git a/SCPUser.exe b/SCPUser.exe
diff --git a/ScpCleanWipe/Properties/CommonInfo.cs b/ScpCleanWipe/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.277.16103")]
-[assembly: AssemblyFileVersion("1.7.277.16103")]
+[assembly: AssemblyVersion("1.7.277.16117")]
+[assembly: AssemblyFileVersion("1.7.277.16117")]
diff --git a/ScpControl/Properties/CommonInfo.cs b/ScpControl/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.277.16103")]
-[assembly: AssemblyFileVersion("1.7.277.16103")]
+[assembly: AssemblyVersion("1.7.277.16117")]
+[assembly: AssemblyFileVersion("1.7.277.16117")]
diff --git a/ScpControl/ScpControl.csproj b/ScpControl/ScpControl.csproj
@@ -23,7 +23,7 @@
     <AssemblyInfoVersionSettings>
     </AssemblyInfoVersionSettings>
     <PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
-    <AssemblyVersion>1.7.277.16103</AssemblyVersion>
+    <AssemblyVersion>1.7.277.16117</AssemblyVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/ScpDebugInfoCollector/Properties/CommonInfo.cs b/ScpDebugInfoCollector/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.277.16103")]
-[assembly: AssemblyFileVersion("1.7.277.16103")]
+[assembly: AssemblyVersion("1.7.277.16117")]
+[assembly: AssemblyFileVersion("1.7.277.16117")]
diff --git a/ScpDriverInstaller/Properties/CommonInfo.cs b/ScpDriverInstaller/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.277.16103")]
-[assembly: AssemblyFileVersion("1.7.277.16103")]
+[assembly: AssemblyVersion("1.7.277.16117")]
+[assembly: AssemblyFileVersion("1.7.277.16117")]
diff --git a/ScpGamepadAnalyzer/Properties/CommonInfo.cs b/ScpGamepadAnalyzer/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.277.16103")]
-[assembly: AssemblyFileVersion("1.7.277.16103")]
+[assembly: AssemblyVersion("1.7.277.16117")]
+[assembly: AssemblyFileVersion("1.7.277.16117")]
diff --git a/ScpMonitor/Properties/CommonInfo.cs b/ScpMonitor/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.277.16103")]
-[assembly: AssemblyFileVersion("1.7.277.16103")]
+[assembly: AssemblyVersion("1.7.277.16117")]
+[assembly: AssemblyFileVersion("1.7.277.16117")]
diff --git a/ScpPair/Properties/CommonInfo.cs b/ScpPair/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.277.16103")]
-[assembly: AssemblyFileVersion("1.7.277.16103")]
+[assembly: AssemblyVersion("1.7.277.16117")]
+[assembly: AssemblyFileVersion("1.7.277.16117")]
diff --git a/ScpProfiler/Properties/CommonInfo.cs b/ScpProfiler/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.277.16103")]
-[assembly: AssemblyFileVersion("1.7.277.16103")]
+[assembly: AssemblyVersion("1.7.277.16117")]
+[assembly: AssemblyFileVersion("1.7.277.16117")]
diff --git a/ScpServer/Properties/CommonInfo.cs b/ScpServer/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.277.16103")]
-[assembly: AssemblyFileVersion("1.7.277.16103")]
+[assembly: AssemblyVersion("1.7.277.16117")]
+[assembly: AssemblyFileVersion("1.7.277.16117")]
diff --git a/ScpService/Properties/CommonInfo.cs b/ScpService/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.277.16103")]
-[assembly: AssemblyFileVersion("1.7.277.16103")]
+[assembly: AssemblyVersion("1.7.277.16117")]
+[assembly: AssemblyFileVersion("1.7.277.16117")]
diff --git a/ScpSettings/Properties/CommonInfo.cs b/ScpSettings/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.277.16103")]
-[assembly: AssemblyFileVersion("1.7.277.16103")]
+[assembly: AssemblyVersion("1.7.277.16117")]
+[assembly: AssemblyFileVersion("1.7.277.16117")]
diff --git a/ScpXInputBridge/Properties/CommonInfo.cs b/ScpXInputBridge/Properties/CommonInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.7.277.16103")]
-[assembly: AssemblyFileVersion("1.7.277.16103")]
+[assembly: AssemblyVersion("1.7.277.16117")]
+[assembly: AssemblyFileVersion("1.7.277.16117")]