Merge branch 'master' into develop

Conflicts: CHANGELOG.TXT Installer/mRemote.nsi mRemoteV1/App/App.Runtime.vb mRemoteV1/Config/Config.Connections.Load.vb mRemoteV1/My Project/Resources.Designer.vb mRemoteV1/My Project/Settings.Designer.vb
2026-02-17 22:11:48 +08:00 · 2011-12-28 19:59:06 -06:00
parent f249505d84 68cee49830
commit 82d56f13fc
16 changed files with 157 additions and 108 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
-Release
-mRemoteV1/bin
-mRemoteV1/obj
-mRemoteV1/publish
+Release/
+mRemoteV1/bin/
+mRemoteV1/obj/
+mRemoteV1/publish/
 *.pfx
 *.suo
 *.vbproj.user
@@ -17,3 +17,6 @@ _Re[Ss]harper.*
 *.user*
 *.pidb
 *.gpState
+_UpgradeReport_Files/
+Backup/
+UpgradeLog.XML
--- a/BUILD.CMD
+++ b/BUILD.CMD
@@ -1,17 +1,22 @@
@echo off

-REM SET VERSIONTAG=RC5
+setlocal enabledelayedexpansion

-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
+set VERSIONTAG=

-call %VCVARSALL% x86 > NUL 2>&1
+set VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 10.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

-rmdir /s /q "%~dp0\mRemoteV1\bin" > NUL 2>&1
-rmdir /s /q "%~dp0\mRemoteV1\obj" > NUL 2>&1
+rem Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
+set SIGCHECK="%ProgramFiles(x86)%\Sigcheck\sigcheck.exe"
+
+call %VCVARSALL% x86
+
+rmdir /s /q "%~dp0\mRemoteV1\bin" > nul 2>&1
+rmdir /s /q "%~dp0\mRemoteV1\obj" > nul 2>&1

 echo Building release version...
 %DEVENV% "%~dp0\mRemoteV1.sln" /build "Release"
@@ -22,12 +27,22 @@ echo Building portable version...
 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"
+mkdir "%~dp0\Release" > nul 2>&1

 echo Getting product version...
-%MAKENSIS% "%~dp0\Installer\GetVersion.nsi"
-"%~dp0\Release\GetVersion.exe"
-call "%~dp0\Release\Version.cmd"
+set VERSIONNSH="%~dp0\Release\Version.nsh"
+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\mRemoteNG.exe"`) do (
+   set PRODUCT_VERSION_SHORT=%%i.%%j
+   echo ^^!define PRODUCT_VERSION "%%i.%%j.%%k.%%l" > %VERSIONNSH%
+   echo ^^!define PRODUCT_VERSION_SHORT "%%i.%%j" >> %VERSIONNSH%
+   echo ^^!define PRODUCT_VERSION_MAJOR "%%i" >> %VERSIONNSH%
+   echo ^^!define PRODUCT_VERSION_MINOR "%%j" >> %VERSIONNSH%
+)
+echo Version is %PRODUCT_VERSION_SHORT%

 echo Creating installer package...
 if defined VERSIONTAG (
@@ -44,17 +59,24 @@ if defined VERSIONTAG (
 	set PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-%PRODUCT_VERSION_SHORT%.zip"
 )

+del %VERSIONNSH%
+
 echo Signing installer package...
 %SIGNCMD% %INSTALLEREXE%

 echo Creating release ZIP file...
-del /f /q %BINARYZIP% > NUL 2>&1
+del /f /q %BINARYZIP% > nul 2>&1
 %RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
 %RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
 %RAR% a -m5 -ep -afzip -inul %BINARYZIP% "%~dp0\*.TXT"

 echo Creating portable ZIP file...
-del /f /q %PORTABLEZIP% > NUL 2>&1
+del /f /q %PORTABLEZIP% > nul 2>&1
 %RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
 %RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
 %RAR% a -m5 -ep -afzip -inul %PORTABLEZIP% "%~dp0\*.TXT"
+
+echo.
+echo Build process complete.
+echo.
+pause
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,12 +1,19 @@
-1.69 (XXXX-XX-XX):
+1.70 (XXXX-XX-XX):
  Added compatibility check for "Use FIPS compliant algorithms" security setting.
  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.
+
+1.69 (2011-12-09):
  Fixed issue #66 - Fresh Install Fails to Create Config
+  Fixed issue #67 - Connection file gets erased
+  Fixed issue #72 - scrollbars added to RDP window after minimize/restore of mRemoteNG
  Disabled automatic updates in the portable edition
+  Fixed file name in window title changing when exporting an XML file.
+  Fixed Use only Notifications panel checkbox.
  Updated PuTTY to version 0.61
  Binaries are now digitally signed
+  Added Credits, License, and Version History items to the Start Menu and made Start Menu item names localizable.

 1.68 (2011-07-07):
  Fixed issue #48 - VerifyDatabaseVersion fails with new (empty) database tables.
--- a/Installer/GetVersion.nsi
+++ b/Installer/GetVersion.nsi
@@ -1,30 +0,0 @@
-!define AppFile "$EXEDIR\..\mRemoteV1\bin\Release\mRemoteNG.exe"
-!define VersionCmdFile "$EXEDIR\Version.cmd"
-!define VersionNshFile "$EXEDIR\Version.nsh"
-
-OutFile "..\Release\GetVersion.exe"
-SilentInstall silent
-RequestExecutionLevel user
-
-Section
-	## Get file version
-	GetDllVersion "${AppFile}" $R0 $R1
-	IntOp $R3 $R0 / 0x00010000
-	IntOp $R4 $R0 & 0x0000FFFF
-	IntOp $R5 $R1 / 0x00010000
-	IntOp $R6 $R1 & 0x0000FFFF
-	StrCpy $R1 "$R3.$R4.$R5.$R6"
-	StrCpy $R2 "$R3.$R4"
-
-	FileOpen $R0 "${VersionCmdFile}" w
-	FileWrite $R0 '@echo off$\r$\n'
-	FileWrite $R0 'SET PRODUCT_VERSION_SHORT=$R2$\r$\n'
-	FileClose $R0
-
-	FileOpen $R0 "${VersionNshFile}" w
-	FileWrite $R0 '!define PRODUCT_VERSION "$R1"$\r$\n'
-	FileWrite $R0 '!define PRODUCT_VERSION_SHORT "$R2"$\r$\n'
-	FileWrite $R0 '!define PRODUCT_VERSION_MAJOR "$R3"$\r$\n'
-	FileWrite $R0 '!define PRODUCT_VERSION_MINOR "$R4"$\r$\n'
-	FileClose $R0
-SectionEnd
--- a/Installer/mRemote.nsi
+++ b/Installer/mRemote.nsi
@@ -1,4 +1,4 @@
-!include "MUI.nsh"
+!include "MUI.nsh"
 !include "WordFunc.nsh"
 !insertmacro VersionCompare

@@ -181,7 +181,7 @@ Section "" ; Install
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayName" "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
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 7080

 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayVersion" ${PRODUCT_VERSION}
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "VersionMajor" ${PRODUCT_VERSION_MAJOR}
--- a/mRemoteV1.sln
+++ b/mRemoteV1.sln
@@ -1,6 +1,6 @@

-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "mRemoteV1", "mRemoteV1\mRemoteV1.vbproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
 EndProject
 Global
--- a/mRemoteV1/App/App.Runtime.vb
+++ b/mRemoteV1/App/App.Runtime.vb
@@ -932,6 +932,8 @@ Namespace App
        End Sub

        Public Shared Sub LoadConnections(Optional ByVal WithDialog As Boolean = False, Optional ByVal Update As Boolean = False)
+            Dim conL As New Config.Connections.Load
+
            Try
                Dim tmrWasEnabled As Boolean
                If TimerSqlWatcher IsNot Nothing Then
@@ -950,41 +952,18 @@ Namespace App
                ConnectionList = New Connection.List
                ContainerList = New Container.List

-                Dim conL As New Config.Connections.Load
-
                If My.Settings.UseSQLServer = False Then
                    If WithDialog Then
                        Dim lD As OpenFileDialog = Tools.Controls.ConnectionsLoadDialog

                        If lD.ShowDialog = System.Windows.Forms.DialogResult.OK Then
                            conL.ConnectionFileName = lD.FileName
-
-                            If conL.ConnectionFileName = App.Info.Connections.DefaultConnectionsPath & "\" & App.Info.Connections.DefaultConnectionsFile Then
-                                My.Settings.LoadConsFromCustomLocation = False
-                            Else
-                                My.Settings.LoadConsFromCustomLocation = True
-                                My.Settings.CustomConsPath = conL.ConnectionFileName
-                            End If
                        Else
                            Exit Sub
                        End If
                    Else
-                        If My.Settings.LoadConsFromCustomLocation = False Then
-                            Dim oldPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName & "\" & App.Info.Connections.DefaultConnectionsFile
-                            Dim newPath As String = App.Info.Connections.DefaultConnectionsPath & "\" & App.Info.Connections.DefaultConnectionsFile
-#If Not PORTABLE Then
-                            If File.Exists(oldPath) Then
-                                conL.ConnectionFileName = oldPath
-                            Else
-                                conL.ConnectionFileName = newPath
-                            End If
-#Else
-                            conL.ConnectionFileName = newPath
-#End If
-                        Else
-                            conL.ConnectionFileName = My.Settings.CustomConsPath
-                            End If
-                        End If
+                        conL.ConnectionFileName = GetStartupConnectionFileName()
+                    End If

                    If File.Exists(conL.ConnectionFileName) = False Then
                        If WithDialog Then
@@ -1033,6 +1012,13 @@ Namespace App

                If My.Settings.UseSQLServer = True Then
                    LastSqlUpdate = Now
+                Else
+                    If conL.ConnectionFileName = App.Info.Connections.DefaultConnectionsPath & "\" & App.Info.Connections.DefaultConnectionsFile Then
+                        My.Settings.LoadConsFromCustomLocation = False
+                    Else
+                        My.Settings.LoadConsFromCustomLocation = True
+                        My.Settings.CustomConsPath = conL.ConnectionFileName
+                    End If
                End If

                If tmrWasEnabled And TimerSqlWatcher IsNot Nothing Then
@@ -1040,9 +1026,40 @@ Namespace App
                End If
            Catch ex As Exception
                MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionsFileCouldNotBeLoaded & vbNewLine & ex.Message)
+                If My.Settings.UseSQLServer = False Then
+                    If Not conL.ConnectionFileName = GetStartupConnectionFileName() Then
+                        LoadConnections()
+                        Exit Sub
+                    Else
+                        MsgBox(String.Format(My.Resources.strErrorStartupConnectionFileLoad, vbNewLine, Application.ProductName, GetStartupConnectionFileName(), ex.Message), MsgBoxStyle.OkOnly + MsgBoxStyle.Critical)
+                        Application.Exit()
+                    End If
+                End If
            End Try
        End Sub

+        Protected Shared Function GetStartupConnectionFileName() As String
+            Dim fileName As New String("")
+
+            If My.Settings.LoadConsFromCustomLocation = False Then
+                Dim oldPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName & "\" & App.Info.Connections.DefaultConnectionsFile
+                Dim newPath As String = App.Info.Connections.DefaultConnectionsPath & "\" & App.Info.Connections.DefaultConnectionsFile
+#If Not PORTABLE Then
+                If File.Exists(oldPath) Then
+                    fileName = oldPath
+                Else
+                    fileName = newPath
+                End If
+#Else
+                fileName = newPath
+#End If
+            Else
+                fileName = My.Settings.CustomConsPath
+            End If
+
+            Return fileName
+        End Function
+
        Public Shared Sub ImportConnections()
            Try
                Dim lD As OpenFileDialog = Tools.Controls.ConnectionsLoadDialog
--- a/mRemoteV1/Config/Config.Connections.Load.vb
+++ b/mRemoteV1/Config/Config.Connections.Load.vb
@@ -716,6 +716,7 @@ Namespace Config
                Catch ex As Exception
                    App.Runtime.IsConnectionsFileLoaded = False
                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strLoadFromXmlFailed & vbNewLine & ex.Message, True)
+                    Throw
                End Try
            End Sub

--- a/mRemoteV1/Config/Config.Connections.Save.vb
+++ b/mRemoteV1/Config/Config.Connections.Save.vb
@@ -157,18 +157,12 @@ Namespace Config
                        SaveToVRE()
                    Case Format.vRDCSV
                        SaveTovRDCSV()
-                    Case Format.mRXML Or Format.None
-                        SaveToXML()
-                        If My.Settings.EncryptCompleteConnectionsFile Then
-                            EncryptCompleteFile()
-                        End If
-                        SetMainFormText(_ConnectionFileName)
                    Case Else
                        SaveToXML()
                        If My.Settings.EncryptCompleteConnectionsFile Then
                            EncryptCompleteFile()
                        End If
-                        SetMainFormText(_ConnectionFileName)
+                        If Not _Export Then SetMainFormText(_ConnectionFileName)
                End Select
            End Sub
 #End Region
--- a/mRemoteV1/Connection/Connection.Protocol.RDP.vb
+++ b/mRemoteV1/Connection/Connection.Protocol.RDP.vb
@@ -98,6 +98,8 @@ Namespace Connection

                    RDP.ConnectingText = My.Language.strConnecting

+                    Control.Anchor = AnchorStyles.None
+
                    Return True
                Catch ex As Exception
                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetPropsFailed & vbNewLine & ex.Message, True)
@@ -153,6 +155,12 @@ Namespace Connection
                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpFocusFailed & vbNewLine & ex.Message, True)
                End Try
            End Sub
+
+            Public Overrides Sub Resize()
+                Control.Location = InterfaceControl.Location
+                Control.Size = InterfaceControl.Size
+                MyBase.Resize()
+            End Sub
 #End Region

 #Region "Private Methods"
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:2.0.50727.4927
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.239
 '
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------

@@ -14,10 +14,10 @@ Option Explicit On

 Namespace My
    
-    'HINWEIS: Diese Datei wird automatisch generiert. Ändern Sie sie nicht direkt. Zum Ändern
-    ' oder bei in dieser Datei auftretenden Buildfehlern wechseln Sie zum Projekt-Designer.
-    ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Eigenes Projekt" im
-    ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor.
+    'NOTE: This file is auto-generated; do not modify it directly.  To make changes,
+    ' or if you encounter build errors in this file, go to the Project Designer
+    ' (go to Project Properties or double-click the My Project node in
+    ' Solution Explorer), and make changes on the Application tab.
    '
    Partial Friend Class MyApplication
        
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices

 <Assembly: AssemblyTitle("mRemoteNG")> 
 <Assembly: AssemblyDescription("")> 
-<Assembly: AssemblyCompany("Next Generation Software")> 
+<Assembly: AssemblyCompany("")> 
 <Assembly: AssemblyProduct("mRemoteNG")> 
 <Assembly: AssemblyCopyright("Copyright © 2007-2009 Felix Deimel, 2010-2011 Riley McArdle")> 
 <Assembly: AssemblyTrademark("")> 
@@ -34,4 +34,4 @@ Imports System.Runtime.InteropServices

 <Assembly: AssemblyVersion("1.69.*")> 

-<Assembly: NeutralResourcesLanguageAttribute("en")> 
+<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.5446
+'     Runtime Version:4.0.30319.239
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  A strongly-typed resource class, for looking up localized strings, etc.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -756,6 +756,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to The startup connection file could not be loaded.{0}{0}{2}{0}{3}{0}{0}In order to prevent data loss, {1} will now exit..
+        '''</summary>
+        Friend ReadOnly Property strErrorStartupConnectionFileLoad() As String
+            Get
+                Return ResourceManager.GetString("strErrorStartupConnectionFileLoad", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized string similar to mRemoteNG Portable Edition does not currently support automatic updates..
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -448,4 +448,7 @@
 	<data name="strUpdateCheckPortableEdition">
 		<value xml:space="preserve">mRemoteNG Portable Edition does not currently support automatic updates.</value>
 	</data>
+  <data name="strErrorStartupConnectionFileLoad">
+    <value xml:space="preserve">The startup connection file could not be loaded.{0}{0}{2}{0}{3}{0}{0}In order to prevent data loss, {1} will now exit.</value>
+  </data>
 </root>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:2.0.50727.5444
+'     Runtime Version:4.0.30319.239
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -15,12 +15,12 @@ Option Explicit On
 Namespace My
    
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
        
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings),MySettings)
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
        
 #Region "My.Settings Auto-Save Functionality"
 #If _MyType = "WindowsForms" Then
--- a/mRemoteV1/mRemoteV1.vbproj
+++ b/mRemoteV1/mRemoteV1.vbproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,7 +14,7 @@
    <OptionExplicit>On</OptionExplicit>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <IsWebBootstrapper>false</IsWebBootstrapper>
@@ -25,7 +25,7 @@
    <ManifestKeyFile>mRemoteV1_TemporaryKey.pfx</ManifestKeyFile>
    <GenerateManifests>true</GenerateManifests>
    <SignManifests>false</SignManifests>
-    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -39,6 +39,7 @@
    <ApplicationRevision>1</ApplicationRevision>
    <ApplicationVersion>1.64.0.%2a</ApplicationVersion>
    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -49,10 +50,11 @@
    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>
    </DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42032,42036</NoWarn>
+    <NoWarn>41999,42016,42017,42018,42019,42032,42036,42353,42354,42355</NoWarn>
    <WarningsAsErrors>
    </WarningsAsErrors>
    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -62,31 +64,34 @@
    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>
    </DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42032,42036</NoWarn>
+    <NoWarn>41999,42016,42017,42018,42019,42032,42036,42353,42354,42355</NoWarn>
    <WarningsAsErrors>
    </WarningsAsErrors>
    <DebugSymbols>true</DebugSymbols>
    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Portable|AnyCPU' ">
    <DefineTrace>true</DefineTrace>
    <OutputPath>bin\Release Portable\</OutputPath>
    <Optimize>true</Optimize>
-    <NoWarn>41999,42016,42017,42018,42019,42032,42036</NoWarn>
+    <NoWarn>41999,42016,42017,42018,42019,42032,42036,42353,42354,42355</NoWarn>
    <DebugType>pdbonly</DebugType>
    <PlatformTarget>x86</PlatformTarget>
    <DefineConstants>PORTABLE</DefineConstants>
    <DebugSymbols>true</DebugSymbols>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Portable|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DefineDebug>true</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <OutputPath>bin\Debug Portable\</OutputPath>
-    <NoWarn>41999,42016,42017,42018,42019,42032,42036</NoWarn>
+    <NoWarn>41999,42016,42017,42018,42019,42032,42036,42353,42354,42355</NoWarn>
    <DebugType>full</DebugType>
    <PlatformTarget>x86</PlatformTarget>
    <DefineConstants>PORTABLE</DefineConstants>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="ADTree, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -885,6 +890,11 @@
    <None Include="Resources\Images\Website.png" />
  </ItemGroup>
  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
      <Visible>False</Visible>
      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@@ -900,6 +910,11 @@
      <ProductName>.NET Framework 3.5</ProductName>
      <Install>false</Install>
    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
  </ItemGroup>
  <ItemGroup>
    <COMReference Include="AxMSTSCLib">