Modified and updated setup

nefarius · Dec 6, 2015 · 0e40aa7 · 0e40aa7
1 parent ada7db9
commit 0e40aa7
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 25 deletions.
diff --git a/Installer/ScpToolkit Setup.aip b/Installer/ScpToolkit Setup.aip
@@ -14,10 +14,10 @@
     <ROW Property="ARPURLUPDATEINFO" Value="https://github.com/nefarius/ScpServer/releases"/>
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="Manufacturer" Value="Nefarius Software Solutions"/>
-    <ROW Property="ProductCode" Value="1033:{341ECD90-8C59-4218-9B83-87D464A5CCC5} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{FCB18730-19B8-4BBF-8D2D-65C377A4BC19} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="ScpToolkit"/>
-    <ROW Property="ProductVersion" Value="1.6.180.15340" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.6.181.15340" Type="32"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{541750FB-F05E-4F6A-AB9A-69A633D3D681}"/>
@@ -471,6 +471,7 @@
     <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[AI_ProgramFiles][Manufacturer]\[ProductName]"/>
     <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
     <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
+    <ROW Action="ScpTrayApp.exe" Type="210" Source="ScpTrayApp.exe"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
     <ROW Name="DualShock3.exe" SourcePath="..\ScpControlPanel\Dual Shock 3.ico" Index="0"/>
@@ -506,6 +507,7 @@
     <ROW Action="AI_ExtractFiles" Sequence="3998" Builds="DefaultBuild"/>
     <ROW Action="AI_DATA_SETTER" Sequence="3997"/>
     <ROW Action="AI_EstimateExtractFiles" Sequence="3999" Builds="DefaultBuild"/>
+    <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; ) )" Sequence="6601"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
     <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="747"/>

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

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