@@ -123,7 +123,7 @@ namespace Shadowsocks.Controller | |||||
{ | { | ||||
Logging.Debug("Ping " + server.FriendlyName()); | Logging.Debug("Ping " + server.FriendlyName()); | ||||
if (server.server == "") return null; | if (server.server == "") return null; | ||||
var IP = Dns.GetHostAddresses(server.server).First(ip => ip.AddressFamily == AddressFamily.InterNetwork); | |||||
var IP = Dns.GetHostAddresses(server.server).First(ip => (ip.AddressFamily == AddressFamily.InterNetwork || ip.AddressFamily == AddressFamily.InterNetworkV6)); | |||||
var ping = new Ping(); | var ping = new Ping(); | ||||
var ret = new List<DataList>(); | var ret = new List<DataList>(); | ||||
foreach ( | foreach ( | ||||
@@ -5,5 +5,7 @@ | |||||
<package id="Microsoft.Bcl" version="1.1.8" targetFramework="net4-client" /> | <package id="Microsoft.Bcl" version="1.1.8" targetFramework="net4-client" /> | ||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net4-client" /> | <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net4-client" /> | ||||
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net4-client" /> | <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net4-client" /> | ||||
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net4-client" /> | |||||
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net4-client" /> | <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net4-client" /> | ||||
<package id="System.Net.Http" version="2.0.20710.0" targetFramework="net4-client" /> | |||||
</packages> | </packages> |
@@ -96,7 +96,14 @@ | |||||
<EmbedInteropTypes>False</EmbedInteropTypes> | <EmbedInteropTypes>False</EmbedInteropTypes> | ||||
</Reference> | </Reference> | ||||
<Reference Include="System.Net" /> | <Reference Include="System.Net" /> | ||||
<Reference Include="System.Net.Http, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | |||||
<Reference Include="System.Net.Http, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> | |||||
<HintPath>3rd\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll</HintPath> | |||||
<Private>True</Private> | |||||
</Reference> | |||||
<Reference Include="System.Net.Http.WebRequest, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> | |||||
<HintPath>3rd\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.WebRequest.dll</HintPath> | |||||
<Private>True</Private> | |||||
</Reference> | |||||
<Reference Include="System.Runtime, Version=2.6.8.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> | <Reference Include="System.Runtime, Version=2.6.8.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> | ||||
<HintPath>3rd\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll</HintPath> | <HintPath>3rd\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll</HintPath> | ||||
<Private>True</Private> | <Private>True</Private> | ||||
@@ -184,7 +191,7 @@ | |||||
<Compile Include="Encryption\EncryptorBase.cs" /> | <Compile Include="Encryption\EncryptorBase.cs" /> | ||||
<Compile Include="Encryption\EncryptorFactory.cs" /> | <Compile Include="Encryption\EncryptorFactory.cs" /> | ||||
<Compile Include="Encryption\IVEncryptor.cs" /> | <Compile Include="Encryption\IVEncryptor.cs" /> | ||||
<Compile Include="Encryption\MbedTLS.cs" /> | |||||
<Compile Include="Encryption\MbedTLS.cs" /> | |||||
<Compile Include="Encryption\PolarSSL.cs" /> | <Compile Include="Encryption\PolarSSL.cs" /> | ||||
<Compile Include="Encryption\PolarSSLEncryptor.cs" /> | <Compile Include="Encryption\PolarSSLEncryptor.cs" /> | ||||
<Compile Include="Encryption\Sodium.cs" /> | <Compile Include="Encryption\Sodium.cs" /> | ||||
@@ -0,0 +1,5 @@ | |||||
<?xml version="1.0" encoding="utf-8"?> | |||||
<packages> | |||||
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" /> | |||||
<package id="System.Net.Http" version="2.0.20710.0" targetFramework="net45" /> | |||||
</packages> |
@@ -31,6 +31,8 @@ | |||||
</PropertyGroup> | </PropertyGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<Reference Include="System" /> | <Reference Include="System" /> | ||||
<Reference Include="System.Net.Http" /> | |||||
<Reference Include="System.Net.Http.WebRequest" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
<Choose> | <Choose> | ||||
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'"> | <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'"> | ||||
@@ -54,6 +56,9 @@ | |||||
<Name>shadowsocks-csharp</Name> | <Name>shadowsocks-csharp</Name> | ||||
</ProjectReference> | </ProjectReference> | ||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | |||||
<None Include="packages.config" /> | |||||
</ItemGroup> | |||||
<Choose> | <Choose> | ||||
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'"> | <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'"> | ||||
<ItemGroup> | <ItemGroup> | ||||