Merge branch 'develop'

Author: Peter-Simpson

Installer/PlatformInstaller.mia

@@ -2800,6 +2800,10 @@ Comment
 Comment
 Set Variable
 Run Program
+Comment
+If
+Set Variable
+End
 Set Variable
 Include Script
 Comment
@@ -5820,6 +5824,10 @@ $
 {FFBC4AEE-4721-4B33-BF5E-FFF21320F08F}
 {5DAB9539-6C8D-455F-82DC-945F552C9E64}
 {276B1780-701B-4257-B4B2-3901364ABDF1}
+{07233482-EA99-4ED6-9E53-114A2F0C967B}
+{B55A8348-42DE-496E-8BA1-3382E4D56202}
+{56C99152-6D65-4C47-83BD-20469AEA073E}
+{B690208E-D581-47BA-8759-C943910248D4}
 {1FCCA280-3592-4B24-925E-CA2B396E68B8}
 {BB362D27-41AC-4A71-B67A-598DD64563B8}
 {A092F3AB-61FF-4CAF-8866-7F0067A691A3}
@@ -7506,6 +7514,8 @@ Kill the start menu cache to ensure icons refresh - it will self restart.
 
 {76FD4600-0D1A-4AB2-B79B-58F0F7D9B7B6}
 Register 64bit JustAHub
+{07233482-EA99-4ED6-9E53-114A2F0C967B}
+Accept RC=128 as OK, it means it couldn't find the specified task, which is harmless in this case.
 {3FDCB84F-CB74-4A3D-8649-C2FB2EFB7985}
 PRELIST
 
@@ -8994,6 +9004,9 @@ Register JustAHub (64 bit)
 {EE7FBFA1-AC7D-4D54-AE17-C5F5DE6F9D7C}
 PROGRESSTEXT$MYAH$MYAH$FALSE
 Registering JustAHub (64 bit)
+{56C99152-6D65-4C47-83BD-20469AEA073E}
+RC$MYAH$MYAH$FALSE
+0
 {340178B5-D93C-4075-ABA8-DE4CCDAFC689}
 MAINTENANCE
 0
@@ -9754,6 +9767,11 @@ RC
 0
 -2146498548
 FALSE
+{B55A8348-42DE-496E-8BA1-3382E4D56202}
+RC
+0
+128
+FALSE
 {B3EB30C5-5686-4186-96B5-86C9FC5D6576}
 $TITLE$ Setup Error
 This product requires at least Administrator Privileges.$NEWLINE$$NEWLINE$Setup cannot continue.
@@ -22405,6 +22423,10 @@ C
 
 
 
+
+
+
+
 
 
 
@@ -25536,6 +25558,10 @@ $
 
 
 
+
+
+
+
 
 
 

Installer/PlatformInstaller.mia.bak

@@ -2775,7 +2775,6 @@ Set Variable
 Run Program
 Set Variable
 Include Script
-Set Variable
 Else
 Write to Text File
 End
@@ -5796,7 +5795,6 @@ $
 {5B4273CE-363A-4CB6-9FDF-03AEB7928465}
 {8AC0CF68-E0E7-49C2-8789-9143AC89D3EC}
 {40B58E7E-F0BE-4BF8-83C5-7EDFA8022D03}
-{4ACA3E75-9C57-4381-A2ED-BC7FB8B7B11C}
 {3320B4BE-9F0E-4859-B840-1A01D1D7BA74}
 {13A172D5-EA74-4017-A006-32BB15CF8280}
 {B26455B4-62FD-4981-B802-C5B74CA138D3}
@@ -8219,9 +8217,6 @@ Preparing ASCOM Profile Store...
 {9605CC0D-A474-4FA5-B255-226CC61BA488}
 PROGRESSTEXT$MYAH$MYAH$FALSE
 Installing developer content.
-{4ACA3E75-9C57-4381-A2ED-BC7FB8B7B11C}
-PROGRESSTEXT$MYAH$MYAH$FALSE
-Creating 64bit native images - ASCOM.Support.Utilities - v6.0.0.0
 {8AC0CF68-E0E7-49C2-8789-9143AC89D3EC}
 ACTION$MYAH$MYAH$FALSE
 NGen64 Install - ASCOM Cache
@@ -8604,7 +8599,7 @@ GACInstall - Copy - Astrometry 5.5.6
 PROGRESSTEXT$MYAH$MYAH$FALSE
 Installing ASCOM.Astrometry debug information
 {2700D18F-E389-489F-9F31-E9F7E94E7F69}
-ABORT$MYAH$MYAH$FALSE
+ACTION$MYAH$MYAH$FALSE
 GACInstall - Copy - Utilities 5.5.6
 {2CA74054-7304-48B0-9951-5CDF84D8C625}
 PROGRESSTEXT$MYAH$MYAH$FALSE
@@ -8997,7 +8992,7 @@ Refresh Start Menu
 ACTION$MYAH$MYAH$FALSE
 Register JustAHub (64 bit)
 {EE7FBFA1-AC7D-4D54-AE17-C5F5DE6F9D7C}
-ABORT$MYAH$MYAH$FALSE
+PROGRESSTEXT$MYAH$MYAH$FALSE
 Registering JustAHub (64 bit)
 {340178B5-D93C-4075-ABA8-DE4CCDAFC689}
 MAINTENANCE
@@ -22413,7 +22408,6 @@ C
 
 
 
-
 
 
 C
@@ -25545,7 +25539,6 @@ $
 
 
 
-
 
 
 $

Installer/PlatformInstaller.mia.bok

@@ -3012,6 +3012,10 @@
 
 
 
+
+
+
+
 
 
 

Installer/PlatformInstaller.mia.brk

@@ -3094,6 +3094,10 @@ B
 
 
 
+
+
+
+
 
 
 

Installer/PlatformInstaller.mia.txt

@@ -2800,6 +2800,10 @@ if Variable SUCCESS not Equals ERROR
     Comment: Kill the start menu cache to ensure icons refresh - it will self restart.
     Set Variable PROGRESSTEXT to Refreshing Start menu
     Run Program TaskKill /IM StartMenuExperienceHost.exe /F (WAIT, get result into variable RC)
+    Comment: Accept RC=128 as OK, it means it couldn't find the specified task, which is harmless in this case.
+    if Variable RC Equals 128
+      Set Variable RC to 0
+    end
     Set Variable ACTION to Refresh Start Menu
     Include Script: UpdateAscomError
 

Installer/PlatformInstaller.mia.txt.bak

@@ -2483,7 +2483,7 @@ if Variable SUCCESS not Equals ERROR
   Set Variable MYPROGRESS to 60
   Set Variable PROGRESSTEXT to Installing ASCOM.Utilities debug information
   Run Program $WINSYSDIR$\Cmd.exe /c copy ASCOM.Utilities.pdb $WINDIR$\assembly\GAC_MSIL\ASCOM.Utilities\5.5.6.0__565de7938946fba7, startup in folder $COMMONFILES$\ASCOM\Platform\v5.5 (WAIT, get result into variable RC)
-  Set Variable ABORT to GACInstall - Copy - Utilities 5.5.6
+  Set Variable ACTION to GACInstall - Copy - Utilities 5.5.6
   Include Script: UpdateAscomError
   Set Variable PROGRESSTEXT to Installing ASCOM.Astrometry debug information
   Run Program $WINSYSDIR$\Cmd.exe /c copy ASCOM.Astrometry.pdb $WINDIR$\assembly\GAC_MSIL\ASCOM.Astrometry\5.5.6.0__565de7938946fba7, startup in folder $COMMONFILES$\ASCOM\Platform\v5.5 (WAIT, get result into variable RC)
@@ -2775,13 +2775,12 @@ if Variable SUCCESS not Equals ERROR
       Run Program $NGEN64$ "ASCOM.Cache, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7" (WAIT, get result into variable RC)
       Set Variable ACTION to NGen64 Install - ASCOM Cache
       Include Script: UpdateAscomError
-      Set Variable PROGRESSTEXT to Creating 64bit native images - ASCOM.Support.Utilities - v6.0.0.0
     else
       Write into Text File $SETUPLOG$ from Value $TIME$       Omitting 64bit NGEN (at end of file)
     end
 
     Comment: Register 64bit JustAHub
-    Set Variable ABORT to Registering JustAHub (64 bit)
+    Set Variable PROGRESSTEXT to Registering JustAHub (64 bit)
     Run Program $COMMONFILES$\ASCOM\JustAHub64\ASCOM.JustAHub64.exe /regserver (WAIT, get result into variable RC)
     Set Variable ACTION to Register JustAHub (64 bit)
     Include Script: UpdateAscomError