From b9bfbe0522f83a6db5ab49c5f959c7ca3e4214e9 Mon Sep 17 00:00:00 2001 From: clowwindy Date: Sun, 9 Nov 2014 02:40:21 +0800 Subject: [PATCH 1/4] fix build for .net 4 --- .../Properties/Resources.Designer.cs | 26 +++++----- shadowsocks-csharp/app.config | 2 +- shadowsocks-csharp/shadowsocks-csharp.csproj | 47 +++++++++++++++++-- 3 files changed, 58 insertions(+), 17 deletions(-) diff --git a/shadowsocks-csharp/Properties/Resources.Designer.cs b/shadowsocks-csharp/Properties/Resources.Designer.cs index 077a5ff0..36db144e 100755 --- a/shadowsocks-csharp/Properties/Resources.Designer.cs +++ b/shadowsocks-csharp/Properties/Resources.Designer.cs @@ -113,26 +113,30 @@ namespace Shadowsocks.Properties { /// __QRCODELIB__ ///</script> ///<style> - /// body { - /// padding: 10px; - /// margin: 0; + /// html, body, table, div { + /// padding: 0px; + /// margin: 0 !important; /// } + /// div#qrcode { + /// margin: 5px !important; + /// text-align: center; + /// vertical-align: center; + /// } /// #qrcode { - /// width:300px; - /// height:300px; + /// width:190px; + /// height:190px; /// } + /// table { + /// width: 100%; + /// height:100%; + /// } ///</style> ///</head> ///<body> ///<div id="qrcode" name="qrcode"></div> ///<script type="text/javascript"> /// function genCode(code) { - /// new QRCode("qrcode", { - /// text: code, - /// width: 300, - /// height: 300, - /// colorDark : "#000000", - /// colorLig [rest of string was truncated]";. + /// new QRCode("qrcode" [rest of string was truncated]";. /// internal static string qrcode { get { diff --git a/shadowsocks-csharp/app.config b/shadowsocks-csharp/app.config index dde978a0..867ff468 100755 --- a/shadowsocks-csharp/app.config +++ b/shadowsocks-csharp/app.config @@ -1,6 +1,6 @@ - + diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj index 45afa2e7..5d4c8262 100755 --- a/shadowsocks-csharp/shadowsocks-csharp.csproj +++ b/shadowsocks-csharp/shadowsocks-csharp.csproj @@ -10,7 +10,7 @@ Properties Shadowsocks Shadowsocks - v2.0 + v4.0 512 @@ -21,7 +21,7 @@ 3.5 - + Client publish\ true Disk @@ -45,6 +45,7 @@ x86 prompt ManagedMinimumRules.ruleset + false bin\x86\Release\ @@ -54,15 +55,51 @@ x86 prompt ManagedMinimumRules.ruleset + false + + + true + bin\Debug\ + TRACE;DEBUG + full + x86 + prompt + ManagedMinimumRules.ruleset + true + + + bin\Release\ + TRACE;SIMPLE_JSON_NO_LINQ_EXPRESSION + true + pdbonly + AnyCPU + prompt + ManagedMinimumRules.ruleset + + + true + bin\x64\Debug\ + TRACE;DEBUG + full + x64 + prompt + ManagedMinimumRules.ruleset + true + + + bin\x64\Release\ + TRACE;SIMPLE_JSON_NO_LINQ_EXPRESSION + true + pdbonly + x64 + prompt + ManagedMinimumRules.ruleset - - - From 0bf26002e41220fe06af24ea6d593660dbbd281b Mon Sep 17 00:00:00 2001 From: clowwindy Date: Sun, 9 Nov 2014 02:45:42 +0800 Subject: [PATCH 2/4] change back to 2.0 --- shadowsocks-csharp/shadowsocks-csharp.csproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj index 5d4c8262..94543fa3 100755 --- a/shadowsocks-csharp/shadowsocks-csharp.csproj +++ b/shadowsocks-csharp/shadowsocks-csharp.csproj @@ -10,7 +10,7 @@ Properties Shadowsocks Shadowsocks - v4.0 + v2.0 512 @@ -21,7 +21,8 @@ 3.5 - Client + + publish\ true Disk From 0bdd5d298b0465d273d2ba6077fcdb2dfcb9699a Mon Sep 17 00:00:00 2001 From: clowwindy Date: Sun, 9 Nov 2014 02:47:42 +0800 Subject: [PATCH 3/4] add comments in readme about the .net framework difference --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9be979a6..4f52c919 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,10 @@ Shadowsocks for Windows Download [latest release]. +For Windows 7 and older, please download Shadowsocks-win-x.x.x.zip. + +For Windows 8.1 and newer, please download Shadowsocks-win-dotnet4.0-x.x.x.zip. + ### Usage 1. Find Shadowsocks icon in notification tray @@ -25,8 +29,8 @@ Download [latest release]. about the change automatically 5. Please disable other proxy addons in your browser, or set them to use system proxy -6. You may need to install VC 2008 Runtime and .Net 2.0 if Shadowsocks failed to -start +6. You may need to install VC 2008 Runtime and .Net framework if Shadowsocks +failed to start ### License From 2585f4d615b95eb3c29237a6f362ae928c78cf27 Mon Sep 17 00:00:00 2001 From: clowwindy Date: Sun, 9 Nov 2014 02:58:16 +0800 Subject: [PATCH 4/4] remove x64 and AnyCPU again --- shadowsocks-csharp/shadowsocks-csharp.csproj | 38 -------------------- 1 file changed, 38 deletions(-) diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj index 94543fa3..3d7e20d2 100755 --- a/shadowsocks-csharp/shadowsocks-csharp.csproj +++ b/shadowsocks-csharp/shadowsocks-csharp.csproj @@ -58,44 +58,6 @@ ManagedMinimumRules.ruleset false - - true - bin\Debug\ - TRACE;DEBUG - full - x86 - prompt - ManagedMinimumRules.ruleset - true - - - bin\Release\ - TRACE;SIMPLE_JSON_NO_LINQ_EXPRESSION - true - pdbonly - AnyCPU - prompt - ManagedMinimumRules.ruleset - - - true - bin\x64\Debug\ - TRACE;DEBUG - full - x64 - prompt - ManagedMinimumRules.ruleset - true - - - bin\x64\Release\ - TRACE;SIMPLE_JSON_NO_LINQ_EXPRESSION - true - pdbonly - x64 - prompt - ManagedMinimumRules.ruleset -