Merge branch 'master' of https://github.com/qiniu/csharp-sdk

Author: jemygraw

src/Qiniu.ALL_VER.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qiniu.Net20", "Qiniu\Qiniu.Net20.csproj", "{E5A764FD-FC95-4B51-BB10-9A807ED25652}"
 EndProject
@@ -17,6 +17,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qiniu.NetCore", "Qiniu\Qini
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qiniu.UWP", "Qiniu\Qiniu.UWP.csproj", "{8ECFA9AE-C543-4241-9C89-9BDF235C37E2}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Qiniu", "Qiniu\Qiniu.csproj", "{60241003-DE4E-4B42-8DE0-5EA73BCB99FC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -51,6 +53,10 @@ Global
 		{8ECFA9AE-C543-4241-9C89-9BDF235C37E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8ECFA9AE-C543-4241-9C89-9BDF235C37E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8ECFA9AE-C543-4241-9C89-9BDF235C37E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60241003-DE4E-4B42-8DE0-5EA73BCB99FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60241003-DE4E-4B42-8DE0-5EA73BCB99FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60241003-DE4E-4B42-8DE0-5EA73BCB99FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60241003-DE4E-4B42-8DE0-5EA73BCB99FC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Qiniu/Qiniu.csproj

@@ -0,0 +1,66 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFrameworks Condition="'$(LibraryFrameworks)'==''">net46;net45;net40;net35;net20;netstandard1.6</TargetFrameworks>
+        <TargetFrameworks Condition="'$(LibraryFrameworks)'!=''">$(LibraryFrameworks)</TargetFrameworks>
+        <AssemblyVersion>7.2.15</AssemblyVersion>
+		<FileVersion>7.2.15</FileVersion>
+		<VersionPrefix>7.2.15</VersionPrefix>
+		<Company>QINIU</Company>
+		<Copyright>Copyright ©  2017</Copyright>
+		<RootNamespace>Qiniu</RootNamespace>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
+		<MinClientVersion>2.12</MinClientVersion>
+    </PropertyGroup>
+    <ItemGroup>
+      <Compile Remove="CDN\Model\HotLinkRequest.cs" />
+      <Compile Remove="Common\Mac.cs" />
+      <Compile Remove="Common\Signature.cs" />
+      <Compile Remove="Http\HttpHelper.cs" />
+      <Compile Remove="Http\UrlHelper.cs" />
+      <Compile Remove="Properties\AssemblyInfo.cs" />
+      <Compile Remove="Util\QETag.cs" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net46' OR '$(TargetFramework)' == 'net45'">
+      <Reference Include="System.Net.Http" />
+    </ItemGroup>
+    <PropertyGroup Condition="'$(TargetFramework)'=='net46'">
+        <AssemblyTitle>Qiniu (Cloud) C# SDK v7.2.15 (.NET 4.6)</AssemblyTitle>
+        <Description>Qiniu (Cloud) C# SDK v7.2.15 (.NET 4.6)</Description>
+		<Product>Qiniu (Cloud) C# SDK v7.2.15 (.NET 4.6)</Product>
+        <DefineConstants>Net46</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetFramework)'=='net45'">
+        <AssemblyTitle>Qiniu (Cloud) C# SDK v7.2.15 (.NET 4.5)</AssemblyTitle>
+        <Description>Qiniu (Cloud) C# SDK v7.2.15 (.NET 4.5)</Description>
+		<Product>Qiniu (Cloud) C# SDK v7.2.15 (.NET 4.5)</Product>
+        <DefineConstants>Net45</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetFramework)'=='net40'">
+        <AssemblyTitle>Qiniu (Cloud) C# SDK v7.2.15 (.NET 4.0)</AssemblyTitle>
+        <Description>Qiniu (Cloud) C# SDK v7.2.15 (.NET 4.0)</Description>
+		<Product>Qiniu (Cloud) C# SDK v7.2.15 (.NET 4.0)</Product>
+        <DefineConstants>Net40</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetFramework)'=='net35'">
+        <AssemblyTitle>Qiniu (Cloud) C# SDK v7.2.15 (.NET 3.5)</AssemblyTitle>
+        <Description>Qiniu (Cloud) C# SDK v7.2.15 (.NET 3.5)</Description>
+		<Product>Qiniu (Cloud) C# SDK v7.2.15 (.NET 3.5)</Product>
+        <DefineConstants>Net35</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetFramework)'=='net20'">
+        <AssemblyTitle>Qiniu (Cloud) C# SDK v7.2.15 (.NET 2.0)</AssemblyTitle>
+        <Description>Qiniu (Cloud) C# SDK v7.2.15 (.NET 2.0)</Description>
+		<Product>Qiniu (Cloud) C# SDK v7.2.15 (.NET 2.0)</Product>
+        <DefineConstants>Net20</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
+        <AssemblyTitle>Qiniu (Cloud) C# SDK v7.2.15 (.Net Core)</AssemblyTitle>
+		<Description>Qiniu (Cloud) C# SDK v7.2.15 (.Net Core)</Description>
+        <Product>Qiniu (Cloud) C# SDK v7.2.15 (.Net Core)</Product>
+        <DefineConstants>NetCore</DefineConstants>
+    </PropertyGroup>
+</Project>