Upgrade solution to Visual Studio 2010 format.

.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

BUILD.CMD

@@ -1,16 +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 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"
@@ -18,34 +24,59 @@ echo Building release version...
 echo Building portable version...
 %DEVENV% "%~dp0\mRemoteV1.sln" /build "Release Portable"
 
-mkdir "%~dp0\Release"
+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" > 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 (
 	%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"
 )
 
+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

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

Installer/Language/czech.nsi

@@ -13,4 +13,10 @@ LangString SelectInstallerLanguage ${LANG_CZECH} "Please select the language of
 LangString RequiresNetFramework ${LANG_CZECH} "mRemoteNG requires Microsoft .NET Framework 2.0."
 
 ; User needs to be Admin
-LangString RequiresAdminUser ${LANG_CZECH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+LangString RequiresAdminUser ${LANG_CZECH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_CZECH} "Credits"
+LangString CopyingLinkName ${LANG_CZECH} "License"
+LangString UninstallLinkName ${LANG_CZECH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_CZECH} "Version History"

Installer/Language/dutch.nsi

@@ -13,4 +13,10 @@ LangString SelectInstallerLanguage ${LANG_DUTCH} "Please select the language of
 LangString RequiresNetFramework ${LANG_DUTCH} "mRemoteNG requires Microsoft .NET Framework 2.0."
 
 ; User needs to be Admin
-LangString RequiresAdminUser ${LANG_DUTCH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+LangString RequiresAdminUser ${LANG_DUTCH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_DUTCH} "Credits"
+LangString CopyingLinkName ${LANG_DUTCH} "License"
+LangString UninstallLinkName ${LANG_DUTCH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_DUTCH} "Version History"

Installer/Language/english.nsi

@@ -13,4 +13,10 @@ LangString SelectInstallerLanguage ${LANG_ENGLISH} "Please select the language o
 LangString RequiresNetFramework ${LANG_ENGLISH} "mRemoteNG requires Microsoft .NET Framework 2.0."
 
 ; User needs to be Admin
-LangString RequiresAdminUser ${LANG_ENGLISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+LangString RequiresAdminUser ${LANG_ENGLISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_ENGLISH} "Credits"
+LangString CopyingLinkName ${LANG_ENGLISH} "License"
+LangString UninstallLinkName ${LANG_ENGLISH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_ENGLISH} "Version History"

Installer/Language/french.nsi

@@ -13,4 +13,10 @@ LangString SelectInstallerLanguage ${LANG_FRENCH} "Please select the language of
 LangString RequiresNetFramework ${LANG_FRENCH} "mRemoteNG requires Microsoft .NET Framework 2.0."
 
 ; User needs to be Admin
-LangString RequiresAdminUser ${LANG_FRENCH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+LangString RequiresAdminUser ${LANG_FRENCH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_FRENCH} "Credits"
+LangString CopyingLinkName ${LANG_FRENCH} "License"
+LangString UninstallLinkName ${LANG_FRENCH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_FRENCH} "Version History"

Installer/Language/german.nsi

@@ -13,4 +13,10 @@ LangString SelectInstallerLanguage ${LANG_GERMAN} "Bitte w
 LangString RequiresNetFramework ${LANG_GERMAN} "mRemoteNG ben<65>tigt das Microsoft .NET Framework 2.0."
 
 ; User needs to be Admin
-LangString RequiresAdminUser ${LANG_GERMAN} "Sie m<>ssen Mitglied der Grupper 'Power Users' or 'Administratoren' sein, damit Sie mRemoteNG installieren k<>nnen."
+LangString RequiresAdminUser ${LANG_GERMAN} "Sie m<>ssen Mitglied der Grupper 'Power Users' or 'Administratoren' sein, damit Sie mRemoteNG installieren k<>nnen."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_GERMAN} "Credits"
+LangString CopyingLinkName ${LANG_GERMAN} "License"
+LangString UninstallLinkName ${LANG_GERMAN} "Uninstall"
+LangString ChangeLogLinkName ${LANG_GERMAN} "Version History"

Installer/Language/polish.nsi

@@ -13,4 +13,10 @@ LangString SelectInstallerLanguage ${LANG_POLISH} "Please select the language of
 LangString RequiresNetFramework ${LANG_POLISH} "mRemoteNG requires Microsoft .NET Framework 2.0."
 
 ; User needs to be Admin
-LangString RequiresAdminUser ${LANG_POLISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+LangString RequiresAdminUser ${LANG_POLISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_POLISH} "Credits"
+LangString CopyingLinkName ${LANG_POLISH} "License"
+LangString UninstallLinkName ${LANG_POLISH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_POLISH} "Version History"

Installer/Language/spanish.nsi

@@ -13,4 +13,10 @@ LangString SelectInstallerLanguage ${LANG_SPANISH} "Please select the language o
 LangString RequiresNetFramework ${LANG_SPANISH} "mRemoteNG requires Microsoft .NET Framework 2.0."
 
 ; User needs to be Admin
-LangString RequiresAdminUser ${LANG_SPANISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+LangString RequiresAdminUser ${LANG_SPANISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_SPANISH} "Credits"
+LangString CopyingLinkName ${LANG_SPANISH} "License"
+LangString UninstallLinkName ${LANG_SPANISH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_SPANISH} "Version History"

Installer/Language/thai.nsi

@@ -15,3 +15,9 @@ LangString RequiresNetFramework ${LANG_THAI} "mRemoteNG มีความต้
 
 ; User needs to be Admin
 LangString RequiresAdminUser ${LANG_THAI} "คุณต้องเป็นสมาชิกในกลุ่มของ 'Power Users' หรือ 'Administrators' เพื่อการติดตั้ง mRemoteNG"
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_THAI} "Credits"
+LangString CopyingLinkName ${LANG_THAI} "License"
+LangString UninstallLinkName ${LANG_THAI} "Uninstall"
+LangString ChangeLogLinkName ${LANG_THAI} "Version History"

Installer/mRemote.nsi

@@ -1,4 +1,4 @@
-!include "MUI.nsh"
+!include "MUI.nsh"
 !include "WordFunc.nsh"
 !insertmacro VersionCompare
 
@@ -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"
@@ -169,15 +170,18 @@ Section "" ; Install
  
 	; Start Menu
 	CreateDirectory "$SMPROGRAMS\mRemoteNG"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(CreditsLinkName).lnk" "$INSTDIR\CREDITS.TXT"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(CopyingLinkName).lnk" "$INSTDIR\COPYING.TXT"
 	CreateShortCut "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk" "$INSTDIR\mRemoteNG.exe"
-	CreateShortCut "$SMPROGRAMS\mRemoteNG\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(UninstallLinkName).lnk" "$INSTDIR\Uninstall.exe"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(ChangeLogLinkName).lnk" "$INSTDIR\CHANGELOG.TXT"
 
 	; 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" 6464
+	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}
@@ -197,13 +201,9 @@ Section "un.Uninstall"
 
 	; Start Menu
 	SetShellVarContext all
-	Delete "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk"
-	Delete "$SMPROGRAMS\mRemoteNG\Uninstall.lnk"
-	RMDir "$SMPROGRAMS\mRemoteNG"
+	RMDir /r "$SMPROGRAMS\mRemoteNG"
 	SetShellVarContext current
-	Delete "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk"
-	Delete "$SMPROGRAMS\mRemoteNG\Uninstall.lnk"
-	RMDir "$SMPROGRAMS\mRemoteNG"
+	RMDir /r "$SMPROGRAMS\mRemoteNG"
 
 	; Registry
 	DeleteRegValue HKLM "Software\mRemoteNG" "InstallPath"

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

mRemoteV1/App/App.Runtime.vb

@@ -682,6 +682,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
@@ -728,6 +729,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 tmrSqlWatcher IsNot Nothing Then
@@ -746,41 +749,18 @@ Namespace App
                 cL = New Connection.List
                 ctL = 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
@@ -831,6 +811,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 tmrSqlWatcher IsNot Nothing Then
@@ -838,9 +825,40 @@ Namespace App
                 End If
             Catch ex As Exception
                 mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.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

mRemoteV1/CHANGELOG.TXT

@@ -1,3 +1,14 @@
+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.
   Fixed issue #60 - Can't save connections file

mRemoteV1/Config/Config.Connections.Load.vb

@@ -716,6 +716,7 @@ Namespace Config
                 Catch ex As Exception
                     App.Runtime.ConnectionsFileLoaded = False
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strLoadFromXmlFailed & vbNewLine & ex.Message, True)
+                    Throw
                 End Try
             End Sub
 

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

mRemoteV1/Connection/Connection.Protocol.RDP.vb

@@ -98,6 +98,8 @@ Namespace Connection
 
                     RDP.ConnectingText = My.Resources.strConnecting
 
+                    Control.Anchor = AnchorStyles.None
+
                     Return True
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetPropsFailed & vbNewLine & ex.Message, True)
@@ -153,6 +155,12 @@ Namespace Connection
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.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"

mRemoteV1/Forms/frmMain.vb

@@ -65,6 +65,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.Resources.strAskUpdatesCommandRecommended, My.Resources.strAskUpdatesCommandCustom, My.Resources.strAskUpdatesCommandAskLater}
             Dim Result As DialogResult = cTaskDialog.ShowTaskDialogBox(Me, My.Application.Info.ProductName, My.Resources.strAskUpdatesMainInstruction, String.Format(My.Resources.strAskUpdatesContent, My.Application.Info.ProductName), "", "", "", "", String.Join("|", CommandButtons), eTaskDialogButtons.None, eSysIcons.Question, eSysIcons.Question)
@@ -78,6 +79,12 @@ Public Class frmMain
 
         Startup.UpdateCheck()
         Startup.AnnouncementCheck()
+#Else
+        mMenInfoAnnouncements.Visible = False
+        mMenToolsUpdate.Visible = False
+        mMenInfoSep2.Visible = False
+#End If
+
         Startup.CreateSQLUpdateHandlerAndStartTimer()
 
         AddSysMenuItems()

mRemoteV1/Forms/frmOptions.resx

@@ -124,154 +124,154 @@
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABu
-        IgAAAk1TRnQBSQFMAgEBBwEAAdABAAHQAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
-        AwABIAMAAQEBAAEgBgABIB4AAeIB7wH0Af8BqAHJAdcB/wF3AaQBtgH/AVoBhgGcAf8BRQFsAYoB/wFA
-        AWcBhwH/AUABcQGVAf8BUwGOAasB/wGPAbcBzQH/Ad0B6gHxAf8MAANXAbcDnwH/A5oB/wOWAf8DkQH/
-        A40B/wOJAf8DhAH/A4AB/wNiAf8DXgH/A1oB/wNXAf8DUwH/A1AB/wNXAbcYAAMNARIDVgG2A1YBtgMN
-        ARFgAAGtAc8B3wH/AVIBkQGtAf8BVwGjAb8B/wFzAcAB1AH/AZUB2QHmAf8BgQHbAfAB/wFLAcYB7AH/
-        AR8BqgHdAf8BEQGSAccB/wEdAYABrAH/ATQBbAGSAf8BnQG/AdEB/wgAA6gB/wPpAf8D0wH/A9IB/wPR
-        Af8D0AH/A84B/wPNAf8DzQH/A8sB/wPLAf8DygH/A8kB/wPIAf8D4gH/A1AB/xgAA14B2QPkAf8D4wH/
-        A1gBwWAAAVUBhAGbAf8BPwG9AecB/wFiAdMB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUsBygHw
-        Af8BGQG2Ae0B/wEAAacB6AH/AQABoQHhAf8BBAGWAdIB/wE4AVkBdQH/CAADrQH/A9YB/wO6Af8DuAH/
-        A7UB/wOzAf8DsQH/A7AB/wOtAf8DqwH/A6oB/wOoAf8DpwH/A6YB/wPIAf8DVAH/CAADCwEPA1QBrQM6
-        AWEDPwFuA3sB+AHiAeEB3wH/AeEB4AHfAf8DawHzAzwBZwM8AWYDUwGtAwsBD1AAAVgBhwGeAf8BPgHE
-        AfAB/wFkAdQB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUsBygHwAf8BGQG2Ae0B/wEAAagB6AH/
-        AQABoQHhAf8BAAGcAdoB/wE5AVoBdwH/CAADsQH/A9kB/wO9Af8DugH/A7gB/wO2Af8DtQH/A7MB/wOw
-        Af8DrwH/A60B/wOrAf8DqQH/A6gB/wPKAf8DWAH/CAADWgHFBP8CtAGzAf4CswGyAf4C5wHmAf8B1gHV
-        AdMB/wHXAdYB1AH/AeMB4gHgAf8BqAGnAaUB/gKxAbAB/QHpAegB5gH/A1gBwVAAAVoBiQGgAf8BPgHE
-        Ae8B/wFjAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGCAd8B8wH/AUwBygHwAf8BGQG2Ae0B/wEAAagB6AH/
-        AQABoQHhAf8BAAGcAdoB/wE7AV0BeQH/CAADtgH/A90B/wPBAf8DvQH/A7wB/wO6Af8DuAH/A7UB/wO0
-        Af8DsgH/A7AB/wOtAf8DrAH/A6wB/wPPAf8DXAH/CAADZAHnAvkB9wH/Au8B7gH/AtsB2gH/AcoCyQH/
-        AckByAHGAf8ByQHIAccB/wHJAcgBxwH/AssByQH/AeYB5QHkAf8B5QHkAeIB/wNlAeVQAAFcAYwBogH/
-        AUABxgHwAf8BZQHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BggHfAfQB/wFMAcoB8AH/ARkBtgHtAf8BAAGo
-        AegB/wEAAaIB4gH/AQABmwHbAf8BPQFgAYAB/wgAA1oBvQPaAf8DyAH/A8AB/wO/Af8DvQH/A7oB/wO4
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABq
+        IgAAAk1TRnQBSQFMAgEBBwEAAdgBAAHYAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABIAMAAQEBAAEgBgABIB4AAeIB7wH0Af8BqAHJAdcB/wF2AaQBtgH/AVkBhgGcAf8BRAFrAYoB/wE/
+        AWYBhwH/AT8BcAGVAf8BUgGOAasB/wGPAbcBzQH/Ad0B6gHxAf8MAANXAbcDnwH/A5oB/wOWAf8DkQH/
+        A40B/wOJAf8DhAH/A4AB/wNhAf8DXQH/A1kB/wNWAf8DUgH/A08B/wNXAbcYAAMNARIDVgG2A1YBtgMN
+        ARFgAAGtAc8B3wH/AVEBkQGtAf8BVgGjAb8B/wFyAcAB1AH/AZUB2QHmAf8BgQHbAfAB/wFKAcYB7AH/
+        AR4BqgHdAf8BEAGSAccB/wEcAYABrAH/ATMBawGSAf8BnQG/AdEB/wgAA6gB/wPpAf8D0wH/A9IB/wPR
+        Af8D0AH/A84B/wPNAf8DzQH/A8sB/wPLAf8DygH/A8kB/wPIAf8D4gH/A08B/xgAA14B2QPkAf8D4wH/
+        A1gBwWAAAVQBhAGbAf8BPgG9AecB/wFhAdMB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUoBygHw
+        Af8BGAG2Ae0B/wEAAacB6AH/AQABoQHhAf8BAwGWAdIB/wE3AVgBdAH/CAADrQH/A9YB/wO6Af8DuAH/
+        A7UB/wOzAf8DsQH/A7AB/wOtAf8DqwH/A6oB/wOoAf8DpwH/A6YB/wPIAf8DUwH/CAADCwEPA1QBrQM6
+        AWEDPwFuA3oB+AHiAeEB3wH/AeEB4AHfAf8DagHzAzwBZwM8AWYDUwGtAwsBD1AAAVcBhwGeAf8BPQHE
+        AfAB/wFjAdQB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUoBygHwAf8BGAG2Ae0B/wEAAagB6AH/
+        AQABoQHhAf8BAAGcAdoB/wE4AVkBdgH/CAADsQH/A9kB/wO9Af8DugH/A7gB/wO2Af8DtQH/A7MB/wOw
+        Af8DrwH/A60B/wOrAf8DqQH/A6gB/wPKAf8DVwH/CAADWgHFBP8CsQGwAf4CsAGvAf4C5wHmAf8B1gHV
+        AdMB/wHXAdYB1AH/AeMB4gHgAf8BpQGkAaIB/gKwAa8B/QHpAegB5gH/A1gBwVAAAVkBiQGgAf8BPQHE
+        Ae8B/wFiAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGCAd8B8wH/AUsBygHwAf8BGAG2Ae0B/wEAAagB6AH/
+        AQABoQHhAf8BAAGcAdoB/wE6AVwBeAH/CAADtgH/A90B/wPBAf8DvQH/A7wB/wO6Af8DuAH/A7UB/wO0
+        Af8DsgH/A7AB/wOtAf8DrAH/A6wB/wPPAf8DWwH/CAADZAHnAvkB9wH/Au8B7gH/AtsB2gH/AcoCyQH/
+        AckByAHGAf8ByQHIAccB/wHJAcgBxwH/AssByQH/AeYB5QHkAf8B5QHkAeIB/wNlAeVQAAFbAYwBogH/
+        AT8BxgHwAf8BZAHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BggHfAfQB/wFLAcoB8AH/ARgBtgHtAf8BAAGo
+        AegB/wEAAaIB4gH/AQABmwHbAf8BPAFfAYAB/wgAA1oBvQPaAf8DyAH/A8AB/wO/Af8DvQH/A7oB/wO4
         Af8DtwH/A7UB/wOzAf8DsAH/A68B/wOzAf8DwgH/A1oBvQgAA04BlQH2AfUB9AH/AeYB5QHkAf8BvwG+
         Ab0B/wLrAeoB/wHUAdMB0gH/AdYB1QHUAf8B4gLhAf8CtAGzAf8B1wHWAdQB/wHiAeEB3wH/A0oBjVAA
-        AV8BjwGlAf8BQQHGAfAB/wFlAdQB8gH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AUsBygHwAf8BGQG2
-        Ae0B/wEAAacB6AH/AQABoQHiAf8BAAGcAdsB/wE/AWMBgwH/CAADWgG9A+MB/wPnAf8D4QH/A+AB/wPg
+        AV4BjwGlAf8BQAHGAfAB/wFkAdQB8gH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AUoBygHwAf8BGAG2
+        Ae0B/wEAAacB6AH/AQABoQHiAf8BAAGcAdsB/wE+AWIBgwH/CAADWgG9A+MB/wPnAf8D4QH/A+AB/wPg
         Af8D3wH/A98B/wPeAf8D3QH/A90B/wPcAf8D2wH/A+AB/wPQAf8DWgG9AwsBDwNVAbUDZAHnAeQB4wHi
         Af8B0QHQAc8B/wLwAe8B/wOuAf8DZAHxA2cB8gKsAasB/wLoAecB/wLLAcoB/wHgAd8B3QH/A2EB5ANV
-        AbUDCwEPSAABYAGSAagB/wFBAcUB8AH/AWYB1AHyAf8BjQHjAfQB/wGiAesB9gH/AYIB3wH0Af8BSwHK
-        AfAB/wEZAbYB7QH/AQABpwHoAf8BAAGhAeEB/wEAAZwB2wH/AUEBZgGGAf8IAAMpAT8DzgH/A+wB/wPe
+        AbUDCwEPSAABXwGSAagB/wFAAcUB8AH/AWUB1AHyAf8BjQHjAfQB/wGiAesB9gH/AYIB3wH0Af8BSgHK
+        AfAB/wEYAbYB7QH/AQABpwHoAf8BAAGhAeEB/wEAAZwB2wH/AUABZQGGAf8IAAMpAT8DzgH/A+wB/wPe
         Af8D2AH/A9IB/wPMAf8DyAH/A8cB/wPIAf8DywH/A9AB/wPdAf8D6AH/A6QB/wMrAUIDPwFtAuQB4wH/
         AdgB1gHVAf8B0gHRAdAB/wHFAcQBwwH/Ae0B7AHrAf8DVwG6CAADXAHNAegB5wHmAf8BtgG1AbQB/wHW
-        AdUB0wH/AeIB4QHgAf8C4AHfAf8DPAFmSAABYwGVAasB/wFBAcUB8AH/AWYB1AHyAf8BjQHjAfQB/wGi
-        AesB9gH/AYMB3wH0Af8BTAHLAfAB/wEZAbUB7QH/AQABpwHoAf8BAAGhAeIB/wEAAZwB2gH/AUQBaQGI
-        Af8MAANaAb0D4wH/A9sB/wPiAf8BtwHQAbgB/wFKAa0BTgH/AVwBqgFKAf8BVgGvAU4B/wE8AaUBSAH/
+        AdUB0wH/AeIB4QHgAf8C4AHfAf8DPAFmSAABYgGVAasB/wFAAcUB8AH/AWUB1AHyAf8BjQHjAfQB/wGi
+        AesB9gH/AYMB3wH0Af8BSwHLAfAB/wEYAbUB7QH/AQABpwHoAf8BAAGhAeIB/wEAAZwB2gH/AUMBaAGI
+        Af8MAANaAb0D4wH/A9sB/wPiAf8BtwHQAbgB/wFJAa0BTQH/AVsBqgFJAf8BVQGvAU0B/wE7AaUBRwH/
         AawBxQGsAf8DwgH/A9EB/wPTAf8DWgG9BAADQgF2AewB6wHoAf8B2gHZAdcB/wHUAdMB0QH/AcYBxQHE
         Af8B3gLcAf8DRgF+CAADUAGaAd0B3AHbAf8ByAHGAcUB/wLiAeEB/wLhAd8B/wHuAe0B7AH/Az8Bb0gA
-        AWUBmAGuAf8BQQHFAfAB/wFmAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AUwBygHwAf8BGQG2
-        Ae0B/wEAAagB6QH/AQABoQHhAf8BAAGcAdoB/wFGAWsBigH/DAADKQE/A9EB/wPzAf8BxwHeAcoB/wFK
-        AckBhQH/AbMB3AGkAf8B5wHHAWIB/wHcAb8BWQH/AVwBzAGPAf8BNQGtAU4B/wG4AdABuAH/A/EB/wOv
-        Af8DKwFCBAADLwFKA2AB6wONAfwB3gHdAdwB/wHLAsoB/wHmAuUB/wNhAeEDMgFQAzgBXANgAesC7gHs
-        Af8BzALLAf8B5wHmAeUB/wKOAY0B/ANgAesDLAFDSAABaAGbAbAB/wFAAcYB8AH/AWYB1AHyAf8BjQHj
-        AfQB/wGiAesB9gH/AYMB3wH0Af8BTAHKAfAB/wEZAbYB7QH/AQABqAHoAf8BAAGhAeEB/wEAAZwB2gH/
-        AUkBbwGOAf8QAANaAb0DxAH/AVwBzgGLAf8BmQHkAasB/wGwAcUBQwH/AeoBtQEuAf8B4QGiAR8B/wGl
-        AZ0BJgH/AYIBxQGPAf8BLwGaATwB/wOgAf8DWgG9EAADXgHOAeEB4AHeAf8B2QHXAdYB/wG4ArcB/wHh
-        AeAB3wH/A6wB/QOxAf0C9gH1Af8CwAG/Af8B6gHpAegB/wLzAfIB/wNcAclQAAFrAZ8BswH/AUABxgHw
-        Af8BZAHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wFMAcoB8AH/ARkBtgHtAf8BAAGnAegB/wEA
-        AaEB4QH/AQABmwHaAf8BSwFyAZAB/xgAAWgBlQFzAfwBogHpAZUB/wHWAc8BTwH/AeIBswEtAf8B0QG7
-        ATUB/wHCAa4BKAH/AYIBvQFSAf8BMQF5AV4B/BgAA0wBkQHjAeIB4AH/At4B3AH/AeEB4AHfAf8BzALL
-        Af8BxAHDAcIB/wLPAc4B/wLeAd0B/wLwAe8B/wLwAe8B/wL2AfUB/wNIAYdQAAFsAaEBtQH/AWYB1QH0
-        Af8BmgHoAfcB/wG1AfMB+gH/AcIB+AH8Af8BwwH4Af0B/wHBAfcB/QH/Aa8B8AH7Af8BjwHiAfcB/wFl
-        AdAB8AH/ATkBuAHlAf8BTgF1AZMB/xgAAWoBlQF0AfwBogHwAZ8B/wHYAe0BrwH/Ad4BxQFOAf8BtAHi
-        AUsB/wFGAecBHwH/AVEB1wFRAf8BQAF7AWUB/BQAAwEBAgNfAeMB5QHkAeEB/wLuAe0B/wLuAe0B/wLr
-        AeoB/wHjAeIB4QH/AugB5wH/AuoB6QH/AvMB8gH/AvUB9AH/AfoB+QH4Af8DXAHfUAABbwGjAbgB/wHF
+        AWQBmAGuAf8BQAHFAfAB/wFlAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AUsBygHwAf8BGAG2
+        Ae0B/wEAAagB6QH/AQABoQHhAf8BAAGcAdoB/wFFAWoBigH/DAADKQE/A9EB/wPzAf8BxwHeAcoB/wFJ
+        AckBhQH/AbMB3AGkAf8B5wHHAWEB/wHcAb8BWAH/AVsBzAGPAf8BNAGtAU0B/wG4AdABuAH/A/EB/wOv
+        Af8DKwFCBAADLwFKA2AB6wOJAfwB3gHdAdwB/wHLAsoB/wHmAuUB/wNhAeEDMgFQAzgBXANgAesC7gHs
+        Af8BzALLAf8B5wHmAeUB/wKKAYkB/ANgAesDLAFDSAABZwGbAbAB/wE/AcYB8AH/AWUB1AHyAf8BjQHj
+        AfQB/wGiAesB9gH/AYMB3wH0Af8BSwHKAfAB/wEYAbYB7QH/AQABqAHoAf8BAAGhAeEB/wEAAZwB2gH/
+        AUgBbgGOAf8QAANaAb0DxAH/AVsBzgGLAf8BmQHkAasB/wGwAcUBQgH/AeoBtQEtAf8B4QGiAR4B/wGl
+        AZ0BJQH/AYIBxQGPAf8BLgGaATsB/wOgAf8DWgG9EAADXgHOAeEB4AHeAf8B2QHXAdYB/wG4ArcB/wHh
+        AeAB3wH/A6sB/QOwAf0C9gH1Af8CwAG/Af8B6gHpAegB/wLzAfIB/wNcAclQAAFqAZ8BswH/AT8BxgHw
+        Af8BYwHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wFLAcoB8AH/ARgBtgHtAf8BAAGnAegB/wEA
+        AaEB4QH/AQABmwHaAf8BSgFxAZAB/xgAAWcBkQFyAfwBogHpAZUB/wHWAc8BTgH/AeIBswEsAf8B0QG7
+        ATQB/wHCAa4BJwH/AYIBvQFRAf8BLwF4AV0B/BgAA0wBkQHjAeIB4AH/At4B3AH/AeEB4AHfAf8BzALL
+        Af8BxAHDAcIB/wLPAc4B/wLeAd0B/wLwAe8B/wLwAe8B/wL2AfUB/wNIAYdQAAFrAaEBtQH/AWUB1QH0
+        Af8BmgHoAfcB/wG1AfMB+gH/AcIB+AH8Af8BwwH4Af0B/wHBAfcB/QH/Aa8B8AH7Af8BjwHiAfcB/wFk
+        AdAB8AH/ATgBuAHlAf8BTQF0AZMB/xgAAWkBkQFzAfwBogHwAZ8B/wHYAe0BrwH/Ad4BxQFNAf8BtAHi
+        AUoB/wFFAecBHgH/AVAB1wFQAf8BPgF6AWQB/BQAAwEBAgNfAeMB5QHkAeEB/wLuAe0B/wLuAe0B/wLr
+        AeoB/wHjAeIB4QH/AugB5wH/AuoB6QH/AvMB8gH/AvUB9AH/AfoB+QH4Af8DXAHfUAABbgGjAbgB/wHF
         AfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9
-        Af8BxQH5Af0B/wHFAfkB/QH/AVABeAGVAf8YAANhAdwByAH3AdQB/wHYAfYBygH/AecB4wGpAf8B2wHP
-        AVIB/wGvAdwBTgH/AZ0B6gGrAf8DXwHgGAADQAFvA38B/gNkAecDXwHzAegB5wHmAf8B5wHmAeUB/wLt
-        AewB/wL7AfoB/wNnAfIDZAHnA4QB/gM9AWhQAAG3AdcB4QH/AYwBvQHMAf8BnQHPAdsB/wGtAd8B6AH/
-        AbkB7AHzAf8BwgH1AfoB/wHCAfUB+gH/AbgB6wHxAf8BqQHaAeMB/wGUAcQB0QH/AXYBqAG4Af8BqQHF
-        AdEB/xgAAy0BRQFrAYUBdwH6AdsB+AHpAf8B5wHyAdgB/wHtAeUBswH/Ad8B2QGmAf8BXwGPAV8B+wMy
+        Af8BxQH5Af0B/wHFAfkB/QH/AU8BdwGVAf8YAANhAdwByAH3AdQB/wHYAfYBygH/AecB4wGpAf8B2wHP
+        AVEB/wGvAdwBTQH/AZ0B6gGrAf8DXwHgGAADQAFvA38B/gNkAecDXwHzAegB5wHmAf8B5wHmAeUB/wLt
+        AewB/wL7AfoB/wNnAfIDZAHnA4EB/gM9AWhQAAG3AdcB4QH/AYwBvQHMAf8BnQHPAdsB/wGtAd8B6AH/
+        AbkB7AHzAf8BwgH1AfoB/wHCAfUB+gH/AbgB6wHxAf8BqQHaAeMB/wGUAcQB0QH/AXUBqAG4Af8BqQHF
+        AdEB/xgAAy0BRQFqAYEBdgH6AdsB+AHpAf8B5wHyAdgB/wHtAeUBswH/Ad8B2QGmAf8BXwGOAV8B+wMy
         AVAgAAMPARQDCgEOA1MBqgHvAe4B7QH/AvQB8wH/A1IBpAMIAQsDEQEXWAAC/gL/AeMB8QH0Af8BuQHX
-        AeEB/wGVAb4BzAH/AXYBqAG7Af8BaQGbAbAB/wFlAZgBrQH/AW4BoQGzAf8BjAGyAcIB/wGxAc0B1wH/
-        Ad8B6wHvAf8D/gH/HAADLgFHA14B2QFuAZUBcgH8AW4BkQFuAfwDXgHdAzIBUCwAAy8BSgNdAfADYgHv
+        AeEB/wGVAb4BzAH/AXUBqAG7Af8BaAGbAbAB/wFkAZgBrQH/AW0BoQGzAf8BjAGyAcIB/wGxAc0B1wH/
+        Ad8B6wHvAf8D/gH/HAADLgFHA14B2QFtAZEBcQH8AW0BjQFtAfwDXgHdAzIBUCwAAy8BSgNdAfADYgHv
         AywBQ2QAAxEBFwNWAbMBUwFUAVMBrLQAAwQBBQMQARUDHwEtAykBPwMvAUkDLgFIAygBPQMeASsDDwEU
-        AwMBBBAAA7cB/wGcAagBngH/AQABXQE4Af8BIgGSAVoB/wEAAWEBOAH/AQoBTgGgAf8BBwFMAZ4B/wED
-        AUkBmwH/AQABRwGZAf8BAAFFAZcB/wEAAUIBlAH/AQABQQGTAf8DUgH/A1IB/xwAA0EBcgFMAl8B8wFZ
+        AwMBBBAAA7cB/wGcAagBngH/AQABXAE3Af8BIQGSAVkB/wEAAWABNwH/AQkBTQGgAf8BBgFLAZ4B/wEC
+        AUgBmwH/AQABRgGZAf8BAAFEAZcB/wEAAUEBlAH/AQABQAGTAf8DUQH/A1EB/xwAA0EBcgFMAl8B8wFZ
         AlwBzwFLAkwBkAMjATNcAAMFAQcDHwEsAj4BPQFqAlIBUAGjAVsCWQHEAV0CWgHTAV0CWgHTAVsCWQHD
-        AVICUQGhAzwBZgMcASgDBAEGDAADFQEdA1EBogEnAZUBXgH/AYIBvgGqAf8BNgGlAYIB/wEXAZcBUAH/
-        ARoBmQFVAf8BHgGZAVkB/wEiAZ0BXgH/AVwBqgHSAf8BWgGoAdEB/wEAAUMBlQH/IAADIQEwASsBRgFy
-        AfwBhgGtAeEB/wFkAagB3AH/AUUBkgHJAf8BFgFYAasB/wFVAlYBsQMfAS1TAAEBAxIBGAM+AWsBXQJZ
-        AdcBYAErASkB/AGsATMBCgH/AeEBUwEnAf8B5AFlATsB/wHTAVEBHwH/AaMBQAEwAf0BYQJeAdoCPgE9
-        AWoDDwEUCAADGAEiAVABUgFQAaQDVgGzAVMBrAGfAf8BWgG3AZ4B/wFkAbsBrAH/AWQBuwGuAf8BZQG7
-        AbAB/wGAAbwBswH/AR0BmgFhAf8BOgGVAccB/wFdAasB0wH/AQABRgGYAf8gAAFUAlYBqwFTAZ0B0QH/
-        AZkBvAHrAf8BVwGgAeMB/wGWAbkB6gH/AZQBuAHqAf8BRgGTAcoB/wErATQBbgH8A0MBeFAAAxsBJgNZ
-        AdIBIwENAQAB/wGKAUIBKgH/AcoBhgFMAf8B9gG8AZwB/wH5AcwBtwH/AeMBoAFeAf8BsQFdAUMB/wFf
-        ATkBGgH/AV4CWAHdAxwBKAgAAVUBVgFVAbEDVgGzA1YBswFCAaQBkQH/AVUBtgGbAf8BTgGyAZsB/wFQ
-        AbIBngH/AVIBswGhAf8BhQG/AbYB/wEkAZ4BggH/AT8BmQHJAf8BYQGtAdQB/wEEAUoBnAH/HAADHwEt
-        ASsBWQF2AfwBnQG/AewB/wFPAZwB4gH/AUEBkwHfAf8BPgGRAd8B/wFFAZQB4AH/AZUBuAHqAf8BhgGt
-        AeEB/wEvAYMBuwH/AUsCTAGQBAADnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/
-        A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/CAABUwJPAaUBOgEfAQcB/wFfAUoBNQH/AY8BXAFHAf8BrAGI
-        AVEB/wHCAaMBiAH/AcEBpQGOAf8BswGYAYEB/wGRAVwBRgH/AVoBQQEsAf8BSQEiAQAB/wFWAlUBsQgA
-        AwgBCwNVAbIDVgGzAVwBsgGoAf8BYwG9AacB/wGHAcEBtQH/AYYBwQG2Af8BhwHBAbcB/wGIAcEBuQH/
-        ASoBogGIAf8BRAGcAcsB/wFlAbAB1QH/AQkBTQGfAf8QAAMrAUIDSAGEAVUCVwG3AUwBXwFhAfMBXAGk
-        AdcB/wGhAcIB7QH/AZ8BwAHtAf8BnQG/Ae0B/wFaAaMB5AH/AUABkgHfAf8BPgGQAd4B/wFhAacB5gH/
-        AZIBtgHoAf8BKQFlAbcB/wM3AVoDnQH/AboCvQH/AeYC7AH/AeYC7QH/AecC7QH/AegC7gH/AekC7wH/
-        AekC7wH/AeoC7wH/AeoC8AH/AesC8AH/AesC8QH/AewC8QH/AewC8QH/Ab0CvwH/A50B/wQAAzkBXwFb
-        ATsBIAH/AcMBsQGiAf8BtgGcAYMB/wGmAV8BMgH/AagBXQEvAf8BwwGkAYcB/wHYAcYBsAH/Ab0BqQGL
-        Af8BZQFFASUB/wFCASIBAwH/ATgBFAEAAf8BPwEYAQAB/wMzAVMIAAMGAQgDVQGyATUBoAGKAf8BkwHJ
-        AboB/wFFAa8BlwH/ASoBogGDAf8BKwGjAYcB/wEtAaQBiwH/ASwBqgGSAf8BOgHCAe0B/wGBAbQB1wH/
-        AQ4BUQGjAf8MAANMAZMBSgGXAc8B/wFhAagB2QH/AY0BtAHiAf8BowHEAe0B/wGnAccB7gH/AUoBlwHN
-        Af8BGgFbAbIB/wFFAZMByQH/AZ8BwAHtAf8BXgGWAaMB/wGeAZYBLgH/AWIBlAGRAf8BjQGzAekB/wFf
-        AaUB2AH/AVoCXgHYBAADXAHqAdsC4gH/Ac0CzwH/A8sB/wPMAf8DzgH/A88B/wPQAf8D0gH/A9MB/wPV
-        Af8B1wLYAf8B5wLsAf8DbQH3BAADIgExAVYCVQGxAU0BIQEAAf8BqgGFAUUB/wGyAVgBFgH/Aa0BNQEA
-        Af8BugFSAQoB/wHqAdUBvwH/Af0B/AH6Af8B1gG+AaYB/wGQAUUBEgH/AUgBFgEAAf8BSQEmAQUB/wFC
-        ASIBBAH/A1cBxQMcAScIAAMEAQYBGwGUAV0B/wFUAbkBngH/AS8BpgGJAf8BXwGxAdUB/wFbAa0B1AH/
-        AVcBqwHSAf8BRQG6AeQB/wEAAZkBTwH/AQ0BjgE+Af8BEAFWAZoB/wwAAUgCYgH2Aa4BzQHwAf8BsAHP
-        AfAB/wGYAb8B7AH/AWQBrgHnAf8BqgHKAe8B/wEjAWEBuAH/BAABGwFcAbMB/wGiAcMB7QH/AagBlwEX
-        Af8BxAG1AUAB/wGsAZcBDAH/AUEBkwHfAf8BmAG7AesB/wECAUoBnwH/BAADXAHqAdkC4QH/AcsCzAH/
-        A8cB/wPIAf8DygH/A8sB/wPNAf8DzgH/A9AB/wPRAf8B0wLUAf8B5QLrAf8DbQH3BAADLgFHA1kB7AFI
-        ARYBAAH/AZkBNQEAAf8BuAFNAQAB/wHCAUkBAAH/AckBWwEJAf8B5gG/AZQB/wHsAdQBtgH/Ac0BnAFI
-        Af8BqAFSARIB/wGZAVMBJwH/AaMBjAFYAf8BZQFMATUB/wJRAT8B9wE1AjQBVQwAAT4BjgHEAf8BOAGs
-        AYsB/wE1AaoBjwH/AWQBtQHYAf8BYAGyAdYB/wFdAa8B1QH/AVkBrAHTAf8BCgGQAUgB/wE/AagBhAH/
-        AQABXgE5Af8DFAEbCAABWgJgAd4BqAHJAe0B/wGEAacB7QH/AT4BUAHtAf8BUAGOAekB/wGtAc0B8AH/
-        AVMBnQHSAf8BJAFiAbkB/wFNAZkBzgH/AaUBxQHuAf8BlQGaAU8B/wGtAZcBDAH/AZ0BlwEzAf8BTAGb
-        AeIB/wGYAbsB6gH/AUgCYgH2BAADXAHqAdcC3wH/AccCyQH/A8IB/wPEAf8DxQH/A8gB/wPJAf8DygH/
-        A8wB/wPNAf8B0ALRAf8B4wLqAf8DbQH3BAADOQFfAkABHQH9AVoBIQEAAf8BrgE/AQAB/wHAAUcBAAH/
-        AecBlgEsAf8B6AGyAWAB/wHkAbEBYAH/AdIBiQEfAf8BvQFMAQAB/wGoAToBAAH/AbgBjQFDAf8B1AHD
-        AbIB/wGYAYQBVAH/AUEBIwEFAf8BPgI9AWoMAAFEAZEByQH/AaQBzAHkAf8BhwG7AdsB/wElAaEBYAH/
-        AR8BnAFaAf8BGgGaAVYB/wEVAZYBUAH/ATEBowGBAf8BhAHAAasB/wEoAZYBXwH/A1EBogMVAR0EAANR
-        AZwBkgG5AeUB/wFUAVoB9gH/AYEBhAH1Af8CJgHwAf8BkAG7AesB/wGuAc0B8AH/AawBzAHwAf8BqgHK
-        AfAB/wGFAbIB6QH/AUQBqQHBAf8BKgGzAY0B/wE8AagBtgH/AVYBoQHkAf8BlwG6AegB/wNdAe0EAANc
-        AeoB1gLfAf8BwwLFAf8DwAH/A8AB/wPCAf8DwwH/A8QB/wPFAf8DyAH/A8kB/wPNAf8B4ALoAf8DbQH3
-        BAADNwFaAV0BTQEoAfoBgwEsAQAB/wHLAVYBAQH/AeUBiwEjAf8B/gG2AVgC/wHjAcIB/wH0AbwBhQH/
-        AdYBXQEPAf8BxQFUAQAB/wG6AUkBAAH/Aa8BXQEfAf8BrgGIAUMB/wGUAVwBQwH/AUIBJAEIAf8DPAFm
-        DAABSQGVAc0B/wGoAc8B5QH/AYwBvwHdAf8BKwGlAYEB/wGNAcUBuAH/AYkBwwG0Af8BhgHBAbEB/wGE
-        Ab8BrwH/AV0BuQGfAf8BVAGtAaAB/wNWAbMBUAFSAVABpAMYASIDIwEzATABawGHAfwBkgGkAfUB/wE/
-        AUAB9gH/ATcBhgH0Af8BIQGmAfsB/wFCAasB8gH/AWQBrwHnAf8BYQGtAecB/wFeAaoB5gH/ASUBtgGA
-        Af8BRgHIAZcB/wEhAbcBYAH/AWMBrAHnAf8BjwG1AeMB/wFaAl4B1QQAA2AB1gHHAs0B/wHbAuQB/wHb
-        AuQB/wHbAuUB/wHcAuUB/wHcAuUB/wHdAuYB/wHdAuYB/wHeAucB/wHfAugB/wHgAugB/wHNAtMB/wNf
-        AeMEAAMmATkBYAJaAd4BjgE0AQAB/wHsAZ4BOQH/Af4BvwGFAv8BzAGhAv8B3wG7Af8B/gHCAWUB/wHi
-        AY4BLwH/AdMBhAEgAf8BygFfARIB/wG1AVYBEAH/AZcBRwENAf8BgQFEAR8B/wNZAewDLgFIDAABTQGY
-        AdAB/wGrAdEB5wH/AZABwgHfAf8BMgGpAYgB/wGRAckBuwH/AVwBugGlAf8BWAG4AaEB/wFUAbYBngH/
-        AVgBuAGdAf8BQwGlAZIB/wNWAbMDVgGzAVUBVgFVAbEEAANJAYcBhgGvAeEB/wG5AdcB8wH/ARgBpgH+
-        Af8BUgG/Av8BEQGjAv8BTAG+AfAB/wEgAc4B+wH/AUABvgHxAf8BOAGzAaAB/wEhAbcBXwH/AS0BswGQ
-        Af8BpwHIAe4B/wFdAaUB1gH/AU8CUQGcBAADLAFDA1sByAOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOd
-        Af8DnQH/A50B/wOdAf8DXgHdAzEBTgQAAwkBDANLAY4BwAFUARMC/wG8AWUB/wH6Ac4BpwH/AfgB2wG+
-        Av8B4gHGAv8BvgGGAf8B9AGsAVsB/wHsAcIBmgH/AeIBtQGLAf8BuAFbARkB/wGdAUoBEgH/AYgBSgEm
-        Af8DTwGlAxABFQwAAVEBmwHTAf8BrgHUAegB/wGrAdMB6AH/AT8BsQGQAf8BmwHOAcAB/wGZAc0BvQH/
-        AZYBywG7Af8BlQHKAbkB/wGAAb8BqAH/AV0BswGpAf8DVgGzA1UBsgMIAQsEAAMEAQYDUQGfAYUBrgHh
-        Af8BQAGyAfkB/wERAaMC/wEmAakB+wH/ARYB0wH+Af8BUgHiAv8BEQHVAv8BZQGwAegB/wFiAa0B5wH/
-        AakBygHvAf8BpQHFAe0B/wErAV0BeAH8AyEBMEQAAxMBGgJkAVMB8QHYAZ4BWAH/AecB0wHAAf8B/AH1
-        Ae4C/wH4AesC/wHlAcIB/wH2AbkBggH/AfIB0gG4Af8B7gHSAbYB/wHCAYYBNAH/AacBXAEtAf8CTQEp
-        AfoDHQEpEAABVAGdAdUB/wFSAZsB0wH/AU8BmgHSAf8BLwGhAYwB/wEqAZ8BigH/AScBnQGFAf8BIwGZ
-        AYAB/wE8AaUBkgH/AWUBuAGxAf8BNgGhAYsB/wNVAbIDBgEIEAADQgF1AV8CYgH2AY4BtgHjAf8BuQHX
-        AfMB/wFDAdUB+wH/ARAB1QL/AScB0QH7Af8BswHSAfIB/wGxAdAB8QH/AZIBuAHiAf8BSAGVAcwB/wNK
-        AYpMAAM1AVcBqQFIARoB/wHKAbgBqAb/Af4B/AL/AfYB4gH/AfsBxQGgAf8B5AG5AZUB/wHbAawBYwH/
-        AcMBjgFCAf8BkwFKAR4B/wE+Aj0BajAAAVMCVAGsA1YBswNWAbMDBAEGGAADFgEeA1QBrgFcAaMB3AH/
-        AZEBuAHkAf8BqAHKAewB/wGlAccB7AH/AY0BtQHiAf8BTgGaAdIB/wFaAl8B2wMxAU5UAAMyAVECZAFZ
-        AewB0AGyAZUB/wHsAeAB2QH/AeYB1QHEAf8B0wGwAZQB/wHTAaYBXQH/AcsBjwE7Af8BZwFlAVkB8gE6
-        AjkBYDQAAVMCVAGsA1YBswMEAQYkAAMrAUIDTAGQAVsCXQHSAVkCXAHPA04BmQMtAUVgAAMRARcDRAF6
-        AloBVwHFAmUBXgHlAmEBWAHmAlwBWQHJAkgBRwGDAxUBHRAAAUIBTQE+BwABPgMAASgDAAFAAwABIAMA
-        AQEBAAEBBgABARYAA/8BAAHgAQcCAAH8AT8CAAHAAQMCAAH8AT8CAAHAAQMCAAHAAQMCAAHAAQMCAAHA
-        AQMCAAHAAQMCAAHAAQMCAAHAAQMCAAHAAQMCAAHAAQMGAAHAAQMCAAEBAYACAAHAAQMBgAIBAYACAAHA
-        AQMBgAEBBAABwAEDAcABAwHAAQMCAAHAAQMB8AEPAcABAwIAAcABAwHwAQ8BgAEDAgABwAEDAfABDwHA
-        AQMCAAHAAQMB8AEPAfABDwIAAcABAwH4AR8B/AE/AgAB4wX/AeABBwGAAQEB/AEfAv8BwAEDAYABBwH4
-        AQcC/wGAAQMBAAEHAfgBAwL/AcABAwEAAQcB8AEBAgABwAEDAQABBwGAAwABgAEBAYABBwIAAYABAQIA
-        AcABBwEBAQABgAEBAgAB4AEDAgABgAEBAgAB4AEBAgABgAEBAgAB4AMAAYABAQIAAeABAAGAAQABgAEB
-        AgAB4AEAAYABAAL/AYABAQHgAQEB4AEBAv8BwAEDAf8BwwHwAQMC/wHgAQcB/wHHAfwBDwL/AfABDws=
+        AVICUQGhAzwBZgMcASgDBAEGDAADFQEdA1EBogEmAZUBXQH/AYIBvgGqAf8BNQGlAYIB/wEWAZcBTwH/
+        ARkBmQFUAf8BHQGZAVgB/wEhAZ0BXQH/AVsBqgHSAf8BWQGoAdEB/wEAAUIBlQH/IAADIQEwASsBQwFx
+        AfwBhgGtAeEB/wFjAagB3AH/AUQBkgHJAf8BFQFXAasB/wFVAlYBsQMfAS1TAAEBAxIBGAM+AWsBXQJZ
+        AdcBXwErASoB/AGsATIBCQH/AeEBUgEmAf8B5AFkAToB/wHTAVABHgH/AaMBQAExAf0BYQJeAdoCPgE9
+        AWoDDwEUCAADGAEiAVABUgFQAaQDVgGzAVIBrAGfAf8BWQG3AZ4B/wFjAbsBrAH/AWMBuwGuAf8BZAG7
+        AbAB/wGAAbwBswH/ARwBmgFgAf8BOQGVAccB/wFcAasB0wH/AQABRQGYAf8gAAFUAlYBqwFSAZ0B0QH/
+        AZkBvAHrAf8BVgGgAeMB/wGWAbkB6gH/AZQBuAHqAf8BRQGTAcoB/wErATIBbQH8A0MBeFAAAxsBJgNZ
+        AdIBIgEMAQAB/wGKAUEBKQH/AcoBhgFLAf8B9gG8AZwB/wH5AcwBtwH/AeMBoAFdAf8BsQFcAUIB/wFe
+        ATgBGQH/AV4CWAHdAxwBKAgAAVUBVgFVAbEDVgGzA1YBswFBAaQBkQH/AVQBtgGbAf8BTQGyAZsB/wFP
+        AbIBngH/AVEBswGhAf8BhQG/AbYB/wEjAZ4BggH/AT4BmQHJAf8BYAGtAdQB/wEDAUkBnAH/HAADHwEt
+        ASsBWAF1AfwBnQG/AewB/wFOAZwB4gH/AUABkwHfAf8BPQGRAd8B/wFEAZQB4AH/AZUBuAHqAf8BhgGt
+        AeEB/wEuAYMBuwH/AUsCTAGQBAADnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/
+        A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/CAABUwJPAaUBOQEeAQYB/wFeAUkBNAH/AY8BWwFGAf8BrAGI
+        AVAB/wHCAaMBiAH/AcEBpQGOAf8BswGYAYEB/wGRAVsBRQH/AVkBQAErAf8BSAEhAQAB/wFWAlUBsQgA
+        AwgBCwNVAbIDVgGzAVsBsgGoAf8BYgG9AacB/wGHAcEBtQH/AYYBwQG2Af8BhwHBAbcB/wGIAcEBuQH/
+        ASkBogGIAf8BQwGcAcsB/wFkAbAB1QH/AQgBTAGfAf8QAAMrAUIDSAGEAVUCVwG3AUwCXwHzAVsBpAHX
+        Af8BoQHCAe0B/wGfAcAB7QH/AZ0BvwHtAf8BWQGjAeQB/wE/AZIB3wH/AT0BkAHeAf8BYAGnAeYB/wGS
+        AbYB6AH/ASgBZAG3Af8DNwFaA50B/wG6Ar0B/wHmAuwB/wHmAu0B/wHnAu0B/wHoAu4B/wHpAu8B/wHp
+        Au8B/wHqAu8B/wHqAvAB/wHrAvAB/wHrAvEB/wHsAvEB/wHsAvEB/wG9Ar8B/wOdAf8EAAM5AV8BWgE6
+        AR8B/wHDAbEBogH/AbYBnAGDAf8BpgFeATEB/wGoAVwBLgH/AcMBpAGHAf8B2AHGAbAB/wG9AakBiwH/
+        AWQBRAEkAf8BQQEhAQIB/wE3ARMBAAH/AT4BFwEAAf8DMwFTCAADBgEIA1UBsgE0AaABigH/AZMByQG6
+        Af8BRAGvAZcB/wEpAaIBgwH/ASoBowGHAf8BLAGkAYsB/wErAaoBkgH/ATkBwgHtAf8BgQG0AdcB/wEN
+        AVABowH/DAADTAGTAUkBlwHPAf8BYAGoAdkB/wGNAbQB4gH/AaMBxAHtAf8BpwHHAe4B/wFJAZcBzQH/
+        ARkBWgGyAf8BRAGTAckB/wGfAcAB7QH/AV0BlgGjAf8BngGWAS0B/wFhAZQBkQH/AY0BswHpAf8BXgGl
+        AdgB/wFaAl4B2AQAA1wB6gHbAuIB/wHNAs8B/wPLAf8DzAH/A84B/wPPAf8D0AH/A9IB/wPTAf8D1QH/
+        AdcC2AH/AecC7AH/A20B9wQAAyIBMQFWAlUBsQFMASABAAH/AaoBhQFEAf8BsgFXARUB/wGtATQBAAH/
+        AboBUQEJAf8B6gHVAb8B/wH9AfwB+gH/AdYBvgGmAf8BkAFEAREB/wFHARUBAAH/AUgBJQEEAf8BQQEh
+        AQMB/wNXAcUDHAEnCAADBAEGARoBlAFcAf8BUwG5AZ4B/wEuAaYBiQH/AV4BsQHVAf8BWgGtAdQB/wFW
+        AasB0gH/AUQBugHkAf8BAAGZAU4B/wEMAY4BPQH/AQ8BVQGaAf8MAAFIAmIB9gGuAc0B8AH/AbABzwHw
+        Af8BmAG/AewB/wFjAa4B5wH/AaoBygHvAf8BIgFgAbgB/wQAARoBWwGzAf8BogHDAe0B/wGoAZcBFgH/
+        AcQBtQE/Af8BrAGXAQsB/wFAAZMB3wH/AZgBuwHrAf8BAQFJAZ8B/wQAA1wB6gHZAuEB/wHLAswB/wPH
+        Af8DyAH/A8oB/wPLAf8DzQH/A84B/wPQAf8D0QH/AdMC1AH/AeUC6wH/A20B9wQAAy4BRwNZAewBRwEV
+        AQAB/wGZATQBAAH/AbgBTAEAAf8BwgFIAQAB/wHJAVoBCAH/AeYBvwGUAf8B7AHUAbYB/wHNAZwBRwH/
+        AagBUQERAf8BmQFSASYB/wGjAYwBVwH/AWQBSwE0Af8CUQE/AfcBNQI0AVUMAAE9AY4BxAH/ATcBrAGL
+        Af8BNAGqAY8B/wFjAbUB2AH/AV8BsgHWAf8BXAGvAdUB/wFYAawB0wH/AQkBkAFHAf8BPgGoAYQB/wEA
+        AV0BOAH/AxQBGwgAAVoCYAHeAagByQHtAf8BhAGnAe0B/wE9AU8B7QH/AU8BjgHpAf8BrQHNAfAB/wFS
+        AZ0B0gH/ASMBYQG5Af8BTAGZAc4B/wGlAcUB7gH/AZUBmgFOAf8BrQGXAQsB/wGdAZcBMgH/AUsBmwHi
+        Af8BmAG7AeoB/wFIAmIB9gQAA1wB6gHXAt8B/wHHAskB/wPCAf8DxAH/A8UB/wPIAf8DyQH/A8oB/wPM
+        Af8DzQH/AdAC0QH/AeMC6gH/A20B9wQAAzkBXwJAAR4B/QFZASABAAH/Aa4BPgEAAf8BwAFGAQAB/wHn
+        AZYBKwH/AegBsgFfAf8B5AGxAV8B/wHSAYkBHgH/Ab0BSwEAAf8BqAE5AQAB/wG4AY0BQgH/AdQBwwGy
+        Af8BmAGEAVMB/wFAASIBBAH/AT4CPQFqDAABQwGRAckB/wGkAcwB5AH/AYcBuwHbAf8BJAGhAV8B/wEe
+        AZwBWQH/ARkBmgFVAf8BFAGWAU8B/wEwAaMBgQH/AYQBwAGrAf8BJwGWAV4B/wNRAaIDFQEdBAADUQGc
+        AZIBuQHlAf8BUwFZAfYB/wGBAYQB9QH/AiUB8AH/AZABuwHrAf8BrgHNAfAB/wGsAcwB8AH/AaoBygHw
+        Af8BhQGyAekB/wFDAakBwQH/ASkBswGNAf8BOwGoAbYB/wFVAaEB5AH/AZcBugHoAf8DXQHtBAADXAHq
+        AdYC3wH/AcMCxQH/A8AB/wPAAf8DwgH/A8MB/wPEAf8DxQH/A8gB/wPJAf8DzQH/AeAC6AH/A20B9wQA
+        AzcCWgFNASgB+gGDASsBAAH/AcsBVQEAAf8B5QGLASIB/wH+AbYBVwL/AeMBwgH/AfQBvAGFAf8B1gFc
+        AQ4B/wHFAVMBAAH/AboBSAEAAf8BrwFcAR4B/wGuAYgBQgH/AZQBWwFCAf8BQQEjAQcB/wM8AWYMAAFI
+        AZUBzQH/AagBzwHlAf8BjAG/Ad0B/wEqAaUBgQH/AY0BxQG4Af8BiQHDAbQB/wGGAcEBsQH/AYQBvwGv
+        Af8BXAG5AZ8B/wFTAa0BoAH/A1YBswFQAVIBUAGkAxgBIgMjATMBLgFqAYMB/AGSAaQB9QH/AT4BPwH2
+        Af8BNgGGAfQB/wEgAaYB+wH/AUEBqwHyAf8BYwGvAecB/wFgAa0B5wH/AV0BqgHmAf8BJAG2AYAB/wFF
+        AcgBlwH/ASABtwFfAf8BYgGsAecB/wGPAbUB4wH/AVoCXgHVBAADYAHWAccCzQH/AdsC5AH/AdsC5AH/
+        AdsC5QH/AdwC5QH/AdwC5QH/Ad0C5gH/Ad0C5gH/Ad4C5wH/Ad8C6AH/AeAC6AH/Ac0C0wH/A18B4wQA
+        AyYBOQFgAloB3gGOATMBAAH/AewBngE4Af8B/gG/AYUC/wHMAaEC/wHfAbsB/wH+AcIBZAH/AeIBjgEu
+        Af8B0wGEAR8B/wHKAV4BEQH/AbUBVQEPAf8BlwFGAQwB/wGBAUMBHgH/A1kB7AMuAUgMAAFMAZgB0AH/
+        AasB0QHnAf8BkAHCAd8B/wExAakBiAH/AZEByQG7Af8BWwG6AaUB/wFXAbgBoQH/AVMBtgGeAf8BVwG4
+        AZ0B/wFCAaUBkgH/A1YBswNWAbMBVQFWAVUBsQQAA0kBhwGGAa8B4QH/AbkB1wHzAf8BFwGmAf4B/wFR
+        Ab8C/wEQAaMC/wFLAb4B8AH/AR8BzgH7Af8BPwG+AfEB/wE3AbMBoAH/ASABtwFeAf8BLAGzAZAB/wGn
+        AcgB7gH/AVwBpQHWAf8BTwJRAZwEAAMsAUMDWwHIA50B/wOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOd
+        Af8DnQH/A50B/wNeAd0DMQFOBAADCQEMA0sBjgHAAVMBEgL/AbwBZAH/AfoBzgGnAf8B+AHbAb4C/wHi
+        AcYC/wG+AYYB/wH0AawBWgH/AewBwgGaAf8B4gG1AYsB/wG4AVoBGAH/AZ0BSQERAf8BiAFJASUB/wNP
+        AaUDEAEVDAABUAGbAdMB/wGuAdQB6AH/AasB0wHoAf8BPgGxAZAB/wGbAc4BwAH/AZkBzQG9Af8BlgHL
+        AbsB/wGVAcoBuQH/AYABvwGoAf8BXAGzAakB/wNWAbMDVQGyAwgBCwQAAwQBBgNRAZ8BhQGuAeEB/wE/
+        AbIB+QH/ARABowL/ASUBqQH7Af8BFQHTAf4B/wFRAeIC/wEQAdUC/wFkAbAB6AH/AWEBrQHnAf8BqQHK
+        Ae8B/wGlAcUB7QH/ASsBXAF3AfwDIQEwRAADEwEaAmQBUwHxAdgBngFXAf8B5wHTAcAB/wH8AfUB7gL/
+        AfgB6wL/AeUBwgH/AfYBuQGCAf8B8gHSAbgB/wHuAdIBtgH/AcIBhgEzAf8BpwFbASwB/wJNASkB+gMd
+        ASkQAAFTAZ0B1QH/AVEBmwHTAf8BTgGaAdIB/wEuAaEBjAH/ASkBnwGKAf8BJgGdAYUB/wEiAZkBgAH/
+        ATsBpQGSAf8BZAG4AbEB/wE1AaEBiwH/A1UBsgMGAQgQAANCAXUBXwJiAfYBjgG2AeMB/wG5AdcB8wH/
+        AUIB1QH7Af8BDwHVAv8BJgHRAfsB/wGzAdIB8gH/AbEB0AHxAf8BkgG4AeIB/wFHAZUBzAH/A0oBikwA
+        AzUBVwGpAUcBGQH/AcoBuAGoBv8B/gH8Av8B9gHiAf8B+wHFAaAB/wHkAbkBlQH/AdsBrAFiAf8BwwGO
+        AUEB/wGTAUkBHQH/AT4CPQFqMAABUwJUAawDVgGzA1YBswMEAQYYAAMWAR4DVAGuAVsBowHcAf8BkQG4
+        AeQB/wGoAcoB7AH/AaUBxwHsAf8BjQG1AeIB/wFNAZoB0gH/AVoCXwHbAzEBTlQAAzIBUQJkAVkB7AHQ
+        AbIBlQH/AewB4AHZAf8B5gHVAcQB/wHTAbABlAH/AdMBpgFcAf8BywGPAToB/wFnAWUBWQHyAToCOQFg
+        NAABUwJUAawDVgGzAwQBBiQAAysBQgNMAZABWwJdAdIBWQJcAc8DTgGZAy0BRWAAAxEBFwNEAXoCWgFX
+        AcUCZQFeAeUCYQFYAeYCXAFZAckCSAFHAYMDFQEdEAABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEA
+        AQEGAAEBFgAD/wEAAeABBwIAAfwBPwIAAcABAwIAAfwBPwIAAcABAwIAAcABAwIAAcABAwIAAcABAwIA
+        AcABAwIAAcABAwIAAcABAwIAAcABAwIAAcABAwYAAcABAwIAAQEBgAIAAcABAwGAAgEBgAIAAcABAwGA
+        AQEEAAHAAQMBwAEDAcABAwIAAcABAwHwAQ8BwAEDAgABwAEDAfABDwGAAQMCAAHAAQMB8AEPAcABAwIA
+        AcABAwHwAQ8B8AEPAgABwAEDAfgBHwH8AT8CAAHjBf8B4AEHAYABAQH8AR8C/wHAAQMBgAEHAfgBBwL/
+        AYABAwEAAQcB+AEDAv8BwAEDAQABBwHwAQECAAHAAQMBAAEHAYADAAGAAQEBgAEHAgABgAEBAgABwAEH
+        AQEBAAGAAQECAAHgAQMCAAGAAQECAAHgAQECAAGAAQECAAHgAwABgAEBAgAB4AEAAYABAAGAAQECAAHg
+        AQABgAEAAv8BgAEBAeABAQHgAQEC/wHAAQMB/wHDAfABAwL/AeABBwH/AccB/AEPAv8B8AEPCw==
 </value>
   </data>
 </root>

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
@@ -112,13 +113,13 @@ Public Class frmOptions
 
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container
-        Dim ListViewItem8 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Startup/Exit", 0)
-        Dim ListViewItem9 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Appearance", 1)
-        Dim ListViewItem10 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Tabs & Panels", 2)
-        Dim ListViewItem11 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Connections", 3)
-        Dim ListViewItem12 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("SQL Server", 4)
-        Dim ListViewItem13 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Updates", 5)
-        Dim ListViewItem14 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Advanced", 6)
+        Dim ListViewItem1 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Startup/Exit", 0)
+        Dim ListViewItem2 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Appearance", 1)
+        Dim ListViewItem3 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Tabs & Panels", 2)
+        Dim ListViewItem4 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Connections", 3)
+        Dim ListViewItem5 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("SQL Server", 4)
+        Dim ListViewItem6 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Updates", 5)
+        Dim ListViewItem7 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Advanced", 6)
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmOptions))
         Me.btnOK = New System.Windows.Forms.Button
         Me.btnCancel = New System.Windows.Forms.Button
@@ -272,7 +273,7 @@ Public Class frmOptions
                     Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.lvPages.FullRowSelect = True
         Me.lvPages.HideSelection = False
-        Me.lvPages.Items.AddRange(New System.Windows.Forms.ListViewItem() {ListViewItem8, ListViewItem9, ListViewItem10, ListViewItem11, ListViewItem12, ListViewItem13, ListViewItem14})
+        Me.lvPages.Items.AddRange(New System.Windows.Forms.ListViewItem() {ListViewItem1, ListViewItem2, ListViewItem3, ListViewItem4, ListViewItem5, ListViewItem6, ListViewItem7})
         Me.lvPages.LabelWrap = False
         Me.lvPages.LargeImageList = Me.imgListPages
         Me.lvPages.Location = New System.Drawing.Point(12, 12)
@@ -1671,6 +1672,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 ApplySpanlinkEdition()
@@ -1706,7 +1715,11 @@ Public Class frmOptions
         lvPages.Items(4).Text = My.Resources.strSQLServer
         lvPages.Items(5).Text = My.Resources.strTabUpdates
         lvPages.Items(6).Text = My.Resources.strTabAdvanced
+#If Not PORTABLE Then
         lblUpdatesExplanation.Text = My.Resources.strUpdateCheck
+#Else
+        lblUpdatesExplanation.Text = My.Resources.strUpdateCheckPortableEdition
+#End If
         btnTestProxy.Text = My.Resources.strButtonTestProxy
         lblSeconds.Text = My.Resources.strLabelSeconds
         lblMaximumPuttyWaitTime.Text = My.Resources.strLabelPuttyTimeout
@@ -1826,7 +1839,7 @@ Public Class frmOptions
         Me.txtSQLPassword.Enabled = chkUseSQLServer.Checked
     End Sub
 
-    Private Sub chkUseOnlyErrorsAndInfosPanel_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs)
+    Private Sub chkUseOnlyErrorsAndInfosPanel_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles chkUseOnlyErrorsAndInfosPanel.CheckedChanged
         Me.chkMCInformation.Enabled = Me.chkUseOnlyErrorsAndInfosPanel.Checked
         Me.chkMCWarnings.Enabled = Me.chkUseOnlyErrorsAndInfosPanel.Checked
         Me.chkMCErrors.Enabled = Me.chkUseOnlyErrorsAndInfosPanel.Checked

mRemoteV1/My 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
         

mRemoteV1/My Project/AssemblyInfo.vb

@@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.68.*")> 
+<Assembly: AssemblyVersion("1.69.*")> 

mRemoteV1/My Project/Resources.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:2.0.50727.4959
+'     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()>  _
@@ -2186,6 +2186,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 VerifyDatabaseVersion (Config.Connections.Save) failed. {0}.
         '''</summary>
@@ -6105,6 +6114,15 @@ Namespace My.Resources
             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)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Error deleting update file!.
         '''</summary>

mRemoteV1/My Project/Resources.resx

@@ -2346,4 +2346,10 @@ Error Description: {1}</value>
 	<data name="strErrorBadDatabaseVersion">
 		<value xml:space="preserve">The database version {0} is not compatible with this version of {1}.</value>
 	</data>
+	<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>

mRemoteV1/My Project/Settings.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:2.0.50727.4959
+'     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

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">
@@ -880,6 +885,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>
@@ -895,6 +905,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">