diff --git a/Directory.Packages.props b/Directory.Packages.props
index c2119c98..3c739ab9 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -5,8 +5,8 @@
$(NoWarn);NU1507
-
-
+
+
diff --git a/mRemoteNG/App/Info/GeneralAppInfo.cs b/mRemoteNG/App/Info/GeneralAppInfo.cs
index 5bd85b94..cf42a5c3 100644
--- a/mRemoteNG/App/Info/GeneralAppInfo.cs
+++ b/mRemoteNG/App/Info/GeneralAppInfo.cs
@@ -54,8 +54,11 @@ namespace mRemoteNG.App.Info
public static Version GetApplicationVersion()
{
- _ = System.Version.TryParse(ApplicationVersion, out Version v);
- return v;
+ string cleanedVersion = ApplicationVersion.Split(' ')[0].Replace("(", "").Replace(")", "").Replace("Build", "");
+ cleanedVersion = cleanedVersion + "." + ApplicationVersion.Split(' ')[^1].Replace(")", "");
+
+ _ = System.Version.TryParse(cleanedVersion, out Version parsedVersion);
+ return parsedVersion;
}
}
}
\ No newline at end of file
diff --git a/mRemoteNG/Language/Language.Designer.cs b/mRemoteNG/Language/Language.Designer.cs
index 6843981a..ca13aaa6 100644
--- a/mRemoteNG/Language/Language.Designer.cs
+++ b/mRemoteNG/Language/Language.Designer.cs
@@ -39,9 +39,6 @@ namespace mRemoteNG.Resources.Language {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
- //string resourceFilePath = "Languages/ru/mRemoteNG.resources.dll";
- //global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager(resourceFilePath, typeof(Language).Assembly);
-
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("mRemoteNG.Language.Language", typeof(Language).Assembly);
resourceMan = temp;
}
@@ -6436,7 +6433,7 @@ namespace mRemoteNG.Resources.Language {
}
///
- /// Looks up a localized string similar to mRemoteNG requires an update.
+ /// Looks up a localized string similar to mRemoteNG available.
///
internal static string UpdateAvailable {
get {
@@ -6689,7 +6686,7 @@ namespace mRemoteNG.Resources.Language {
}
///
- /// Looks up a localized string similar to Version.
+ /// Looks up a localized string similar to Current Version.
///
internal static string Version {
get {
diff --git a/mRemoteNG/Language/Language.resx b/mRemoteNG/Language/Language.resx
index 6f1a9330..311c87c4 100644
--- a/mRemoteNG/Language/Language.resx
+++ b/mRemoteNG/Language/Language.resx
@@ -1670,7 +1670,7 @@ If you run into such an error, please create a new connection file!
Uncheck the properties you want not to be saved!
- mRemoteNG requires an update
+ mRemoteNG available
mRemoteNG can periodically connect to the mRemoteNG website to check for updates.
@@ -1719,7 +1719,7 @@ mRemoteNG will now quit and begin with the installation.
Use SQL Server to load && save connections
- Version
+ Current Version
VNC
diff --git a/mRemoteNG/Properties/AssemblyInfo.cs b/mRemoteNG/Properties/AssemblyInfo.cs
index af86b784..bce28109 100644
--- a/mRemoteNG/Properties/AssemblyInfo.cs
+++ b/mRemoteNG/Properties/AssemblyInfo.cs
@@ -18,10 +18,10 @@ using System.Resources;
[assembly: AssemblyCulture("")]
// Version information
-[assembly: AssemblyVersion("1.78.2.2932")]
-[assembly: AssemblyFileVersion("1.78.2.2932")]
+[assembly: AssemblyVersion("1.78.2.2936")]
+[assembly: AssemblyFileVersion("1.78.2.2936")]
[assembly: NeutralResourcesLanguageAttribute("en-US")]
-[assembly: AssemblyInformationalVersion("1.78.2 (Nightly Build 2932)")]
+[assembly: AssemblyInformationalVersion("1.78.2 (Nightly Build 2936)")]
// Logging
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "log4net.config")]
diff --git a/mRemoteNG/UI/Window/UpdateWindow.cs b/mRemoteNG/UI/Window/UpdateWindow.cs
index 397fdc2c..eb826721 100644
--- a/mRemoteNG/UI/Window/UpdateWindow.cs
+++ b/mRemoteNG/UI/Window/UpdateWindow.cs
@@ -52,10 +52,8 @@ namespace mRemoteNG.UI.Window
if (!ThemeManager.getInstance().ActiveAndExtended) return;
base.ApplyTheme();
- txtChangeLog.BackColor =
- ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
- txtChangeLog.ForeColor =
- ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
+ txtChangeLog.BackColor = ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
+ txtChangeLog.ForeColor = ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
}
private void ApplyLanguage()
@@ -68,7 +66,7 @@ namespace mRemoteNG.UI.Window
: Language.DownloadAndInstall;
lblChangeLogLabel.Text = Language.Changelog;
lblInstalledVersion.Text = Language.Version;
- lblInstalledVersionLabel.Text = $"{Language.AvailableVersion}:";
+ lblInstalledVersionLabel.Text = $"{Language.Version}:";
lblLatestVersion.Text = Language.Version;
lblLatestVersionLabel.Text = $"{Language.AvailableVersion}:";
}
diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj
index e8f35e35..746e88f2 100644
--- a/mRemoteNG/mRemoteNG.csproj
+++ b/mRemoteNG/mRemoteNG.csproj
@@ -5,7 +5,7 @@
net9.0-windows7.0
true
Icons\mRemoteNG.ico
- 1.77.3-dev
+ 1.78.2-dev
Multi-protocol remote connections manager
$([System.DateTime]::Now.Year) mRemoteNG Dev Team, 2010-2013 Riley McArdle, 2007-2009 Felix Deimel
COPYING.TXT
@@ -34,7 +34,7 @@
bin\x64\Debug\
False
False
- 7
+ 8
@@ -43,7 +43,7 @@
false
False
- 7
+ 8
True
@@ -53,7 +53,7 @@
false
False
- 7
+ 8
PORTABLE
@@ -62,13 +62,13 @@
false
False
- 7
+ 8
True
False
True
- 7
+ 8
True
@@ -572,6 +572,9 @@
true
+
+ 8
+