fixes/simplified postbuild installer scripts

7 files changed, 28 insertions, 59 deletions

diff --git a/Tools/copy_release_installer.ps1 b/Tools/copy_release_installer.ps1
deleted file mode 100644
index c7160870..00000000
--- a/Tools/copy_release_installer.ps1
+++ /dev/null
@@ -1,21 +0,0 @@
-param (
-    [string]
-    $SourcePath,
-
-    [string]
-    $DestinationDir
-)
-
-Write-Host $SourcePath
-Write-Host $DestinationDir
-
-if (!(Test-Path -Path $DestinationDir))
-{
-    New-Item -Path $DestinationDir -ItemType "directory"
-}
-
-$sourceFiles = Get-ChildItem -Path $SourcePath -Recurse | ?{$_.Extension -match "exe|msi"}
-foreach ($item in $sourceFiles)
-{
-    Copy-Item -Path $item.FullName -Destination $DestinationDir -Force
-}
\ No newline at end of file
diff --git a/Tools/postbuild_installer.ps1 b/Tools/postbuild_installer.ps1
index 59a8d112..89623f9a 100644
--- a/Tools/postbuild_installer.ps1
+++ b/Tools/postbuild_installer.ps1
@@ -25,9 +25,9 @@ param (
     $ExcludeFromSigning
 )
 
-Write-Output "+=================================================================+"
-Write-Output "|             Beginning mRemoteNG Installer Post Build            |"
-Write-Output "+=================================================================+"
+Write-Output "+===========================================================================================+"
+Write-Output "|                          Beginning mRemoteNG Installer Post Build                         |"
+Write-Output "+===========================================================================================+"
 Format-Table -AutoSize -Wrap -InputObject @{
     "SolutionDir" = $SolutionDir
     "TargetDir" = $TargetDir
@@ -40,5 +40,4 @@ Format-Table -AutoSize -Wrap -InputObject @{
 
 & "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
 & "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
-& "$PSScriptRoot\rename_installer_with_version.ps1" -SolutionDir $SolutionDir
-& "$PSScriptRoot\copy_release_installer.ps1" -SourcePath $TargetDir -DestinationDir (Join-Path -Path $SolutionDir -ChildPath "Release")
\ No newline at end of file
+& "$PSScriptRoot\rename_and_copy_installer.ps1" -SolutionDir $SolutionDir
diff --git a/Tools/postbuild_mremoteng.ps1 b/Tools/postbuild_mremoteng.ps1
index 91aa91ff..6a35f412 100644
--- a/Tools/postbuild_mremoteng.ps1
+++ b/Tools/postbuild_mremoteng.ps1
@@ -25,9 +25,9 @@ param (
     $ExcludeFromSigning
 )
 
-Write-Output "+=================================================================+"
-Write-Output "|                  Beginning mRemoteNG Post Build                 |"
-Write-Output "+=================================================================+"
+Write-Output "+===========================================================================================+"
+Write-Output "|                               Beginning mRemoteNG Post Build                              |"
+Write-Output "+===========================================================================================+"
 Format-Table -AutoSize -Wrap -InputObject @{
     "SolutionDir" = $SolutionDir
     "TargetDir" = $TargetDir
@@ -42,4 +42,4 @@ Format-Table -AutoSize -Wrap -InputObject @{
 & "$PSScriptRoot\tidy_files_for_release.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
 & "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
 & "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
-& "$PSScriptRoot\zip_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName
\ No newline at end of file
+& "$PSScriptRoot\zip_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName
diff --git a/Tools/rename_and_copy_installer.ps1 b/Tools/rename_and_copy_installer.ps1
new file mode 100644
index 00000000..8d52af7c
--- /dev/null
+++ b/Tools/rename_and_copy_installer.ps1
@@ -0,0 +1,13 @@
+param (
+    [string]
+    $SolutionDir
+)
+
+
+$targetVersionedFile = "$SolutionDir\mRemoteNG\bin\x64\Release\mRemoteNG.exe"
+$version = &"$SolutionDir\Tools\exes\sigcheck.exe" /accepteula -q -n $targetVersionedFile
+$src = $SolutionDir + "mRemoteNGInstaller\Installer\bin\Release\en-US\mRemoteNG-Installer.msi"
+$dst = $SolutionDir + "Release\mRemoteNG-Installer-" + $version + ".msi"
+
+# Copy file
+Copy-Item $src -Destination $dst -Force
diff --git a/Tools/rename_installer_with_version.ps1 b/Tools/rename_installer_with_version.ps1
deleted file mode 100644
index 851e4891..00000000
--- a/Tools/rename_installer_with_version.ps1
+++ /dev/null
@@ -1,29 +0,0 @@
-param (
-    [string]
-    $SolutionDir
-)
-
-$renameTarget = $SolutionDir + "mRemoteNGInstaller\Installer\bin\Release\en-US\mRemoteNG-Installer.msi"
-
-Write-Host $SolutionDir
-Write-Host $renameTarget
-
-$targetVersionedFile = "$SolutionDir\mRemoteNG\bin\Release\mRemoteNG.exe"
-$version = &"$SolutionDir\Tools\exes\sigcheck.exe" /accepteula -q -n $targetVersionedFile
-
-
-$renameTargetFileObject = Get-Item -Path $renameTarget -ErrorAction SilentlyContinue
-if ($renameTargetFileObject)
-{
-    # Build the new file name
-    $oldFileName = $renameTargetFileObject.Name
-    $newFileName = $oldFileName -replace "$("\"+$renameTargetFileObject.Extension)",$("-"+$version+$renameTargetFileObject.Extension)
-    Write-Host $oldFileName
-    Write-Host $newFileName
-
-    # Delete any items that already exist with the new name (effectively an overwrite)
-    Remove-Item -Path "$($renameTargetFileObject.Directory.FullName)\$newFileName" -ErrorAction SilentlyContinue
-
-    # Rename file
-    Rename-Item -Path $renameTarget -NewName $newFileName -ErrorAction SilentlyContinue
-}
\ No newline at end of file
diff --git a/Tools/verify_binary_signatures.ps1 b/Tools/verify_binary_signatures.ps1
index ce9180da..2cd64091 100644
--- a/Tools/verify_binary_signatures.ps1
+++ b/Tools/verify_binary_signatures.ps1
@@ -20,6 +20,7 @@ param (
 
 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 
+
 #  validate release versions and if the certificate value was passed
 if ($ConfigurationName -match "Release" -And ($CertificatePath)) {
 	
diff --git a/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs b/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs
index 5a7c682c..22f09b23 100644
--- a/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs
+++ b/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs
@@ -123,6 +123,12 @@
             <Component Id="cmpEDFC52653A3A4D5C80AB3A0B7CE9AE35" Directory="INSTALLDIR" Guid="*">
                 <File Id="fil9C1ED4726B58F1CD4C25AF29BDBE0F77" KeyPath="yes" Source="$(var.HarvestPath)\Renci.SshNet.dll" />
             </Component>
+            <Component Id="cmp71D2F22FB4AE52AFE966BBFE99795AC3" Directory="INSTALLDIR" Guid="*">
+                <File Id="fil6C2A719CC70BFBC268546246DDB8752C" KeyPath="yes" Source="$(var.HarvestPath)\sigcheck.exe" />
+            </Component>
+            <Component Id="cmp5F7F44EF050CEBB0CC91115F98198566" Directory="INSTALLDIR" Guid="*">
+                <File Id="fil0092CDA5A5F632801964A8973275EDAD" KeyPath="yes" Source="$(var.HarvestPath)\sigcheck64.exe" />
+            </Component>
             <Component Id="cmpEEF6A35F8A6BADDF0E1C90F92FE0D47E" Directory="INSTALLDIR" Guid="*">
                 <File Id="fil0DAB9F548FB79BA6060656EC4E6D6E46" KeyPath="yes" Source="$(var.HarvestPath)\SparkleLibrary.dll" />
             </Component>