Merge branch 'release/1.69' into develop

Conflicts: CHANGELOG.TXT mRemoteV1/Forms/frmOptions.vb mRemoteV1/My Project/AssemblyInfo.vb mRemoteV1/My Project/Resources.Designer.vb mRemoteV1/My Project/Resources.resx
2026-02-26 12:08:37 +08:00 · 2011-12-05 00:59:32 -06:00
parent 6792737f25 87b0f317d1
commit f249505d84
10 changed files with 52 additions and 5 deletions
--- a/BUILD.CMD
+++ b/BUILD.CMD
@@ -6,6 +6,7 @@ SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
 SET DEVENV="devenv.exe"
 SET MAKENSIS="%ProgramFiles(x86)%\NSIS\Unicode\makensis.exe"
 SET RAR="%ProgramFiles%\WinRAR\WinRAR.exe"
+SET SIGNCMD=signtool.exe sign /n "Next Generation Software" /sha1 "c4ece717747eb7d0cac824f6c7431e5237138b02" /t http://timestamp.verisign.com/scripts/timstamp.dll

 call %VCVARSALL% x86 > NUL 2>&1

@@ -18,6 +19,9 @@ echo Building release version...
 echo Building portable version...
 %DEVENV% "%~dp0\mRemoteV1.sln" /build "Release Portable"

+echo Signing binaries...
+%SIGNCMD% "%~dp0\mRemoteV1\bin\Release\de\mRemoteNG.resources.dll" "%~dp0\mRemoteV1\bin\Release\en-US\mRemoteNG.resources.dll" "%~dp0\mRemoteV1\bin\Release\fr\mRemoteNG.resources.dll" "%~dp0\mRemoteV1\bin\Release\AxInterop.WFICALib.dll" "%~dp0\mRemoteV1\bin\Release\AxInterop.MSTSCLib.dll" "%~dp0\mRemoteV1\bin\Release\Interop.WFICALib.dll" "%~dp0\mRemoteV1\bin\Release\Interop.ShDocVw.dll" "%~dp0\mRemoteV1\bin\Release\Interop.MSTSCLib.dll" "%~dp0\mRemoteV1\bin\Release\Interop.EOLWTSCOM.dll" "%~dp0\mRemoteV1\bin\Release\Interop.EOLWTSCOM.dll" "%~dp0\mRemoteV1\bin\Release\mRemoteNG.exe" "%~dp0\mRemoteV1\bin\Release Portable\de\mRemoteNG.resources.dll" "%~dp0\mRemoteV1\bin\Release Portable\en-US\mRemoteNG.resources.dll" "%~dp0\mRemoteV1\bin\Release Portable\fr\mRemoteNG.resources.dll" "%~dp0\mRemoteV1\bin\Release Portable\AxInterop.WFICALib.dll" "%~dp0\mRemoteV1\bin\Release Portable\AxInterop.MSTSCLib.dll" "%~dp0\mRemoteV1\bin\Release Portable\Interop.WFICALib.dll" "%~dp0\mRemoteV1\bin\Release Portable\Interop.ShDocVw.dll" "%~dp0\mRemoteV1\bin\Release Portable\Interop.MSTSCLib.dll" "%~dp0\mRemoteV1\bin\Release Portable\Interop.EOLWTSCOM.dll" "%~dp0\mRemoteV1\bin\Release Portable\Interop.EOLWTSCOM.dll" "%~dp0\mRemoteV1\bin\Release Portable\mRemoteNG.exe"
+
 mkdir "%~dp0\Release"

 echo Getting product version...
@@ -29,15 +33,20 @@ echo Creating installer package...
 if defined VERSIONTAG (
 	%MAKENSIS% /DPRODUCT_VERSION_TAG=%VERSIONTAG% "%~dp0\Installer\mRemote.nsi"

+	set INSTALLEREXE="%~dp0\Release\mRemoteNG-Installer-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.exe"
 	set BINARYZIP="%~dp0\Release\mRemoteNG-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.zip"
 	set PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.zip"
 ) else (
 	%MAKENSIS% "%~dp0\Installer\mRemote.nsi"

+	set INSTALLEREXE="%~dp0\Release\mRemoteNG-Installer-%PRODUCT_VERSION_SHORT%.exe"
 	set BINARYZIP="%~dp0\Release\mRemoteNG-%PRODUCT_VERSION_SHORT%.zip"
 	set PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-%PRODUCT_VERSION_SHORT%.zip"
 )

+echo Signing installer package...
+%SIGNCMD% %INSTALLEREXE%
+
 echo Creating release ZIP file...
 del /f /q %BINARYZIP% > NUL 2>&1
 %RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -3,6 +3,10 @@
  Improved reporting of errors when encrypting and decrypting connection files.
  Added partial Polish translation.
  The panel tabs are now hidden if only one panel is open.
+  Fixed issue #66 - Fresh Install Fails to Create Config
+  Disabled automatic updates in the portable edition
+  Updated PuTTY to version 0.61
+  Binaries are now digitally signed

 1.68 (2011-07-07):
  Fixed issue #48 - VerifyDatabaseVersion fails with new (empty) database tables.
--- a/Installer/Dependencies/putty.exe
+++ b/Installer/Dependencies/putty.exe
--- a/Installer/mRemote.nsi
+++ b/Installer/mRemote.nsi
@@ -26,6 +26,7 @@ RequestExecutionLevel admin

 ; Version Information
 VIProductVersion ${PRODUCT_VERSION}
+VIAddVersionKey "CompanyName" "Next Generation Software"
 VIAddVersionKey "ProductName" "mRemoteNG"
 VIAddVersionKey "ProductVersion" ${PRODUCT_VERSION}
 VIAddVersionKey "LegalCopyright" "Copyright © 2007-2009 Felix Deimel, 2010-2011 Riley McArdle"
@@ -178,7 +179,7 @@ Section "" ; Install
 	; Registry
 	WriteRegStr HKLM "Software\mRemoteNG" "InstallPath" $INSTDIR
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayName" "mRemoteNG"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "Publisher" "mRemoteNG"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "Publisher" "Next Generation Software"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayIcon" "$INSTDIR\mRemoteNG.exe"
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 7180

--- a/mRemoteV1/App/App.Runtime.vb
+++ b/mRemoteV1/App/App.Runtime.vb
@@ -884,6 +884,7 @@ Namespace App

                My.Settings.LoadConsFromCustomLocation = False

+                Directory.CreateDirectory(Path.GetDirectoryName(filename))
                Dim xW As New XmlTextWriter(filename, System.Text.Encoding.UTF8)
                xW.Formatting = Formatting.Indented
                xW.Indentation = 4
--- a/mRemoteV1/Forms/frmMain.vb
+++ b/mRemoteV1/Forms/frmMain.vb
@@ -68,6 +68,7 @@ Public Class frmMain
            Windows.Show(UI.Window.Type.ComponentsCheck)
        End If

+#If Not PORTABLE Then
        If Not My.Settings.CheckForUpdatesAsked Then
            Dim CommandButtons() As String = {My.Language.strAskUpdatesCommandRecommended, My.Language.strAskUpdatesCommandCustom, My.Language.strAskUpdatesCommandAskLater}
            cTaskDialog.ShowTaskDialogBox(Me, My.Application.Info.ProductName, My.Language.strAskUpdatesMainInstruction, String.Format(My.Language.strAskUpdatesContent, My.Application.Info.ProductName), "", "", "", "", String.Join("|", CommandButtons), eTaskDialogButtons.None, eSysIcons.Question, eSysIcons.Question)
@@ -81,6 +82,12 @@ Public Class frmMain

        Startup.UpdateCheck()
        Startup.AnnouncementCheck()
+#Else
+        mMenInfoAnnouncements.Visible = False
+        mMenToolsUpdate.Visible = False
+        mMenInfoSep2.Visible = False
+#End If
+
        Startup.CreateSQLUpdateHandlerAndStartTimer()

        AddSysMenuItems()
--- a/mRemoteV1/Forms/frmOptions.vb
+++ b/mRemoteV1/Forms/frmOptions.vb
@@ -1,4 +1,5 @@
-Imports WeifenLuo.WinFormsUI.Docking
+Imports mRemoteNG.My.Resources
+Imports WeifenLuo.WinFormsUI.Docking
 Imports mRemoteNG.App.Runtime

 Public Class frmOptions
@@ -1667,6 +1668,14 @@ Public Class frmOptions
        ' Switch to the _initialTab
        tcTabControl.SelectedIndex = _initialTab
        lvPages.Items(_initialTab).Selected = True
+
+#If PORTABLE Then
+        For Each Control As Control In tcTabControl.TabPages(5).Controls
+            If Control IsNot lblUpdatesExplanation Then
+                Control.Visible = False
+            End If
+        Next
+#End If
    End Sub

    Private Sub ApplyLanguage()
@@ -1677,7 +1686,11 @@ Public Class frmOptions
        lvPages.Items(4).Text = My.Language.strSQLServer
        lvPages.Items(5).Text = My.Language.strTabUpdates
        lvPages.Items(6).Text = My.Language.strTabAdvanced
+#If Not PORTABLE Then
        lblUpdatesExplanation.Text = My.Language.strUpdateCheck
+#Else
+        lblUpdatesExplanation.Text = My.Language.strUpdateCheckPortableEdition
+#End If
        btnTestProxy.Text = My.Language.strButtonTestProxy
        lblSeconds.Text = My.Language.strLabelSeconds
        lblMaximumPuttyWaitTime.Text = My.Language.strLabelPuttyTimeout
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices

 <Assembly: AssemblyTitle("mRemoteNG")> 
 <Assembly: AssemblyDescription("")> 
-<Assembly: AssemblyCompany("")> 
+<Assembly: AssemblyCompany("Next Generation Software")> 
 <Assembly: AssemblyProduct("mRemoteNG")> 
 <Assembly: AssemblyCopyright("Copyright © 2007-2009 Felix Deimel, 2010-2011 Riley McArdle")> 
 <Assembly: AssemblyTrademark("")> 
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("1.68.*")> 
+<Assembly: AssemblyVersion("1.69.*")> 

 <Assembly: NeutralResourcesLanguageAttribute("en")> 
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:2.0.50727.5444
+'     Runtime Version:2.0.50727.5446
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -753,6 +753,15 @@ Namespace My.Resources
            End Get
        End Property
        
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to mRemoteNG Portable Edition does not currently support automatic updates..
+        '''</summary>
+        Friend ReadOnly Property strUpdateCheckPortableEdition() As String
+            Get
+                Return ResourceManager.GetString("strUpdateCheckPortableEdition", resourceCulture)
        Friend ReadOnly Property Tab_Icon() As System.Drawing.Icon
            Get
                Dim obj As Object = ResourceManager.GetObject("Tab_Icon", resourceCulture)
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -445,4 +445,7 @@
  <data name="News" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Images_FamFamFam\News.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+	<data name="strUpdateCheckPortableEdition">
+		<value xml:space="preserve">mRemoteNG Portable Edition does not currently support automatic updates.</value>
+	</data>
 </root>