Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mRemoteNG/mRemoteNG.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiley McArdle <riley@mremoteng.org>2010-02-03 08:01:14 +0300
committerRiley McArdle <riley@mremoteng.org>2010-02-03 08:01:14 +0300
commit9a0f8881a752f0d9b132c854f0de777bdbbd9348 (patch)
tree5377123aa9a59a58f5f5cb747c821c0d298f4abf
parent7c41abb1b402d07b7295fa7d3da4eaa642c68130 (diff)
Added build configuration for portable edition.1.63
Fixes for portable edition. Added missing Icons directory. New build script to make release ZIPs and installer EXE.
-rw-r--r--.gitignore2
-rw-r--r--BUILD.CMD32
-rw-r--r--Installer/mRemote.nsi6
-rw-r--r--mRemoteV1.sln6
-rw-r--r--mRemoteV1/App/App.Info.vb7
-rw-r--r--mRemoteV1/Config/Config.Settings.Providers.vb26
-rw-r--r--mRemoteV1/Icons/Anti Virus.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Backup.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Build Server.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Database.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Domain Controller.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/ESX.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Fax.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/File Server.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Finance.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Firewall.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Linux.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Log.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Mail Server.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Remote Desktop.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Router.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/SSH.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/SharePoint.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Switch.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Tel.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Telnet.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Terminal Server.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Test Server.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Virtual Machine.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Web Server.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/WiFi.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Windows.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/Workstation.icobin0 -> 1150 bytes
-rw-r--r--mRemoteV1/Icons/mRemote.icobin0 -> 3750 bytes
-rw-r--r--mRemoteV1/My Project/AssemblyInfo.vb4
-rw-r--r--mRemoteV1/My Project/Resources.Designer.vb9
-rw-r--r--mRemoteV1/My Project/Resources.resx3
-rw-r--r--mRemoteV1/UI/UI.Window.About.vb6
-rw-r--r--mRemoteV1/confConsNew.xml2
-rw-r--r--mRemoteV1/mRemoteV1.vbproj120
40 files changed, 195 insertions, 28 deletions
diff --git a/.gitignore b/.gitignore
index edf9e18b..f07583ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-Installer/bin
+Release
mRemoteV1/bin
mRemoteV1/obj
mRemoteV1/publish
diff --git a/BUILD.CMD b/BUILD.CMD
new file mode 100644
index 00000000..ccfb4485
--- /dev/null
+++ b/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"
diff --git a/Installer/mRemote.nsi b/Installer/mRemote.nsi
index cea4aa23..8d12bea9 100644
--- a/Installer/mRemote.nsi
+++ b/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}
diff --git a/mRemoteV1.sln b/mRemoteV1.sln
index b31f9527..5cf6d34f 100644
--- a/mRemoteV1.sln
+++ b/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
diff --git a/mRemoteV1/App/App.Info.vb b/mRemoteV1/App/App.Info.vb
index 0bcee326..5b898675 100644
--- a/mRemoteV1/App/App.Info.vb
+++ b/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
diff --git a/mRemoteV1/Config/Config.Settings.Providers.vb b/mRemoteV1/Config/Config.Settings.Providers.vb
index 7df61d14..7be706f5 100644
--- a/mRemoteV1/Config/Config.Settings.Providers.vb
+++ b/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
diff --git a/mRemoteV1/Icons/Anti Virus.ico b/mRemoteV1/Icons/Anti Virus.ico
new file mode 100644
index 00000000..815d01c4
--- /dev/null
+++ b/mRemoteV1/Icons/Anti Virus.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Backup.ico b/mRemoteV1/Icons/Backup.ico
new file mode 100644
index 00000000..3e916514
--- /dev/null
+++ b/mRemoteV1/Icons/Backup.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Build Server.ico b/mRemoteV1/Icons/Build Server.ico
new file mode 100644
index 00000000..b664fa74
--- /dev/null
+++ b/mRemoteV1/Icons/Build Server.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Database.ico b/mRemoteV1/Icons/Database.ico
new file mode 100644
index 00000000..0926231a
--- /dev/null
+++ b/mRemoteV1/Icons/Database.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Domain Controller.ico b/mRemoteV1/Icons/Domain Controller.ico
new file mode 100644
index 00000000..0582f3ca
--- /dev/null
+++ b/mRemoteV1/Icons/Domain Controller.ico
Binary files differ
diff --git a/mRemoteV1/Icons/ESX.ico b/mRemoteV1/Icons/ESX.ico
new file mode 100644
index 00000000..54eeb2a4
--- /dev/null
+++ b/mRemoteV1/Icons/ESX.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Fax.ico b/mRemoteV1/Icons/Fax.ico
new file mode 100644
index 00000000..3bdc790a
--- /dev/null
+++ b/mRemoteV1/Icons/Fax.ico
Binary files differ
diff --git a/mRemoteV1/Icons/File Server.ico b/mRemoteV1/Icons/File Server.ico
new file mode 100644
index 00000000..67676b7d
--- /dev/null
+++ b/mRemoteV1/Icons/File Server.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Finance.ico b/mRemoteV1/Icons/Finance.ico
new file mode 100644
index 00000000..ab813dca
--- /dev/null
+++ b/mRemoteV1/Icons/Finance.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Firewall.ico b/mRemoteV1/Icons/Firewall.ico
new file mode 100644
index 00000000..2343ae6a
--- /dev/null
+++ b/mRemoteV1/Icons/Firewall.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Linux.ico b/mRemoteV1/Icons/Linux.ico
new file mode 100644
index 00000000..cb8f13a9
--- /dev/null
+++ b/mRemoteV1/Icons/Linux.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Log.ico b/mRemoteV1/Icons/Log.ico
new file mode 100644
index 00000000..789653ef
--- /dev/null
+++ b/mRemoteV1/Icons/Log.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Mail Server.ico b/mRemoteV1/Icons/Mail Server.ico
new file mode 100644
index 00000000..9f0d1806
--- /dev/null
+++ b/mRemoteV1/Icons/Mail Server.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Remote Desktop.ico b/mRemoteV1/Icons/Remote Desktop.ico
new file mode 100644
index 00000000..2ac9c212
--- /dev/null
+++ b/mRemoteV1/Icons/Remote Desktop.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Router.ico b/mRemoteV1/Icons/Router.ico
new file mode 100644
index 00000000..b1cd8e60
--- /dev/null
+++ b/mRemoteV1/Icons/Router.ico
Binary files differ
diff --git a/mRemoteV1/Icons/SSH.ico b/mRemoteV1/Icons/SSH.ico
new file mode 100644
index 00000000..12b5b580
--- /dev/null
+++ b/mRemoteV1/Icons/SSH.ico
Binary files differ
diff --git a/mRemoteV1/Icons/SharePoint.ico b/mRemoteV1/Icons/SharePoint.ico
new file mode 100644
index 00000000..5c420c31
--- /dev/null
+++ b/mRemoteV1/Icons/SharePoint.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Switch.ico b/mRemoteV1/Icons/Switch.ico
new file mode 100644
index 00000000..acb7482a
--- /dev/null
+++ b/mRemoteV1/Icons/Switch.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Tel.ico b/mRemoteV1/Icons/Tel.ico
new file mode 100644
index 00000000..b4b401fc
--- /dev/null
+++ b/mRemoteV1/Icons/Tel.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Telnet.ico b/mRemoteV1/Icons/Telnet.ico
new file mode 100644
index 00000000..ebe0c036
--- /dev/null
+++ b/mRemoteV1/Icons/Telnet.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Terminal Server.ico b/mRemoteV1/Icons/Terminal Server.ico
new file mode 100644
index 00000000..c19c6ba6
--- /dev/null
+++ b/mRemoteV1/Icons/Terminal Server.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Test Server.ico b/mRemoteV1/Icons/Test Server.ico
new file mode 100644
index 00000000..6159d9f8
--- /dev/null
+++ b/mRemoteV1/Icons/Test Server.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Virtual Machine.ico b/mRemoteV1/Icons/Virtual Machine.ico
new file mode 100644
index 00000000..00d805f8
--- /dev/null
+++ b/mRemoteV1/Icons/Virtual Machine.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Web Server.ico b/mRemoteV1/Icons/Web Server.ico
new file mode 100644
index 00000000..d2aa024d
--- /dev/null
+++ b/mRemoteV1/Icons/Web Server.ico
Binary files differ
diff --git a/mRemoteV1/Icons/WiFi.ico b/mRemoteV1/Icons/WiFi.ico
new file mode 100644
index 00000000..86075745
--- /dev/null
+++ b/mRemoteV1/Icons/WiFi.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Windows.ico b/mRemoteV1/Icons/Windows.ico
new file mode 100644
index 00000000..3a9752ba
--- /dev/null
+++ b/mRemoteV1/Icons/Windows.ico
Binary files differ
diff --git a/mRemoteV1/Icons/Workstation.ico b/mRemoteV1/Icons/Workstation.ico
new file mode 100644
index 00000000..95cbf232
--- /dev/null
+++ b/mRemoteV1/Icons/Workstation.ico
Binary files differ
diff --git a/mRemoteV1/Icons/mRemote.ico b/mRemoteV1/Icons/mRemote.ico
new file mode 100644
index 00000000..02b38ac0
--- /dev/null
+++ b/mRemoteV1/Icons/mRemote.ico
Binary files differ
diff --git a/mRemoteV1/My Project/AssemblyInfo.vb b/mRemoteV1/My Project/AssemblyInfo.vb
index 8536f367..7e4c7fef 100644
--- a/mRemoteV1/My Project/AssemblyInfo.vb
+++ b/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")>
diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb
index adcbae33..f428d743 100644
--- a/mRemoteV1/My Project/Resources.Designer.vb
+++ b/mRemoteV1/My Project/Resources.Designer.vb
@@ -835,6 +835,15 @@ Namespace My.Resources
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>
Friend ReadOnly Property strReleasedUnderGPL() As String
diff --git a/mRemoteV1/My Project/Resources.resx b/mRemoteV1/My Project/Resources.resx
index 111bfc7c..3d8d7c38 100644
--- a/mRemoteV1/My Project/Resources.resx
+++ b/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> \ No newline at end of file
diff --git a/mRemoteV1/UI/UI.Window.About.vb b/mRemoteV1/UI/UI.Window.About.vb
index 81a50059..f301a417 100644
--- a/mRemoteV1/UI/UI.Window.About.vb
+++ b/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)
diff --git a/mRemoteV1/confConsNew.xml b/mRemoteV1/confConsNew.xml
index 670b316e..6ab6e5cf 100644
--- a/mRemoteV1/confConsNew.xml
+++ b/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" /> \ No newline at end of file
+<Connections Name="Connections" Export="False" Protected="GiUis20DIbnYzWPcdaQKfjE2H5jh//L5v4RGrJMGNXuIq2CttB/d/BxaBP2LwRhY" ConfVersion="2.2" /> \ No newline at end of file
diff --git a/mRemoteV1/mRemoteV1.vbproj b/mRemoteV1/mRemoteV1.vbproj
index 6e3c2058..5c6dc8c1 100644
--- a/mRemoteV1/mRemoteV1.vbproj
+++ b/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" />