From a2e0be125a07a44ba2058891b7c75b70518b4877 Mon Sep 17 00:00:00 2001 From: vletroye Date: Sat, 16 Jan 2021 21:06:11 +0100 Subject: [PATCH] Update Installer to build MODS v7.3 Downgrade to .NET 4.5.2 as no support for requirements .NET 4.6 in InstallShield LT 2015... --- Hash/App.config | 2 +- Hash/Hash.csproj | 2 +- Installer/Installer.isl | 35 +++++++++++++++------- Installer/Installer.isproj | 1 + Installer/ModsPackager.exe - Shortcut.lnk | Bin 0 -> 2479 bytes Json Editor/App.config | 2 +- Json Editor/Json Editor.csproj | 2 +- Mods/App.config | 4 +-- Mods/Forms/MainForm.cs | 2 +- Mods/Mods.csproj | 2 +- Mods/Properties/AssemblyInfo.cs | 4 +-- 11 files changed, 35 insertions(+), 21 deletions(-) create mode 100644 Installer/ModsPackager.exe - Shortcut.lnk diff --git a/Hash/App.config b/Hash/App.config index bae5d6d..8227adb 100644 --- a/Hash/App.config +++ b/Hash/App.config @@ -1,6 +1,6 @@ - + diff --git a/Hash/Hash.csproj b/Hash/Hash.csproj index 4d9166a..7d85488 100644 --- a/Hash/Hash.csproj +++ b/Hash/Hash.csproj @@ -9,7 +9,7 @@ Properties Hash Hash - v4.6.1 + v4.5.2 512 true diff --git a/Installer/Installer.isl b/Installer/Installer.isl index f39c73b..2629c5a 100644 --- a/Installer/Installer.isl +++ b/Installer/Installer.isl @@ -51,10 +51,10 @@ 1252 - Installation Database + ##ID_STRING6## Mods Packager ##ID_STRING2## - Installer,MSI,Database + Installer,MSI,Synology,Package Contact: Your local administrator Administrator @@ -346,7 +346,9 @@ ISDotNetInstallerArgsRollback ISX_DEFAULTCOMPONENT1{6CD417B1-B01A-4D5B-9C50-75441D283B39}INSTALLDIR217/LogFile=/LogFile=/LogFile=/LogFile= Mods.Content_Files{807C1A3B-EBD4-4960-9D8C-A021EC9E711C}INSTALLDIR2mods.content_files17/LogFile=/LogFile=/LogFile=/LogFile= + Mods.Content_Files1{64CC7C9A-7B60-4FD2-9766-0C2CF81DE954}INSTALLDIR2mods.content_files17/LogFile=/LogFile=/LogFile=/LogFile= Mods.Primary_output{F8BED34B-5E08-4D06-8E9C-2A5E6A9699E8}INSTALLDIR2mods.primary_output17/LogFile=/LogFile=/LogFile=/LogFile= + Mods.Primary_output1{8921831D-1126-419D-AF7C-73B34871DB91}INSTALLDIR2mods.primary_output17/LogFile=/LogFile=/LogFile=/LogFile= @@ -1059,7 +1061,9 @@ Component_ + +
INSTALLDIRISX_DEFAULTCOMPONENT1 INSTALLDIRMods.Content_FilesINSTALLDIRMods.Content_Files1 INSTALLDIRMods.Primary_outputINSTALLDIRMods.Primary_output1
@@ -1876,7 +1880,9 @@ Component_ + +
AlwaysInstallISX_DEFAULTCOMPONENT1 AlwaysInstallMods.Content_FilesAlwaysInstallMods.Content_Files1 AlwaysInstallMods.Primary_outputAlwaysInstallMods.Primary_output1
@@ -1891,8 +1897,8 @@ ISBuildSourcePathISAttributesISComponentSubFolder_ -
mods.content_filesMods.Content_FilesMods.Content Files01<Mods1>|ContentFiles3 - mods.primary_outputMods.Primary_outputMods.Primary output01<Mods1>|Built3 + mods.content_filesMods.Content_Files1Mods.Content Files01<Mods1>|ContentFiles3 + mods.primary_outputMods.Primary_output1Mods.Primary output01<Mods1>|Built3
@@ -2036,7 +2042,9 @@ Miscellaneous
ISX_DEFAULTCOMPONENT1_7B1C6A18_98B2_4E4F_B0CC_3ABFDB512B31_FILTER Mods.Content_Files_00D3A843_553E_4152_BE4B_B09F1D6E9F01_FILTER + Mods.Content_Files1_75987947_24D9_4D60_95BE_13929A1C1E1A_FILTER Mods.Primary_output_59E22F67_703C_452D_AACE_74D30540592D_FILTER + Mods.Primary_output1_3B622F5F_9419_42D6_81C8_56643C5C59AA_FILTER
@@ -2629,10 +2637,10 @@ EncodedCommentTimeStamp - + - + @@ -3730,11 +3738,13 @@ - - + + + +
COMPANY_NAME1033BeatificaBytes0598270898COMPANY_NAME1033BeatificaBytes0-2136391948 DN_AlwaysInstall1033Always Install0816195852 IDPROP_EXPRESS_LAUNCH_CONDITION_COLOR1033The color settings of your system are not adequate for running [ProductName].0816195852IDPROP_EXPRESS_LAUNCH_CONDITION_DOTNETVERSION45FULL1033Microsoft .NET Framework 4.5 Full package or greater needs to be installed for this installation to continue.0816198604IDPROP_EXPRESS_LAUNCH_CONDITION_DOTNETVERSION45FULL1033Microsoft .NET Framework 4.5 Full package or greater needs to be installed for this installation to continue.0-2136374156 IDPROP_EXPRESS_LAUNCH_CONDITION_OS1033The operating system is not adequate for running [ProductName].0816195852 IDPROP_EXPRESS_LAUNCH_CONDITION_PROCESSOR1033The processor is not adequate for running [ProductName].0816195852 IDPROP_EXPRESS_LAUNCH_CONDITION_RAM1033The amount of RAM is not adequate for running [ProductName].0816195852IDS__TargetReq_DESC_PROCESSOR1033The processor is not adequate for running [ProductName].0816195852 IDS__TargetReq_DESC_RAM1033The amount of RAM is not adequate for running [ProductName].0816195852 IDS__TargetReq_DESC_RESOLUTION1033The screen resolution is not adequate for running [ProductName].0816195852ID_STRING11033http://www.BeatificaBytes.com0598270898ID_STRING21033BeatificaBytes0598270898ID_STRING11033http://www.BeatificaBytes.com0-2136391948ID_STRING21033BeatificaBytes0-2136391948 ID_STRING31033MODSPA~1|Mods Packager0816231022 ID_STRING41033MODSPA~1|Mods Packager01218860564 ID_STRING51033Uninstall01218864660ID_STRING61033Installation Setup0-2136379788ID_STRING71033https://github.com/vletroye/Mods/issues0-2136391948 IIDS_UITEXT_FeatureUninstalled1033This feature will remain uninstalled.0816195852
@@ -3851,6 +3861,7 @@ ISIconIndex ARPPRODUCTICON.exe<ISProjectFolder>\PackagingSyno.ico0 NewShortcut1_6DBF1A1F7499430FADBE08D4DC66DB56.exe<ISProjectFolder>\PackagingSyno.ico0 + NewShortcut2_C94034979F044213920A74F599CECB88.exe<VSSolutionFolder>\Mods\PackagingSyno.ico0 NewShortcut3_1AF6161E1BEA4439A75EBF95741E4ADB.exeC:\Program Files (x86)\InstallShield\2015LE\Redist\Language Independent\OS Independent\uninstall.ico0 _1FE368E50F934826A5CA6C42E53C6903.exeE:\Work\Development\Git\Mods\Mods\MyOwnDSMShortcuts\bin\Debug\Mods.exe0 _204E2581017E4E47AC1D35E1D988C2B2.exeE:\Work\Development\Git\Mods\Mods\MyOwnDSMShortcuts\bin\Release\Mods.exe0 @@ -4315,6 +4326,7 @@ QwBEAF8AUgBPAE0AAQBFAHgAcAByAGUAcwBzAA== Value ISComments ALLUSERS1 + ARPHELPLINK##ID_STRING7## ARPINSTALLLOCATION ARPPRODUCTICONARPPRODUCTICON.exe ARPSIZE @@ -4358,6 +4370,7 @@ QwBEAF8AUgBPAE0AAQBFAHgAcAByAGUAcwBzAA== LAUNCHPROGRAMCOMPCODE{933D4236-753E-4F5A-9D46-010C6766AA69} LAUNCHPROGRAMFILEKEYmods.primary_output LAUNCHREADME1 + MSIFASTINSTALL1 Manufacturer##COMPANY_NAME## PIDKEY PIDTemplate12345<###-%%%%%%%>@@@@@ @@ -4387,7 +4400,7 @@ QwBEAF8AUgBPAE0AAQBFAHgAcAByAGUAcwBzAA== PROGRAMFILETOLAUNCHATEND[INSTALLDIR]Mods.Primary output ProductCode{4D6A4347-3372-4B79-9AD6-B7A0632892B9} ProductNameMods Packager - ProductVersion7.02.0000 + ProductVersion7.03.0000 ProgressType0install ProgressType1Installing ProgressType2installed @@ -4400,7 +4413,7 @@ QwBEAF8AUgBPAE0AAQBFAHgAcAByAGUAcwBzAA== SERIALNUMBER SERIALNUMVALSUCCESSRETVAL1 SHOWLAUNCHPROGRAM-1 - SecureCustomPropertiesUSERNAME;COMPANYNAME;ISX_SERIALNUM;SUPPORTDIR;DOTNETVERSION45FULL;ISFOUNDNEWERPRODUCTVERSION + SecureCustomPropertiesUSERNAME;COMPANYNAME;ISX_SERIALNUM;SUPPORTDIR;ISFOUNDNEWERPRODUCTVERSION;DOTNETVERSION45FULL SelectedSetupType##IDS__DisplayName_Typical## SetupTypeTypical UpgradeCode{27F45286-2A72-42ED-AB4F-0F0AD96CED55} @@ -4551,7 +4564,7 @@ QwBEAF8AUgBPAE0AAQBFAHgAcAByAGUAcwBzAA== ISComments ISShortcutName ISAttributes - NewShortcut2modspa_1_mods_packager##ID_STRING4##Mods.Primary_outputAlwaysInstall1 + NewShortcut2modspa_1_mods_packager##ID_STRING4##Mods.Primary_outputAlwaysInstallNewShortcut2_C94034979F044213920A74F599CECB88.exe01 NewShortcut3modspa_1_mods_packager##ID_STRING5##ISX_DEFAULTCOMPONENT1[SystemFolder]MsiExec.exe/x [ProductCode]NewShortcut3_1AF6161E1BEA4439A75EBF95741E4ADB.exe01 diff --git a/Installer/Installer.isproj b/Installer/Installer.isproj index 7b03314..e6aacba 100644 --- a/Installer/Installer.isproj +++ b/Installer/Installer.isproj @@ -29,6 +29,7 @@ + Mods diff --git a/Installer/ModsPackager.exe - Shortcut.lnk b/Installer/ModsPackager.exe - Shortcut.lnk new file mode 100644 index 0000000000000000000000000000000000000000..bfcfa1b2e18d11a394f55a265ee543fdc0a89f42 GIT binary patch literal 2479 zcmdUxU2GIp6vzLI1quS)!nUDBWP@KAahYmNbhWXY&VIp`E;~qVGJy`eV_Caj+1WJv zVwFddnwY2$BDEi&JOB?Q8pDGG5*|!=X-q`n1*#7uYz^rPA;v_{x%08xaj{Q6Fq?Dd z&Ye5I^S|ewd+#Oyczmm<1g?k@kuT8-Kh<~NmTRHK8=m~1cNQD(#u2UJ&FhF7oN$CJ{!J=B`Y74f+9{IJ%6gWDBD? zJ)YM_btgNdRD?8}mNDF^hb4y2l}?+MjwT&h34y5QuZI}-yGrz#mJOMyAEr^q8}n5B9L*%M@KzPoLlEwWb8K-&iI3aYG+>$zenuNNvREj*Rw`fa^x+)luTnw2idexOvDn+tcCa6v4k6Z27t1HIpF!>6S3VUzkubb^j zsxXth@O2ozvYba-p-$?J;Tm+kZEM~ z(EG9Lu?y{sJQQ(VqLK$JEj{=B{b;xM>!npAlV8=&zeerrxd#upoyJ}@M4a-x1UK+ASL`F61@KuZ@ccGJTWg6nz$_g(8XXN;I))0=&L3?e6G;0H13z!1 z<<7#tc|X0Y_w%3Hzq^4egEzO%^9(-C9awmY>~T)}`XcJM;2|k4v$$ evA)2W-s - + diff --git a/Json Editor/Json Editor.csproj b/Json Editor/Json Editor.csproj index e8620c4..031d43c 100644 --- a/Json Editor/Json Editor.csproj +++ b/Json Editor/Json Editor.csproj @@ -9,7 +9,7 @@ Properties ZTn.Json.Editor ZTn.Json.Editor - v4.6.1 + v4.5.2 512 SAK diff --git a/Mods/App.config b/Mods/App.config index 4463499..022dfbd 100644 --- a/Mods/App.config +++ b/Mods/App.config @@ -9,12 +9,12 @@ - + - v7.1 + v7.3 diff --git a/Mods/Forms/MainForm.cs b/Mods/Forms/MainForm.cs index 7d37f6c..9fc478c 100644 --- a/Mods/Forms/MainForm.cs +++ b/Mods/Forms/MainForm.cs @@ -3865,7 +3865,7 @@ private void IgnoreValidPackageFiles(FileInfo info, List content) if (!string.IsNullOrEmpty(uiDir)) content.Remove(Path.Combine(path, uiDir)); } - content.Remove(Path.Combine(path, "Mods.exe")); + content.Remove(Path.Combine(path, "Hash.exe")); content.Remove(Path.Combine(path, "7z.dll")); content.Remove(Path.Combine(path, "7z.exe")); diff --git a/Mods/Mods.csproj b/Mods/Mods.csproj index f7f2092..41abbca 100644 --- a/Mods/Mods.csproj +++ b/Mods/Mods.csproj @@ -9,7 +9,7 @@ Properties BeatificaBytes.Synology.Mods Mods - v4.6.1 + v4.5.2 512 SAK SAK diff --git a/Mods/Properties/AssemblyInfo.cs b/Mods/Properties/AssemblyInfo.cs index 0f954fe..d95615d 100644 --- a/Mods/Properties/AssemblyInfo.cs +++ b/Mods/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("7.2.*")] -[assembly: AssemblyFileVersion("7.2.*")] +[assembly: AssemblyVersion("7.3.*")] +[assembly: AssemblyFileVersion("7.3.*")]