diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs index d156e036..a9369e5f 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Connection; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.Http; diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs index ade55a19..1a678091 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Data; using System.Linq; using System.Security; -using Connection; using mRemoteNG.App; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs index 845b9a1c..c3d746a9 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs @@ -18,7 +18,6 @@ using mRemoteNG.Tree.Root; using mRemoteNG.UI.Forms; using mRemoteNG.UI.TaskDialog; using mRemoteNG.Resources.Language; -using Connection; namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml { diff --git a/mRemoteNG/Connection/AbstractConnectionRecord.cs b/mRemoteNG/Connection/AbstractConnectionRecord.cs index e14236a5..c5c8c227 100644 --- a/mRemoteNG/Connection/AbstractConnectionRecord.cs +++ b/mRemoteNG/Connection/AbstractConnectionRecord.cs @@ -8,7 +8,6 @@ using mRemoteNG.Properties; using mRemoteNG.Tools; using mRemoteNG.Tools.Attributes; using mRemoteNG.Resources.Language; -using Connection; namespace mRemoteNG.Connection { diff --git a/mRemoteNG/Connection/ConnectionInfo.cs b/mRemoteNG/Connection/ConnectionInfo.cs index 965d233e..0a417182 100644 --- a/mRemoteNG/Connection/ConnectionInfo.cs +++ b/mRemoteNG/Connection/ConnectionInfo.cs @@ -18,7 +18,6 @@ using mRemoteNG.Properties; using mRemoteNG.Tree; using mRemoteNG.Resources.Language; using mRemoteNG.Tree.Root; -using Connection; namespace mRemoteNG.Connection { diff --git a/mRemoteNG/Connection/ExternalAddressProviderSelector.cs b/mRemoteNG/Connection/ExternalAddressProviderSelector.cs index f81d4ed0..e67f0c8f 100644 --- a/mRemoteNG/Connection/ExternalAddressProviderSelector.cs +++ b/mRemoteNG/Connection/ExternalAddressProviderSelector.cs @@ -1,7 +1,7 @@ using mRemoteNG.Resources.Language; using mRemoteNG.Tools; -namespace Connection +namespace mRemoteNG.Connection { public enum ExternalAddressProvider { diff --git a/mRemoteNG/Connection/ExternalCredentialProviderSelector.cs b/mRemoteNG/Connection/ExternalCredentialProviderSelector.cs index 06e14e4a..6eb2504a 100644 --- a/mRemoteNG/Connection/ExternalCredentialProviderSelector.cs +++ b/mRemoteNG/Connection/ExternalCredentialProviderSelector.cs @@ -1,7 +1,7 @@ using mRemoteNG.Resources.Language; using mRemoteNG.Tools; -namespace Connection +namespace mRemoteNG.Connection { public enum ExternalCredentialProvider { diff --git a/mRemoteNG/Connection/Protocol/PuttyBase.cs b/mRemoteNG/Connection/Protocol/PuttyBase.cs index 5b956d56..0fe7a7dd 100644 --- a/mRemoteNG/Connection/Protocol/PuttyBase.cs +++ b/mRemoteNG/Connection/Protocol/PuttyBase.cs @@ -11,7 +11,6 @@ using System.Threading; using System.Windows.Forms; using mRemoteNG.Properties; using mRemoteNG.Resources.Language; -using Connection; using System.IO; // ReSharper disable ArrangeAccessorOwnerBody diff --git a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs index 6f5c89d5..aa26acac 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs @@ -15,7 +15,6 @@ using mRemoteNG.UI.Forms; using mRemoteNG.UI.Tabs; using MSTSCLib; using mRemoteNG.Resources.Language; -using Connection; using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; using System.DirectoryServices.ActiveDirectory; diff --git a/mRemoteNG/Properties/AssemblyInfo.cs b/mRemoteNG/Properties/AssemblyInfo.cs index d12155ee..f881ae39 100644 --- a/mRemoteNG/Properties/AssemblyInfo.cs +++ b/mRemoteNG/Properties/AssemblyInfo.cs @@ -15,8 +15,8 @@ using System.Resources; [assembly: AssemblyCulture("")] // Version information -[assembly: AssemblyVersion("1.77.3.1763")] -[assembly: AssemblyFileVersion("1.77.3.1763")] +[assembly: AssemblyVersion("1.77.3.1782")] +[assembly: AssemblyFileVersion("1.77.3.1782")] [assembly: NeutralResourcesLanguageAttribute("en-US")] -[assembly: AssemblyInformationalVersion("1.77.3 (Nightly Build: 1763)")] +[assembly: AssemblyInformationalVersion("1.77.3 (Nightly Build: 1782)")] diff --git a/mRemoteNG/Properties/OptionsCredentialsPage.Designer.cs b/mRemoteNG/Properties/OptionsCredentialsPage.Designer.cs index 8e7f71c0..7041c4b2 100644 --- a/mRemoteNG/Properties/OptionsCredentialsPage.Designer.cs +++ b/mRemoteNG/Properties/OptionsCredentialsPage.Designer.cs @@ -8,11 +8,12 @@ // //------------------------------------------------------------------------------ -using Connection; +using mRemoteNG.Connection; + +namespace mRemoteNG.Properties +{ + -namespace mRemoteNG.Properties { - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] internal sealed partial class OptionsCredentialsPage : global::System.Configuration.ApplicationSettingsBase { diff --git a/mRemoteNG/Properties/rbac.Designer.cs b/mRemoteNG/Properties/rbac.Designer.cs index 00cfec9c..2162d3a0 100644 --- a/mRemoteNG/Properties/rbac.Designer.cs +++ b/mRemoteNG/Properties/rbac.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.5.0.0")] internal sealed partial class rbac : global::System.Configuration.ApplicationSettingsBase { private static rbac defaultInstance = ((rbac)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new rbac()))); diff --git a/mRemoteNG/Tools/MiscTools.cs b/mRemoteNG/Tools/MiscTools.cs index bd1ba250..b81a8a09 100644 --- a/mRemoteNG/Tools/MiscTools.cs +++ b/mRemoteNG/Tools/MiscTools.cs @@ -44,7 +44,7 @@ namespace mRemoteNG.Tools public static Optional PasswordDialog(string passwordName = null, bool verify = true) { - var splash = FrmSplashScreenNew.GetInstance(); + //var splash = FrmSplashScreenNew.GetInstance(); //TODO: something not right there //if (PresentationSource.FromVisual(splash)) // splash.Close(); diff --git a/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs b/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs index eb73230c..cbfbe437 100644 --- a/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs +++ b/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs @@ -17,7 +17,6 @@ using mRemoteNG.Tools; using mRemoteNG.Tools.Attributes; using mRemoteNG.Tree.Root; using mRemoteNG.Resources.Language; -using Connection; namespace mRemoteNG.UI.Controls.ConnectionInfoPropertyGrid { diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs index eee6276c..08828e02 100644 --- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs +++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs @@ -1,7 +1,6 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using Connection; using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; @@ -16,7 +15,7 @@ using NUnit.Framework; namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv { - public class CsvConnectionsDeserializerMremotengFormatTests + public class CsvConnectionsDeserializerMremotengFormatTests { private CsvConnectionsDeserializerMremotengFormat _deserializer; private CsvConnectionsSerializerMremotengFormat _serializer; diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs index 7150b714..62b1ff97 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Connection; using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; diff --git a/mRemoteNGTests/Tree/ClickHandlers/ExpandNodeClickHandlerTests.cs b/mRemoteNGTests/Tree/ClickHandlers/ExpandNodeClickHandlerTests.cs index 0ef112c1..0f083fe6 100644 --- a/mRemoteNGTests/Tree/ClickHandlers/ExpandNodeClickHandlerTests.cs +++ b/mRemoteNGTests/Tree/ClickHandlers/ExpandNodeClickHandlerTests.cs @@ -7,7 +7,7 @@ using NSubstitute; using NUnit.Framework; -namespace mRemoteNGTests.Tree +namespace mRemoteNGTests.Tree.ClickHandlers { public class ExpandNodeClickHandlerTests { diff --git a/mRemoteNGTests/Tree/ClickHandlers/OpenConnectionClickHandlerTests.cs b/mRemoteNGTests/Tree/ClickHandlers/OpenConnectionClickHandlerTests.cs index 846911a5..6e66e5c5 100644 --- a/mRemoteNGTests/Tree/ClickHandlers/OpenConnectionClickHandlerTests.cs +++ b/mRemoteNGTests/Tree/ClickHandlers/OpenConnectionClickHandlerTests.cs @@ -6,7 +6,7 @@ using NSubstitute; using NUnit.Framework; -namespace mRemoteNGTests.Tree +namespace mRemoteNGTests.Tree.ClickHandlers { public class OpenConnectionClickHandlerTests { diff --git a/mRemoteNGTests/Tree/ClickHandlers/SwitchToConnectionClickHandlerTests.cs b/mRemoteNGTests/Tree/ClickHandlers/SwitchToConnectionClickHandlerTests.cs index df105fb1..4034f3be 100644 --- a/mRemoteNGTests/Tree/ClickHandlers/SwitchToConnectionClickHandlerTests.cs +++ b/mRemoteNGTests/Tree/ClickHandlers/SwitchToConnectionClickHandlerTests.cs @@ -6,7 +6,7 @@ using NSubstitute; using NUnit.Framework; -namespace mRemoteNGTests.Tree +namespace mRemoteNGTests.Tree.ClickHandlers { public class SwitchToConnectionClickHandlerTests { diff --git a/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs b/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs index 7937908c..4a710415 100644 --- a/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs +++ b/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs @@ -5,7 +5,7 @@ using NSubstitute; using NUnit.Framework; -namespace mRemoteNGTests.Tree +namespace mRemoteNGTests.Tree.ClickHandlers { public class TreeNodeCompositeClickHandlerTests { @@ -24,7 +24,7 @@ namespace mRemoteNGTests.Tree { var handler1 = Substitute.For>(); var handler2 = Substitute.For>(); - _clickHandler.ClickHandlers = new[] {handler1, handler2}; + _clickHandler.ClickHandlers = new[] { handler1, handler2 }; _clickHandler.Execute(_connectionInfo); handler1.Received().Execute(_connectionInfo); handler2.Received().Execute(_connectionInfo);