diff --git a/.gitignore b/.gitignore
index 7f5bfe195..78f8a4fa1 100644
--- 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
diff --git a/BUILD.CMD b/BUILD.CMD
index 760b26211..09e3a6392 100644
--- 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
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 23bee28a7..168ae7c1e 100644
--- 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.
diff --git a/Installer/GetVersion.nsi b/Installer/GetVersion.nsi
deleted file mode 100644
index c8b64ad67..000000000
--- a/Installer/GetVersion.nsi
+++ /dev/null
@@ -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
diff --git a/Installer/mRemote.nsi b/Installer/mRemote.nsi
index b56b7d421..6419a98e2 100644
--- 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}
diff --git a/mRemoteV1.sln b/mRemoteV1.sln
index 5cf6d34f4..d257cbe93 100644
--- 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
diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb
index e14b78466..8840703d4 100644
--- 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
diff --git a/mRemoteV1/Config/Config.Connections.Load.vb b/mRemoteV1/Config/Config.Connections.Load.vb
index f27e9a743..177379c84 100644
--- 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
diff --git a/mRemoteV1/Config/Config.Connections.Save.vb b/mRemoteV1/Config/Config.Connections.Save.vb
index 0b0475d3f..2d7645122 100644
--- 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
diff --git a/mRemoteV1/Connection/Connection.Protocol.RDP.vb b/mRemoteV1/Connection/Connection.Protocol.RDP.vb
index 4048aae31..264e8510e 100644
--- 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"
diff --git a/mRemoteV1/My Project/Application.Designer.vb b/mRemoteV1/My Project/Application.Designer.vb
index b22463ef5..ecdc1065a 100644
--- a/mRemoteV1/My Project/Application.Designer.vb
+++ b/mRemoteV1/My Project/Application.Designer.vb
@@ -1,10 +1,10 @@
'------------------------------------------------------------------------------
'
-' 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.
'
'------------------------------------------------------------------------------
@@ -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
diff --git a/mRemoteV1/My Project/AssemblyInfo.vb b/mRemoteV1/My Project/AssemblyInfo.vb
index c0d74dcf3..2e42168c0 100644
--- a/mRemoteV1/My Project/AssemblyInfo.vb
+++ b/mRemoteV1/My Project/AssemblyInfo.vb
@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
-
+
@@ -34,4 +34,4 @@ Imports System.Runtime.InteropServices
-
\ No newline at end of file
+
diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb
index 386c6a66b..60fb6dd6d 100644
--- a/mRemoteV1/My Project/Resources.Designer.vb
+++ b/mRemoteV1/My Project/Resources.Designer.vb
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
'
' 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
'''
''' A strongly-typed resource class, for looking up localized strings, etc.
'''
- _
@@ -756,6 +756,15 @@ Namespace My.Resources
End Get
End Property
+ '''
+ ''' 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..
+ '''
+ Friend ReadOnly Property strErrorStartupConnectionFileLoad() As String
+ Get
+ Return ResourceManager.GetString("strErrorStartupConnectionFileLoad", resourceCulture)
+ End Get
+ End Property
+
'''
''' Looks up a localized string similar to mRemoteNG Portable Edition does not currently support automatic updates..
'''
diff --git a/mRemoteV1/My Project/Resources.resx b/mRemoteV1/My Project/Resources.resx
index 72b9d335f..29c043fd9 100644
--- a/mRemoteV1/My Project/Resources.resx
+++ b/mRemoteV1/My Project/Resources.resx
@@ -448,4 +448,7 @@
mRemoteNG Portable Edition does not currently support automatic updates.
+
+ 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.
+
\ No newline at end of file
diff --git a/mRemoteV1/My Project/Settings.Designer.vb b/mRemoteV1/My Project/Settings.Designer.vb
index 020aa9277..3bfdafcf9 100644
--- a/mRemoteV1/My Project/Settings.Designer.vb
+++ b/mRemoteV1/My Project/Settings.Designer.vb
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
'
' 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
_
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
diff --git a/mRemoteV1/mRemoteV1.vbproj b/mRemoteV1/mRemoteV1.vbproj
index 4d1ea8482..12ffacc51 100644
--- a/mRemoteV1/mRemoteV1.vbproj
+++ b/mRemoteV1/mRemoteV1.vbproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -14,7 +14,7 @@
On
- 2.0
+ 3.5
false
@@ -25,7 +25,7 @@
mRemoteV1_TemporaryKey.pfx
true
false
- true
+ v2.0
publish\
true
Disk
@@ -39,6 +39,7 @@
1
1.64.0.%2a
false
+ true
true
@@ -49,10 +50,11 @@
bin\Debug\
- 41999,42016,42017,42018,42019,42032,42036
+ 41999,42016,42017,42018,42019,42032,42036,42353,42354,42355
x86
+ AllRules.ruleset
pdbonly
@@ -62,31 +64,34 @@
bin\Release\
- 41999,42016,42017,42018,42019,42032,42036
+ 41999,42016,42017,42018,42019,42032,42036,42353,42354,42355
true
x86
+ AllRules.ruleset
true
bin\Release Portable\
true
- 41999,42016,42017,42018,42019,42032,42036
+ 41999,42016,42017,42018,42019,42032,42036,42353,42354,42355
pdbonly
x86
PORTABLE
true
+ AllRules.ruleset
true
true
true
bin\Debug Portable\
- 41999,42016,42017,42018,42019,42032,42036
+ 41999,42016,42017,42018,42019,42032,42036,42353,42354,42355
full
x86
PORTABLE
+ AllRules.ruleset
@@ -885,6 +890,11 @@
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
False
.NET Framework 2.0 %28x86%29
@@ -900,6 +910,11 @@
.NET Framework 3.5
false
+
+ False
+ .NET Framework 3.5 SP1
+ false
+