Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix for current version and released version comparison

Browse Source 
small fixes in Language
amazon lib update
This commit is contained in:
Dimitrij
2025-04-02 13:19:10 +01:00
parent 4b28eb6758
commit 2770c761b2
7 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Directory.Packages.props
View File

@@ -5,8 +5,8 @@
<NoWarn>$(NoWarn);NU1507</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AWSSDK.Core" Version="3.7.402.29" />
<PackageVersion Include="AWSSDK.EC2" Version="3.7.436.11" />
<PackageVersion Include="AWSSDK.Core" Version="3.7.402.31" />
<PackageVersion Include="AWSSDK.EC2" Version="3.7.437.1" />
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.5.1" />
<PackageVersion Include="Castle.Core" Version="5.2.1" />
<PackageVersion Include="ConsoleControl" Version="1.3.0" />

7
mRemoteNG/App/Info/GeneralAppInfo.cs
View File

@@ -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;
}
}
}

7
mRemoteNG/Language/Language.Designer.cs generated
View File

@@ -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 {
}
/// <summary>
/// Looks up a localized string similar to mRemoteNG requires an update.
/// Looks up a localized string similar to mRemoteNG available.
/// </summary>
internal static string UpdateAvailable {
get {
@@ -6689,7 +6686,7 @@ namespace mRemoteNG.Resources.Language {
}
/// <summary>
/// Looks up a localized string similar to Version.
/// Looks up a localized string similar to Current Version.
/// </summary>
internal static string Version {
get {

4
mRemoteNG/Language/Language.resx
View File

@@ -1670,7 +1670,7 @@ If you run into such an error, please create a new connection file!</value>
<value>Uncheck the properties you want not to be saved!</value>
</data>
<data name="UpdateAvailable" xml:space="preserve">
<value>mRemoteNG requires an update</value>
<value>mRemoteNG available</value>
</data>
<data name="UpdateCheck" xml:space="preserve">
<value>mRemoteNG can periodically connect to the mRemoteNG website to check for updates.</value>
@@ -1719,7 +1719,7 @@ mRemoteNG will now quit and begin with the installation.</value>
<value>Use SQL Server to load &amp;&amp; save connections</value>
</data>
<data name="Version" xml:space="preserve">
<value>Version</value>
<value>Current Version</value>
</data>
<data name="Vnc" xml:space="preserve">
<value>VNC</value>

6
mRemoteNG/Properties/AssemblyInfo.cs
View File

@@ -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")]

8
mRemoteNG/UI/Window/UpdateWindow.cs
View File

@@ -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}:";
}

15
mRemoteNG/mRemoteNG.csproj
View File

@@ -5,7 +5,7 @@
<TargetFramework>net9.0-windows7.0</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<ApplicationIcon>Icons\mRemoteNG.ico</ApplicationIcon>
<Version>1.77.3-dev</Version>
<Version>1.78.2-dev</Version>
<Description>Multi-protocol remote connections manager</Description>
<Copyright>$([System.DateTime]::Now.Year) mRemoteNG Dev Team, 2010-2013 Riley McArdle, 2007-2009 Felix Deimel</Copyright>
<PackageLicenseFile>COPYING.TXT</PackageLicenseFile>
@@ -34,7 +34,7 @@
<OutputPath>bin\x64\Debug\</OutputPath>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<Optimize>False</Optimize>
<WarningLevel>7</WarningLevel>
<WarningLevel>8</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<DefineConstants />
@@ -43,7 +43,7 @@
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<WarningLevel>7</WarningLevel>
<WarningLevel>8</WarningLevel>
<ResolveComReferenceSilent>True</ResolveComReferenceSilent>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Portable|x64'">
@@ -53,7 +53,7 @@
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<WarningLevel>7</WarningLevel>
<WarningLevel>8</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Portable|x64'">
<DefineConstants>PORTABLE</DefineConstants>
@@ -62,13 +62,13 @@
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<WarningLevel>7</WarningLevel>
<WarningLevel>8</WarningLevel>
<ResolveComReferenceSilent>True</ResolveComReferenceSilent>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Installer|x64'">
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<Optimize>True</Optimize>
<WarningLevel>7</WarningLevel>
<WarningLevel>8</WarningLevel>
<ResolveComReferenceSilent>True</ResolveComReferenceSilent>
</PropertyGroup>
<ItemGroup>
@@ -572,6 +572,9 @@
<PropertyGroup>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Deploy to github|x64'">
<WarningLevel>8</WarningLevel>
</PropertyGroup>
<!--
<Target Name="MoveAssemblies" AfterTargets="Build">
<ItemGroup>