From d9c31dace889f59a829158258b5fd09282ccedf5 Mon Sep 17 00:00:00 2001
From: Adam Hathcock <adam.hathcock@autodesk.com>
Date: Fri, 12 Jun 2015 11:31:04 +0100
Subject: [PATCH] Fixing lingering build issues

---
 SharpCompress/AssemblyInfo.cs                     | 14 ++++++--------
 SharpCompress/Common/ReaderExtractionEventArgs.cs |  8 ++------
 SharpCompress/SharpCompress.Portable.csproj       |  7 ++++++-
 SharpCompress/SharpCompress.PortableTest.csproj   |  3 +--
 SharpCompress/SharpCompress.WindowsStore.csproj   |  5 ++++-
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/SharpCompress/AssemblyInfo.cs b/SharpCompress/AssemblyInfo.cs
index adab8935..e6a12407 100644
--- a/SharpCompress/AssemblyInfo.cs
+++ b/SharpCompress/AssemblyInfo.cs
@@ -2,6 +2,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
+
 #if PORTABLE
 [assembly: AssemblyTitle("SharpCompress.Portable")]
 [assembly: AssemblyProduct("SharpCompress.Portable")]
@@ -9,14 +10,11 @@ using System.Runtime.CompilerServices;
 
 [assembly: AssemblyTitle("SharpCompress")]
 [assembly: AssemblyProduct("SharpCompress")]
-[assembly:
-    InternalsVisibleTo(
-        "SharpCompress.Test"
-        )]
-[assembly:
-InternalsVisibleTo(
-        "SharpCompress.Test.Portable"
-        )]
+#endif
+
+#if !NET2 && !PORTABLE && !NETFX_CORE
+[assembly: InternalsVisibleTo("SharpCompress.Test")]
+[assembly: InternalsVisibleTo("SharpCompress.Test.Portable")]
 #endif
 
 [assembly: CLSCompliant(true)]
diff --git a/SharpCompress/Common/ReaderExtractionEventArgs.cs b/SharpCompress/Common/ReaderExtractionEventArgs.cs
index 1820c49b..2dc33e6e 100644
--- a/SharpCompress/Common/ReaderExtractionEventArgs.cs
+++ b/SharpCompress/Common/ReaderExtractionEventArgs.cs
@@ -1,17 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
 
 namespace SharpCompress.Common
 {
-    public class ReaderExtractionEventArgs<T>:EventArgs
+    public class ReaderExtractionEventArgs<T> : EventArgs
     {
         internal ReaderExtractionEventArgs(T entry)
         {
             Item = entry;
-        } 
+        }
         public T Item { get; private set; }
     }
 }
diff --git a/SharpCompress/SharpCompress.Portable.csproj b/SharpCompress/SharpCompress.Portable.csproj
index ead5b9b9..240c14ad 100644
--- a/SharpCompress/SharpCompress.Portable.csproj
+++ b/SharpCompress/SharpCompress.Portable.csproj
@@ -128,6 +128,7 @@
     <Compile Include="Common\Rar\RarFilePart.cs" />
     <Compile Include="Common\Rar\RarRijndael.Portable.cs" />
     <Compile Include="Common\Rar\RarVolume.cs" />
+    <Compile Include="Common\ReaderExtractionEventArgs.cs" />
     <Compile Include="Common\SevenZip\ArchiveDatabase.cs" />
     <Compile Include="Common\SevenZip\ArchiveReader.cs" />
     <Compile Include="Common\SevenZip\CBindPair.cs" />
@@ -147,6 +148,7 @@
     <Compile Include="Common\Tar\TarReadOnlySubStream.cs" />
     <Compile Include="Common\Tar\TarVolume.cs" />
     <Compile Include="Common\Volume.cs" />
+    <Compile Include="Common\Zip\Headers\LocalEntryHeaderExtraFactory.cs" />
     <Compile Include="Common\Zip\WinzipAesCryptoStream.Portable.cs" />
     <Compile Include="Common\Zip\Headers\DirectoryEndHeader.cs" />
     <Compile Include="Common\Zip\Headers\DirectoryEntryHeader.cs" />
@@ -154,7 +156,7 @@
     <Compile Include="Common\Zip\Headers\IgnoreHeader.cs" />
     <Compile Include="Common\Zip\Headers\LocalEntryHeader.cs" />
     <Compile Include="Common\Zip\Headers\SplitHeader.cs" />
-    <Compile Include="Common\Zip\Headers\ZipFileEntry..cs" />
+    <Compile Include="Common\Zip\Headers\ZipFileEntry.cs" />
     <Compile Include="Common\Zip\Headers\ZipHeader.cs" />
     <Compile Include="Common\Zip\Headers\ZipHeaderType.cs" />
     <Compile Include="Common\Zip\PkwareTraditionalCryptoStream.cs" />
@@ -297,6 +299,9 @@
     <Compile Include="Reader\GZip\GZipReader.cs" />
     <Compile Include="Reader\IReader.cs" />
     <Compile Include="Reader\IReader.Extensions.cs" />
+    <Compile Include="Reader\IReaderExtractionListener.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Reader\Rar\MultiVolumeRarReader.cs" />
     <Compile Include="Reader\Rar\NonSeekableStreamFilePart.cs" />
     <Compile Include="Reader\Rar\RarReader.cs" />
diff --git a/SharpCompress/SharpCompress.PortableTest.csproj b/SharpCompress/SharpCompress.PortableTest.csproj
index f31799e3..4cc0ed70 100644
--- a/SharpCompress/SharpCompress.PortableTest.csproj
+++ b/SharpCompress/SharpCompress.PortableTest.csproj
@@ -91,7 +91,6 @@
     <Compile Include="Common\ArchiveEncoding.cs" />
     <Compile Include="Archive\AbstractWritableArchive.cs" />
     <Compile Include="Archive\AbstractArchive.cs" />
-    <Compile Include="Archive\AbstractWritableArchive.Extensions.cs" />
     <Compile Include="Archive\ArchiveFactory.cs" />
     <Compile Include="Archive\GZip\GZipWritableArchiveEntry.cs" />
     <Compile Include="Archive\IArchive.Extensions.cs" />
@@ -398,4 +397,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/SharpCompress/SharpCompress.WindowsStore.csproj b/SharpCompress/SharpCompress.WindowsStore.csproj
index 974b4ceb..0dbb616c 100644
--- a/SharpCompress/SharpCompress.WindowsStore.csproj
+++ b/SharpCompress/SharpCompress.WindowsStore.csproj
@@ -114,6 +114,7 @@
     <Compile Include="Common\Rar\RarFilePart.cs" />
     <Compile Include="Common\Rar\RarRijndael.Portable.cs" />
     <Compile Include="Common\Rar\RarVolume.cs" />
+    <Compile Include="Common\ReaderExtractionEventArgs.cs" />
     <Compile Include="Common\SevenZip\ArchiveDatabase.cs" />
     <Compile Include="Common\SevenZip\ArchiveReader.cs" />
     <Compile Include="Common\SevenZip\CBindPair.cs" />
@@ -138,8 +139,9 @@
     <Compile Include="Common\Zip\Headers\HeaderFlags.cs" />
     <Compile Include="Common\Zip\Headers\IgnoreHeader.cs" />
     <Compile Include="Common\Zip\Headers\LocalEntryHeader.cs" />
+    <Compile Include="Common\Zip\Headers\LocalEntryHeaderExtraFactory.cs" />
     <Compile Include="Common\Zip\Headers\SplitHeader.cs" />
-    <Compile Include="Common\Zip\Headers\ZipFileEntry..cs" />
+    <Compile Include="Common\Zip\Headers\ZipFileEntry.cs" />
     <Compile Include="Common\Zip\Headers\ZipHeader.cs" />
     <Compile Include="Common\Zip\Headers\ZipHeaderType.cs" />
     <Compile Include="Common\Zip\PkwareTraditionalCryptoStream.cs" />
@@ -284,6 +286,7 @@
     <Compile Include="Reader\GZip\GZipReader.cs" />
     <Compile Include="Reader\IReader.cs" />
     <Compile Include="Reader\IReader.Extensions.cs" />
+    <Compile Include="Reader\IReaderExtractionListener.cs" />
     <Compile Include="Reader\Rar\MultiVolumeRarReader.cs" />
     <Compile Include="Reader\Rar\NonSeekableStreamFilePart.cs" />
     <Compile Include="Reader\Rar\RarReader.cs" />