From b4a3b14334665592bf57029468c22a6d82c5ddce Mon Sep 17 00:00:00 2001 From: Riley McArdle Date: Fri, 15 Feb 2013 20:11:03 -0600 Subject: [PATCH] Fix issue MR-85 - Microsoft .NET Framework warning Fix issue MR-86 - Citrix GDI+ Error when screen is locked Fix issue MR-299 - mRemoteNG crashes while using remotely (Windows XP remote desktop) Change target .NET Framework to 3.0 instead of 2.0 --- CHANGELOG.TXT | 4 ++++ Installer/Language/czech.nsi | 2 +- Installer/Language/dutch.nsi | 2 +- Installer/Language/english.nsi | 2 +- Installer/Language/french.nsi | 2 +- Installer/Language/german.nsi | 2 +- Installer/Language/polish.nsi | 2 +- Installer/Language/spanish.nsi | 2 +- Installer/Language/thai.nsi | 2 +- Installer/mRemote.nsi | 2 +- mRemoteV1/app.config | 30 ++++++++++++++---------------- mRemoteV1/mRemoteV1.vbproj | 3 ++- 12 files changed, 29 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 2239cadd..a3875d64 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -9,6 +9,8 @@ Fix issue MR-79 - MoveUp/Down item doesn't work + Sort button broken Fix issue MR-80 - Reconnect previous sessions Fix issue MR-81 - Problem Duplicating Folder w/ Sub-Folders + Fix issue MR-85 - Microsoft .NET Framework warning + Fix issue MR-86 - Citrix GDI+ Error when screen is locked Fix issue MR-93 - Regional settings problem when using SQL connection in mRemoteNG Fix issue MR-96 - When pressing SHIFT+F4 to create a new connection inside a folder, the new connections doesn't inherit any properties from its parent Fix issue MR-97 - Integrate Dutch translation @@ -28,6 +30,8 @@ Fix issue MR-233 - Backslash at end of password prevents success of putty invocation and corresponding auto-logon Fix issue MR-277 - Inheritance configuration button not appear in configuration tab Fix issue MR-284 - SSH: Text not showing properly + Fix issue MR-299 - mRemoteNG crashes while using remotely (Windows XP remote desktop) + mRemoteNG now requires .NET Framework 3.0 instead of 2.0 Added compatibility check for "Use FIPS compliant algorithms" security setting. Improved reporting of errors when encrypting and decrypting connection files. Added partial Polish translation. diff --git a/Installer/Language/czech.nsi b/Installer/Language/czech.nsi index 4283b8c9..940f713d 100644 --- a/Installer/Language/czech.nsi +++ b/Installer/Language/czech.nsi @@ -10,7 +10,7 @@ LangString InstallerLanguage ${LANG_CZECH} "Installer Language" LangString SelectInstallerLanguage ${LANG_CZECH} "Please select the language of the installer" ; Requires .NET Framework -LangString RequiresNetFramework ${LANG_CZECH} "mRemoteNG requires Microsoft .NET Framework 2.0." +LangString RequiresNetFramework ${LANG_CZECH} "mRemoteNG requires Microsoft .NET Framework 3.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." diff --git a/Installer/Language/dutch.nsi b/Installer/Language/dutch.nsi index 81895f92..6a0059e5 100644 --- a/Installer/Language/dutch.nsi +++ b/Installer/Language/dutch.nsi @@ -10,7 +10,7 @@ LangString InstallerLanguage ${LANG_DUTCH} "Installer Language" LangString SelectInstallerLanguage ${LANG_DUTCH} "Please select the language of the installer" ; Requires .NET Framework -LangString RequiresNetFramework ${LANG_DUTCH} "mRemoteNG requires Microsoft .NET Framework 2.0." +LangString RequiresNetFramework ${LANG_DUTCH} "mRemoteNG requires Microsoft .NET Framework 3.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." diff --git a/Installer/Language/english.nsi b/Installer/Language/english.nsi index 1188bbb7..3fc807d3 100644 --- a/Installer/Language/english.nsi +++ b/Installer/Language/english.nsi @@ -10,7 +10,7 @@ LangString InstallerLanguage ${LANG_ENGLISH} "Installer Language" LangString SelectInstallerLanguage ${LANG_ENGLISH} "Please select the language of the installer" ; Requires .NET Framework -LangString RequiresNetFramework ${LANG_ENGLISH} "mRemoteNG requires Microsoft .NET Framework 2.0." +LangString RequiresNetFramework ${LANG_ENGLISH} "mRemoteNG requires Microsoft .NET Framework 3.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." diff --git a/Installer/Language/french.nsi b/Installer/Language/french.nsi index aa69cbc2..7b7857ca 100644 --- a/Installer/Language/french.nsi +++ b/Installer/Language/french.nsi @@ -10,7 +10,7 @@ LangString InstallerLanguage ${LANG_FRENCH} "Installer Language" LangString SelectInstallerLanguage ${LANG_FRENCH} "Please select the language of the installer" ; Requires .NET Framework -LangString RequiresNetFramework ${LANG_FRENCH} "mRemoteNG requires Microsoft .NET Framework 2.0." +LangString RequiresNetFramework ${LANG_FRENCH} "mRemoteNG requires Microsoft .NET Framework 3.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." diff --git a/Installer/Language/german.nsi b/Installer/Language/german.nsi index 253950d7..e1e6fd9b 100644 --- a/Installer/Language/german.nsi +++ b/Installer/Language/german.nsi @@ -10,7 +10,7 @@ LangString InstallerLanguage ${LANG_GERMAN} "Installationsprogamm Sprache" LangString SelectInstallerLanguage ${LANG_GERMAN} "Bitte wählen Sie die Sprache für das Installationsprogramm" ; Requires .NET Framework -LangString RequiresNetFramework ${LANG_GERMAN} "mRemoteNG benötigt das Microsoft .NET Framework 2.0." +LangString RequiresNetFramework ${LANG_GERMAN} "mRemoteNG benötigt das Microsoft .NET Framework 3.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." diff --git a/Installer/Language/polish.nsi b/Installer/Language/polish.nsi index 4641b96b..4f7d1987 100644 --- a/Installer/Language/polish.nsi +++ b/Installer/Language/polish.nsi @@ -10,7 +10,7 @@ LangString InstallerLanguage ${LANG_POLISH} "Installer Language" LangString SelectInstallerLanguage ${LANG_POLISH} "Please select the language of the installer" ; Requires .NET Framework -LangString RequiresNetFramework ${LANG_POLISH} "mRemoteNG requires Microsoft .NET Framework 2.0." +LangString RequiresNetFramework ${LANG_POLISH} "mRemoteNG requires Microsoft .NET Framework 3.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." diff --git a/Installer/Language/spanish.nsi b/Installer/Language/spanish.nsi index d14152dc..9a5797bf 100644 --- a/Installer/Language/spanish.nsi +++ b/Installer/Language/spanish.nsi @@ -10,7 +10,7 @@ LangString InstallerLanguage ${LANG_SPANISH} "Installer Language" LangString SelectInstallerLanguage ${LANG_SPANISH} "Please select the language of the installer" ; Requires .NET Framework -LangString RequiresNetFramework ${LANG_SPANISH} "mRemoteNG requires Microsoft .NET Framework 2.0." +LangString RequiresNetFramework ${LANG_SPANISH} "mRemoteNG requires Microsoft .NET Framework 3.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." diff --git a/Installer/Language/thai.nsi b/Installer/Language/thai.nsi index eb45860b..739f1612 100644 --- a/Installer/Language/thai.nsi +++ b/Installer/Language/thai.nsi @@ -11,7 +11,7 @@ LangString InstallerLanguage ${LANG_THAI} "āļ āļēāļĐāļēāļŠāļģāļŦāļĢāļąāļšāļāļē LangString SelectInstallerLanguage ${LANG_THAI} "āļāļĢāļļāļ“āļēāđ€āļĨāļ·āļ­āļāļ āļēāļĐāļēāļŠāļģāļŦāļĢāļąāļšāļāļēāļĢāļ•āļīāļ”āļ•āļąāđ‰āļ‡" ; Requires .NET Framework -LangString RequiresNetFramework ${LANG_THAI} "mRemoteNG āļĄāļĩāļ„āļ§āļēāļĄāļ•āđ‰āļ­āļ‡āļāļēāļĢ Microsoft .NET Framework 2.0. āđ€āļ›āđ‡āļ™āļžāļ·āđ‰āļ™āļāļēāļ™" +LangString RequiresNetFramework ${LANG_THAI} "mRemoteNG āļĄāļĩāļ„āļ§āļēāļĄāļ•āđ‰āļ­āļ‡āļāļēāļĢ Microsoft .NET Framework 3.0. āđ€āļ›āđ‡āļ™āļžāļ·āđ‰āļ™āļāļēāļ™" ; User needs to be Admin LangString RequiresAdminUser ${LANG_THAI} "āļ„āļļāļ“āļ•āđ‰āļ­āļ‡āđ€āļ›āđ‡āļ™āļŠāļĄāļēāļŠāļīāļāđƒāļ™āļāļĨāļļāđˆāļĄāļ‚āļ­āļ‡ 'Power Users' āļŦāļĢāļ·āļ­ 'Administrators' āđ€āļžāļ·āđˆāļ­āļāļēāļĢāļ•āļīāļ”āļ•āļąāđ‰āļ‡ mRemoteNG" diff --git a/Installer/mRemote.nsi b/Installer/mRemote.nsi index d59dba4e..41a596b8 100644 --- a/Installer/mRemote.nsi +++ b/Installer/mRemote.nsi @@ -143,7 +143,7 @@ Function SelectLanguage StrCpy $0 $0 "" 1 # skip "v" - ${VersionCompare} $0 "2.0" $1 + ${VersionCompare} $0 "3.0" $1 ${If} $1 == 2 StrCpy $InstallDotNET "Yes" ${EndIf} diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config index 9879ce12..3fc6d73f 100644 --- a/mRemoteV1/app.config +++ b/mRemoteV1/app.config @@ -1,12 +1,12 @@ -ïŧŋ + -
- -
+
+ +
- -
+ +
@@ -15,19 +15,19 @@ - - + + - + - + - + @@ -45,12 +45,10 @@ - + - + @@ -573,4 +571,4 @@ - + diff --git a/mRemoteV1/mRemoteV1.vbproj b/mRemoteV1/mRemoteV1.vbproj index 08bebc26..9a84878a 100644 --- a/mRemoteV1/mRemoteV1.vbproj +++ b/mRemoteV1/mRemoteV1.vbproj @@ -25,7 +25,7 @@ mRemoteV1_TemporaryKey.pfx true false - v2.0 + v3.0 publish\ true Disk @@ -41,6 +41,7 @@ false true true + true