update to 5.1.3

Anankke · Aug 16, 2018 · 90413ca · 90413ca
1 parent 69620c9
commit 90413ca
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 19 deletions.
diff --git a/shadowsocks-csharp/Controller/UpdateChecker.cs b/shadowsocks-csharp/Controller/UpdateChecker.cs
@@ -18,7 +18,7 @@ public class UpdateChecker
 
         public const string Name = "ShadowsocksR";
         public const string Copyright = "Copyright © BreakWa11 2017. Fork from Shadowsocks by clowwindy";
-        public const string Version = "5.1.1";
+        public const string Version = "5.1.3";
 #if !_CONSOLE
         public const string NetVer = "4.0";
 #else

diff --git a/shadowsocks-csharp/Model/Server.cs b/shadowsocks-csharp/Model/Server.cs
@@ -543,7 +543,7 @@ public void tcpingLatency()
 
             try
             {
-                sock.EndConnect(result);
+                sock.Close();
             }
             catch (Exception)
             {

diff --git a/shadowsocks-csharp/Properties/Resources.Designer.cs b/shadowsocks-csharp/Properties/Resources.Designer.cs
diff --git a/shadowsocks-csharp/View/MenuViewController.cs b/shadowsocks-csharp/View/MenuViewController.cs
@@ -158,12 +158,19 @@ private void timerDelayCheckUpdate_Elapsed(object sender, System.Timers.ElapsedE
         private void timerUpdateLatency_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
             timerUpdateLatency.Interval = 1000.0 * 60;
+            timerUpdateLatency.Stop();
             Configuration configuration = _controller.GetCurrentConfiguration();
-            foreach (var server in configuration.configs)
+            for (int i = 0; i < configuration.configs.Count; i++)
             {
+                var server = configuration.configs[i];
                 server.tcpingLatency();
+                if (i % 10 == 0)
+                {
+                    UpdateServersMenu();
+                }
             }
             UpdateServersMenu();
+            timerUpdateLatency.Start();
         }
         void controller_Errored(object sender, System.IO.ErrorEventArgs e)
         {
@@ -637,7 +644,7 @@ void updateFreeNodeChecker_NewFreeNodeFound(object sender, EventArgs e)
             {
                 if (updateFreeNodeChecker.noitify)
                     ShowBalloonTip(I18N.GetString("Success"),
-                        String.Format(I18N.GetString("Update subscribe {0} success"), lastGroup), ToolTipIcon.Info, 10000);
+                        string.Format(I18N.GetString("Update subscribe {0} success"), lastGroup), ToolTipIcon.Info, 10000);
             }
             else
             {

diff --git a/shadowsocks-csharp/app.config b/shadowsocks-csharp/app.config
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <configuration>
 <startup>
-  <supportedRuntime version="v4.0"/>
+  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
 </startup></configuration>
diff --git a/shadowsocks-csharp/shadowsocks-csharp4.0.csproj b/shadowsocks-csharp/shadowsocks-csharp4.0.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Shadowsocks</RootNamespace>
     <AssemblyName>ShadowsocksR</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject>Shadowsocks.Program</StartupObject>
     <ApplicationIcon>shadowsocks.ico</ApplicationIcon>
@@ -292,7 +292,9 @@
     <None Include="Data\privoxy.exe.gz" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="ssr-win-4.0.xml" />
+    <Content Include="ssr-win-4.0.xml">
+      <SubType>Designer</SubType>
+    </Content>
     <None Include="Properties\DataSources\Shadowsocks.View.ConfigForm.datasource" />
     <None Include="Resources\ss20.png" />
     <None Include="Resources\ss16.png" />

diff --git a/shadowsocks-csharp/ssr-win-4.0.xml b/shadowsocks-csharp/ssr-win-4.0.xml
@@ -2,7 +2,7 @@
 <rss xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:files="https://sourceforge.net/api/files.rdf#" xmlns:media="http://video.search.yahoo.com/mrss/" xmlns:doap="http://usefulinc.com/ns/doap#" xmlns:sf="https://sourceforge.net/api/sfelements.rdf#" version="2.0">
   <channel xmlns:files="https://sourceforge.net/api/files.rdf#" xmlns:media="http://video.search.yahoo.com/mrss/" xmlns:doap="http://usefulinc.com/ns/doap#" xmlns:sf="https://sourceforge.net/api/sfelements.rdf#">
     <item>
-      <media:content xmlns:media="http://video.search.yahoo.com/mrss/" type="application/zip; charset=binary" url="https://github.com/SoDa-GitHub/shadowsocksrr-csharp/releases/download/5.1.1/ShadowsocksR-win-5.1.1.7z" filesize="828669"></media:content>
+      <media:content xmlns:media="http://video.search.yahoo.com/mrss/" type="application/zip; charset=binary" url="https://github.com/SoDa-GitHub/shadowsocksrr-csharp/releases/download/5.1.3/ShadowsocksR-win-5.1.3.7z" filesize="828669"></media:content>
     </item>
   </channel>
 </rss>

diff --git a/test/test.csproj b/test/test.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>test</RootNamespace>
     <AssemblyName>test</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>