Skip to content
代码片段 群组 项目
提交 713a0a61 编辑于 作者: Dimitrij's avatar Dimitrij
浏览文件

more fixes for CA1416

上级 a3b9695b
未找到相关分支
未找到相关标签
无相关合并请求
显示
47 个添加99 个删除
namespace mRemoteNG.App.Info using System.Runtime.Versioning;
namespace mRemoteNG.App.Info
{ {
[SupportedOSPlatform("windows")]
public class CredentialsFileInfo public class CredentialsFileInfo
{ {
public static readonly string CredentialsPath = SettingsFileInfo.SettingsPath; public static readonly string CredentialsPath = SettingsFileInfo.SettingsPath;
......
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.Versioning;
using System.Security; using System.Security;
using System.Xml.Linq; using System.Xml.Linq;
using mRemoteNG.Credential; using mRemoteNG.Credential;
...@@ -9,6 +10,7 @@ using mRemoteNG.Security.Factories; ...@@ -9,6 +10,7 @@ using mRemoteNG.Security.Factories;
namespace mRemoteNG.Config namespace mRemoteNG.Config
{ {
[SupportedOSPlatform("windows")]
public class CredentialHarvester public class CredentialHarvester
{ {
private readonly IEqualityComparer<ICredentialRecord> _credentialComparer = new CredentialDomainUserComparer(); private readonly IEqualityComparer<ICredentialRecord> _credentialComparer = new CredentialDomainUserComparer();
......
using System.Linq; using System.Linq;
using System.Runtime.Versioning;
using mRemoteNG.Config.DataProviders; using mRemoteNG.Config.DataProviders;
using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Config.Serializers.MiscSerializers;
using mRemoteNG.Container; using mRemoteNG.Container;
...@@ -6,6 +7,7 @@ using mRemoteNG.Container; ...@@ -6,6 +7,7 @@ using mRemoteNG.Container;
namespace mRemoteNG.Config.Import namespace mRemoteNG.Config.Import
{ {
[SupportedOSPlatform("windows")]
public class PuttyConnectionManagerImporter : IConnectionImporter<string> public class PuttyConnectionManagerImporter : IConnectionImporter<string>
{ {
public void Import(string filePath, ContainerInfo destinationContainer) public void Import(string filePath, ContainerInfo destinationContainer)
......
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.Versioning;
using mRemoteNG.Config.DataProviders; using mRemoteNG.Config.DataProviders;
using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Config.Serializers.MiscSerializers;
using mRemoteNG.Container; using mRemoteNG.Container;
...@@ -7,6 +8,7 @@ using mRemoteNG.Container; ...@@ -7,6 +8,7 @@ using mRemoteNG.Container;
namespace mRemoteNG.Config.Import namespace mRemoteNG.Config.Import
{ {
[SupportedOSPlatform("windows")]
public class RemoteDesktopConnectionImporter : IConnectionImporter<string> public class RemoteDesktopConnectionImporter : IConnectionImporter<string>
{ {
public void Import(string fileName, ContainerInfo destinationContainer) public void Import(string fileName, ContainerInfo destinationContainer)
......
using System; using System;
using System.Runtime.Versioning;
using System.Security; using System.Security;
using System.Xml.Linq; using System.Xml.Linq;
using mRemoteNG.Connection; using mRemoteNG.Connection;
...@@ -7,6 +8,7 @@ using mRemoteNG.Security; ...@@ -7,6 +8,7 @@ using mRemoteNG.Security;
namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
{ {
[SupportedOSPlatform("windows")]
// ReSharper disable once InconsistentNaming // ReSharper disable once InconsistentNaming
public class XmlConnectionNodeSerializer26 : ISerializer<ConnectionInfo, XElement> public class XmlConnectionNodeSerializer26 : ISerializer<ConnectionInfo, XElement>
{ {
......
using System; using System;
using System.Linq; using System.Linq;
using System.Runtime.Versioning;
using System.Security; using System.Security;
using System.Xml.Linq; using System.Xml.Linq;
using mRemoteNG.Connection; using mRemoteNG.Connection;
...@@ -10,6 +11,7 @@ using mRemoteNG.Tree.Root; ...@@ -10,6 +11,7 @@ using mRemoteNG.Tree.Root;
namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
{ {
[SupportedOSPlatform("windows")]
public class XmlConnectionsDocumentCompiler public class XmlConnectionsDocumentCompiler
{ {
private readonly ICryptographyProvider _cryptographyProvider; private readonly ICryptographyProvider _cryptographyProvider;
......
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.Versioning;
using System.Xml.Linq; using System.Xml.Linq;
using mRemoteNG.Credential; using mRemoteNG.Credential;
using mRemoteNG.Credential.Repositories; using mRemoteNG.Credential.Repositories;
namespace mRemoteNG.Config.Serializers.CredentialProviderSerializer namespace mRemoteNG.Config.Serializers.CredentialProviderSerializer
{ {
[SupportedOSPlatform("windows")]
public class CredentialRepositoryListDeserializer public class CredentialRepositoryListDeserializer
{ {
private readonly ISecureSerializer<IEnumerable<ICredentialRecord>, string> _serializer; private readonly ISecureSerializer<IEnumerable<ICredentialRecord>, string> _serializer;
......
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.Versioning;
using System.Security; using System.Security;
using System.Xml.Linq; using System.Xml.Linq;
using mRemoteNG.Credential; using mRemoteNG.Credential;
...@@ -8,6 +9,7 @@ using mRemoteNG.Security.Factories; ...@@ -8,6 +9,7 @@ using mRemoteNG.Security.Factories;
namespace mRemoteNG.Config.Serializers.CredentialSerializer namespace mRemoteNG.Config.Serializers.CredentialSerializer
{ {
[SupportedOSPlatform("windows")]
public class XmlCredentialPasswordDecryptorDecorator : ISecureDeserializer<string, IEnumerable<ICredentialRecord>> public class XmlCredentialPasswordDecryptorDecorator : ISecureDeserializer<string, IEnumerable<ICredentialRecord>>
{ {
private readonly IDeserializer<string, IEnumerable<ICredentialRecord>> _baseDeserializer; private readonly IDeserializer<string, IEnumerable<ICredentialRecord>> _baseDeserializer;
......
using System; using System;
using System.IO; using System.IO;
using System.Runtime.Versioning;
using System.Xml; using System.Xml;
using mRemoteNG.Connection; using mRemoteNG.Connection;
using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol;
...@@ -9,6 +10,7 @@ using mRemoteNG.Tree.Root; ...@@ -9,6 +10,7 @@ using mRemoteNG.Tree.Root;
namespace mRemoteNG.Config.Serializers.MiscSerializers namespace mRemoteNG.Config.Serializers.MiscSerializers
{ {
[SupportedOSPlatform("windows")]
public class PuttyConnectionManagerDeserializer : IDeserializer<string, ConnectionTreeModel> public class PuttyConnectionManagerDeserializer : IDeserializer<string, ConnectionTreeModel>
{ {
public ConnectionTreeModel Deserialize(string puttycmConnectionsXml) public ConnectionTreeModel Deserialize(string puttycmConnectionsXml)
......
using System; using System;
using System.Runtime.Versioning;
using mRemoteNG.Connection; using mRemoteNG.Connection;
using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Connection.Protocol.RDP;
using mRemoteNG.Tree; using mRemoteNG.Tree;
...@@ -6,6 +7,7 @@ using mRemoteNG.Tree.Root; ...@@ -6,6 +7,7 @@ using mRemoteNG.Tree.Root;
namespace mRemoteNG.Config.Serializers.MiscSerializers namespace mRemoteNG.Config.Serializers.MiscSerializers
{ {
[SupportedOSPlatform("windows")]
public class RemoteDesktopConnectionDeserializer : IDeserializer<string, ConnectionTreeModel> public class RemoteDesktopConnectionDeserializer : IDeserializer<string, ConnectionTreeModel>
{ {
// .rdp file schema: https://technet.microsoft.com/en-us/library/ff393699(v=ws.10).aspx // .rdp file schema: https://technet.microsoft.com/en-us/library/ff393699(v=ws.10).aspx
......
using System; using System;
using System.Runtime.Versioning;
using System.Security; using System.Security;
using mRemoteNG.Security; using mRemoteNG.Security;
using mRemoteNG.Security.Authentication; using mRemoteNG.Security.Authentication;
...@@ -9,6 +10,7 @@ using mRemoteNG.Tree.Root; ...@@ -9,6 +10,7 @@ using mRemoteNG.Tree.Root;
namespace mRemoteNG.Config.Serializers namespace mRemoteNG.Config.Serializers
{ {
[SupportedOSPlatform("windows")]
public class XmlConnectionsDecryptor public class XmlConnectionsDecryptor
{ {
private readonly ICryptographyProvider _cryptographyProvider; private readonly ICryptographyProvider _cryptographyProvider;
......
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.Versioning;
using System.Xml.Linq; using System.Xml.Linq;
using mRemoteNG.Config; using mRemoteNG.Config;
using mRemoteNG.Config.DataProviders; using mRemoteNG.Config.DataProviders;
...@@ -7,6 +8,7 @@ using mRemoteNG.Config.Serializers; ...@@ -7,6 +8,7 @@ using mRemoteNG.Config.Serializers;
namespace mRemoteNG.Credential.Repositories namespace mRemoteNG.Credential.Repositories
{ {
[SupportedOSPlatform("windows")]
public class XmlCredentialRepositoryFactory public class XmlCredentialRepositoryFactory
{ {
private readonly ISecureSerializer<IEnumerable<ICredentialRecord>, string> _serializer; private readonly ISecureSerializer<IEnumerable<ICredentialRecord>, string> _serializer;
......
using System; using System;
using System.Runtime.Versioning;
using System.Xml.Linq; using System.Xml.Linq;
using mRemoteNG.Security.SymmetricEncryption; using mRemoteNG.Security.SymmetricEncryption;
namespace mRemoteNG.Security.Factories namespace mRemoteNG.Security.Factories
{ {
[SupportedOSPlatform("windows")]
public class CryptoProviderFactoryFromXml : ICryptoProviderFactory public class CryptoProviderFactoryFromXml : ICryptoProviderFactory
{ {
private readonly XElement _element; private readonly XElement _element;
......
...@@ -25,10 +25,7 @@ namespace mRemoteNG.Themes ...@@ -25,10 +25,7 @@ namespace mRemoteNG.Themes
public class MremoteDockPaneStripFactory : DockPanelExtender.IDockPaneStripFactory public class MremoteDockPaneStripFactory : DockPanelExtender.IDockPaneStripFactory
{ {
public DockPaneStripBase CreateDockPaneStrip(DockPane pane) public DockPaneStripBase CreateDockPaneStrip(DockPane pane) => new DockPaneStripNG(pane);
{
return new DockPaneStripNG(pane);
}
} }
public class MremoteFloatWindowFactory : DockPanelExtender.IFloatWindowFactory public class MremoteFloatWindowFactory : DockPanelExtender.IFloatWindowFactory
......
...@@ -3,10 +3,11 @@ using mRemoteNG.Container; ...@@ -3,10 +3,11 @@ using mRemoteNG.Container;
using System; using System;
using System.Windows.Forms; using System.Windows.Forms;
using mRemoteNG.Resources.Language; using mRemoteNG.Resources.Language;
using System.Runtime.Versioning;
namespace mRemoteNG.Tree namespace mRemoteNG.Tree
{ {
[SupportedOSPlatform("windows")]
public class SelectedConnectionDeletionConfirmer : IConfirm<ConnectionInfo> public class SelectedConnectionDeletionConfirmer : IConfirm<ConnectionInfo>
{ {
private readonly Func<string, DialogResult> _confirmationFunc; private readonly Func<string, DialogResult> _confirmationFunc;
......
using BrightIdeasSoftware; using BrightIdeasSoftware;
using mRemoteNG.Connection; using mRemoteNG.Connection;
using System.Runtime.Versioning;
namespace mRemoteNG.UI.Controls.ConnectionTree namespace mRemoteNG.UI.Controls.ConnectionTree
{ {
[SupportedOSPlatform("windows")]
public class NameColumn : OLVColumn public class NameColumn : OLVColumn
{ {
public NameColumn(ImageGetterDelegate imageGetterDelegate) public NameColumn(ImageGetterDelegate imageGetterDelegate)
......
...@@ -39,13 +39,8 @@ namespace mRemoteNG.UI.TaskDialog ...@@ -39,13 +39,8 @@ namespace mRemoteNG.UI.TaskDialog
public static EventHandler OnTaskDialogShown = null; public static EventHandler OnTaskDialogShown = null;
public static EventHandler OnTaskDialogClosed = null; public static EventHandler OnTaskDialogClosed = null;
//-------------------------------------------------------------------------------- #region [ShowTaskDialogBox]
//--------------------------------------------------------------------------------
#region ShowTaskDialogBox
//--------------------------------------------------------------------------------
public static DialogResult ShowTaskDialogBox(IWin32Window owner, string title, string mainInstruction, string content, string expandedInfo, string footer, string verificationText, string radioButtons, string commandButtons, ETaskDialogButtons buttons, ESysIcons mainIcon, ESysIcons footerIcon, int defaultIndex) public static DialogResult ShowTaskDialogBox(IWin32Window owner, string title, string mainInstruction, string content, string expandedInfo, string footer, string verificationText, string radioButtons, string commandButtons, ETaskDialogButtons buttons, ESysIcons mainIcon, ESysIcons footerIcon, int defaultIndex)
{ {
DialogResult result; DialogResult result;
...@@ -115,11 +110,7 @@ namespace mRemoteNG.UI.TaskDialog ...@@ -115,11 +110,7 @@ namespace mRemoteNG.UI.TaskDialog
#endregion #endregion
//-------------------------------------------------------------------------------- #region [MessageBox]
#region MessageBox
//--------------------------------------------------------------------------------
public static DialogResult MessageBox(IWin32Window owner, string title, string mainInstruction, string content, string expandedInfo, string footer, string verificationText, ETaskDialogButtons buttons, ESysIcons mainIcon, ESysIcons footerIcon) public static DialogResult MessageBox(IWin32Window owner, string title, string mainInstruction, string content, string expandedInfo, string footer, string verificationText, ETaskDialogButtons buttons, ESysIcons mainIcon, ESysIcons footerIcon)
{ {
return ShowTaskDialogBox(owner, title, mainInstruction, content, expandedInfo, footer, verificationText, "", "", buttons, mainIcon, footerIcon); return ShowTaskDialogBox(owner, title, mainInstruction, content, expandedInfo, footer, verificationText, "", "", buttons, mainIcon, footerIcon);
...@@ -149,20 +140,10 @@ namespace mRemoteNG.UI.TaskDialog ...@@ -149,20 +140,10 @@ namespace mRemoteNG.UI.TaskDialog
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
#region ShowRadioBox #region [ShowRadioBox]
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
public static int ShowRadioBox(IWin32Window owner, public static int ShowRadioBox(IWin32Window owner, string title, string mainInstruction, string content, string expandedInfo, string footer, string verificationText, string radioButtons, ESysIcons mainIcon, ESysIcons footerIcon, int defaultIndex)
string title,
string mainInstruction,
string content,
string expandedInfo,
string footer,
string verificationText,
string radioButtons,
ESysIcons mainIcon,
ESysIcons footerIcon,
int defaultIndex)
{ {
var res = ShowTaskDialogBox(owner, title, mainInstruction, content, expandedInfo, footer, verificationText, radioButtons, "", ETaskDialogButtons.OkCancel, mainIcon, footerIcon, defaultIndex); var res = ShowTaskDialogBox(owner, title, mainInstruction, content, expandedInfo, footer, verificationText, radioButtons, "", ETaskDialogButtons.OkCancel, mainIcon, footerIcon, defaultIndex);
if (res == DialogResult.OK) if (res == DialogResult.OK)
...@@ -173,16 +154,7 @@ namespace mRemoteNG.UI.TaskDialog ...@@ -173,16 +154,7 @@ namespace mRemoteNG.UI.TaskDialog
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
// Overloaded versions... // Overloaded versions...
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
public static int ShowRadioBox(string title, public static int ShowRadioBox(string title, string mainInstruction, string content, string expandedInfo, string footer, string verificationText, string radioButtons, ESysIcons mainIcon, ESysIcons footerIcon, int defaultIndex)
string mainInstruction,
string content,
string expandedInfo,
string footer,
string verificationText,
string radioButtons,
ESysIcons mainIcon,
ESysIcons footerIcon,
int defaultIndex)
{ {
var res = ShowTaskDialogBox(null, title, mainInstruction, content, expandedInfo, footer, verificationText, radioButtons, "", ETaskDialogButtons.OkCancel, mainIcon, footerIcon, defaultIndex); var res = ShowTaskDialogBox(null, title, mainInstruction, content, expandedInfo, footer, verificationText, radioButtons, "", ETaskDialogButtons.OkCancel, mainIcon, footerIcon, defaultIndex);
if (res == DialogResult.OK) if (res == DialogResult.OK)
...@@ -190,43 +162,22 @@ namespace mRemoteNG.UI.TaskDialog ...@@ -190,43 +162,22 @@ namespace mRemoteNG.UI.TaskDialog
return -1; return -1;
} }
public static int ShowRadioBox(IWin32Window owner, public static int ShowRadioBox(IWin32Window owner, string title, string mainInstruction, string content, string expandedInfo, string footer, string verificationText, string radioButtons, ESysIcons mainIcon, ESysIcons footerIcon)
string title,
string mainInstruction,
string content,
string expandedInfo,
string footer,
string verificationText,
string radioButtons,
ESysIcons mainIcon,
ESysIcons footerIcon)
{ {
return ShowRadioBox(owner, title, mainInstruction, content, expandedInfo, footer, verificationText, radioButtons, ESysIcons.Question, ESysIcons.Information, 0); return ShowRadioBox(owner, title, mainInstruction, content, expandedInfo, footer, verificationText, radioButtons, ESysIcons.Question, ESysIcons.Information, 0);
} }
public static int ShowRadioBox(IWin32Window owner, public static int ShowRadioBox(IWin32Window owner, string title, string mainInstruction, string content, string radioButtons, int defaultIndex)
string title,
string mainInstruction,
string content,
string radioButtons,
int defaultIndex)
{ {
return ShowRadioBox(owner, title, mainInstruction, content, "", "", "", radioButtons, ESysIcons.Question, ESysIcons.Information, defaultIndex); return ShowRadioBox(owner, title, mainInstruction, content, "", "", "", radioButtons, ESysIcons.Question, ESysIcons.Information, defaultIndex);
} }
public static int ShowRadioBox(IWin32Window owner, public static int ShowRadioBox(IWin32Window owner, string title, string mainInstruction, string content, string radioButtons)
string title,
string mainInstruction,
string content,
string radioButtons)
{ {
return ShowRadioBox(owner, title, mainInstruction, content, "", "", "", radioButtons, ESysIcons.Question, ESysIcons.Information, 0); return ShowRadioBox(owner, title, mainInstruction, content, "", "", "", radioButtons, ESysIcons.Question, ESysIcons.Information, 0);
} }
public static int ShowRadioBox(string title, public static int ShowRadioBox(string title, string mainInstruction, string content, string radioButtons)
string mainInstruction,
string content,
string radioButtons)
{ {
return ShowRadioBox(null, title, mainInstruction, content, "", "", "", radioButtons, ESysIcons.Question, ESysIcons.Information, 0); return ShowRadioBox(null, title, mainInstruction, content, "", "", "", radioButtons, ESysIcons.Question, ESysIcons.Information, 0);
} }
...@@ -238,22 +189,9 @@ namespace mRemoteNG.UI.TaskDialog ...@@ -238,22 +189,9 @@ namespace mRemoteNG.UI.TaskDialog
#region ShowCommandBox #region ShowCommandBox
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
public static int ShowCommandBox(IWin32Window owner, public static int ShowCommandBox(IWin32Window owner, string title, string mainInstruction, string content, string expandedInfo, string footer, string verificationText,string commandButtons, bool showCancelButton, ESysIcons mainIcon, ESysIcons footerIcon)
string title,
string mainInstruction,
string content,
string expandedInfo,
string footer,
string verificationText,
string commandButtons,
bool showCancelButton,
ESysIcons mainIcon,
ESysIcons footerIcon)
{ {
var res = ShowTaskDialogBox(owner, title, mainInstruction, content, expandedInfo, footer, verificationText, var res = ShowTaskDialogBox(owner, title, mainInstruction, content, expandedInfo, footer, verificationText, "", commandButtons, showCancelButton ? ETaskDialogButtons.Cancel : ETaskDialogButtons.None, mainIcon, footerIcon);
"", commandButtons,
showCancelButton ? ETaskDialogButtons.Cancel : ETaskDialogButtons.None,
mainIcon, footerIcon);
if (res == DialogResult.OK) if (res == DialogResult.OK)
return CommandButtonResult; return CommandButtonResult;
return -1; return -1;
...@@ -262,32 +200,15 @@ namespace mRemoteNG.UI.TaskDialog ...@@ -262,32 +200,15 @@ namespace mRemoteNG.UI.TaskDialog
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
// Overloaded versions... // Overloaded versions...
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
public static int ShowCommandBox(string title, public static int ShowCommandBox(string title, string mainInstruction, string content, string expandedInfo, string footer, string verificationText, string commandButtons, bool showCancelButton, ESysIcons mainIcon, ESysIcons footerIcon)
string mainInstruction,
string content,
string expandedInfo,
string footer,
string verificationText,
string commandButtons,
bool showCancelButton,
ESysIcons mainIcon,
ESysIcons footerIcon)
{ {
var res = ShowTaskDialogBox(null, title, mainInstruction, content, expandedInfo, footer, verificationText, var res = ShowTaskDialogBox(null, title, mainInstruction, content, expandedInfo, footer, verificationText,"", commandButtons, showCancelButton ? ETaskDialogButtons.Cancel : ETaskDialogButtons.None, mainIcon, footerIcon);
"", commandButtons,
showCancelButton ? ETaskDialogButtons.Cancel : ETaskDialogButtons.None,
mainIcon, footerIcon);
if (res == DialogResult.OK) if (res == DialogResult.OK)
return CommandButtonResult; return CommandButtonResult;
return -1; return -1;
} }
public static int ShowCommandBox(IWin32Window owner, public static int ShowCommandBox(IWin32Window owner, string title, string mainInstruction, string content, string commandButtons, bool showCancelButton)
string title,
string mainInstruction,
string content,
string commandButtons,
bool showCancelButton)
{ {
return ShowCommandBox(owner, title, mainInstruction, content, "", "", "", commandButtons, showCancelButton, ESysIcons.Question, ESysIcons.Information); return ShowCommandBox(owner, title, mainInstruction, content, "", "", "", commandButtons, showCancelButton, ESysIcons.Question, ESysIcons.Information);
} }
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
想要评论请 注册