Modern namespaces and typos fixed

v2rayN/ProtosLib/Tests.cs

@@ -1,13 +1,12 @@
 using ProtosLib.Statistics;
 
-namespace ProtosLib
+namespace ProtosLib;
+
+public class Tests
 {
-    public class Tests
-    {
   private StatsService.StatsServiceClient client_;
 
   public Tests()
   {
   }
-    }
 }

v2rayN/v2rayN/Base/MyDGTextColumn.cs

@@ -1,9 +1,7 @@
 using System.Windows.Controls;
 
-namespace v2rayN.Base
-{
-    internal class MyDGTextColumn : DataGridTextColumn
-    {
+namespace v2rayN.Base;
+
+internal class MyDGTextColumn : DataGridTextColumn {
   public string ExName { get; set; }
-    }
 }

v2rayN/v2rayN/Common/DownloaderHelper.cs

@@ -2,10 +2,10 @@
 using System.IO;
 using System.Net;
 
-namespace v2rayN
+namespace v2rayN;
+
+internal class DownloaderHelper
 {
-    internal class DownloaderHelper
-    {
   private static readonly Lazy<DownloaderHelper> _instance = new(() => new());
   public static DownloaderHelper Instance => _instance.Value;
 
@@ -177,5 +177,4 @@ namespace v2rayN
 
     downloadOpt = null;
   }
-    }
 }

v2rayN/v2rayN/Common/FileManager.cs

@@ -2,10 +2,10 @@
 using System.IO.Compression;
 using System.Text;
 
-namespace v2rayN
+namespace v2rayN;
+
+public static class FileManager
 {
-    public static class FileManager
-    {
   public static bool ByteArrayToFile(string fileName, byte[] content)
   {
     try
@@ -86,5 +86,4 @@ namespace v2rayN
     }
     return true;
   }
-    }
 }

v2rayN/v2rayN/Common/HttpClientHelper.cs

@@ -4,12 +4,12 @@ using System.Net.Http.Headers;
 using System.Net.Mime;
 using System.Text;
 
-namespace v2rayN
+namespace v2rayN;
+
+/// <summary>
+/// </summary>
+public class HttpClientHelper
 {
-    /// <summary>
-    /// </summary>
-    public class HttpClientHelper
-    {
   private static readonly Lazy<HttpClientHelper> _instance = new(() =>
   {
     HttpClientHandler handler = new() { UseCookies = false };
@@ -184,5 +184,4 @@ namespace v2rayN
       }
     } while (isMoreToRead);
   }
-    }
 }

v2rayN/v2rayN/Common/Job.cs

@@ -1,15 +1,14 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-namespace v2rayN
-{
-    /*
+namespace v2rayN;
+/*
  * See:
  * http://stackoverflow.com/questions/6266820/working-example-of-createjobobject-setinformationjobobject-pinvoke-in-net
  */
 
-    public class Job : IDisposable
-    {
+public class Job : IDisposable
+{
   private IntPtr handle = IntPtr.Zero;
 
   public Job()
@@ -113,24 +112,24 @@ namespace v2rayN
   private static extern bool CloseHandle(IntPtr hObject);
 
   #endregion Interop
-    }
+}
 
-    #region Helper classes
+#region Helper classes
 
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct IO_COUNTERS
-    {
+[StructLayout(LayoutKind.Sequential)]
+internal struct IO_COUNTERS
+{
   public UInt64 ReadOperationCount;
   public UInt64 WriteOperationCount;
   public UInt64 OtherOperationCount;
   public UInt64 ReadTransferCount;
   public UInt64 WriteTransferCount;
   public UInt64 OtherTransferCount;
-    }
+}
 
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct JOBOBJECT_BASIC_LIMIT_INFORMATION
-    {
+[StructLayout(LayoutKind.Sequential)]
+internal struct JOBOBJECT_BASIC_LIMIT_INFORMATION
+{
   public Int64 PerProcessUserTimeLimit;
   public Int64 PerJobUserTimeLimit;
   public UInt32 LimitFlags;
@@ -140,29 +139,29 @@ namespace v2rayN
   public UIntPtr Affinity;
   public UInt32 PriorityClass;
   public UInt32 SchedulingClass;
-    }
+}
 
-    [StructLayout(LayoutKind.Sequential)]
-    public struct SECURITY_ATTRIBUTES
-    {
+[StructLayout(LayoutKind.Sequential)]
+public struct SECURITY_ATTRIBUTES
+{
   public UInt32 nLength;
   public IntPtr lpSecurityDescriptor;
   public Int32 bInheritHandle;
-    }
+}
 
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION
-    {
+[StructLayout(LayoutKind.Sequential)]
+internal struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION
+{
   public JOBOBJECT_BASIC_LIMIT_INFORMATION BasicLimitInformation;
   public IO_COUNTERS IoInfo;
   public UIntPtr ProcessMemoryLimit;
   public UIntPtr JobMemoryLimit;
   public UIntPtr PeakProcessMemoryUsed;
   public UIntPtr PeakJobMemoryUsed;
-    }
+}
 
-    public enum JobObjectInfoType
-    {
+public enum JobObjectInfoType
+{
   AssociateCompletionPortInformation = 7,
   BasicLimitInformation = 2,
   BasicUIRestrictions = 4,
@@ -170,7 +169,6 @@ namespace v2rayN
   ExtendedLimitInformation = 9,
   SecurityLimitInformation = 5,
   GroupInformation = 11
-    }
-
-    #endregion Helper classes
 }
+
+#endregion Helper classes

v2rayN/v2rayN/Common/JsonUtils.cs

@@ -3,10 +3,10 @@ using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
-namespace v2rayN
+namespace v2rayN;
+
+internal class JsonUtils
 {
-    internal class JsonUtils
-    {
   /// <summary>
   /// DeepCopy
   /// </summary>
@@ -130,5 +130,4 @@ namespace v2rayN
       return -1;
     }
   }
-    }
 }

v2rayN/v2rayN/Common/Logging.cs

@@ -3,10 +3,10 @@ using NLog.Config;
 using NLog.Targets;
 using System.IO;
 
-namespace v2rayN
+namespace v2rayN;
+
+public class Logging
 {
-    public class Logging
-    {
   public static void Setup()
   {
     LoggingConfiguration config = new();
@@ -74,5 +74,4 @@ namespace v2rayN
       }
     }
   }
-    }
 }

v2rayN/v2rayN/Common/ProxySetting.cs

@@ -1,10 +1,10 @@
 using System.Runtime.InteropServices;
 using static v2rayN.Common.ProxySetting.InternetConnectionOption;
 
-namespace v2rayN.Common
+namespace v2rayN.Common;
+
+internal class ProxySetting
 {
-    internal class ProxySetting
-    {
   private const string _regPath = @"Software\Microsoft\Windows\CurrentVersion\Internet Settings";
 
   private static bool SetProxyFallback(string? strProxy, string? exceptions, int type)
@@ -356,5 +356,4 @@ namespace v2rayN.Common
       ref int lpcEntries        // Number of entries written to the buffer
     );
   }
-    }
 }

v2rayN/v2rayN/Common/QRCodeHelper.cs

@@ -9,13 +9,13 @@ using ZXing.Common;
 using ZXing.QrCode;
 using ZXing.Windows.Compatibility;
 
-namespace v2rayN
+namespace v2rayN;
+
+/// <summary>
+/// 含有QR码的描述类和包装编码和渲染
+/// </summary>
+public class QRCodeHelper
 {
-    /// <summary>
-    /// 含有QR码的描述类和包装编码和渲染
-    /// </summary>
-    public class QRCodeHelper
-    {
   public static DrawingImage? GetQRCode(string? strContent)
   {
     if (strContent is null)
@@ -100,5 +100,4 @@ namespace v2rayN
 
     return new(96 / g.DpiX, 96 / g.DpiY);
   }
-    }
 }

v2rayN/v2rayN/Common/QueryableExtension.cs

@@ -1,10 +1,10 @@
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace v2rayN
+namespace v2rayN;
+
+public static class QueryableExtension
 {
-    public static class QueryableExtension
-    {
   public static IOrderedQueryable<T> OrderBy<T>(this IQueryable<T> query, string propertyName)
   {
     return _OrderBy<T>(query, propertyName, false);
@@ -46,5 +46,4 @@ namespace v2rayN
 
     return lambda;
   }
-    }
 }

v2rayN/v2rayN/Common/SemanticVersion.cs

@@ -1,7 +1,7 @@
-namespace v2rayN
+namespace v2rayN;
+
+public class SemanticVersion
 {
-    public class SemanticVersion
-    {
   private int major;
   private int minor;
   private int patch;
@@ -176,5 +176,4 @@
   }
 
   #endregion Private
-    }
 }

v2rayN/v2rayN/Common/SqliteHelper.cs

@@ -1,10 +1,10 @@
 using SQLite;
 using System.Collections;
 
-namespace v2rayN
+namespace v2rayN;
+
+public sealed class SQLiteHelper
 {
-    public sealed class SQLiteHelper
-    {
   private static readonly Lazy<SQLiteHelper> _instance = new(() => new());
   public static SQLiteHelper Instance => _instance.Value;
   private string _connstr;
@@ -119,5 +119,4 @@ namespace v2rayN
   {
     return _dbAsync.Table<T>();
   }
-    }
 }

v2rayN/v2rayN/Common/StringEx.cs

@@ -1,10 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 
-namespace v2rayN
+namespace v2rayN;
+
+internal static class StringEx
 {
-    internal static class StringEx
-    {
   public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
   {
     return string.IsNullOrEmpty(value);
@@ -90,5 +90,4 @@ namespace v2rayN
 
     return $"\"{value}\"";
   }
-    }
 }

v2rayN/v2rayN/Common/UI.cs

@@ -1,10 +1,10 @@
 using Microsoft.Win32;
 using System.Windows;
 
-namespace v2rayN
+namespace v2rayN;
+
+internal class UI
 {
-    internal class UI
-    {
   private static readonly string caption = "v2rayN";
 
   public static void Show(string msg)
@@ -35,5 +35,4 @@ namespace v2rayN
 
     return true;
   }
-    }
 }

v2rayN/v2rayN/Common/Utils.cs

@@ -19,10 +19,10 @@ using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace v2rayN
+namespace v2rayN;
+
+internal class Utils
 {
-    internal class Utils
-    {
   #region 资源Json操作
 
   /// <summary>
@@ -1126,5 +1126,4 @@ namespace v2rayN
   public static extern int DwmSetWindowAttribute(IntPtr hwnd, DWMWINDOWATTRIBUTE attribute, ref int attributeValue, uint attributeSize);
 
   #endregion Windows API
-    }
 }

v2rayN/v2rayN/Common/YamlUtils.cs

@@ -1,10 +1,10 @@
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
-namespace v2rayN.Common
+namespace v2rayN.Common;
+
+internal class YamlUtils
 {
-    internal class YamlUtils
-    {
   #region YAML
 
   /// <summary>
@@ -54,5 +54,4 @@ namespace v2rayN.Common
   }
 
   #endregion YAML
-    }
 }

v2rayN/v2rayN/Converters/DelayColorConverter.cs

@@ -1,10 +1,10 @@
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace v2rayN.Converters
+namespace v2rayN.Converters;
+
+public class DelayColorConverter : IValueConverter
 {
-    public class DelayColorConverter : IValueConverter
-    {
   public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
   {
     int.TryParse(value.ToString(), out var delay);
@@ -21,5 +21,4 @@ namespace v2rayN.Converters
   {
     return null;
   }
-    }
 }

v2rayN/v2rayN/Converters/InverseBooleanConverter.cs

@@ -1,11 +1,11 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace v2rayN.Converters
+namespace v2rayN.Converters;
+
+[ValueConversion(typeof(bool), typeof(bool))]
+public class InverseBooleanConverter : IValueConverter
 {
-    [ValueConversion(typeof(bool), typeof(bool))]
-    public class InverseBooleanConverter : IValueConverter
-    {
   public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
   {
     if (targetType != typeof(bool))
@@ -20,5 +20,4 @@ namespace v2rayN.Converters
   {
     throw new NotImplementedException();
   }
-    }
 }

v2rayN/v2rayN/Converters/MaterialDesignFonts.cs

@@ -1,10 +1,10 @@
 using System.Windows.Media;
 using v2rayN.Handler;
 
-namespace v2rayN.Converters
+namespace v2rayN.Converters;
+
+public class MaterialDesignFonts
 {
-    public class MaterialDesignFonts
-    {
   public static FontFamily MyFont { get; }
 
   static MaterialDesignFonts()
@@ -23,5 +23,4 @@ namespace v2rayN.Converters
     }
     MyFont ??= new FontFamily("Microsoft YaHei");
   }
-    }
 }

v2rayN/v2rayN/Enums/EConfigType.cs

@@ -1,7 +1,7 @@
-namespace v2rayN.Enums
+namespace v2rayN.Enums;
+
+public enum EConfigType
 {
-    public enum EConfigType
-    {
   VMess = 1,
   Custom = 2,
   Shadowsocks = 3,
@@ -12,5 +12,4 @@
   Tuic = 8,
   Wireguard = 9,
   Http = 10
-    }
 }

v2rayN/v2rayN/Enums/ECoreType.cs

@@ -1,7 +1,7 @@
-namespace v2rayN.Enums
+namespace v2rayN.Enums;
+
+public enum ECoreType
 {
-    public enum ECoreType
-    {
   v2fly = 1,
   Xray = 2,
   SagerNet = 3,
@@ -16,5 +16,4 @@
   juicity = 25,
   hysteria2 = 26,
   v2rayN = 99
-    }
 }

v2rayN/v2rayN/Enums/EGlobalHotkey.cs

@@ -1,11 +1,10 @@
-namespace v2rayN.Enums
+namespace v2rayN.Enums;
+
+public enum EGlobalHotkey
 {
-    public enum EGlobalHotkey
-    {
   ShowForm = 0,
   SystemProxyClear = 1,
   SystemProxySet = 2,
   SystemProxyUnchanged = 3,
   SystemProxyPac = 4,
-    }
 }

v2rayN/v2rayN/Enums/EInboundProtocol.cs

@@ -1,7 +1,7 @@
-namespace v2rayN.Enums
+namespace v2rayN.Enums;
+
+public enum EInboundProtocol
 {
-    public enum EInboundProtocol
-    {
   socks = 0,
   http,
   socks2,
@@ -10,5 +10,4 @@
   api,
   api2,
   speedtest = 21
-    }
 }

v2rayN/v2rayN/Enums/EMove.cs

@@ -1,11 +1,10 @@
-namespace v2rayN.Enums
+namespace v2rayN.Enums;
+
+public enum EMove
 {
-    public enum EMove
-    {
   Top = 1,
   Up = 2,
   Down = 3,
   Bottom = 4,
   Position = 5
-    }
 }

v2rayN/v2rayN/Enums/ERuleMode.cs

@@ -1,10 +1,9 @@
-namespace v2rayN.Enums
+namespace v2rayN.Enums;
+
+public enum ERuleMode
 {
-    public enum ERuleMode
-    {
   Rule = 0,
   Global = 1,
   Direct = 2,
   Unchanged = 3
-    }
 }

v2rayN/v2rayN/Enums/EServerColName.cs

@@ -1,7 +1,7 @@
-namespace v2rayN.Enums
+namespace v2rayN.Enums;
+
+public enum EServerColName
 {
-    public enum EServerColName
-    {
   def = 0,
   configType,
   remarks,
@@ -17,5 +17,4 @@
   todayUp,
   totalDown,
   totalUp
-    }
 }

v2rayN/v2rayN/Enums/ESpeedActionType.cs

@@ -1,10 +1,9 @@
-namespace v2rayN.Enums
+namespace v2rayN.Enums;
+
+public enum ESpeedActionType
 {
-    public enum ESpeedActionType
-    {
   Tcping,
   Realping,
   Speedtest,
   Mixedtest
-    }
 }

v2rayN/v2rayN/Enums/ESysProxyType.cs

@@ -1,10 +1,9 @@
-namespace v2rayN.Enums
+namespace v2rayN.Enums;
+
+public enum ESysProxyType
 {
-    public enum ESysProxyType
-    {
   ForcedClear = 0,
   ForcedChange = 1,
   Unchanged = 2,
   Pac = 3
-    }
 }

v2rayN/v2rayN/Enums/ETransport.cs

@@ -1,7 +1,7 @@
-namespace v2rayN.Enums
+namespace v2rayN.Enums;
+
+public enum ETransport
 {
-    public enum ETransport
-    {
   tcp,
   kcp,
   ws,
@@ -11,5 +11,4 @@
   http,
   quic,
   grpc
-    }
 }

v2rayN/v2rayN/Enums/EViewAction.cs

@@ -1,8 +1,7 @@
-namespace v2rayN.Enums
+namespace v2rayN.Enums;
+
+public enum EViewAction
 {
-    public enum EViewAction
-    {
   AdjustMainLvColWidth,
   ProfilesFocus
-    }
 }

v2rayN/v2rayN/Global.cs

@@ -1,9 +1,9 @@
 using v2rayN.Enums;
 
-namespace v2rayN
+namespace v2rayN;
+
+internal class Global
 {
-    internal class Global
-    {
   #region const
 
   public const string GithubUrl = "https://github.com";
@@ -193,5 +193,4 @@ namespace v2rayN
   public static readonly List<string> proxyVehicleType = new List<string> { "file", "http" };
 
   #endregion const
-    }
 }

v2rayN/v2rayN/Properties/Resources.Designer.cs

@@ -8,21 +8,20 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace v2rayN.Properties {
-    using System;
+namespace v2rayN.Properties;
 
 
-    /// <summary>
-    ///   一个强类型的资源类，用于查找本地化的字符串等。
-    /// </summary>
-    // 此类是由 StronglyTypedResourceBuilder
-    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
-    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
-    // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+/// <summary>
+///   一个强类型的资源类，用于查找本地化的字符串等。
+/// </summary>
+// 此类是由 StronglyTypedResourceBuilder
+// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+// (以 /str 作为命令选项)，或重新生成 VS 项目。
+[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+internal class Resources {
 
   private static global::System.Resources.ResourceManager resourceMan;
 
@@ -219,5 +218,4 @@ namespace v2rayN.Properties {
       return ((System.Drawing.Bitmap)(obj));
     }
   }
-    }
 }

v2rayN/v2rayUpgrade/MainForm.cs

@@ -5,10 +5,10 @@ using System.IO.Compression;
 using System.Text;
 using System.Windows.Forms;
 
-namespace v2rayUpgrade
+namespace v2rayUpgrade;
+
+public partial class MainForm : Form
 {
-    public partial class MainForm : Form
-    {
   private readonly string defaultFilename = "v2ray-windows.zip";
   private string? fileName;
 
@@ -143,5 +143,4 @@ namespace v2rayUpgrade
     }
     return Path.Combine(startupPath, fileName);
   }
-    }
 }

v2rayN/v2rayUpgrade/Program.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Windows.Forms;
 
-namespace v2rayUpgrade
+namespace v2rayUpgrade;
+
+internal static class Program
 {
-    internal static class Program
-    {
   /// <summary>
   /// 应用程序的主入口点。
   /// </summary>
@@ -17,5 +17,4 @@ namespace v2rayUpgrade
     Application.SetCompatibleTextRenderingDefault(false);
     Application.Run(new MainForm(args));
   }
-    }
 }