Fixed the NEW_SERVER_PORT property to use the value entered by the user. Fixed a typo in CustomActions.

Author: SlaviDimitrov

build_/win/CustomActions/CustomActions/CustomAction.cs

@@ -328,7 +328,7 @@ public static ActionResult CheckServerPort(Session session)
                 }
                 else
                 {
-                    session.Log("Port {0} is in free.", port);
+                    session.Log("Port {0} is free.", port);
                     session[HawkCDServerProperties.IsDeafultServerPortInUse] = "0";
                 }
 

build_/win/Installers/HawkCD_Server.msifact

@@ -804,7 +804,7 @@ You can choose not to install [ProductName] by clicking Cancel to exit.
 <Fragment>
         <UI>
             <Dialog Id="HostNameDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
-                <Control Id="Control_1" Property="NEW_EDIT_PROPERTY" Type="Edit" X="10" Y="130" Width="150" Height="20">
+                <Control Id="Control_1" Property="NEW_SERVER_PORT" Type="Edit" X="10" Y="130" Width="150" Height="20">
 <Condition Action="hide">IS_DEFAULT_SERVER_PORT_IN_USE = 0</Condition>
 <Condition Action="show">IS_DEFAULT_SERVER_PORT_IN_USE = 1</Condition>
 </Control>
@@ -1824,6 +1824,11 @@ You can choose not to install [ProductName] by clicking Cancel to exit.
 <CustomAction Type="2" ID="LaunchJavaDownloadPage" Impersonate="yes" Return="0" SuppressModularization="no" TerminalServerAware="no" HideTarget="no" Execute="immediate" Location="3" FileName="" FileID="" PropertyName="" FullPath="[SystemFolder]cmd.exe" WorkingFolder="SystemFolder" CommandLineArguments="/c start explorer &quot;http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html&quot;">
 <CustomTimingList/>
 </CustomAction>
+<CustomAction Type="6" ID="UpdateServerShortcutUrlProp" Impersonate="yes" Return="2" SuppressModularization="no" TerminalServerAware="no" HideTarget="no" Execute="immediate" Property="SERVER_SHORTCUT_URL" Value="http://localhost:[NEW_SERVER_PORT]/">
+<CustomTimingList>
+<CustomTiming Sequence="4" Execute="0" Exit="0" RelativeAction="InstallInitialize" SequenceNumber="0" Condition="IS_DEFAULT_SERVER_PORT_IN_USE = 1"/>
+</CustomTimingList>
+</CustomAction>
 </CustomActions>
 <MediaItems>
 <MediaItem ID="1" DiskPrompt="Disk 1" Type="0" CompressionLevel="3" EmbedCabInMSI="yes" CabFilename="setup.cab" OutputSubFolder="" VolumeLabel=""/>

build_/win/Installers/Wix_Server/WiX/HawkCD_Server.wxs

@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Created with MSI Factory version 2.1.1011.0
-     on 2016-10-31 at 21:25:03 -->
+     on 2016-11-06 at 11:00:05 -->
 <?include BuildVars.wxi?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 <Product Id="$(var.ProductBuildGUID)" Name="HawkCD Server - $(var.BuildNumber) - Alpha" Version="$(var.BuildNumber)" Manufacturer="RnD Solutions Ltd." UpgradeCode="EC3C72CC-B52F-4A00-A632-595710B93D88" Language="1033">
@@ -72,6 +72,7 @@
 <CustomAction Id="CheckServerPort" Impersonate="yes" Return="ignore" Execute="immediate" BinaryKey="CustomActions.CA.dll" DllEntry="CheckServerPort"/>
 <CustomAction Id="CheckIsUserAdministrator" Impersonate="yes" Return="check" Execute="immediate" BinaryKey="CustomActions.CA.dll" DllEntry="CheckIsUserAdministrator"/>
 <CustomAction Id="LaunchJavaDownloadPage" Impersonate="yes" Return="asyncNoWait" Execute="immediate" ExeCommand="[SystemFolder]cmd.exe /c start explorer &quot;http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html&quot;" Directory="SystemFolder"/>
+<CustomAction Id="UpdateServerShortcutUrlProp" Impersonate="yes" Return="check" Execute="immediate" Property="SERVER_SHORTCUT_URL" Value="http://localhost:[NEW_SERVER_PORT]/"/>
 <Binary Id="CustomActions.CA.dll" SourceFile="$(var.Buildzone)\CustomActions\CustomActions\bin\Debug\CustomActions.CA.dll"/>
 <InstallExecuteSequence>
 <Custom Action="InstallRedis" After="InstallFinalize">NOT REMOVE~="ALL" </Custom>
@@ -89,6 +90,7 @@
 <Custom Action="UpdateRedisConfig" Before="InstallRedis">NOT REMOVE~="ALL" AND NOT OLDERVERSIONBEINGUPGRADED</Custom>
 <Custom Action="CheckServerPort" Before="AppSearch">1</Custom>
 <Custom Action="CheckIsUserAdministrator" Before="AppSearch">1</Custom>
+<Custom Action="UpdateServerShortcutUrlProp" Before="InstallInitialize">IS_DEFAULT_SERVER_PORT_IN_USE = 1</Custom>
 </InstallExecuteSequence>
 <InstallUISequence>
 <Custom Action="DetectJava" Before="AppSearch">1</Custom>

build_/win/Installers/Wix_Server/WiX/msifactui.wxs

@@ -505,7 +505,7 @@ You can choose not to install [ProductName] by clicking Cancel to exit.
 <Fragment>
         <UI>
             <Dialog Id="HostNameDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
-                <Control Id="Control_1" Property="NEW_EDIT_PROPERTY" Type="Edit" X="10" Y="130" Width="150" Height="20">
+                <Control Id="Control_1" Property="NEW_SERVER_PORT" Type="Edit" X="10" Y="130" Width="150" Height="20">
 <Condition Action="hide">IS_DEFAULT_SERVER_PORT_IN_USE = 0</Condition>
 <Condition Action="show">IS_DEFAULT_SERVER_PORT_IN_USE = 1</Condition>
 </Control>