From dafb1b364c426f81154d0dde23264b43a68506b5 Mon Sep 17 00:00:00 2001 From: Dimitrij Date: Tue, 15 Oct 2024 13:41:41 +0100 Subject: [PATCH] lib updates --- ExternalConnectors/ExternalConnectors.csproj | 6 +-- mRemoteNG.sln | 25 ++------- mRemoteNG/App.config | 8 +++ mRemoteNG/App/ProgramRoot.cs | 16 ++++++ mRemoteNG/Connection/PuttySessionInfo.cs | 4 +- mRemoteNG/Properties/AssemblyInfo.cs | 6 +-- mRemoteNG/Themes/ThemeManager.cs | 16 ------ mRemoteNG/UI/Window/ConnectionTreeWindow.resx | 54 +++++++++---------- mRemoteNG/mRemoteNG.csproj | 22 +++++--- .../CustomActions/CustomActions.csproj | 3 ++ mRemoteNGSpecs/mRemoteNGSpecs.csproj | 6 +-- mRemoteNGTests/mRemoteNGTests.csproj | 6 +-- 12 files changed, 85 insertions(+), 87 deletions(-) diff --git a/ExternalConnectors/ExternalConnectors.csproj b/ExternalConnectors/ExternalConnectors.csproj index d98be0c9..e13b20b4 100644 --- a/ExternalConnectors/ExternalConnectors.csproj +++ b/ExternalConnectors/ExternalConnectors.csproj @@ -7,7 +7,7 @@ Library True x64 - Debug;Release;Debug Portable;Release Portable + Debug;Release;Debug Portable;Release Portable;Deploy to github @@ -15,8 +15,8 @@ - - + + diff --git a/mRemoteNG.sln b/mRemoteNG.sln index 7dc3c89b..6fef66d5 100644 --- a/mRemoteNG.sln +++ b/mRemoteNG.sln @@ -24,52 +24,35 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExternalConnectors", "Exter EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug Installer|x64 = Debug Installer|x64 - Debug Portable|x64 = Debug Portable|x64 Debug|x64 = Debug|x64 Release Installer and Portable|x64 = Release Installer and Portable|x64 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Installer|x64.ActiveCfg = Debug|x64 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Installer|x64.Build.0 = Debug|x64 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x64.Build.0 = Debug Portable|x64 {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x64.ActiveCfg = Debug|x64 {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x64.Build.0 = Debug|x64 {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer and Portable|x64.ActiveCfg = Release|x64 {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer and Portable|x64.Build.0 = Release|x64 {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.ActiveCfg = Release|x64 {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.Build.0 = Release|x64 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Installer|x64.ActiveCfg = Debug|x64 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x64.ActiveCfg = Debug|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x64.Build.0 = Debug|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer and Portable|x64.ActiveCfg = Release|x64 {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x64.ActiveCfg = Release|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Installer|x64.ActiveCfg = Debug|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Installer|x64.Build.0 = Debug|x64 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x64.ActiveCfg = Debug|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x64.Build.0 = Debug|x64 {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer and Portable|x64.ActiveCfg = Release|x64 {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer and Portable|x64.Build.0 = Release|x64 {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x64.ActiveCfg = Release|x64 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Installer|x64.ActiveCfg = Debug|x64 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Installer|x64.Build.0 = Debug|x64 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x64.ActiveCfg = Debug|x64 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x64.Build.0 = Debug|x64 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer and Portable|x64.ActiveCfg = Release|x64 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer and Portable|x64.Build.0 = Release|x64 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x64.ActiveCfg = Release|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Installer|x64.ActiveCfg = Debug|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x64.ActiveCfg = Debug|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x64.Build.0 = Debug|x64 {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer and Portable|x64.ActiveCfg = Release|x64 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x64.ActiveCfg = Release|x64 - {A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Debug Installer|x64.ActiveCfg = Debug|x64 - {A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Debug Installer|x64.Build.0 = Debug|x64 - {A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 - {A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Debug Portable|x64.Build.0 = Debug Portable|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x64.ActiveCfg = Release Installer|x64 {A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Debug|x64.ActiveCfg = Debug|x64 {A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Debug|x64.Build.0 = Debug|x64 {A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Release Installer and Portable|x64.ActiveCfg = Release|x64 diff --git a/mRemoteNG/App.config b/mRemoteNG/App.config index 49cc43e1..f326b769 100644 --- a/mRemoteNG/App.config +++ b/mRemoteNG/App.config @@ -1,3 +1,11 @@  + + + + + + + + \ No newline at end of file diff --git a/mRemoteNG/App/ProgramRoot.cs b/mRemoteNG/App/ProgramRoot.cs index 29023244..359a8223 100644 --- a/mRemoteNG/App/ProgramRoot.cs +++ b/mRemoteNG/App/ProgramRoot.cs @@ -1,6 +1,8 @@ using System; using System.Diagnostics; using System.Drawing; +using System.IO; +using System.Reflection; using System.Runtime.Versioning; using System.Threading; using System.Windows.Forms; @@ -21,6 +23,20 @@ namespace mRemoteNG.App [STAThread] public static void Main(string[] args) { + // Set path for assembly resolution + // This is needed for the application to find the assemblies in the Assemblies folder + AppDomain.CurrentDomain.AssemblyResolve += (sender, resolveArgs) => + { + string assemblyName = new AssemblyName(resolveArgs.Name).Name.Replace(".resources", string.Empty); + string assemblyFile = assemblyName + ".dll"; + string assemblyPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assemblies", assemblyFile); + + if (File.Exists(assemblyPath)) + { + return Assembly.LoadFrom(assemblyPath); + } + return null; + }; /* * Temporarily disable LocalSettingsManager initialization at startup * due to unfinished implementation causing build errors. diff --git a/mRemoteNG/Connection/PuttySessionInfo.cs b/mRemoteNG/Connection/PuttySessionInfo.cs index b456d89b..a523d936 100644 --- a/mRemoteNG/Connection/PuttySessionInfo.cs +++ b/mRemoteNG/Connection/PuttySessionInfo.cs @@ -80,9 +80,7 @@ namespace mRemoteNG.Connection } catch (Exception ex) { - Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, - Language.ErrorCouldNotLaunchPutty + Environment.NewLine + - ex.Message); + Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.ErrorCouldNotLaunchPutty + Environment.NewLine + ex.Message); } } diff --git a/mRemoteNG/Properties/AssemblyInfo.cs b/mRemoteNG/Properties/AssemblyInfo.cs index b3177d93..21543bd0 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.77.3.2666")] -[assembly: AssemblyFileVersion("1.77.3.2666")] +[assembly: AssemblyVersion("1.77.3.2693")] +[assembly: AssemblyFileVersion("1.77.3.2693")] [assembly: NeutralResourcesLanguageAttribute("en-US")] -[assembly: AssemblyInformationalVersion("1.77.3 (Nightly Build 2666)")] +[assembly: AssemblyInformationalVersion("1.77.3 (Nightly Build 2693)")] // Logging [assembly: log4net.Config.XmlConfigurator(ConfigFile = "log4net.config")] diff --git a/mRemoteNG/Themes/ThemeManager.cs b/mRemoteNG/Themes/ThemeManager.cs index adef43f1..a7b52ad8 100644 --- a/mRemoteNG/Themes/ThemeManager.cs +++ b/mRemoteNG/Themes/ThemeManager.cs @@ -169,22 +169,6 @@ namespace mRemoteNG.Themes //Load the embedded themes, extended palettes are taken from the vs2015 themes, trying to match the color theme - // 2012 - ThemeInfo vs2012Light = new("vs2012Light", new VS2012LightTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2012, ((ThemeInfo)themes["vs2015lightNG"]).ExtendedPalette); - themes.Add(vs2012Light.Name, vs2012Light); - ThemeInfo vs2012Dark = new("vs2012Dark", new VS2012DarkTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2012, ((ThemeInfo)themes["vs2015darkNG"]).ExtendedPalette); - themes.Add(vs2012Dark.Name, vs2012Dark); - ThemeInfo vs2012Blue = new("vs2012Blue", new VS2012BlueTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2012, ((ThemeInfo)themes["vs2015blueNG"]).ExtendedPalette); - themes.Add(vs2012Blue.Name, vs2012Blue); - - // 2013 - ThemeInfo vs2013Light = new("vs2013Light", new VS2013LightTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2013, ((ThemeInfo)themes["vs2015lightNG"]).ExtendedPalette); - themes.Add(vs2013Light.Name, vs2013Light); - ThemeInfo vs2013Dark = new("vs2013Dark", new VS2013DarkTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2013, ((ThemeInfo)themes["vs2015darkNG"]).ExtendedPalette); - themes.Add(vs2013Dark.Name, vs2013Dark); - ThemeInfo vs2013Blue = new("vs2013Blue", new VS2013BlueTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2013, ((ThemeInfo)themes["vs2015blueNG"]).ExtendedPalette); - themes.Add(vs2013Blue.Name, vs2013Blue); - // 2015 ThemeInfo vs2015Light = new("vs2015Light", new VS2015LightTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2015, ((ThemeInfo)themes["vs2015lightNG"]).ExtendedPalette); themes.Add(vs2015Light.Name, vs2015Light); diff --git a/mRemoteNG/UI/Window/ConnectionTreeWindow.resx b/mRemoteNG/UI/Window/ConnectionTreeWindow.resx index 8283f562..83cc00f8 100644 --- a/mRemoteNG/UI/Window/ConnectionTreeWindow.resx +++ b/mRemoteNG/UI/Window/ConnectionTreeWindow.resx @@ -1,17 +1,17 @@ - diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj index 0b487bae..0bdb02ea 100644 --- a/mRemoteNG/mRemoteNG.csproj +++ b/mRemoteNG/mRemoteNG.csproj @@ -11,7 +11,7 @@ COPYING.TXT https://mremoteng.org/ x64 - Debug;Release;Debug Portable;Release Portable;Release Installer + Debug;Release;Debug Portable;Release Portable;Release Installer;Deploy to github false latest Header_dark.png @@ -93,24 +93,20 @@ - - - - - + - + - + @@ -525,4 +521,14 @@ + + true + + + + + + + + \ No newline at end of file diff --git a/mRemoteNGInstaller/CustomActions/CustomActions.csproj b/mRemoteNGInstaller/CustomActions/CustomActions.csproj index 169f219b..a30b4610 100644 --- a/mRemoteNGInstaller/CustomActions/CustomActions.csproj +++ b/mRemoteNGInstaller/CustomActions/CustomActions.csproj @@ -64,6 +64,9 @@ 7.3 prompt + + bin\x64\Deploy to github\ + diff --git a/mRemoteNGSpecs/mRemoteNGSpecs.csproj b/mRemoteNGSpecs/mRemoteNGSpecs.csproj index 189e3dfa..1581c203 100644 --- a/mRemoteNGSpecs/mRemoteNGSpecs.csproj +++ b/mRemoteNGSpecs/mRemoteNGSpecs.csproj @@ -6,7 +6,7 @@ enable true x64 - Debug;Release;Debug Portable;Release Portable;Release Installer + Debug;Release;Release Installer false @@ -23,8 +23,8 @@ - - + + diff --git a/mRemoteNGTests/mRemoteNGTests.csproj b/mRemoteNGTests/mRemoteNGTests.csproj index 9d702418..b515e1a2 100644 --- a/mRemoteNGTests/mRemoteNGTests.csproj +++ b/mRemoteNGTests/mRemoteNGTests.csproj @@ -11,15 +11,15 @@ false - Debug;Release;Debug Portable;Release Portable;Release Installer + Debug;Release;Debug Portable;Release Portable;Release Installer;Deploy to github - - + +