From c32705dda3c803d59eb80549bfeaeb3cef049bd9 Mon Sep 17 00:00:00 2001
From: monojenkins <jo.shields+jenkins@xamarin.com>
Date: Tue, 25 Oct 2016 04:51:24 +0000
Subject: [PATCH] [msvc] Update csproj files

---
 .../Facades_System.Diagnostics.Tracing-net_4_x.csproj         | 1 -
 .../Facades_System.Net.Sockets-net_4_x.csproj                 | 3 ---
 mcs/class/System.Core/System.Core-net_4_x.csproj              | 1 -
 mcs/class/System.Core/System.Core-plaincore-net_4_x.csproj    | 1 -
 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 +++
 mcs/class/corlib/corlib-net_4_x.csproj                        | 2 ++
 mcs/tools/mkbundle/mkbundle-net_4_x.csproj                    | 4 ++++
 msvc/scripts/order.xml                                        | 2 +-
 10 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing-net_4_x.csproj b/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing-net_4_x.csproj
index e743ee19c29..8e7866cdebb 100644
--- a/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing-net_4_x.csproj
+++ b/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing-net_4_x.csproj
@@ -55,7 +55,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="EventCounter.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.
diff --git a/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets-net_4_x.csproj b/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets-net_4_x.csproj
index 35175afbf2a..cbf77602dab 100644
--- a/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets-net_4_x.csproj
+++ b/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets-net_4_x.csproj
@@ -55,9 +55,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="SocketReceiveFromResult.cs" />
-    <Compile Include="SocketReceiveMessageFromResult.cs" />
-    <Compile Include="SocketTaskExtensions.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.
diff --git a/mcs/class/System.Core/System.Core-net_4_x.csproj b/mcs/class/System.Core/System.Core-net_4_x.csproj
index 65bb1294281..e05da6cf2f5 100644
--- a/mcs/class/System.Core/System.Core-net_4_x.csproj
+++ b/mcs/class/System.Core/System.Core-net_4_x.csproj
@@ -386,7 +386,6 @@
     <Compile Include="System.Security.Cryptography\ECCurve.cs" />
     <Compile Include="System.Security.Cryptography\ECParameters.cs" />
     <Compile Include="System.Security.Cryptography\ECPoint.cs" />
-    <Compile Include="System.Security.Cryptography\IncrementalHash.cs" />
     <Compile Include="System.Security.Cryptography\MD5Cng.cs" />
     <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />
     <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />
diff --git a/mcs/class/System.Core/System.Core-plaincore-net_4_x.csproj b/mcs/class/System.Core/System.Core-plaincore-net_4_x.csproj
index 9668c39f9fb..65cc4052217 100644
--- a/mcs/class/System.Core/System.Core-plaincore-net_4_x.csproj
+++ b/mcs/class/System.Core/System.Core-plaincore-net_4_x.csproj
@@ -386,7 +386,6 @@
     <Compile Include="System.Security.Cryptography\ECCurve.cs" />
     <Compile Include="System.Security.Cryptography\ECParameters.cs" />
     <Compile Include="System.Security.Cryptography\ECPoint.cs" />
-    <Compile Include="System.Security.Cryptography\IncrementalHash.cs" />
     <Compile Include="System.Security.Cryptography\MD5Cng.cs" />
     <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />
     <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />
diff --git a/mcs/class/System/System-bare-net_4_x.csproj b/mcs/class/System/System-bare-net_4_x.csproj
index 7c67e68835c..77b0ba27093 100644
--- a/mcs/class/System/System-bare-net_4_x.csproj
+++ b/mcs/class/System/System-bare-net_4_x.csproj
@@ -1110,6 +1110,9 @@
     <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />
     <Compile Include="System.Net.Sockets\SocketAsyncResult.cs" />
     <Compile Include="System.Net.Sockets\SocketOperation.cs" />
+    <Compile Include="System.Net.Sockets\SocketReceiveFromResult.cs" />
+    <Compile Include="System.Net.Sockets\SocketReceiveMessageFromResult.cs" />
+    <Compile Include="System.Net.Sockets\SocketTaskExtensions.cs" />
     <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />
     <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />
     <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />
diff --git a/mcs/class/System/System-net_4_x.csproj b/mcs/class/System/System-net_4_x.csproj
index 62daa34d9ee..3695bdb9a4a 100644
--- a/mcs/class/System/System-net_4_x.csproj
+++ b/mcs/class/System/System-net_4_x.csproj
@@ -1110,6 +1110,9 @@
     <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />
     <Compile Include="System.Net.Sockets\SocketAsyncResult.cs" />
     <Compile Include="System.Net.Sockets\SocketOperation.cs" />
+    <Compile Include="System.Net.Sockets\SocketReceiveFromResult.cs" />
+    <Compile Include="System.Net.Sockets\SocketReceiveMessageFromResult.cs" />
+    <Compile Include="System.Net.Sockets\SocketTaskExtensions.cs" />
     <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />
     <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />
     <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />
diff --git a/mcs/class/System/System-secxml-net_4_x.csproj b/mcs/class/System/System-secxml-net_4_x.csproj
index cd6f0607362..f1d489f9144 100644
--- a/mcs/class/System/System-secxml-net_4_x.csproj
+++ b/mcs/class/System/System-secxml-net_4_x.csproj
@@ -1110,6 +1110,9 @@
     <Compile Include="System.Net.Sockets\SocketAsyncEventArgs.cs" />
     <Compile Include="System.Net.Sockets\SocketAsyncResult.cs" />
     <Compile Include="System.Net.Sockets\SocketOperation.cs" />
+    <Compile Include="System.Net.Sockets\SocketReceiveFromResult.cs" />
+    <Compile Include="System.Net.Sockets\SocketReceiveMessageFromResult.cs" />
+    <Compile Include="System.Net.Sockets\SocketTaskExtensions.cs" />
     <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />
     <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />
     <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />
diff --git a/mcs/class/corlib/corlib-net_4_x.csproj b/mcs/class/corlib/corlib-net_4_x.csproj
index 1e89d68be88..9ab59b31503 100644
--- a/mcs/class/corlib/corlib-net_4_x.csproj
+++ b/mcs/class/corlib/corlib-net_4_x.csproj
@@ -896,6 +896,7 @@
     <Compile Include="System.Diagnostics.Tracing\EventAttribute.cs" />
     <Compile Include="System.Diagnostics.Tracing\EventCommand.cs" />
     <Compile Include="System.Diagnostics.Tracing\EventCommandEventArgs.cs" />
+    <Compile Include="System.Diagnostics.Tracing\EventCounter.cs" />
     <Compile Include="System.Diagnostics.Tracing\EventDataAttribute.cs" />
     <Compile Include="System.Diagnostics.Tracing\EventFieldAttribute.cs" />
     <Compile Include="System.Diagnostics.Tracing\EventFieldFormat.cs" />
@@ -1407,6 +1408,7 @@
     <Compile Include="System.Security.Cryptography\DESCryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\DSACryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\ICspAsymmetricAlgorithm.cs" />
+    <Compile Include="System.Security.Cryptography\IncrementalHash.cs" />
     <Compile Include="System.Security.Cryptography\KeyNumber.cs" />
     <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\RC2CryptoServiceProvider.cs" />
diff --git a/mcs/tools/mkbundle/mkbundle-net_4_x.csproj b/mcs/tools/mkbundle/mkbundle-net_4_x.csproj
index 014353d8bcc..f9ba0a189f3 100644
--- a/mcs/tools/mkbundle/mkbundle-net_4_x.csproj
+++ b/mcs/tools/mkbundle/mkbundle-net_4_x.csproj
@@ -94,6 +94,10 @@
       <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
       <Name>System.Core-net_4_x</Name>
     </ProjectReference>
+    <ProjectReference Include="../../class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_x.csproj">
+      <Project>{9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}</Project>
+      <Name>System.IO.Compression.FileSystem-net_4_x</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/msvc/scripts/order.xml b/msvc/scripts/order.xml
index 984496144c4..2d2fd97ad83 100644
--- a/msvc/scripts/order.xml
+++ b/msvc/scripts/order.xml
@@ -4699,7 +4699,7 @@
     </project>
     <project dir="tools/mkbundle" library="mkbundle-net_4_x">
       <boot></boot>
-      <flags>/codepage:65001 -resource:template.c -resource:template_z.c -resource:template_main.c -d:STATIC,NO_SYMBOL_WRITER,NO_AUTHENTICODE -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 -optimize /noconfig -r:System.Xml -r:System -r:System.Core</flags>
+      <flags>/codepage:65001 -resource:template.c -resource:template_z.c -resource:template_main.c -d:STATIC,NO_SYMBOL_WRITER,NO_AUTHENTICODE -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 -optimize /noconfig -r:System.Xml -r:System -r:System.Core -r:System.IO.Compression.FileSystem</flags>
       <output>mkbundle.exe</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/net_4_x/mkbundle.exe</library_output>
-- 
2.25.1