diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs index fafb3341d..ca2653be4 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs @@ -190,12 +190,12 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv ? connectionCsv[headers.IndexOf("RDGatewayHostname")] : ""; - connectionRecord.StartProgram = headers.Contains("StartProgram") - ? connectionCsv[headers.IndexOf("StartProgram")] + connectionRecord.RDPStartProgram = headers.Contains("RDPStartProgram") + ? connectionCsv[headers.IndexOf("RDPStartProgram")] : ""; - connectionRecord.StartProgramWorkDir = headers.Contains("StartProgramWorkDir") - ? connectionCsv[headers.IndexOf("StartProgramWorkDir")] + connectionRecord.RDPStartProgramWorkDir = headers.Contains("RDPStartProgramWorkDir") + ? connectionCsv[headers.IndexOf("RDPStartProgramWorkDir")] : ""; if (headers.Contains("Protocol")) diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs index 27c536ba0..0a0bb7537 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs @@ -61,12 +61,12 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv "CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectClipboard;RedirectSmartCards;RedirectSound;RedirectKeys;" + "PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;Favorite;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;" + "VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;" + - "RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;RedirectAudioCapture;RdpVersion;StartProgram;StartProgramWorkDir;"); + "RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;RedirectAudioCapture;RdpVersion;RDPStartProgram;RDPStartProgramWorkDir;"); if (_saveFilter.SaveInheritance) sb.Append("InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;" + "InheritEnableFontSmoothing;InheritEnableDesktopComposition;InheritDisableFullWindowDrag;InheritDisableMenuAnimations;InheritDisableCursorShadow;InheritDisableCursorBlinking;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;" + - "InheritProtocol;InheritSSHTunnelConnectionName;InheritSSHOptions;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;" + + "InheritProtocol;InheritSSHTunnelConnectionName;InheritOpeningCommand;InheritSSHOptions;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;" + "InheritRedirectClipboard;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritAutomaticResize;" + "InheritUseConsoleSession;InheritUseCredSsp;InheritUseVmId;InheritUseEnhancedMode;InheritVmId;InheritRenderingEngine;InheritUsername;" + "InheritRDPAuthenticationLevel;InheritLoadBalanceInfo;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;" + @@ -174,8 +174,8 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv .Append(FormatForCsv(con.RDGatewayDomain)) .Append(FormatForCsv(con.RedirectAudioCapture)) .Append(FormatForCsv(con.RdpVersion)) - .Append(FormatForCsv(con.StartProgram)) - .Append(FormatForCsv(con.StartProgramWorkDir)); + .Append(FormatForCsv(con.RDPStartProgram)) + .Append(FormatForCsv(con.RDPStartProgramWorkDir)); if (!_saveFilter.SaveInheritance) diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs index 8e069ccb8..faf6fe580 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs @@ -123,8 +123,8 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql connectionInfo.RedirectSound = (RDPSounds)Enum.Parse(typeof(RDPSounds), (string)dataRow["RedirectSound"]); connectionInfo.SoundQuality = (RDPSoundQuality)Enum.Parse(typeof(RDPSoundQuality), (string)dataRow["SoundQuality"]); connectionInfo.RedirectAudioCapture = (bool)dataRow["RedirectAudioCapture"]; - connectionInfo.StartProgram = (string)dataRow["StartProgram"]; - connectionInfo.StartProgramWorkDir = (string)dataRow["StartProgramWorkDir"]; + connectionInfo.RDPStartProgram = (string)dataRow["StartProgram"]; + connectionInfo.RDPStartProgramWorkDir = (string)dataRow["StartProgramWorkDir"]; connectionInfo.RedirectKeys = (bool)dataRow["RedirectKeys"]; connectionInfo.OpeningCommand = (string)dataRow["OpeningCommand"]; connectionInfo.PreExtApp = (string)dataRow["PreExtApp"]; diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs index 578642e95..9e73857c9 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs @@ -323,8 +323,8 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql dataRow["SoundQuality"].Equals(connectionInfo.SoundQuality.ToString()) && dataRow["RedirectAudioCapture"].Equals(connectionInfo.RedirectAudioCapture) && dataRow["RedirectKeys"].Equals(connectionInfo.RedirectKeys) && - dataRow["StartProgram"].Equals(connectionInfo.StartProgram) && - dataRow["StartProgramWorkDir"].Equals(connectionInfo.StartProgramWorkDir); + dataRow["StartProgram"].Equals(connectionInfo.RDPStartProgram) && + dataRow["StartProgramWorkDir"].Equals(connectionInfo.RDPStartProgramWorkDir); isFieldNotChange = isFieldNotChange && dataRow["Connected"].Equals(false) && // TODO: this column can eventually be removed. we now save this property locally @@ -590,8 +590,8 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql dataRow["RdpVersion"] = connectionInfo.RdpVersion; dataRow["Favorite"] = connectionInfo.Favorite; dataRow["ICAEncryptionStrength"] = string.Empty; - dataRow["StartProgram"] = connectionInfo.StartProgram; - dataRow["StartProgramWorkDir"] = connectionInfo.StartProgramWorkDir; + dataRow["StartProgram"] = connectionInfo.RDPStartProgram; + dataRow["StartProgramWorkDir"] = connectionInfo.RDPStartProgramWorkDir; if (_saveFilter.SaveInheritance) { diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs index aa9d3516a..74935780e 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs @@ -99,7 +99,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml element.Add(new XAttribute("MacAddress", connectionInfo.MacAddress)); element.Add(new XAttribute("UserField", connectionInfo.UserField)); element.Add(new XAttribute("ExtApp", connectionInfo.ExtApp)); - element.Add(new XAttribute("StartProgram", connectionInfo.StartProgram)); + element.Add(new XAttribute("StartProgram", connectionInfo.RDPStartProgram)); element.Add(new XAttribute("VNCCompression", connectionInfo.VNCCompression)); element.Add(new XAttribute("VNCEncoding", connectionInfo.VNCEncoding)); element.Add(new XAttribute("VNCAuthMode", connectionInfo.VNCAuthMode)); diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs index c2d822edf..457914dc5 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs @@ -115,8 +115,8 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml element.Add(new XAttribute("UserField", connectionInfo.UserField)); element.Add(new XAttribute("Favorite", connectionInfo.Favorite)); element.Add(new XAttribute("ExtApp", connectionInfo.ExtApp)); - element.Add(new XAttribute("StartProgram", connectionInfo.StartProgram)); - element.Add(new XAttribute("StartProgramWorkDir", connectionInfo.StartProgramWorkDir)); + element.Add(new XAttribute("StartProgram", connectionInfo.RDPStartProgram)); + element.Add(new XAttribute("StartProgramWorkDir", connectionInfo.RDPStartProgramWorkDir)); element.Add(new XAttribute("VNCCompression", connectionInfo.VNCCompression)); element.Add(new XAttribute("VNCEncoding", connectionInfo.VNCEncoding)); element.Add(new XAttribute("VNCAuthMode", connectionInfo.VNCAuthMode)); diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs index e74b2a4b7..01b6751f1 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs @@ -541,13 +541,14 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml connectionInfo.SSHTunnelConnectionName = xmlnode.GetAttributeAsString("SSHTunnelConnectionName"); connectionInfo.OpeningCommand = xmlnode.GetAttributeAsString("OpeningCommand"); connectionInfo.SSHOptions = xmlnode.GetAttributeAsString("SSHOptions"); - connectionInfo.StartProgram = xmlnode.GetAttributeAsString("StartProgram"); + connectionInfo.RDPStartProgram = xmlnode.GetAttributeAsString("StartProgram"); + connectionInfo.RDPStartProgramWorkDir = xmlnode.GetAttributeAsString("StartProgramWorkDir"); connectionInfo.DisableFullWindowDrag = xmlnode.GetAttributeAsBool("DisableFullWindowDrag"); connectionInfo.DisableMenuAnimations = xmlnode.GetAttributeAsBool("DisableMenuAnimations"); connectionInfo.DisableCursorShadow = xmlnode.GetAttributeAsBool("DisableCursorShadow"); connectionInfo.DisableCursorBlinking = xmlnode.GetAttributeAsBool("DisableCursorBlinking"); - connectionInfo.StartProgram = xmlnode.GetAttributeAsString("StartProgram"); - connectionInfo.StartProgramWorkDir = xmlnode.GetAttributeAsString("StartProgramWorkDir"); + connectionInfo.RDPStartProgram = xmlnode.GetAttributeAsString("StartProgram"); + connectionInfo.RDPStartProgramWorkDir = xmlnode.GetAttributeAsString("StartProgramWorkDir"); connectionInfo.Inheritance.RedirectClipboard = xmlnode.GetAttributeAsBool("InheritRedirectClipboard"); connectionInfo.Inheritance.Favorite = xmlnode.GetAttributeAsBool("InheritFavorite"); connectionInfo.Inheritance.RdpVersion = xmlnode.GetAttributeAsBool("InheritRdpVersion"); diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs index 7740ed46f..db2332998 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs @@ -152,7 +152,7 @@ namespace mRemoteNG.Config.Serializers.MiscSerializers connectionInfo.RDGatewayHostname = value; break; case "alternate shell": - connectionInfo.StartProgram = value; + connectionInfo.RDPStartProgram = value; break; } } diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs index 8f0af1763..63b672229 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs @@ -183,8 +183,8 @@ namespace mRemoteNG.Config.Serializers.MiscSerializers { if (bool.TryParse(connectionSettingsNode.SelectSingleNode("./connectToConsole")?.InnerText, out var useConsole)) connectionInfo.UseConsoleSession = useConsole; - connectionInfo.StartProgram = connectionSettingsNode.SelectSingleNode("./startProgram")?.InnerText; - connectionInfo.StartProgramWorkDir = connectionSettingsNode.SelectSingleNode("./startProgramWorkDir")?.InnerText; + connectionInfo.RDPStartProgram = connectionSettingsNode.SelectSingleNode("./startProgram")?.InnerText; + connectionInfo.RDPStartProgramWorkDir = connectionSettingsNode.SelectSingleNode("./startProgramWorkDir")?.InnerText; if (int.TryParse(connectionSettingsNode.SelectSingleNode("./port")?.InnerText, out var port)) connectionInfo.Port = port; } diff --git a/mRemoteNG/Connection/AbstractConnectionRecord.cs b/mRemoteNG/Connection/AbstractConnectionRecord.cs index 65b9d2bf6..967e762d3 100644 --- a/mRemoteNG/Connection/AbstractConnectionRecord.cs +++ b/mRemoteNG/Connection/AbstractConnectionRecord.cs @@ -79,8 +79,8 @@ namespace mRemoteNG.Connection private string _macAddress; private string _openingCommand; private string _userField; - private string _startProgram; - private string _startProgramWorkDir; + private string _RDPStartProgram; + private string _RDPStartProgramWorkDir; private bool _favorite; private ProtocolVNC.Compression _vncCompression; @@ -744,23 +744,23 @@ namespace mRemoteNG.Connection } [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.StartProgram)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionStartProgram)), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.RDPStartProgram)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDPStartProgram)), AttributeUsedInProtocol(ProtocolType.RDP)] - public virtual string StartProgram + public virtual string RDPStartProgram { - get => GetPropertyValue("StartProgram", _startProgram); - set => SetField(ref _startProgram, value, "StartProgram"); + get => GetPropertyValue("RDPStartProgram", _RDPStartProgram); + set => SetField(ref _RDPStartProgram, value, "RDPStartProgram"); } [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), LocalizedAttributes.LocalizedDisplayName(nameof(Language.RDPStartProgramWorkDir)), LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDPStartProgramWorkDir)), AttributeUsedInProtocol(ProtocolType.RDP)] - public virtual string StartProgramWorkDir + public virtual string RDPStartProgramWorkDir { - get => GetPropertyValue("StartProgramWorkDir", _startProgramWorkDir); - set => SetField(ref _startProgramWorkDir, value, "StartProgramWorkDir"); + get => GetPropertyValue("RDPStartProgramWorkDir", _RDPStartProgramWorkDir); + set => SetField(ref _RDPStartProgramWorkDir, value, "RDPStartProgramWorkDir"); } #endregion diff --git a/mRemoteNG/Connection/ConnectionInfo.cs b/mRemoteNG/Connection/ConnectionInfo.cs index dda409f3e..7efdfdcab 100644 --- a/mRemoteNG/Connection/ConnectionInfo.cs +++ b/mRemoteNG/Connection/ConnectionInfo.cs @@ -317,8 +317,8 @@ namespace mRemoteNG.Connection private void SetRemoteDesktopServicesDefaults() { - StartProgram = string.Empty; - StartProgramWorkDir = string.Empty; + RDPStartProgram = string.Empty; + RDPStartProgramWorkDir = string.Empty; } private void SetRdGatewayDefaults() @@ -367,8 +367,8 @@ namespace mRemoteNG.Connection MacAddress = Settings.Default.ConDefaultMacAddress; UserField = Settings.Default.ConDefaultUserField; Favorite = Settings.Default.ConDefaultFavorite; - StartProgram = Settings.Default.ConDefaultStartProgram; - StartProgramWorkDir = Settings.Default.ConDefaultStartProgram; + RDPStartProgram = Settings.Default.ConDefaultRDPStartProgram; + RDPStartProgramWorkDir = Settings.Default.ConDefaultRDPStartProgram; OpeningCommand = Settings.Default.OpeningCommand; } diff --git a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs index 636d10d1d..805be265d 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs @@ -288,8 +288,8 @@ namespace mRemoteNG.Connection.Protocol.RDP _rdpClient.AdvancedSettings2.MinutesToIdleTimeout = connectionInfo.RDPMinutesToIdleTimeout; #region Remote Desktop Services - _rdpClient.SecuredSettings2.StartProgram = connectionInfo.StartProgram; - _rdpClient.SecuredSettings2.WorkDir = connectionInfo.StartProgramWorkDir; + _rdpClient.SecuredSettings2.StartProgram = connectionInfo.RDPStartProgram; + _rdpClient.SecuredSettings2.WorkDir = connectionInfo.RDPStartProgramWorkDir; #endregion //not user changeable diff --git a/mRemoteNG/Language/Language.Designer.cs b/mRemoteNG/Language/Language.Designer.cs index 855cc2a0c..18c527f45 100644 --- a/mRemoteNG/Language/Language.Designer.cs +++ b/mRemoteNG/Language/Language.Designer.cs @@ -3999,15 +3999,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Start Program/alternate shell. - /// - internal static string PropertyDescriptionStartProgram { - get { - return ResourceManager.GetString("PropertyDescriptionStartProgram", resourceCulture); - } - } - /// /// Looks up a localized string similar to Connect to the console session of the remote host.. /// @@ -5613,15 +5604,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Start Program. - /// - internal static string StartProgram { - get { - return ResourceManager.GetString("StartProgram", resourceCulture); - } - } - /// /// Looks up a localized string similar to Startup/Exit. /// diff --git a/mRemoteNG/Language/Language.fr.resx b/mRemoteNG/Language/Language.fr.resx index 4fef3e057..106194b55 100644 --- a/mRemoteNG/Language/Language.fr.resx +++ b/mRemoteNG/Language/Language.fr.resx @@ -1687,10 +1687,10 @@ mRemoteNG va se fermer et l'installation va commencer. Tester la connexion - + Démarrer un programme / un shell alternatif - + Démarrer un programme diff --git a/mRemoteNG/Language/Language.resx b/mRemoteNG/Language/Language.resx index 6655f245c..27b098cdd 100644 --- a/mRemoteNG/Language/Language.resx +++ b/mRemoteNG/Language/Language.resx @@ -2181,6 +2181,14 @@ Nightly Channel includes Alphas, Betas & Release Candidates. Alternate shell working directory https://docs.microsoft.com/en-us/windows/win32/termserv/imstscsecuredsettings-workdir + + TODO + + + + TODO + + Disk Drives diff --git a/mRemoteNG/Properties/Settings.Designer.cs b/mRemoteNG/Properties/Settings.Designer.cs index e2901e2ba..c70f9bfda 100644 --- a/mRemoteNG/Properties/Settings.Designer.cs +++ b/mRemoteNG/Properties/Settings.Designer.cs @@ -3098,24 +3098,24 @@ namespace mRemoteNG.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("")] - public string ConDefaultStartProgram { + public string ConDefaultRDPStartProgram { get { - return ((string)(this["ConDefaultStartProgram"])); + return ((string)(this["ConDefaultRDPStartProgram"])); } set { - this["ConDefaultStartProgram"] = value; + this["ConDefaultRDPStartProgram"] = value; } } [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("")] - public string ConDefaultStartProgramWorkDir { + public string ConDefaultRDPStartProgramWorkDir { get { - return ((string)(this["ConDefaultStartProgramWorkDir"])); + return ((string)(this["ConDefaultRDPStartProgramWorkDir"])); } set { - this["ConDefaultStartProgramWorkDir"] = value; + this["ConDefaultRDPStartProgramWorkDir"] = value; } } diff --git a/mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd b/mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd index a94f9248c..3c580aef2 100644 --- a/mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd +++ b/mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd @@ -171,5 +171,6 @@ + \ No newline at end of file diff --git a/mRemoteNG/app.config b/mRemoteNG/app.config index 4f8262921..5676688a9 100644 --- a/mRemoteNG/app.config +++ b/mRemoteNG/app.config @@ -791,10 +791,13 @@ False - + - + + + + diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs index d095ce914..c343f3bbe 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs @@ -178,7 +178,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers public void StartProgramImportedCorrectly() { var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First(); - Assert.That(connectionInfo.StartProgram, Is.EqualTo(ExpectedStartProgram)); + Assert.That(connectionInfo.RDPStartProgram, Is.EqualTo(ExpectedStartProgram)); } //[Test] diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs index 8e88ad5d5..ab9d23484 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs @@ -164,7 +164,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers new TestCaseData((Func)(con => con.RedirectPrinters), ExpectedPrinterRedirection).SetName(nameof(ConnectionInfo.RedirectPrinters)), new TestCaseData((Func)(con => con.RedirectPorts), ExpectedPortRedirection).SetName(nameof(ConnectionInfo.RedirectPorts)), new TestCaseData((Func)(con => con.RedirectDiskDrives), ExpectedDriveRedirection).SetName(nameof(ConnectionInfo.RedirectDiskDrives)), - new TestCaseData((Func)(con => con.StartProgram), ExpectedStartProgram).SetName(nameof(ConnectionInfo.StartProgram)), + new TestCaseData((Func)(con => con.RDPStartProgram), ExpectedStartProgram).SetName(nameof(ConnectionInfo.RDPStartProgram)), }; } diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs index 3ce220204..dd2362f65 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs @@ -330,7 +330,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers var importedRdcmanRootNode = rootNode.Children.OfType().First(); var group1 = importedRdcmanRootNode.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); - Assert.That(connection.StartProgram, Is.EqualTo(ExpectedStartProgram)); + Assert.That(connection.RDPStartProgram, Is.EqualTo(ExpectedStartProgram)); } } } \ No newline at end of file diff --git a/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs b/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs index 984b3cdde..d4ffab640 100644 --- a/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs +++ b/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs @@ -72,8 +72,8 @@ public TType UseEnhancedMode { get; set; } public TType SSHOptions { get; set; } public TType SSHTunnelConnectionName { get; set; } - public TType StartProgram { get; set; } - public TType StartProgramWorkDir { get; set; } + public TType RDPStartProgram { get; set; } + public TType RDPStartProgramWorkDir { get; set; } public TType OpeningCommand { get; set; } } } diff --git a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs index 352867136..13d30c532 100644 --- a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs +++ b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs @@ -261,8 +261,8 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests nameof(ConnectionInfo.RedirectAudioCapture), nameof(ConnectionInfo.RdpVersion), nameof(ConnectionInfo.OpeningCommand), - nameof(ConnectionInfo.StartProgram), - nameof(ConnectionInfo.StartProgramWorkDir) + nameof(ConnectionInfo.RDPStartProgram), + nameof(ConnectionInfo.RDPStartProgramWorkDir) }); break; case ProtocolType.VNC: