diff --git a/ICSharpCode.SharpZLib.sln b/ICSharpCode.SharpZLib.sln
index c9f73d9ee..f47aae14b 100644
--- a/ICSharpCode.SharpZLib.sln
+++ b/ICSharpCode.SharpZLib.sln
@@ -1,24 +1,24 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZLib", "src\ICSharpCode.SharpZLib.csproj", "{F880FC22-D7F9-44F4-BD42-9148468AF25F}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpZipLibTests", "tests\SharpZipLibTests.csproj", "{4F9BF21E-A7FC-4005-A1C7-A17108F7010D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZLib", "src\ICSharpCode.SharpZLib.csproj", "{18D20629-913A-4474-B2D1-643290E14ED7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F880FC22-D7F9-44F4-BD42-9148468AF25F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F880FC22-D7F9-44F4-BD42-9148468AF25F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F880FC22-D7F9-44F4-BD42-9148468AF25F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F880FC22-D7F9-44F4-BD42-9148468AF25F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4F9BF21E-A7FC-4005-A1C7-A17108F7010D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4F9BF21E-A7FC-4005-A1C7-A17108F7010D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4F9BF21E-A7FC-4005-A1C7-A17108F7010D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F9BF21E-A7FC-4005-A1C7-A17108F7010D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18D20629-913A-4474-B2D1-643290E14ED7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18D20629-913A-4474-B2D1-643290E14ED7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18D20629-913A-4474-B2D1-643290E14ED7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18D20629-913A-4474-B2D1-643290E14ED7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/samples/cs/CreateZipFile/AssemblyInfo.cs b/samples/cs/CreateZipFile/AssemblyInfo.cs
index 5f58e6c49..d3f712e72 100644
--- a/samples/cs/CreateZipFile/AssemblyInfo.cs
+++ b/samples/cs/CreateZipFile/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("0.85.1.270")]
+[assembly: AssemblyVersion("0.85.1.271")]
 
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
diff --git a/samples/cs/FastZip/AssemblyInfo.cs b/samples/cs/FastZip/AssemblyInfo.cs
index 3749cc46f..6ed0bf436 100644
--- a/samples/cs/FastZip/AssemblyInfo.cs
+++ b/samples/cs/FastZip/AssemblyInfo.cs
@@ -23,7 +23,7 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("0.85.1.270")]
+[assembly: AssemblyVersion("0.85.1.271")]
 
 // The following attributes specify the key for the sign of your assembly. See the
 // .NET Framework documentation for more information about signing.
diff --git a/samples/cs/minibzip2/AssemblyInfo.cs b/samples/cs/minibzip2/AssemblyInfo.cs
index 521965371..52d9bfc8e 100644
--- a/samples/cs/minibzip2/AssemblyInfo.cs
+++ b/samples/cs/minibzip2/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("0.85.1.270")]
+[assembly: AssemblyVersion("0.85.1.271")]
 
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
diff --git a/samples/cs/minigzip/AssemblyInfo.cs b/samples/cs/minigzip/AssemblyInfo.cs
index 521965371..52d9bfc8e 100644
--- a/samples/cs/minigzip/AssemblyInfo.cs
+++ b/samples/cs/minigzip/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("0.85.1.270")]
+[assembly: AssemblyVersion("0.85.1.271")]
 
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
diff --git a/samples/cs/sz/AssemblyInfo.cs b/samples/cs/sz/AssemblyInfo.cs
index 4d977f3f5..7fcb93595 100644
--- a/samples/cs/sz/AssemblyInfo.cs
+++ b/samples/cs/sz/AssemblyInfo.cs
@@ -23,7 +23,7 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("0.85.1.270")]
+[assembly: AssemblyVersion("0.85.1.271")]
 
 // The following attributes specify the key for the sign of your assembly. See the
 // .NET Framework documentation for more information about signing.
diff --git a/samples/cs/tar/AssemblyInfo.cs b/samples/cs/tar/AssemblyInfo.cs
index 428311597..f2ad4e1d3 100644
--- a/samples/cs/tar/AssemblyInfo.cs
+++ b/samples/cs/tar/AssemblyInfo.cs
@@ -23,7 +23,7 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("0.85.1.270")]
+[assembly: AssemblyVersion("0.85.1.271")]
 
 // The following attributes specify the key for the sign of your assembly. See the
 // .NET Framework documentation for more information about signing.
diff --git a/samples/cs/zf/AssemblyInfo.cs b/samples/cs/zf/AssemblyInfo.cs
index dd0d7e513..0b29de2cf 100644
--- a/samples/cs/zf/AssemblyInfo.cs
+++ b/samples/cs/zf/AssemblyInfo.cs
@@ -26,7 +26,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.85.1.270")]
+[assembly: AssemblyVersion("0.85.1.271")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs
index 896769121..67a85563d 100644
--- a/src/AssemblyInfo.cs
+++ b/src/AssemblyInfo.cs
@@ -49,7 +49,7 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("0.85.1.270")]
+[assembly: AssemblyVersion("0.85.1.271")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
diff --git a/src/ICSharpCode.SharpZLib.csproj b/src/ICSharpCode.SharpZLib.csproj
new file mode 100644
index 000000000..0ada806b1
--- /dev/null
+++ b/src/ICSharpCode.SharpZLib.csproj
@@ -0,0 +1,107 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{18D20629-913A-4474-B2D1-643290E14ED7}</ProjectGuid>
+    <RootNamespace>ICSharpCode.SharpZipLib</RootNamespace>
+    <AssemblyName>ICSharpCode.SharpZipLib</AssemblyName>
+    <OutputType>Library</OutputType>
+    <WarningLevel>4</WarningLevel>
+    <NoStdLib>False</NoStdLib>
+    <NoConfig>False</NoConfig>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\ICSharpCode.SharpZipLib.key</AssemblyOriginatorKeyFile>
+    <DelaySign>False</DelaySign>
+    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>False</DebugSymbols>
+    <Optimize>True</Optimize>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>NET_VER_1</DefineConstants>
+    <OutputPath>..\bin\</OutputPath>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <Optimize>False</Optimize>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <OutputPath>..\bin\</OutputPath>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <DebugType>Full</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs" />
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Checksums\IChecksum.cs" />
+    <Compile Include="Checksums\Adler32.cs" />
+    <Compile Include="Checksums\Crc32.cs" />
+    <Compile Include="Zip\ZipEntry.cs" />
+    <Compile Include="Zip\ZipInputStream.cs" />
+    <Compile Include="Zip\ZipOutputStream.cs" />
+    <Compile Include="Zip\ZipConstants.cs" />
+    <Compile Include="Zip\ZipFile.cs" />
+    <Compile Include="GZip\GZipOutputStream.cs" />
+    <Compile Include="GZip\GZipInputStream.cs" />
+    <Compile Include="GZip\GZipConstants.cs" />
+    <Compile Include="Zip\ZipException.cs" />
+    <Compile Include="BZip2\BZip2InputStream.cs" />
+    <Compile Include="BZip2\BZip2OutputStream.cs" />
+    <Compile Include="BZip2\BZip2Constants.cs" />
+    <Compile Include="BZip2\BZip2.cs" />
+    <Compile Include="Checksums\StrangeCrc.cs" />
+    <Compile Include="Tar\TarEntry.cs" />
+    <Compile Include="Tar\TarHeader.cs" />
+    <Compile Include="Tar\TarBuffer.cs" />
+    <Compile Include="Tar\TarOutputStream.cs" />
+    <Compile Include="Tar\InvalidHeaderException.cs" />
+    <Compile Include="Tar\TarInputStream.cs" />
+    <Compile Include="Tar\TarArchive.cs" />
+    <Compile Include="Zip\Compression\PendingBuffer.cs" />
+    <Compile Include="Zip\Compression\InflaterDynHeader.cs" />
+    <Compile Include="Zip\Compression\InflaterHuffmanTree.cs" />
+    <Compile Include="Zip\Compression\DeflaterPending.cs" />
+    <Compile Include="Zip\Compression\DeflaterHuffman.cs" />
+    <Compile Include="Zip\Compression\DeflaterEngine.cs" />
+    <Compile Include="Zip\Compression\Inflater.cs" />
+    <Compile Include="Zip\Compression\DeflaterConstants.cs" />
+    <Compile Include="Zip\Compression\Deflater.cs" />
+    <Compile Include="Zip\Compression\Streams\DeflaterOutputStream.cs" />
+    <Compile Include="Zip\Compression\Streams\InflaterInputStream.cs" />
+    <Compile Include="Zip\Compression\Streams\StreamManipulator.cs" />
+    <Compile Include="Zip\Compression\Streams\OutputWindow.cs" />
+    <Compile Include="SharpZipBaseException.cs" />
+    <Compile Include="Tar\TarException.cs" />
+    <Compile Include="GZip\GZipException.cs" />
+    <Compile Include="BZip2\BZip2Exception.cs" />
+    <Compile Include="Core\NameFilter.cs" />
+    <Compile Include="Zip\FastZip.cs" />
+    <Compile Include="Core\FileSystemScanner.cs" />
+    <Compile Include="Core\PathFilter.cs" />
+    <Compile Include="Core\INameTransform.cs" />
+    <Compile Include="Zip\ZipNameTransform.cs" />
+    <Compile Include="Encryption\PkzipClassic.cs" />
+    <Compile Include="Core\IScanFilter.cs" />
+    <Compile Include="Zip\ZipHelperStream.cs" />
+    <Compile Include="Zip\ZipExtraData.cs" />
+    <Compile Include="Core\StreamUtils.cs" />
+    <Compile Include="Zip\ZipEntryFactory.cs" />
+    <Compile Include="Zip\IEntryFactory.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+</Project>
\ No newline at end of file
diff --git a/tests/AssemblyInfo.cs b/tests/AssemblyInfo.cs
index e70c49675..15696f0ba 100644
--- a/tests/AssemblyInfo.cs
+++ b/tests/AssemblyInfo.cs
@@ -23,7 +23,7 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("0.85.1.270")]
+[assembly: AssemblyVersion("0.85.1.271")]
 
 // The following attributes specify the key for the sign of your assembly. See the
 // .NET Framework documentation for more information about signing.
diff --git a/tests/SharpZipLibTests.csproj b/tests/SharpZipLibTests.csproj
new file mode 100644
index 000000000..a4faded1e
--- /dev/null
+++ b/tests/SharpZipLibTests.csproj
@@ -0,0 +1,62 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4F9BF21E-A7FC-4005-A1C7-A17108F7010D}</ProjectGuid>
+    <RootNamespace>SharpZipLibTests</RootNamespace>
+    <AssemblyName>SharpZipLibTests</AssemblyName>
+    <OutputType>Library</OutputType>
+    <WarningLevel>4</WarningLevel>
+    <NoStdLib>False</NoStdLib>
+    <NoConfig>False</NoConfig>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <Optimize>False</Optimize>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <OutputPath>bin\Debug\</OutputPath>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <DebugType>Full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>False</DebugSymbols>
+    <Optimize>True</Optimize>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <OutputPath>bin\Release\</OutputPath>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="nunit.framework">
+      <HintPath>..\Nunit\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Zip\ZipTests.cs" />
+    <Compile Include="BZip2\Bzip2Tests.cs" />
+    <Compile Include="GZip\GZipTests.cs" />
+    <Compile Include="Tar\TarTests.cs" />
+    <Compile Include="Base\InflaterDeflaterTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\src\ICSharpCode.SharpZLib.csproj">
+      <Project>{18D20629-913A-4474-B2D1-643290E14ED7}</Project>
+      <Name>ICSharpCode.SharpZLib</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+</Project>
\ No newline at end of file