Split project and removed dependency on microsoft.net.http

dist/nuget/Microsoft.AspNet.WebApi.Extensions.Compression.Server.nuspec

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>Microsoft.AspNet.WebApi.Extensions.Compression.Server</id>
+    <version>2.0.0</version>
+    <title>Microsoft ASP.NET Web API Compression Support</title>
+    <authors>Ove Andersen</authors>
+    <owners>EyeCatch</owners>
+    <description>
+      Module for ASP.NET Web API that enables GZip and Deflate support for incoming and outgoing requests. 
+Please note that this is not an official Microsoft package.
+    </description>
+    <summary>
+      Module for ASP.NET Web API that enables GZip and Deflate support for incoming and outgoing requests. Please note that this is not an official Microsoft package.
+    </summary>
+    <language>en-US</language>
+    <projectUrl>https://github.com/azzlack/Microsoft.AspNet.WebApi.MessageHandlers.Compression</projectUrl>
+    <iconUrl>http://www.eyecatch.no/favicon.ico</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <licenseUrl>http://www.eyecatch.no/licenses/apache-20/</licenseUrl>
+    <copyright>Copyright EyeCatch 2016</copyright>
+    <dependencies>
+    </dependencies>
+    <references></references>
+    <tags>aspnet webapi aspnetwebapi http compression gzip deflate eyecatch</tags>
+  </metadata>
+  <files>
+	<file src="..\..\src\Server\bin\Release\Microsoft.AspNet.WebApi.Extensions.Compression.Server.dll" target="lib\net45" />
+	<file src="..\..\src\Server\bin\Release\Microsoft.AspNet.WebApi.Extensions.Compression.Server.pdb" target="lib\net45" />
+	<file src="..\..\src\Core\bin\Release\System.Net.Http.Extensions.Compression.Core.dll" target="lib\net45" />
+	<file src="..\..\src\Core\bin\Release\System.Net.Http.Extensions.Compression.Core.pdb" target="lib\net45" />
+	<file src="..\..\src\Core\**\*.cs" exclude="**\obj\**\*.*" target="src" />
+	<file src="..\..\src\Server\**\*.cs" exclude="**\obj\**\*.*" target="src" />
+  </files>
+</package>

src/NuGetPackage/Package.nuspec → dist/nuget/Microsoft.AspNet.WebApi.MessageHandlers.Compression.nuspec

@@ -2,25 +2,14 @@
 <package >
   <metadata>
     <id>Microsoft.AspNet.WebApi.MessageHandlers.Compression</id>
-    <version>1.3.0</version>
+    <version>2.0.0</version>
     <title>Microsoft ASP.NET Web API Compression Support</title>
     <authors>Ove Andersen</authors>
     <owners>EyeCatch</owners>
     <description>
       Module for ASP.NET Web API that enables GZip and Deflate support for incoming and outgoing requests. 
 Please note that this is not an official Microsoft package.
-
-Supported Platforms:
-- .NET Framework 4.5
-- Windows 8
-- Windows Phone 8.1
-- Windows Phone Silverlight 8
-- Portable Class Libraries
     </description>
-    <releaseNotes>
-      - Added attribute for disable compression for certain routes
-- Fixed clearing of non-standard properties when compressing and decompressing
-    </releaseNotes>
     <summary>
       Module for ASP.NET Web API that enables GZip and Deflate support for incoming and outgoing requests. Please note that this is not an official Microsoft package.
     </summary>
@@ -29,19 +18,12 @@ Supported Platforms:
     <iconUrl>http://www.eyecatch.no/favicon.ico</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>http://www.eyecatch.no/licenses/apache-20/</licenseUrl>
-    <copyright>Copyright EyeCatch 2015</copyright>
+    <copyright>Copyright EyeCatch 2016</copyright>
     <dependencies>
-      <group>
-        <dependency id="Microsoft.Net.Http" version="2.2.29" />
-        <dependency id="Microsoft.Bcl.Compression" version="3.9.85" />
-      </group>
+        <dependency id="Microsoft.AspNet.WebApi.MessageHandlers.Compression.Client" version="2.0.0" />
+        <dependency id="Microsoft.AspNet.WebApi.MessageHandlers.Compression.Server" version="2.0.0" />
     </dependencies>
     <references></references>
     <tags>aspnet webapi aspnetwebapi compression gzip deflate eyecatch</tags>
   </metadata>
-  <files>
-    <file src="lib\" target="lib" />
-    <file src="tools\" target="tools" />
-    <file src="content\" target="content" />
-  </files>
 </package>

dist/nuget/System.Net.Http.Extensions.Compression.Client.nuspec

@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>System.Net.Http.Extensions.Compression.Client</id>
+    <version>2.0.0</version>
+    <title>Microsoft HTTP Client Compression Support</title>
+    <authors>Ove Andersen</authors>
+    <owners>EyeCatch</owners>
+    <description>
+      Module for Microsoft HTTP Client that enables GZip and Deflate support for incoming and outgoing requests. 
+Please note that this is not an official Microsoft package.
+    </description>
+    <summary>
+      Module for Microsoft HTTP Client that enables GZip and Deflate support for incoming and outgoing requests. Please note that this is not an official Microsoft package.
+    </summary>
+    <language>en-US</language>
+    <projectUrl>https://github.com/azzlack/Microsoft.AspNet.WebApi.MessageHandlers.Compression</projectUrl>
+    <iconUrl>http://www.eyecatch.no/favicon.ico</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <licenseUrl>http://www.eyecatch.no/licenses/apache-20/</licenseUrl>
+    <copyright>Copyright EyeCatch 2016</copyright>
+    <dependencies>
+      <group>
+        <dependency id="Microsoft.Net.Http" version="2.2.29" />
+        <dependency id="Microsoft.Bcl.Compression" version="3.9.85" />
+      </group>
+    </dependencies>
+    <references></references>
+    <tags>aspnet webapi aspnetwebapi http compression gzip deflate eyecatch</tags>
+  </metadata>
+  <files>
+	<file src="..\..\src\Client\bin\Release\System.Net.Http.Extensions.Compression.Client.dll" target="lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac" />
+	<file src="..\..\src\Client\bin\Release\System.Net.Http.Extensions.Compression.Client.pdb" target="lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac" />
+	<file src="..\..\src\Core\bin\Release\System.Net.Http.Extensions.Compression.Core.dll" target="lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac" />
+	<file src="..\..\src\Core\bin\Release\System.Net.Http.Extensions.Compression.Core.pdb" target="lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac" />
+	<file src="..\..\src\Core\**\*.cs" exclude="**\obj\**\*.*" target="src" />
+	<file src="..\..\src\Client\**\*.cs" exclude="**\obj\**\*.*" target="src" />
+  </files>
+</package>

src/Client/Client.csproj

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{56E19FF7-9AC7-48C5-9AC2-105F55AA16E1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>System.Net.Http.Extensions.Compression.Client</RootNamespace>
+    <AssemblyName>System.Net.Http.Extensions.Compression.Client</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="ClientCompressionHandler.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Core\Core.csproj">
+      <Project>{b7534554-ab6c-44ac-bf34-424dbe596216}</Project>
+      <Name>Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

src/Microsoft.AspNet.WebApi.MessageHandlers.Compression/ClientCompressionHandler.cs → src/Client/ClientCompressionHandler.cs

@@ -1,16 +1,16 @@
-namespace Microsoft.AspNet.WebApi.MessageHandlers.Compression
+namespace System.Net.Http.Extensions.Compression.Client
 {
     using System;
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Linq;
     using System.Net.Http;
+    using System.Net.Http.Extensions.Compression.Core;
+    using System.Net.Http.Extensions.Compression.Core.Interfaces;
+    using System.Net.Http.Extensions.Compression.Core.Models;
     using System.Threading;
     using System.Threading.Tasks;
 
-    using Microsoft.AspNet.WebApi.MessageHandlers.Compression.Interfaces;
-    using Microsoft.AspNet.WebApi.MessageHandlers.Compression.Models;
-
     /// <summary>
     /// Message handler for handling gzip/deflate requests/responses on a <see cref="HttpClient"/>.
     /// </summary>

src/Microsoft.AspNet.WebApi.MessageHandlers.Compression/Compressors/BaseCompressor.cs → src/Core/Compressors/BaseCompressor.cs

@@ -1,11 +1,9 @@
-namespace Microsoft.AspNet.WebApi.MessageHandlers.Compression.Compressors
+namespace System.Net.Http.Extensions.Compression.Core.Compressors
 {
-    using System;
     using System.IO;
+    using System.Net.Http.Extensions.Compression.Core.Interfaces;
     using System.Threading.Tasks;
 
-    using Microsoft.AspNet.WebApi.MessageHandlers.Compression.Interfaces;
-
     /// <summary>
     /// Base compressor for compressing streams.
     /// </summary>

src/Microsoft.AspNet.WebApi.MessageHandlers.Compression/Compressors/DeflateCompressor.cs → src/Core/Compressors/DeflateCompressor.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.AspNet.WebApi.MessageHandlers.Compression.Compressors
+namespace System.Net.Http.Extensions.Compression.Core.Compressors
 {
     using System.IO;
     using System.IO.Compression;

src/Microsoft.AspNet.WebApi.MessageHandlers.Compression/Compressors/GZipCompressor.cs → src/Core/Compressors/GZipCompressor.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.AspNet.WebApi.MessageHandlers.Compression.Compressors
+namespace System.Net.Http.Extensions.Compression.Core.Compressors
 {
     using System.IO;
     using System.IO.Compression;

src/Core/Core.csproj

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{B7534554-AB6C-44AC-BF34-424DBE596216}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>System.Net.Http.Extensions.Compression.Core</RootNamespace>
+    <AssemblyName>System.Net.Http.Extensions.Compression.Core</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Compressors\BaseCompressor.cs" />
+    <Compile Include="Compressors\DeflateCompressor.cs" />
+    <Compile Include="Compressors\GZipCompressor.cs" />
+    <Compile Include="HttpContentOperations.cs" />
+    <Compile Include="Interfaces\ICompressor.cs" />
+    <Compile Include="Models\CompressedContent.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Net.Http">
+      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\System.Net.Http.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

src/Microsoft.AspNet.WebApi.MessageHandlers.Compression/HttpContentOperations.cs → src/Core/HttpContentOperations.cs

@@ -1,13 +1,12 @@
-namespace Microsoft.AspNet.WebApi.MessageHandlers.Compression
+namespace System.Net.Http.Extensions.Compression.Core
 {
     using System;
     using System.Diagnostics;
     using System.IO;
     using System.Net.Http;
+    using System.Net.Http.Extensions.Compression.Core.Interfaces;
     using System.Threading.Tasks;
 
-    using Microsoft.AspNet.WebApi.MessageHandlers.Compression.Interfaces;
-
     /// <summary>
     /// Helper methods for operating on <see cref="HttpContent"/> instances.
     /// </summary>

src/Microsoft.AspNet.WebApi.MessageHandlers.Compression/Interfaces/ICompressor.cs → src/Core/Interfaces/ICompressor.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.AspNet.WebApi.MessageHandlers.Compression.Interfaces
+namespace System.Net.Http.Extensions.Compression.Core.Interfaces
 {
     using System.IO;
     using System.Threading.Tasks;

src/Microsoft.AspNet.WebApi.MessageHandlers.Compression/Models/CompressedContent.cs → src/Core/Models/CompressedContent.cs

@@ -1,15 +1,14 @@
-namespace Microsoft.AspNet.WebApi.MessageHandlers.Compression.Models
+namespace System.Net.Http.Extensions.Compression.Core.Models
 {
     using System;
     using System.Diagnostics;
     using System.IO;
     using System.Linq;
     using System.Net;
     using System.Net.Http;
+    using System.Net.Http.Extensions.Compression.Core.Interfaces;
     using System.Threading.Tasks;
 
-    using Microsoft.AspNet.WebApi.MessageHandlers.Compression.Interfaces;
-
     /// <summary>
     /// Represents compressed HTTP content.
     /// </summary>

src/Core/Properties/AssemblyInfo.cs

@@ -0,0 +1,30 @@
+using System.Resources;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Core")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Core")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]