diff --git a/shadowsocks-csharp/Properties/Resources.Designer.cs b/shadowsocks-csharp/Properties/Resources.Designer.cs
index 3d0151b1..e3cd3ddf 100644
--- a/shadowsocks-csharp/Properties/Resources.Designer.cs
+++ b/shadowsocks-csharp/Properties/Resources.Designer.cs
@@ -73,13 +73,14 @@ namespace Shadowsocks.Properties {
///var rules = [];
///
///// convert to abp grammar
+ ///var re = /^(@@)?\|\|.*?[^\^]$/;
///for (var i = 0; i < __RULES__.length; i++) {
/// var s = __RULES__[i];
- /// if (s.substring(0, 2) == "||") s += "^";
+ /// if (s.match(re)) s += "^";
/// rules.push(s);
///}
///
- ///for (var i = 0; i < [rest of string was truncated]";.
+ /// [rest of string was truncated]";.
///
public static string abp_js {
get {
diff --git a/shadowsocks-csharp/Properties/Settings.Designer.cs b/shadowsocks-csharp/Properties/Settings.Designer.cs
index efed8372..dfd4d4e0 100644
--- a/shadowsocks-csharp/Properties/Settings.Designer.cs
+++ b/shadowsocks-csharp/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace Shadowsocks.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.1.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/shadowsocks-csharp/app.config b/shadowsocks-csharp/app.config
index 8b836868..ac464a1f 100755
--- a/shadowsocks-csharp/app.config
+++ b/shadowsocks-csharp/app.config
@@ -6,7 +6,7 @@
-
+
@@ -20,7 +20,7 @@
-
+
@@ -30,6 +30,10 @@
+
+
+
+
diff --git a/shadowsocks-csharp/packages.config b/shadowsocks-csharp/packages.config
index dcc18bbb..070ffa21 100644
--- a/shadowsocks-csharp/packages.config
+++ b/shadowsocks-csharp/packages.config
@@ -4,28 +4,28 @@
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj
index 07812867..0f2f3d8e 100644
--- a/shadowsocks-csharp/shadowsocks-csharp.csproj
+++ b/shadowsocks-csharp/shadowsocks-csharp.csproj
@@ -1,6 +1,6 @@
-
+
@@ -13,7 +13,7 @@
Properties
Shadowsocks
Shadowsocks
- v4.7.2
+ v4.8
512
@@ -79,14 +79,14 @@
..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll
-
- ..\packages\DynamicData.6.17.14\lib\net461\DynamicData.dll
+
+ ..\packages\DynamicData.7.1.1\lib\net461\DynamicData.dll
..\packages\GlobalHotKey.1.1.0\lib\GlobalHotKey.dll
-
- ..\packages\Google.Protobuf.3.13.0\lib\net45\Google.Protobuf.dll
+
+ ..\packages\Google.Protobuf.3.14.0\lib\net45\Google.Protobuf.dll
..\packages\AvalonEdit.6.0.1\lib\net45\ICSharpCode.AvalonEdit.dll
@@ -100,31 +100,31 @@
..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
- ..\packages\NLog.4.7.5\lib\net45\NLog.dll
+ ..\packages\NLog.4.7.6\lib\net45\NLog.dll
-
- ..\packages\Pharmacist.Common.1.8.1\lib\netstandard2.0\Pharmacist.Common.dll
+
+ ..\packages\Pharmacist.Common.2.0.5\lib\net472\Pharmacist.Common.dll
-
- ..\packages\ReactiveUI.11.5.35\lib\net461\ReactiveUI.dll
+
+ ..\packages\ReactiveUI.12.1.5\lib\net461\ReactiveUI.dll
-
- ..\packages\ReactiveUI.Events.WPF.11.5.35\lib\net472\ReactiveUI.Events.WPF.dll
+
+ ..\packages\ReactiveUI.Events.WPF.12.1.5\lib\net472\ReactiveUI.Events.WPF.dll
-
- ..\packages\ReactiveUI.Fody.11.5.35\lib\net461\ReactiveUI.Fody.Helpers.dll
+
+ ..\packages\ReactiveUI.Fody.12.1.5\lib\net461\ReactiveUI.Fody.Helpers.dll
-
- ..\packages\ReactiveUI.Validation.1.7.1\lib\net461\ReactiveUI.Validation.dll
+
+ ..\packages\ReactiveUI.Validation.1.8.6\lib\net461\ReactiveUI.Validation.dll
-
- ..\packages\ReactiveUI.WPF.11.5.35\lib\net472\ReactiveUI.WPF.dll
+
+ ..\packages\ReactiveUI.WPF.12.1.5\lib\net472\ReactiveUI.Wpf.dll
-
- ..\packages\Splat.9.6.1\lib\net461\Splat.dll
+
+ ..\packages\Splat.9.8.1\lib\net461\Splat.dll
@@ -155,16 +155,16 @@
..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
-
- ..\packages\System.Reactive.4.4.1\lib\net46\System.Reactive.dll
+
+ ..\packages\System.Reactive.5.0.0\lib\net472\System.Reactive.dll
..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll
True
True
-
- ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll
@@ -447,7 +447,7 @@
-
+