diff --git a/shadowsocks-csharp/3rd/zxing/common/StringUtils.cs b/shadowsocks-csharp/3rd/zxing/common/StringUtils.cs index 55b5ec91..f15fd8e6 100755 --- a/shadowsocks-csharp/3rd/zxing/common/StringUtils.cs +++ b/shadowsocks-csharp/3rd/zxing/common/StringUtils.cs @@ -30,16 +30,16 @@ namespace ZXing.Common #if (WINDOWS_PHONE70 || WINDOWS_PHONE71 || WINDOWS_PHONE80 || SILVERLIGHT4 || SILVERLIGHT5 || NETFX_CORE || PORTABLE) private const String PLATFORM_DEFAULT_ENCODING = "UTF-8"; #else - private static String PLATFORM_DEFAULT_ENCODING = Encoding.Default.WebName; + private static string PLATFORM_DEFAULT_ENCODING = Encoding.Default.WebName; #endif - public static String SHIFT_JIS = "SJIS"; - public static String GB2312 = "GB2312"; - private const String EUC_JP = "EUC-JP"; - private const String UTF8 = "UTF-8"; - private const String ISO88591 = "ISO-8859-1"; + public static string SHIFT_JIS = "SJIS"; + public static string GB2312 = "GB2312"; + private const string EUC_JP = "EUC-JP"; + private const string UTF8 = "UTF-8"; + private const string ISO88591 = "ISO-8859-1"; private static readonly bool ASSUME_SHIFT_JIS = - String.Compare(SHIFT_JIS, PLATFORM_DEFAULT_ENCODING, StringComparison.OrdinalIgnoreCase) == 0 || - String.Compare(EUC_JP, PLATFORM_DEFAULT_ENCODING, StringComparison.OrdinalIgnoreCase) == 0; + string.Equals(SHIFT_JIS, PLATFORM_DEFAULT_ENCODING, StringComparison.OrdinalIgnoreCase) || + string.Equals(EUC_JP, PLATFORM_DEFAULT_ENCODING, StringComparison.OrdinalIgnoreCase); /// /// Guesses the encoding. diff --git a/shadowsocks-csharp/FodyWeavers.xml b/shadowsocks-csharp/FodyWeavers.xml index 2e6d4a7a..6e33a3fc 100644 --- a/shadowsocks-csharp/FodyWeavers.xml +++ b/shadowsocks-csharp/FodyWeavers.xml @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/shadowsocks-csharp/packages.config b/shadowsocks-csharp/packages.config index 2230519e..c0fab934 100644 --- a/shadowsocks-csharp/packages.config +++ b/shadowsocks-csharp/packages.config @@ -1,5 +1,6 @@  +