Skip to content

Commit b98aabe

Browse files
committed
Updated version
Updated setup Added SCPUser.exe
1 parent a5fab17 commit b98aabe

File tree

15 files changed

+36
-33
lines changed

15 files changed

+36
-33
lines changed

Installer/ScpToolkit Setup.aip

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<DOCUMENT Type="Advanced Installer" CreateVersion="12.4.2" version="12.8" Modules="enterprise" RootPath="." Language="en" Id="{4A610BC3-7F32-44FC-9153-310AC8708D94}">
2+
<DOCUMENT Type="Advanced Installer" CreateVersion="12.4.2" version="13.0" Modules="enterprise" RootPath="." Language="en" Id="{4A610BC3-7F32-44FC-9153-310AC8708D94}">
33
<COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
44
<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"/>
55
</COMPONENT>
@@ -309,7 +309,6 @@
309309
</COMPONENT>
310310
<COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
311311
<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"/>
312-
<ATTRIBUTE name="CurrentBuild" value="DefaultBuild"/>
313312
</COMPONENT>
314313
<COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
315314
<ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -361,7 +360,7 @@
361360
<COMPONENT cid="caphyon.advinst.msicomp.MsiAssemblyNameComponent">
362361
<ROW Component_="ScpService.exe" Name="Name" Value="ScpService" Sync="false"/>
363362
<ROW Component_="ScpService.exe" Name="Culture" Value="neutral" Sync="false"/>
364-
<ROW Component_="ScpService.exe" Name="Version" Value="1.6.241.16023" Sync="true"/>
363+
<ROW Component_="ScpService.exe" Name="Version" Value="1.7.277.16117" Sync="true"/>
365364
<ROW Component_="ScpService.exe" Name="ProcessorArchitecture" Value="MSIL" Sync="false"/>
366365
</COMPONENT>
367366
<COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
@@ -476,6 +475,7 @@
476475
<ROW Action="AI_DeleteRCadLzma" Type="51" Source="AI_DeleteRLzma" Target="[AI_SETUPEXEPATH]"/>
477476
<ROW Action="AI_DeleteRLzma" Type="1281" Source="lzmaextractor.dll" Target="DeleteLZMAFiles"/>
478477
<ROW Action="AI_DpiContentScale" Type="1" Source="aicustact.dll" Target="DpiContentScale"/>
478+
<ROW Action="AI_EnableDebugLog" Type="321" Source="aicustact.dll" Target="EnableDebugLog"/>
479479
<ROW Action="AI_EstimateExtractFiles" Type="1" Source="Prereq.dll" Target="EstimateExtractFiles"/>
480480
<ROW Action="AI_ExtractCadLzma" Type="51" Source="AI_ExtractLzma" Target="[AI_SETUPEXEPATH]"/>
481481
<ROW Action="AI_ExtractFiles" Type="1025" Source="Prereq.dll" Target="ExtractSourceFiles" AdditionalSeq="AI_DATA_SETTER"/>
@@ -501,6 +501,7 @@
501501
<ROW Action="AI_ResolveLocalizedCredentials" Type="1" Source="aicustact.dll" Target="GetLocalizedCredentials"/>
502502
<ROW Action="AI_RollbackTasks" Type="11521" Source="aischeduler.dll" Target="DeleteTasks" WithoutSeq="true"/>
503503
<ROW Action="AI_RollbackTasks2" Type="11521" Source="aischeduler2.dll" Target="DeleteTasks" WithoutSeq="true"/>
504+
<ROW Action="AI_RunFinishActions" Type="1" Source="aicustact.dll" Target="RunFinishActions" WithoutSeq="true"/>
504505
<ROW Action="AI_SETPROGRAMFILES" Type="51" Source="AI_ProgramFiles" Target="[ProgramFilesFolder]"/>
505506
<ROW Action="AI_SETPROGRAMFILES64" Type="51" Source="AI_ProgramFiles" Target="[ProgramFiles64Folder]"/>
506507
<ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
@@ -539,7 +540,7 @@
539540
<ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="747"/>
540541
<ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1501"/>
541542
<ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1399"/>
542-
<ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
543+
<ROW Action="AI_ResolveKnownFolders" Sequence="54"/>
543544
<ROW Action="AI_REDIRECT_32BIT_FOLDER" Condition="NOT VersionNT64 AND NOT AI_Disable32BitRedirection" Sequence="798"/>
544545
<ROW Action="AI_REDIRECT_32BIT_SH_FOLDER" Condition="NOT VersionNT64 AND NOT AI_Disable32BitRedirection" Sequence="799"/>
545546
<ROW Action="AI_SETPROGRAMFILES64" Condition="VersionNT64" Sequence="748"/>
@@ -552,7 +553,7 @@
552553
<ROW Action="AI_NativeImageUnInstall" Condition="DISABLEROLLBACK &lt;&gt; 1" Sequence="6252"/>
553554
<ROW Action="AI_NativeImageUnInstallCommit" Condition="DISABLEROLLBACK = 1" Sequence="6251"/>
554555
<ROW Action="AI_ConfigPermissions" Condition="REMOVE &lt;&gt; &quot;ALL&quot;" Sequence="5851"/>
555-
<ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/>
556+
<ROW Action="AI_ResolveLocalizedCredentials" Sequence="52"/>
556557
<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"/>
557558
<ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99" Builds="DefaultBuild"/>
558559
<ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="101" Builds="DefaultBuild"/>
@@ -577,11 +578,12 @@
577578
<ROW Action="AI_UninstallTasks" Condition="REMOVE=&quot;ALL&quot;" Sequence="1698"/>
578579
<ROW Action="AI_ProcessTasks2" Condition="(VersionNT &gt;= 600) AND (REMOVE&lt;&gt;&quot;ALL&quot;)" Sequence="1624"/>
579580
<ROW Action="AI_UninstallTasks2" Condition="(VersionNT &gt;= 600) AND (REMOVE=&quot;ALL&quot;)" Sequence="1699"/>
581+
<ROW Action="AI_EnableDebugLog" Sequence="51"/>
580582
</COMPONENT>
581583
<COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
582584
<ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="747"/>
583-
<ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
584-
<ROW Action="AI_DpiContentScale" Sequence="52"/>
585+
<ROW Action="AI_ResolveKnownFolders" Sequence="54"/>
586+
<ROW Action="AI_DpiContentScale" Sequence="53"/>
585587
<ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99"/>
586588
<ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="102"/>
587589
<ROW Action="AI_SETPROGRAMFILES64" Condition="VersionNT64" Sequence="748"/>
@@ -590,7 +592,8 @@
590592
<ROW Action="MaintenanceTypeDlg" Condition="AI_MAINT" Sequence="1250" SeqType="3" MsiKey="MaintenanceTypeDlg"/>
591593
<ROW Action="AI_ChooseTextStyles" Sequence="73"/>
592594
<ROW Action="AI_AppSearchEx" Sequence="101"/>
593-
<ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/>
595+
<ROW Action="AI_ResolveLocalizedCredentials" Sequence="52"/>
596+
<ROW Action="AI_EnableDebugLog" Sequence="51"/>
594597
</COMPONENT>
595598
<COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
596599
<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"/>

SCPUser.exe

437 KB
Binary file not shown.

ScpCleanWipe/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.277.16103")]
15-
[assembly: AssemblyFileVersion("1.7.277.16103")]
14+
[assembly: AssemblyVersion("1.7.277.16117")]
15+
[assembly: AssemblyFileVersion("1.7.277.16117")]

ScpControl/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.277.16103")]
15-
[assembly: AssemblyFileVersion("1.7.277.16103")]
14+
[assembly: AssemblyVersion("1.7.277.16117")]
15+
[assembly: AssemblyFileVersion("1.7.277.16117")]

ScpControl/ScpControl.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<AssemblyInfoVersionSettings>
2424
</AssemblyInfoVersionSettings>
2525
<PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
26-
<AssemblyVersion>1.7.277.16103</AssemblyVersion>
26+
<AssemblyVersion>1.7.277.16117</AssemblyVersion>
2727
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

ScpDebugInfoCollector/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.277.16103")]
15-
[assembly: AssemblyFileVersion("1.7.277.16103")]
14+
[assembly: AssemblyVersion("1.7.277.16117")]
15+
[assembly: AssemblyFileVersion("1.7.277.16117")]

ScpDriverInstaller/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.277.16103")]
15-
[assembly: AssemblyFileVersion("1.7.277.16103")]
14+
[assembly: AssemblyVersion("1.7.277.16117")]
15+
[assembly: AssemblyFileVersion("1.7.277.16117")]

ScpGamepadAnalyzer/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.277.16103")]
15-
[assembly: AssemblyFileVersion("1.7.277.16103")]
14+
[assembly: AssemblyVersion("1.7.277.16117")]
15+
[assembly: AssemblyFileVersion("1.7.277.16117")]

ScpMonitor/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.277.16103")]
15-
[assembly: AssemblyFileVersion("1.7.277.16103")]
14+
[assembly: AssemblyVersion("1.7.277.16117")]
15+
[assembly: AssemblyFileVersion("1.7.277.16117")]

ScpPair/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.277.16103")]
15-
[assembly: AssemblyFileVersion("1.7.277.16103")]
14+
[assembly: AssemblyVersion("1.7.277.16117")]
15+
[assembly: AssemblyFileVersion("1.7.277.16117")]

ScpProfiler/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.277.16103")]
15-
[assembly: AssemblyFileVersion("1.7.277.16103")]
14+
[assembly: AssemblyVersion("1.7.277.16117")]
15+
[assembly: AssemblyFileVersion("1.7.277.16117")]

ScpServer/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.277.16103")]
15-
[assembly: AssemblyFileVersion("1.7.277.16103")]
14+
[assembly: AssemblyVersion("1.7.277.16117")]
15+
[assembly: AssemblyFileVersion("1.7.277.16117")]

ScpService/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.277.16103")]
15-
[assembly: AssemblyFileVersion("1.7.277.16103")]
14+
[assembly: AssemblyVersion("1.7.277.16117")]
15+
[assembly: AssemblyFileVersion("1.7.277.16117")]

ScpSettings/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.277.16103")]
15-
[assembly: AssemblyFileVersion("1.7.277.16103")]
14+
[assembly: AssemblyVersion("1.7.277.16117")]
15+
[assembly: AssemblyFileVersion("1.7.277.16117")]

ScpXInputBridge/Properties/CommonInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("1.7.277.16103")]
15-
[assembly: AssemblyFileVersion("1.7.277.16103")]
14+
[assembly: AssemblyVersion("1.7.277.16117")]
15+
[assembly: AssemblyFileVersion("1.7.277.16117")]

0 commit comments

Comments
 (0)