From 98e866069e289095a7c1cbc40cfb2721ab4fe517 Mon Sep 17 00:00:00 2001 From: Grand Silence Date: Fri, 27 Dec 2019 20:09:57 +0300 Subject: [PATCH] - Remove new keyword from Socks4aProxyClient - AppVeyor: nuget package publishing on GitHub Releases - Disable MSBuild warning 1573 (undocumented parameter) --- Leaf.xNet/Leaf.xNet.csproj | 2 +- Leaf.xNet/Services/Cloudflare/ChallengeSolver.cs | 1 + Leaf.xNet/~Proxy/Socks4aProxyClient.cs | 2 +- appveyor.yml | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Leaf.xNet/Leaf.xNet.csproj b/Leaf.xNet/Leaf.xNet.csproj index d820a2e..d195703 100644 --- a/Leaf.xNet/Leaf.xNet.csproj +++ b/Leaf.xNet/Leaf.xNet.csproj @@ -48,7 +48,7 @@ © 2018-2020 Developed by Grand Silence — Kelog Studio net,http,socks,proxy,cloudflare,xnet,https,stormwall,useragent,parsing,bot,web,crowling icon.png - 1591 + 1591,1573 Improved xNet for .NET Framework 4.5.2+ & .NET Core 2+ diff --git a/Leaf.xNet/Services/Cloudflare/ChallengeSolver.cs b/Leaf.xNet/Services/Cloudflare/ChallengeSolver.cs index 0ad9a33..f905a6e 100644 --- a/Leaf.xNet/Services/Cloudflare/ChallengeSolver.cs +++ b/Leaf.xNet/Services/Cloudflare/ChallengeSolver.cs @@ -25,6 +25,7 @@ public static class ChallengeSolver /// /// The HTML content of the clearance page, which contains the challenge. /// The hostname of the protected website. + /// The port of the protected website. /// The solution. public static ChallengeSolution Solve(string challengePageContent, string targetHost, int targetPort) { diff --git a/Leaf.xNet/~Proxy/Socks4aProxyClient.cs b/Leaf.xNet/~Proxy/Socks4aProxyClient.cs index ad1bd6d..e2cb3a1 100644 --- a/Leaf.xNet/~Proxy/Socks4aProxyClient.cs +++ b/Leaf.xNet/~Proxy/Socks4aProxyClient.cs @@ -83,7 +83,7 @@ public static bool TryParse(string proxyAddress, out Socks4AProxyClient result) // ReSharper disable once UnusedMember.Global - internal new void SendCommand(NetworkStream nStream, byte command, string destinationHost, int destinationPort) + internal void SendCommand(NetworkStream nStream, byte command, string destinationHost, int destinationPort) { var dstPort = GetPortBytes(destinationPort); byte[] dstIp = { 0, 0, 0, 1 }; diff --git a/appveyor.yml b/appveyor.yml index 035e341..392d2d3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,6 +28,8 @@ build: publish_nuget: true verbosity: minimal artifacts: +- path: Leaf.xNet\bin\Release\Leaf.xNet.$(appveyor_build_version).nupkg + name: Leaf.xNet_v$(appveyor_build_version)__Nuget_All_Targets - path: Leaf.xNet\bin\Release\net452 name: Leaf.xNet_v$(appveyor_build_version)__NET_Framework_4.5.2 - path: Leaf.xNet\bin\Release\net462 @@ -50,7 +52,7 @@ deploy: release: Leaf.xNet v$(appveyor_build_version) auth_token: secure: NQtMOO3yB309cDK/pFWRiQ== - artifact: Leaf.xNet_v$(appveyor_build_version)__NET_Framework_4.5.2;Leaf.xNet_v$(appveyor_build_version)__NET_Framework_4.6.2;Leaf.xNet_v$(appveyor_build_version)__NET_Framework_4.7.2;Leaf.xNet_v$(appveyor_build_version)__NET_Framework_4.8;Leaf.xNet_v$(appveyor_build_version)__NET_Standard_2.0 + artifact: Leaf.xNet_v$(appveyor_build_version)__Nuget_All_Targets;Leaf.xNet_v$(appveyor_build_version)__NET_Framework_4.5.2;Leaf.xNet_v$(appveyor_build_version)__NET_Framework_4.6.2;Leaf.xNet_v$(appveyor_build_version)__NET_Framework_4.7.2;Leaf.xNet_v$(appveyor_build_version)__NET_Framework_4.8;Leaf.xNet_v$(appveyor_build_version)__NET_Standard_2.0 on: branch: master only_commits: