Added build configuration for portable edition.

Fixes for portable edition.
Added missing Icons directory.
New build script to make release ZIPs and installer EXE.

.gitignore

@@ -1,4 +1,4 @@
-Installer/bin
+Release
 mRemoteV1/bin
 mRemoteV1/obj
 mRemoteV1/publish

BUILD.CMD

@@ -0,0 +1,32 @@
+@echo off
+
+SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
+SET DEVENV="devenv.exe"
+SET MAKENSIS="%ProgramFiles(x86)%\NSIS\makensis.exe"
+SET RAR="%ProgramFiles%\WinRAR\Rar.exe"
+SET BINARYZIP="%~dp0\Release\mRemoteNG-1.63.zip"
+SET PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-1.63.zip"
+
+call %VCVARSALL% x86
+
+rmdir /s /q "%~dp0\mRemoteV1\bin"
+rmdir /s /q "%~dp0\mRemoteV1\obj"
+
+%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release"
+%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release Portable"
+
+mkdir "%~dp0\Release"
+
+%MAKENSIS% "%~dp0\Installer\mRemote.nsi"
+
+del /f /q %BINARYZIP%
+
+%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
+%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
+%RAR% a -m5 -ep %BINARYZIP% "%~dp0\*.TXT"
+
+del /f /q %PORTABLEZIP%
+
+%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
+%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
+%RAR% a -m5 -ep %PORTABLEZIP% "%~dp0\*.TXT"

Installer/mRemote.nsi

@@ -3,7 +3,7 @@
 !insertmacro VersionCompare
 
 !DEFINE PRODUCT_VERSION_MAJOR 1
-!DEFINE PRODUCT_VERSION_MINOR 62
+!DEFINE PRODUCT_VERSION_MINOR 63
 
 !DEFINE PRODUCT_VERSION "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}"
 !DEFINE PRODUCT_VERSION_LONG "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}.0.0"
@@ -13,7 +13,7 @@ Var InstallDotNET
 
 ; Basic Config
 Name "mRemoteNG ${PRODUCT_VERSION}"
-OutFile "bin\mRemoteNG-Installer-${PRODUCT_VERSION}.exe"
+OutFile "..\Release\mRemoteNG-Installer-${PRODUCT_VERSION}.exe"
 SetCompressor /SOLID lzma
 InstallDir "$PROGRAMFILES\mRemoteNG"
 InstallDirRegKey HKLM "Software\mRemoteNG" "InstallPath"
@@ -106,7 +106,7 @@ Section "" ; Install
 	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" "DisplayIcon" "$INSTDIR\mRemoteNG.exe"
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 5816
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 6464
 
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayVersion" ${PRODUCT_VERSION}
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "VersionMajor" ${PRODUCT_VERSION_MAJOR}

mRemoteV1.sln

@@ -5,12 +5,18 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "mRemoteV1", "mRemoteV1\mRem
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug Portable|Any CPU = Debug Portable|Any CPU
 		Debug|Any CPU = Debug|Any CPU
+		Release Portable|Any CPU = Release Portable|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|Any CPU
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.Build.0 = Debug Portable|Any CPU
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release Portable|Any CPU
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release Portable|Any CPU
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

mRemoteV1/App/App.Info.vb

@@ -14,10 +14,11 @@ Namespace App
         End Class
 
         Public Class Settings
-            'Exchange to make portable/normal
+#If Not PORTABLE Then
             Public Shared ReadOnly SettingsPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName
-            'Public Shared ReadOnly SettingsPath As String = My.Application.Info.DirectoryPath
-
+#Else
+            Public Shared ReadOnly SettingsPath As String = My.Application.Info.DirectoryPath
+#End If
             Public Shared ReadOnly LayoutFileName As String = "pnlLayout.xml"
             Public Shared ReadOnly ExtAppsFilesName As String = "extApps.xml"
         End Class

mRemoteV1/Config/Config.Settings.Providers.vb

@@ -6,15 +6,13 @@ Namespace Config
     Namespace Settings
         Namespace Providers
             Public Class ChooseProvider
-                'Exchange to make portable/normal
+#If Not PORTABLE Then
                 Inherits LocalFileSettingsProvider
-                'Inherits PortableSettingsProvider
+#Else
+                Inherits PortableSettingsProvider
+#End If
             End Class
 
-
-
-
-
             Public Class PortableSettingsProvider
                 Inherits SettingsProvider
 
@@ -145,13 +143,17 @@ Namespace Config
                     End Try
 
                     'Check to see if the node exists, if so then set its new value
-                    If Not SettingNode Is Nothing Then
-                        SettingNode.InnerText = propVal.SerializedValue.ToString
+                    If SettingNode IsNot Nothing Then
+                        If propVal.SerializedValue IsNot Nothing Then
+                            SettingNode.InnerText = propVal.SerializedValue.ToString
+                        End If
                     Else
                         If IsRoaming(propVal.Property) Then
                             'Store the value as an element of the Settings Root Node
                             SettingNode = SettingsXML.CreateElement(propVal.Name)
-                            SettingNode.InnerText = propVal.SerializedValue.ToString
+                            If propVal.SerializedValue IsNot Nothing Then
+                                SettingNode.InnerText = propVal.SerializedValue.ToString
+                            End If
                             SettingsXML.SelectSingleNode(SETTINGSROOT).AppendChild(SettingNode)
                         Else
                             'Its machine specific, store as an element of the machine name node,
@@ -169,10 +171,14 @@ Namespace Config
                             End If
 
                             SettingNode = SettingsXML.CreateElement(propVal.Name)
-                            SettingNode.InnerText = propVal.SerializedValue.ToString
+                            If propVal.SerializedValue IsNot Nothing Then
+                                SettingNode.InnerText = propVal.SerializedValue.ToString
+                            End If
                             MachineNode.AppendChild(SettingNode)
                         End If
                     End If
+
+
                 End Sub
 
                 Private Function IsRoaming(ByVal prop As SettingsProperty) As Boolean

mRemoteV1/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.62")> 
-<Assembly: AssemblyFileVersion("1.62")> 
+<Assembly: AssemblyVersion("1.63")> 
+<Assembly: AssemblyFileVersion("1.63")> 

mRemoteV1/My Project/Resources.Designer.vb

@@ -834,6 +834,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Portable Edition.
+        '''</summary>
+        Friend ReadOnly Property strPortableEdition() As String
+            Get
+                Return ResourceManager.GetString("strPortableEdition", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Released under the GNU General Public License (GPL).
         '''</summary>

mRemoteV1/My Project/Resources.resx

@@ -487,4 +487,7 @@
   <data name="strDoNotShowThisMessageAgain" xml:space="preserve">
     <value>Do not show this message again.</value>
   </data>
+  <data name="strPortableEdition" xml:space="preserve">
+    <value>Portable Edition</value>
+  </data>
 </root>

mRemoteV1/UI/UI.Window.About.vb

@@ -56,6 +56,7 @@ Namespace UI
                 '
                 Me.lblEdition.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
                 Me.lblEdition.BackColor = System.Drawing.Color.Black
+                Me.lblEdition.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                 Me.lblEdition.ForeColor = System.Drawing.Color.White
                 Me.lblEdition.Location = New System.Drawing.Point(512, 112)
                 Me.lblEdition.Name = "lblEdition"
@@ -243,10 +244,15 @@ Namespace UI
             End Sub
 
             Private Sub ApplyEditions()
+#If PORTABLE Then
+                lblEdition.Text = My.Resources.strPortableEdition
+                lblEdition.Visible = True
+#Else
                 If App.Editions.Spanlink.Enabled Then
                     lblEdition.Text = "Spanlink Communications"
                     lblEdition.Visible = True
                 End If
+#End If
             End Sub
 
             Private Sub FillLinkLabel(ByVal llbl As LinkLabel, ByVal Text As String, ByVal URL As String)

mRemoteV1/confConsNew.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Connections Name="Connections" Export="False" Protected="GiUis20DIbnYzWPcdaQKfjE2H5jh//L5v4RGrJMGNXuIq2CttB/d/BxaBP2LwRhY" ConfVersion="2.1" />
+<Connections Name="Connections" Export="False" Protected="GiUis20DIbnYzWPcdaQKfjE2H5jh//L5v4RGrJMGNXuIq2CttB/d/BxaBP2LwRhY" ConfVersion="2.2" />

mRemoteV1/mRemoteV1.vbproj

@@ -68,6 +68,25 @@
     <DebugSymbols>false</DebugSymbols>
     <PlatformTarget>x86</PlatformTarget>
   </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>
+    <DebugType>None</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <DefineConstants>PORTABLE</DefineConstants>
+  </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>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <DefineConstants>PORTABLE</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ADTree, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -92,6 +111,7 @@
     <Reference Include="MagicLibrary, Version=1.7.4.0, Culture=neutral, PublicKeyToken=3a6eb82f876a49bc">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>References\MagicLibrary.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="MiniGeckoBrowser, Version=1.0.3142.33318, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -583,9 +603,9 @@
     <Content Include="Help\Update.htm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Notes\Help.txt" />
-    <Content Include="Notes\ICA.txt" />
-    <Content Include="Notes\Misc.txt" />
+    <None Include="Notes\Help.txt" />
+    <None Include="Notes\ICA.txt" />
+    <None Include="Notes\Misc.txt" />
     <Content Include="CHANGELOG.TXT">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -618,8 +638,8 @@
     <None Include="Resources\Images\Duplicate.png" />
     <None Include="Resources\Images\PortScan.png" />
     <None Include="Resources\Icons\PortScan_Icon.ico" />
-    <Content Include="Notes\MultiLang.txt" />
-    <Content Include="Notes\MultiUserCons.txt" />
+    <None Include="Notes\MultiLang.txt" />
+    <None Include="Notes\MultiUserCons.txt" />
     <None Include="Resources\Images_FamFamFam\Copy.png" />
     <None Include="Resources\Images_FamFamFam\Delete.png" />
     <None Include="Resources\Icons_FamFamFam\Config_Icon.ico" />
@@ -685,7 +705,7 @@
     <None Include="Resources\Images_FamFamFam\Chat.png" />
     <None Include="Resources\Icons_FamFamFam\Panels_Icon.ico" />
     <None Include="Resources\Images_FamFamFam\JumpTo.png" />
-    <Content Include="Notes\PropertyList.txt" />
+    <None Include="Notes\PropertyList.txt" />
     <None Include="Resources\Images_FamFamFam\Monitor_GoTo.png" />
     <None Include="Resources\Images_FamFamFam\Monitor.png" />
     <None Include="Resources\Icons\UVNC_SC_Icon.ico" />
@@ -696,11 +716,95 @@
     <None Include="Resources\Icons\ComponentsCheck_Icon.ico" />
     <None Include="Resources\Icons_FamFamFam\News_Icon.ico" />
     <None Include="Resources\Images_FamFamFam\News.png" />
-    <Content Include="Resources\Announcement\mRemote_Announcement.txt" />
-    <Content Include="Resources\Update\mRemote_Update.txt" />
+    <None Include="Resources\Announcement\mRemote_Announcement.txt" />
+    <None Include="Resources\Update\mRemote_Update.txt" />
     <Content Include="Help\Main.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Icons\Anti Virus.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Backup.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Build Server.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Database.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Domain Controller.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\ESX.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Fax.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\File Server.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Finance.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Firewall.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Linux.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Log.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Mail Server.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\mRemote.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Remote Desktop.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Router.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\SharePoint.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\SSH.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Switch.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Tel.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Telnet.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Terminal Server.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Test Server.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Virtual Machine.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Web Server.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\WiFi.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Windows.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Icons\Workstation.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Resources\Images\Copy.png" />
     <None Include="Resources\Icons\mRemote_Icon.ico" />
     <None Include="Resources\Icons\Sessions_Icon.ico" />