From 3fb757552917b9a97b0a41a2eb1864d5846dbb73 Mon Sep 17 00:00:00 2001 From: tecxx Date: Wed, 8 Jun 2022 20:55:06 +0200 Subject: [PATCH 1/3] save RCG and RestrictedAdmin fields correctly in connections file --- .../Xml/XmlConnectionNodeSerializer27.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs index f0e01ed2..83ca03fa 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs @@ -151,6 +151,9 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml ? new XAttribute("RDGatewayDomain", connectionInfo.RDGatewayDomain) : new XAttribute("RDGatewayDomain", "")); + element.Add(new XAttribute("UseRCG", connectionInfo.UseRCG)); + element.Add(new XAttribute("UseRestrictedAdmin", connectionInfo.UseRestrictedAdmin)); + element.Add(new XAttribute("UserViaAPI", connectionInfo.UserViaAPI)); element.Add(new XAttribute("EC2InstanceId", connectionInfo.EC2InstanceId)); element.Add(new XAttribute("EC2Region", connectionInfo.EC2Region)); @@ -298,6 +301,10 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml element.Add(new XAttribute("InheritUseEnhancedMode", inheritance.UseEnhancedMode.ToString().ToLowerInvariant())); if (inheritance.UserViaAPI) element.Add(new XAttribute("InheritUserViaAPI", inheritance.UserViaAPI.ToString().ToLowerInvariant())); + if (inheritance.UseRCG) + element.Add(new XAttribute("InheritUseRCG", inheritance.UseRCG.ToString().ToLowerInvariant())); + if (inheritance.UseRestrictedAdmin) + element.Add(new XAttribute("InheritUseRestrictedAdmin", inheritance.UseRestrictedAdmin.ToString().ToLowerInvariant())); } } } From 5bd854116afa362ef00dd8c8f997d17d67a9291a Mon Sep 17 00:00:00 2001 From: tecxx Date: Wed, 8 Jun 2022 21:22:59 +0200 Subject: [PATCH 2/3] rcg/restrictedadmin fixes: schema file and defaults to false --- mRemoteNG/Properties/Settings.Designer.cs | 6 +++--- mRemoteNG/Properties/Settings.settings | 4 ++-- mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mRemoteNG/Properties/Settings.Designer.cs b/mRemoteNG/Properties/Settings.Designer.cs index 75f6bcae..7a76e94d 100644 --- a/mRemoteNG/Properties/Settings.Designer.cs +++ b/mRemoteNG/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace mRemoteNG.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -1405,7 +1405,7 @@ namespace mRemoteNG.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] + [global::System.Configuration.DefaultSettingValueAttribute("False")] public bool ConDefaultUseRestrictedAdmin { get { return ((bool)(this["ConDefaultUseRestrictedAdmin"])); @@ -1429,7 +1429,7 @@ namespace mRemoteNG.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] + [global::System.Configuration.DefaultSettingValueAttribute("False")] public bool ConDefaultUseRCG { get { return ((bool)(this["ConDefaultUseRCG"])); diff --git a/mRemoteNG/Properties/Settings.settings b/mRemoteNG/Properties/Settings.settings index f75b9d31..93ba8b49 100644 --- a/mRemoteNG/Properties/Settings.settings +++ b/mRemoteNG/Properties/Settings.settings @@ -348,13 +348,13 @@ False - True + False False - True + False False diff --git a/mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd b/mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd index 7305756b..aef6fcb6 100644 --- a/mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd +++ b/mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd @@ -175,5 +175,10 @@ + + + + + \ No newline at end of file From 7b89430317cc8e00f6058f98290b98f2a26d68ef Mon Sep 17 00:00:00 2001 From: tecxx Date: Fri, 10 Jun 2022 21:31:55 +0200 Subject: [PATCH 3/3] quickfix to save application settings correctly --- mRemoteNG/Config/Settings/SettingsSaver.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mRemoteNG/Config/Settings/SettingsSaver.cs b/mRemoteNG/Config/Settings/SettingsSaver.cs index 26937498..ff31d23f 100644 --- a/mRemoteNG/Config/Settings/SettingsSaver.cs +++ b/mRemoteNG/Config/Settings/SettingsSaver.cs @@ -47,6 +47,21 @@ namespace mRemoteNG.Config.Settings SaveQuickConnectToolbarLocation(quickConnectToolStrip); SaveMultiSshToolbarLocation(multiSshToolStrip); + Properties.App.Default.Save(); + Properties.AppUI.Default.Save(); + Properties.OptionsAdvancedPage.Default.Save(); + Properties.OptionsAppearancePage.Default.Save(); + Properties.OptionsBackupPage.Default.Save(); + Properties.OptionsConnectionsPage.Default.Save(); + Properties.OptionsCredentialsPage.Default.Save(); + Properties.OptionsDBsPage.Default.Save(); + Properties.OptionsNotificationsPage.Default.Save(); + Properties.OptionsSecurityPage.Default.Save(); + Properties.OptionsStartupExitPage.Default.Save(); + Properties.OptionsTabsPanelsPage.Default.Save(); + Properties.OptionsThemePage.Default.Save(); + Properties.OptionsUpdatesPage.Default.Save(); + Properties.Settings.Default.Save(); SaveDockPanelLayout();