From c11459faf3352394a571265ade6c42e241bcf098 Mon Sep 17 00:00:00 2001
From: monojenkins <jo.shields+jenkins@xamarin.com>
Date: Thu, 5 Jan 2017 17:36:22 +0100
Subject: [PATCH] [msvc] Update csproj files (#4207)

---
 .../System.IO.Compression-net_4_x.csproj      | 128 +++++-------------
 mcs/class/System/System-bare-net_4_x.csproj   |   3 +-
 mcs/class/System/System-net_4_x.csproj        |   3 +-
 mcs/class/System/System-secxml-net_4_x.csproj |   3 +-
 msvc/scripts/order.xml                        |   2 +-
 5 files changed, 38 insertions(+), 101 deletions(-)

diff --git a/mcs/class/System.IO.Compression/System.IO.Compression-net_4_x.csproj b/mcs/class/System.IO.Compression/System.IO.Compression-net_4_x.csproj
index 2b43b04be5e..c5df37fb0fa 100644
--- a/mcs/class/System.IO.Compression/System.IO.Compression-net_4_x.csproj
+++ b/mcs/class/System.IO.Compression/System.IO.Compression-net_4_x.csproj
@@ -15,7 +15,7 @@
     <NoStdLib>True</NoStdLib>
     
     <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>
     </RootNamespace>
@@ -49,100 +49,38 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\Crc32Helper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\BlockType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\CopyEncoder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\DeflateInput.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\DeflateManagedStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\DeflaterManaged.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\FastEncoder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\FastEncoderStatus.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\FastEncoderWindow.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\FileFormats.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\HuffmanTree.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\InflaterManaged.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\InflaterState.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\InputBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\Match.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\MatchState.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\OutputBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\OutputWindow.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\PositionPreservingWriteOnlyStreamWrapper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\ZipArchive.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\ZipArchiveEntry.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\ZipArchiveMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\ZipBlocks.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\ZipCustomStreams.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\ZipHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\ZipVersion.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="..\..\build\common\SR.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="SharpCompress\Archive\AbstractArchive.cs" />
-    <Compile Include="SharpCompress\Archive\AbstractWritableArchive.cs" />
-    <Compile Include="SharpCompress\Archive\AbstractWritableArchive.Extensions.cs" />
-    <Compile Include="SharpCompress\Archive\ArchiveFactory.cs" />
-    <Compile Include="SharpCompress\Archive\IArchive.cs" />
-    <Compile Include="SharpCompress\Archive\IArchive.Extensions.cs" />
-    <Compile Include="SharpCompress\Archive\IArchiveEntry.cs" />
-    <Compile Include="SharpCompress\Archive\IArchiveEntry.Extensions.cs" />
-    <Compile Include="SharpCompress\Archive\IArchiveExtractionListener.cs" />
-    <Compile Include="SharpCompress\Archive\IWritableArchiveEntry.cs" />
-    <Compile Include="SharpCompress\Archive\Zip\ZipArchive.cs" />
-    <Compile Include="SharpCompress\Archive\Zip\ZipArchiveEntry.cs" />
-    <Compile Include="SharpCompress\Archive\Zip\ZipWritableArchiveEntry.cs" />
-    <Compile Include="SharpCompress\Common\ArchiveEncoding.cs" />
-    <Compile Include="SharpCompress\Common\ArchiveException.cs" />
-    <Compile Include="SharpCompress\Common\ArchiveExtractionEventArgs.cs" />
-    <Compile Include="SharpCompress\Common\ArchiveType.cs" />
-    <Compile Include="SharpCompress\Common\CompressedBytesReadEventArgs.cs" />
-    <Compile Include="SharpCompress\Common\CompressionInfo.cs" />
-    <Compile Include="SharpCompress\Common\CompressionType.cs" />
-    <Compile Include="SharpCompress\Common\CryptographicException.cs" />
-    <Compile Include="SharpCompress\Common\Entry.cs" />
-    <Compile Include="SharpCompress\Common\EntryStream.cs" />
-    <Compile Include="SharpCompress\Common\ExtractionException.cs" />
-    <Compile Include="SharpCompress\Common\ExtractOptions.cs" />
-    <Compile Include="SharpCompress\Common\FilePart.cs" />
-    <Compile Include="SharpCompress\Common\FilePartExtractionBeginEventArgs.cs" />
-    <Compile Include="SharpCompress\Common\FlagUtility.cs" />
-    <Compile Include="SharpCompress\Common\IEntry.cs" />
-    <Compile Include="SharpCompress\Common\IExtractionListener.cs" />
-    <Compile Include="SharpCompress\Common\IncompleteArchiveException.cs" />
-    <Compile Include="SharpCompress\Common\InvalidFormatException.cs" />
-    <Compile Include="SharpCompress\Common\IVolume.cs" />
-    <Compile Include="SharpCompress\Common\MultipartStreamRequiredException.cs" />
-    <Compile Include="SharpCompress\Common\MultiVolumeExtractionException.cs" />
-    <Compile Include="SharpCompress\Common\Options.cs" />
-    <Compile Include="SharpCompress\Common\PasswordProtectedException.cs" />
-    <Compile Include="SharpCompress\Common\Volume.cs" />
-    <Compile Include="SharpCompress\Common\Zip\Headers\DirectoryEndHeader.cs" />
-    <Compile Include="SharpCompress\Common\Zip\Headers\DirectoryEntryHeader.cs" />
-    <Compile Include="SharpCompress\Common\Zip\Headers\HeaderFlags.cs" />
-    <Compile Include="SharpCompress\Common\Zip\Headers\IgnoreHeader.cs" />
-    <Compile Include="SharpCompress\Common\Zip\Headers\LocalEntryHeader.cs" />
-    <Compile Include="SharpCompress\Common\Zip\Headers\SplitHeader.cs" />
-    <Compile Include="SharpCompress\Common\Zip\Headers\ZipFileEntry..cs" />
-    <Compile Include="SharpCompress\Common\Zip\Headers\ZipHeader.cs" />
-    <Compile Include="SharpCompress\Common\Zip\Headers\ZipHeaderType.cs" />
-    <Compile Include="SharpCompress\Common\Zip\PkwareTraditionalCryptoStream.cs" />
-    <Compile Include="SharpCompress\Common\Zip\PkwareTraditionalEncryptionData.cs" />
-    <Compile Include="SharpCompress\Common\Zip\SeekableZipFilePart.cs" />
-    <Compile Include="SharpCompress\Common\Zip\SeekableZipHeaderFactory.cs" />
-    <Compile Include="SharpCompress\Common\Zip\StreamingZipFilePart.cs" />
-    <Compile Include="SharpCompress\Common\Zip\StreamingZipHeaderFactory.cs" />
-    <Compile Include="SharpCompress\Common\Zip\WinzipAesCryptoStream.cs" />
-    <Compile Include="SharpCompress\Common\Zip\WinzipAesEncryptionData.cs" />
-    <Compile Include="SharpCompress\Common\Zip\WinzipAesKeySize.cs" />
-    <Compile Include="SharpCompress\Common\Zip\ZipCompressionMethod.cs" />
-    <Compile Include="SharpCompress\Common\Zip\ZipEntry.cs" />
-    <Compile Include="SharpCompress\Common\Zip\ZipFilePart.cs" />
-    <Compile Include="SharpCompress\Common\Zip\ZipHeaderFactory.cs" />
-    <Compile Include="SharpCompress\Common\Zip\ZipVolume.cs" />
-    <Compile Include="SharpCompress\Compressor\CompressionMode.cs" />
-    <Compile Include="SharpCompress\Compressor\Deflate\CRC32.cs" />
-    <Compile Include="SharpCompress\Compressor\Deflate\ZlibBase.cs" />
-    <Compile Include="SharpCompress\EnumExtensions.cs" />
-    <Compile Include="SharpCompress\IO\AppendingStream.cs" />
-    <Compile Include="SharpCompress\IO\CountingWritableSubStream.cs" />
-    <Compile Include="SharpCompress\IO\ListeningStream.cs" />
-    <Compile Include="SharpCompress\IO\MarkingBinaryReader.cs" />
-    <Compile Include="SharpCompress\IO\NonDisposingStream.cs" />
-    <Compile Include="SharpCompress\IO\ReadOnlySubStream.cs" />
-    <Compile Include="SharpCompress\IO\RewindableStream.cs" />
-    <Compile Include="SharpCompress\IO\StreamingMode.cs" />
-    <Compile Include="SharpCompress\LazyReadOnlyCollection.cs" />
-    <Compile Include="SharpCompress\Reader\AbstractReader.cs" />
-    <Compile Include="SharpCompress\Reader\IReader.cs" />
-    <Compile Include="SharpCompress\Reader\IReader.Extensions.cs" />
-    <Compile Include="SharpCompress\Reader\ReaderFactory.cs" />
-    <Compile Include="SharpCompress\Reader\Zip\ZipReader.cs" />
-    <Compile Include="SharpCompress\ReadOnlyCollection.cs" />
-    <Compile Include="SharpCompress\Utility.cs" />
-    <Compile Include="SharpCompress\Writer\AbstractWriter.cs" />
-    <Compile Include="SharpCompress\Writer\IWriter.cs" />
-    <Compile Include="SharpCompress\Writer\IWriter.Extensions.cs" />
-    <Compile Include="SharpCompress\Writer\WriterFactory.cs" />
-    <Compile Include="SharpCompress\Writer\Zip\ZipCentralDirectoryEntry.cs" />
-    <Compile Include="SharpCompress\Writer\Zip\ZipWriter.cs" />
-    <Compile Include="TypeForwarders.cs" />
-    <Compile Include="ZipArchive.cs" />
-    <Compile Include="ZipArchiveEntry.cs" />
-    <Compile Include="ZipArchiveMode.cs" />
  </ItemGroup>
+    <Compile Include="corefx\SR.cs" />
+    <Compile Include="corefx\ZipArchiveEntry.Mono.cs" />
+    <Compile Include="TypeForwarders.cs" />
  </ItemGroup>
   <!-- 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">
@@ -173,10 +111,6 @@
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.Core/System.Core-net_4_x.csproj">
-      <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
-      <Name>System.Core-net_4_x</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/mcs/class/System/System-bare-net_4_x.csproj b/mcs/class/System/System-bare-net_4_x.csproj
index 528e1b60eb0..04751d29877 100644
--- a/mcs/class/System/System-bare-net_4_x.csproj
+++ b/mcs/class/System/System-bare-net_4_x.csproj
@@ -51,6 +51,7 @@
   <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\CompressionLevel.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\CompressionMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\GZipStream.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
     <Compile Include="..\referencesource\System\compmod\microsoft\win32\safehandles\SafeProcessHandle.cs" />
     <Compile Include="..\referencesource\System\compmod\system\codedom\CodeArgumentReferenceExpression.cs" />
@@ -727,6 +728,7 @@
     <Compile Include="..\referencesource\System\sys\system\threading\semaphore.cs" />
     <Compile Include="..\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="corefx\ZLibNative.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />
@@ -982,7 +984,6 @@
     <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />
     <Compile Include="System.Diagnostics\Win32EventLog.cs" />
     <Compile Include="System.IO.Compression\DeflateStream.cs" />
-    <Compile Include="System.IO.Compression\GZipStream.cs" />
     <Compile Include="System.IO.Ports\Handshake.cs" />
     <Compile Include="System.IO.Ports\ISerialStream.cs" />
     <Compile Include="System.IO.Ports\Parity.cs" />
diff --git a/mcs/class/System/System-net_4_x.csproj b/mcs/class/System/System-net_4_x.csproj
index 90a8fe81a87..94c14468146 100644
--- a/mcs/class/System/System-net_4_x.csproj
+++ b/mcs/class/System/System-net_4_x.csproj
@@ -51,6 +51,7 @@
   <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\CompressionLevel.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\CompressionMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\GZipStream.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
     <Compile Include="..\referencesource\System\compmod\microsoft\win32\safehandles\SafeProcessHandle.cs" />
     <Compile Include="..\referencesource\System\compmod\system\codedom\CodeArgumentReferenceExpression.cs" />
@@ -727,6 +728,7 @@
     <Compile Include="..\referencesource\System\sys\system\threading\semaphore.cs" />
     <Compile Include="..\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="corefx\ZLibNative.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />
@@ -982,7 +984,6 @@
     <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />
     <Compile Include="System.Diagnostics\Win32EventLog.cs" />
     <Compile Include="System.IO.Compression\DeflateStream.cs" />
-    <Compile Include="System.IO.Compression\GZipStream.cs" />
     <Compile Include="System.IO.Ports\Handshake.cs" />
     <Compile Include="System.IO.Ports\ISerialStream.cs" />
     <Compile Include="System.IO.Ports\Parity.cs" />
diff --git a/mcs/class/System/System-secxml-net_4_x.csproj b/mcs/class/System/System-secxml-net_4_x.csproj
index 2e935ca7623..3f8c87214f2 100644
--- a/mcs/class/System/System-secxml-net_4_x.csproj
+++ b/mcs/class/System/System-secxml-net_4_x.csproj
@@ -51,6 +51,7 @@
   <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\CompressionLevel.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\CompressionMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\GZipStream.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
     <Compile Include="..\referencesource\System\compmod\microsoft\win32\safehandles\SafeProcessHandle.cs" />
     <Compile Include="..\referencesource\System\compmod\system\codedom\CodeArgumentReferenceExpression.cs" />
@@ -727,6 +728,7 @@
     <Compile Include="..\referencesource\System\sys\system\threading\semaphore.cs" />
     <Compile Include="..\referencesource\System\sys\system\windows\markup\ValueSerializerAttribute.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="corefx\ZLibNative.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeCompiler.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />
     <Compile Include="Microsoft.CSharp\CSharpCodeProvider.cs" />
@@ -982,7 +984,6 @@
     <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />
     <Compile Include="System.Diagnostics\Win32EventLog.cs" />
     <Compile Include="System.IO.Compression\DeflateStream.cs" />
-    <Compile Include="System.IO.Compression\GZipStream.cs" />
     <Compile Include="System.IO.Ports\Handshake.cs" />
     <Compile Include="System.IO.Ports\ISerialStream.cs" />
     <Compile Include="System.IO.Ports\Parity.cs" />
diff --git a/msvc/scripts/order.xml b/msvc/scripts/order.xml
index c9c01556d76..0a287ea5066 100644
--- a/msvc/scripts/order.xml
+++ b/msvc/scripts/order.xml
@@ -1289,7 +1289,7 @@
     </project>
     <project dir="class/System.IO.Compression" library="System.IO.Compression-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll /debug:portable -optimize /unsafe -r:./../../class/lib/net_4_x/System.dll -r:./../../class/lib/net_4_x/System.Core.dll</flags>
+      <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll /debug:portable -optimize -r:./../../class/lib/net_4_x/System.dll</flags>
       <output>System.IO.Compression.dll</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/net_4_x/System.IO.Compression.dll</library_output>
-- 
2.25.1