Merge branch 'Release_v1.74' into develop

2026-02-17 22:11:48 +08:00 · 2016-06-20 15:18:38 -06:00
parent 85dc45a479 ba7608602b
commit 7671328245
11 changed files with 110 additions and 72 deletions
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,4 +1,4 @@
-1.74 (2016-06-1X):
+1.74 (2016-06-20):

  Supported Platforms/Components:
  -------------------------------
--- a/InstallerProjects/Installer/Installer.wixproj
+++ b/InstallerProjects/Installer/Installer.wixproj
@@ -100,6 +100,7 @@
    </LinkerAdditionalOptions>
    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
    <Cultures>en-US</Cultures>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <Cultures>en-US</Cultures>
@@ -112,13 +113,27 @@
    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
  </PropertyGroup>
  <PropertyGroup>
-    <PreBuildEvent>REM Harvest bin directory of the mRemoteV1 project
+    <PostBuildEvent>set /p buildenv=&lt;buildenv.tmp
+
+REM Sign MSI
+IF EXIST C:\mRemoteNG_code_signing_cert.pfx (powershell "&amp;""$(SolutionDir)Tools\signfiles.ps1""" %27%25cd%25%27)
+
+REM Rename MSI to include version number
+powershell "&amp;""$(SolutionDir)Tools\rename_installer_with_version.ps1""" %27$(SolutionDir)%27 %27!(TargetPath)%27
+
+REM Copy MSI to Release folder
+IF %25buildenv: Portable=%25==Release (powershell "&amp;""$(SolutionDir)Tools\copy_release_installer.ps1""" %27$(TargetDir)%27 %27$(SolutionDir)Release%27)</PostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>REM Clean the TargetDir
+rmdir /S /Q "$(TargetDir)"
+
+echo $(ConfigurationName) &gt; buildenv.tmp
+
+REM Harvest bin directory of the mRemoteV1 project
 call "$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteV1\bin\$(Configuration)" -ag -dr APPLICATIONROOTDIRECTORY -var var.HarvestPath -srd -cg MandatoryComponents -template fragment -out "$(ProjectDir)Fragments\FilesFragment.wxs" -t "$(ProjectDir)Filters\Harvest_Filter.xslt" -v
+
 REM Convert the license file "COPYING.TXT" to "License.rtf" to be shown in the installer GUI
 call "$(ProjectDir)Resources\Pandoc\pandoc.exe" -s -t rtf -o "$(ProjectDir)\Resources\License.rtf" "$(SolutionDir)COPYING.TXT"</PreBuildEvent>
  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>REM Sign MSI
-IF EXIST C:\mRemoteNG_code_signing_cert.pfx (powershell "&amp;""$(SolutionDir)signfiles.ps1""" "%25cd%25")</PostBuildEvent>
-  </PropertyGroup>
 </Project>
--- a/Tools/build-relport.cmd
+++ b/Tools/build-relport.cmd
@@ -0,0 +1,42 @@
+@echo off
+
+setlocal enabledelayedexpansion
+
+set SOLUTIONDIR=%~dp0..
+
+rem Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
+set SIGCHECK="%SOLUTIONDIR%\Tools\sigcheck.exe"
+set SEVENZIP="%SOLUTIONDIR%\Tools\7zip\7za.exe"
+
+set VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
+call %VCVARSALL% x86
+
+IF NOT "%~1"=="build" goto skipbuild
+echo Building...
+"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe" "%SOLUTIONDIR%\mRemoteV1.sln" /Rebuild "Release Portable"
+
+:skipbuild
+set SIGCHECK=!SIGCHECK:"=^"!
+set SIGCHECK=!SIGCHECK: =^^ !
+set SIGCHECK=!SIGCHECK:(=^^(!
+set SIGCHECK=!SIGCHECK:)=^^)!
+for /F "usebackq delims=. tokens=1-4" %%i in (`!SIGCHECK! /accepteula -q -n "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable\mRemoteNG.exe"`) do (
+   set PRODUCT_VERSION_SHORT=%%i.%%j
+   set PRODUCT_VERSION=%%i.%%j.%%k.%%l
+)
+echo Version is %PRODUCT_VERSION%
+
+set PORTABLEZIP="%SOLUTIONDIR%\Release\mRemoteNG-Portable-%PRODUCT_VERSION%.zip"
+
+rmdir /S /Q "%SOLUTIONDIR%\mRemoteV1\bin\package"
+mkdir "%SOLUTIONDIR%\mRemoteV1\bin\package"
+copy "%SOLUTIONDIR%\*.txt" "%SOLUTIONDIR%\mRemoteV1\bin\package"
+copy "%SOLUTIONDIR%\Installer Projects\Installer\Dependencies\PuTTYNG.exe" "%SOLUTIONDIR%\mRemoteV1\bin\package"
+
+xcopy /S /Y "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable" "%SOLUTIONDIR%\mRemoteV1\bin\package"
+
+echo Creating portable ZIP file...
+echo %PORTABLEZIP% 
+del /f /q %PORTABLEZIP% > nul 2>&1
+%SEVENZIP% a -bt -mx=9 -mm=LZMA -tzip -y -r %PORTABLEZIP% "%SOLUTIONDIR%\mRemoteV1\bin\package\*.*"
+%SEVENZIP% a -bt -mx=9 -mm=LZMA -tzip -y %PORTABLEZIP% "%SOLUTIONDIR%\*.TXT"
--- a/Tools/copy_release_installer.ps1
+++ b/Tools/copy_release_installer.ps1
@@ -0,0 +1,13 @@
+$sourcePath = $args[0]
+$destinationDir = $args[1]
+
+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
+}
--- a/Tools/rename_installer_with_version.ps1
+++ b/Tools/rename_installer_with_version.ps1
@@ -0,0 +1,21 @@
+#$solutionDir = $args[0] -replace "\\$"
+$solutionDir = "C:\Users\vsparda\Documents\Repositories\mRemoteNG Project\mRemoteNG\"
+#$renameTarget = $args[1]
+$renameTarget = "C:\Users\vsparda\Documents\Repositories\mRemoteNG Project\mRemoteNG\InstallerProjects\Installer\bin\Release\en-US\mRemoteNG-Installer.msi"
+$targetVersionedFile = "$solutionDir\mRemoteV1\bin\Release\mRemoteNG.exe"
+$version = &"$solutionDir\Tools\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)
+
+    # 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
+}
--- a/build-relport.cmd
+++ b/build-relport.cmd
@@ -1,40 +0,0 @@
-@echo off
-
-setlocal enabledelayedexpansion
-
-rem Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
-set SIGCHECK="Tools\sigcheck.exe"
-set SEVENZIP="Tools\7zip\7za.exe"
-
-set VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
-call %VCVARSALL% x86
-
-IF NOT "%~1"=="build" goto skipbuild
-echo Building...
-"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe" "%~dp0\mRemoteV1.sln" /Rebuild "Release Portable"
-
-:skipbuild
-set SIGCHECK=!SIGCHECK:"=^"!
-set SIGCHECK=!SIGCHECK: =^^ !
-set SIGCHECK=!SIGCHECK:(=^^(!
-set SIGCHECK=!SIGCHECK:)=^^)!
-for /F "usebackq delims=. tokens=1-4" %%i in (`!SIGCHECK! /accepteula -q -n "%~dp0\mRemoteV1\bin\Release Portable\mRemoteNG.exe"`) do (
-   set PRODUCT_VERSION_SHORT=%%i.%%j
-   set PRODUCT_VERSION=%%i.%%j.%%k.%%l
-)
-echo Version is %PRODUCT_VERSION%
-
-set PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-%PRODUCT_VERSION%.zip"
-
-rmdir /S /Q %~dp0\mRemoteV1\bin\package
-mkdir %~dp0\mRemoteV1\bin\package
-copy %~dp0\*.txt %~dp0\mRemoteV1\bin\package
-copy "%~dp0\Installer Projects\Installer\Dependencies\PuTTYNG.exe" %~dp0\mRemoteV1\bin\package
-
-xcopy /S /Y "%~dp0\mRemoteV1\bin\Release Portable" %~dp0\mRemoteV1\bin\package
-
-echo Creating portable ZIP file...
-echo %PORTABLEZIP% 
-del /f /q %PORTABLEZIP% > nul 2>&1
-%SEVENZIP% a -bt -mx=9 -mm=LZMA -tzip -y -r %PORTABLEZIP% "%~dp0\mRemoteV1\bin\package\*.*"
-%SEVENZIP% a -bt -mx=9 -mm=LZMA -tzip -y %PORTABLEZIP% "%~dp0\*.TXT"
--- a/mRemoteV1/Properties/AssemblyInfo.cs
+++ b/mRemoteV1/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@ using System.Runtime.InteropServices;

 [assembly:AssemblyTitle("mRemoteNG")]
 [assembly: AssemblyDescription("Multi-protocol remote connections manager")]
-[assembly: AssemblyCompany("mRemoteNG Dev Team")]
+[assembly: AssemblyCompany("")]
 [assembly:AssemblyProduct("mRemoteNG")]
 [assembly: AssemblyCopyright("Copyright © 2016 mRemoteNG Dev Team; 2010-2013 Riley McArdle; 2007-2009 Felix Deimel")]
 [assembly:AssemblyTrademark("")]
--- a/mRemoteV1/Resources/Help/Index.htm
+++ b/mRemoteV1/Resources/Help/Index.htm
@@ -22,7 +22,6 @@
      <li><a href="Config.htm">Config</a></li>
      <li><a href="ErrorsAndInfos.htm">Errors and Infos</a></li>
      <li><a href="SaveAsExport.htm">Save As / Export</a></li>
-      <li><a href="Sessions.htm">Sessions</a></li>
      <li><a href="ScreenshotManager.htm">Screenshot Manager</a></li>
      <li><a href="Connection.htm">Connection</a></li>
      <li><a href="Options.htm">Options</a></li>
--- a/mRemoteV1/Resources/Help/Sessions.htm
+++ b/mRemoteV1/Resources/Help/Sessions.htm
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" >
-<head>
-    <title>Sessions</title>
-    <link href="Main.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-    <p>
-        Sorry, not yet...</p>
-
-</body>
-</html>
--- a/mRemoteV1/UI/Window/HelpWindow.cs
+++ b/mRemoteV1/UI/Window/HelpWindow.cs
@@ -35,7 +35,6 @@ namespace mRemoteNG.UI.Window
 			TreeNode TreeNode10 = new TreeNode("Config");
 			TreeNode TreeNode11 = new TreeNode("Errors and Infos");
 			TreeNode TreeNode12 = new TreeNode("Save As / Export");
-			TreeNode TreeNode13 = new TreeNode("Sessions");
 			TreeNode TreeNode14 = new TreeNode("Screenshot Manager");
 			TreeNode TreeNode15 = new TreeNode("Connection");
 			TreeNode TreeNode16 = new TreeNode("Options");
@@ -45,7 +44,7 @@ namespace mRemoteNG.UI.Window
 			TreeNode TreeNode20 = new TreeNode("Import From Active Directory");
 			TreeNode TreeNode21 = new TreeNode("External Applications");
 			TreeNode TreeNode22 = new TreeNode("Port Scan");
-			TreeNode TreeNode23 = new TreeNode("User Interface", new TreeNode[] {TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12, TreeNode13, TreeNode14, TreeNode15, TreeNode16, TreeNode17, TreeNode18, TreeNode19, TreeNode20, TreeNode21, TreeNode22});
+			TreeNode TreeNode23 = new TreeNode("User Interface", new TreeNode[] {TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12, TreeNode14, TreeNode15, TreeNode16, TreeNode17, TreeNode18, TreeNode19, TreeNode20, TreeNode21, TreeNode22});
 			TreeNode TreeNode24 = new TreeNode("Quick Reference");
 			TreeNode TreeNode25 = new TreeNode("Help", new TreeNode[] {TreeNode1, TreeNode7, TreeNode23, TreeNode24});
 			wbHelp = new WebBrowser();
@@ -117,9 +116,6 @@ namespace mRemoteNG.UI.Window
 			TreeNode12.Name = "Node11";
 			TreeNode12.Tag = "SaveAsExport";
 			TreeNode12.Text = "Save As / Export";
-			TreeNode13.Name = "Node12";
-			TreeNode13.Tag = "Sessions";
-			TreeNode13.Text = "Sessions";
 			TreeNode14.Name = "Node13";
 			TreeNode14.Tag = "ScreenshotManager";
 			TreeNode14.Text = "Screenshot Manager";
@@ -154,6 +150,7 @@ namespace mRemoteNG.UI.Window
 			TreeNode24.Text = "Quick Reference";
 			TreeNode25.Name = "Node0";
 			TreeNode25.Text = "Help";
+            TreeNode25.Tag = "Index";
 			tvIndex.Nodes.AddRange(new TreeNode[] {TreeNode25});
 			tvIndex.ShowRootLines = false;
 			tvIndex.Size = new System.Drawing.Size(207, 321);
@@ -249,7 +246,7 @@ namespace mRemoteNG.UI.Window
 				
 		private void tvIndex_AfterSelect(Object sender, TreeViewEventArgs e)
 		{
-			if (((string)e.Node.Tag) != "")
+			if (((string)e.Node.Tag) != "" && e.Node.Tag != null)
 			{
 				wbHelp.Navigate(GeneralAppInfo.HomePath + "\\Help\\" + Convert.ToString(e.Node.Tag) +".htm");
 			}
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -816,9 +816,6 @@
    <Content Include="Resources\Help\Screenshots\Reference\01.png">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
-    <Content Include="Resources\Help\Sessions.htm">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
    <Content Include="Resources\Help\SQLScript.txt">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
@@ -1206,13 +1203,20 @@ REM Set LargeAddressAware on binary
 editbin /largeaddressaware mRemoteNG.exe

 REM Sign binaries
-IF EXIST C:\mRemoteNG_code_signing_cert.pfx (powershell "&amp;""$(SolutionDir)signfiles.ps1""" %25cd%25)
+IF EXIST C:\mRemoteNG_code_signing_cert.pfx (
+    IF %25buildenv: Portable=%25==Release (
+        powershell "&amp;""$(SolutionDir)Tools\signfiles.ps1""" '%25cd%25'
+    )
+)

 REM Remove unnecessary files from Release versions
 IF %25buildenv: Portable=%25==Release (
    rmdir /s /q app.publish
    del /q *.pdb *.publish *.xml *.backup *.log *vshost* *.tmp
-)</PostBuildEvent>
+)
+
+REM Package ZIP if building Release Portable
+IF %25buildenv: =%25==ReleasePortable ("$(SolutionDir)Tools\build-relport.cmd")</PostBuildEvent>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    <DebugSymbols>true</DebugSymbols>