Merge pull request #7 from extremecodetv/core

Migration to netstandard2

README.md

@@ -1,12 +1,7 @@
-# SocksSharp
-
-[![AppVeyor](https://img.shields.io/appveyor/ci/gruntjs/grunt/master.svg?style=flat-square)](https://ci.appveyor.com/project/extremecodetv/sockssharp/)
-[![NuGet](https://img.shields.io/nuget/v/sockssharp.svg?style=flat-square)](https://www.nuget.org/packages/SocksSharp/)
-[![License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://raw.githubusercontent.com/extremecodetv/SocksSharp/master/LICENSE)
+# SocksSharp [![AppVeyor](https://img.shields.io/appveyor/ci/gruntjs/grunt/master.svg?style=flat-square)](https://ci.appveyor.com/project/extremecodetv/sockssharp/) [![NuGet](https://img.shields.io/nuget/v/sockssharp.svg?style=flat-square)](https://www.nuget.org/packages/SocksSharp/) [![License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://raw.githubusercontent.com/extremecodetv/SocksSharp/master/LICENSE)
 
 ![SocksSharp](http://i.imgur.com/hh1aZVU.png)
 
-
 SocksSharp provides support for Socks4/4a/5 proxy servers to [HttpClient](https://msdn.microsoft.com/en-us/library/system.net.http.httpclient(v=vs.118).aspx)
 
 ## Installation
@@ -17,6 +12,13 @@ Install as [NuGet package](https://www.nuget.org/packages/SocksSharp/):
 Install-Package SocksSharp
 ```
 
+.NET CLI:
+
+```shell
+dotnet add package SocksSharp
+```
+
+
 ## Basic Usage
 ```C#
 var settings = new ProxySettings()

SocksSharp.sln

@@ -1,26 +1,25 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.16
+VisualStudioVersion = 15.0.26730.10
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocksSharp", "src\SocksSharp\SocksSharp.csproj", "{F5393E6A-DBED-48DA-A3AF-5506DDF8D01E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocksSharp.Core", "src\SocksSharp\SocksSharp.Core.csproj", "{6D0D29F1-A3E8-479B-8B7A-1A246691D76F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F5393E6A-DBED-48DA-A3AF-5506DDF8D01E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5393E6A-DBED-48DA-A3AF-5506DDF8D01E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5393E6A-DBED-48DA-A3AF-5506DDF8D01E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5393E6A-DBED-48DA-A3AF-5506DDF8D01E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B98A2BDB-2576-4015-92E9-22B0B519F0BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B98A2BDB-2576-4015-92E9-22B0B519F0BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B98A2BDB-2576-4015-92E9-22B0B519F0BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B98A2BDB-2576-4015-92E9-22B0B519F0BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D0D29F1-A3E8-479B-8B7A-1A246691D76F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D0D29F1-A3E8-479B-8B7A-1A246691D76F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D0D29F1-A3E8-479B-8B7A-1A246691D76F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D0D29F1-A3E8-479B-8B7A-1A246691D76F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {E9ABC8DC-8E38-4FDE-A2DC-7F8A7A0EBC82}
+	EndGlobalSection
 EndGlobal

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.0.0-beta-{build}
+version: 1.1.0-ci-{build}
 pull_requests:
   do_not_increment_build_number: true
 image: Visual Studio 2017
@@ -17,4 +17,4 @@ deploy:
       secure: XDyu2Wr5aDX3OW1GTJTSIq2y5wq5q8OFX9gJEHiRdwHGmCKNki/fI0vREBq1zYWR
     artifact: /.*\.nupkg/
     on:
-      branch: dev
+      branch: dev

src/SocksSharp/SocksSharp.Core.csproj

@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>SocksSharp provides support for Socks4/4a/5 proxy servers to HttpClient</Description>
+    <Copyright>Copyright © Artem Dontsov, ExtremeCode, 2017</Copyright>
+    <AssemblyTitle>SocksSharp</AssemblyTitle>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Artem Dontsov</Authors>
+    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <NoWarn>$(NoWarn);1591</NoWarn>
+    <AssemblyName>SocksSharp</AssemblyName>
+    <PackageId>SocksSharp</PackageId>
+    <PackageTags>socks5;socks4;socks4a;proxy;httpclient;</PackageTags>
+    <PackageIconUrl>https://camo.githubusercontent.com/ad1cacaaf72d2b7b85b7b35de25f5b30941b1a70/687474703a2f2f692e696d6775722e636f6d2f686831615a56552e706e67</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/extremecodetv/SocksSharp</PackageProjectUrl>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.0</NetStandardImplicitPackageVersion>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DocumentationFile>bin\Debug\documentation.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Net.Http" Version="4.3.2" />
+  </ItemGroup>
+</Project>

src/SocksSharp/SocksSharp.csproj

@@ -20,8 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile>bin\Release\SocksSharp.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>