[msvc] Update csproj files

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 e743ee19c299983be92619d79069a403b7f8564a..8e7866cdebbdd3282fdca441f83e063364c299a2 100644 (file)
--- 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" />\r
   <ItemGroup>\r
     <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="EventCounter.cs" />\r
     <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r

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 35175afbf2acc555f76fafeb25693d83bede0685..cbf77602dab39714d52f89326bfaa9b9e284f267 100644 (file)
--- 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" />\r
   <ItemGroup>\r
     <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="SocketReceiveFromResult.cs" />\r
-    <Compile Include="SocketReceiveMessageFromResult.cs" />\r
-    <Compile Include="SocketTaskExtensions.cs" />\r
     <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r

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 65bb1294281006da2f3effc7bbc58ddeae3b553d..e05da6cf2f53ca01a425e19b8d78e2599c65ca55 100644 (file)
--- 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" />\r
     <Compile Include="System.Security.Cryptography\ECParameters.cs" />\r
     <Compile Include="System.Security.Cryptography\ECPoint.cs" />\r
-    <Compile Include="System.Security.Cryptography\IncrementalHash.cs" />\r
     <Compile Include="System.Security.Cryptography\MD5Cng.cs" />\r
     <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />\r
     <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />\r

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 9668c39f9fb417cae998d94b3d10647d96f9037d..65cc4052217dad1da21a3d6ab0cc2a0925745fc2 100644 (file)
--- 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" />\r
     <Compile Include="System.Security.Cryptography\ECParameters.cs" />\r
     <Compile Include="System.Security.Cryptography\ECPoint.cs" />\r
-    <Compile Include="System.Security.Cryptography\IncrementalHash.cs" />\r
     <Compile Include="System.Security.Cryptography\MD5Cng.cs" />\r
     <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />\r
     <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />\r

diff --git a/mcs/class/System/System-bare-net_4_x.csproj b/mcs/class/System/System-bare-net_4_x.csproj
index 7c67e68835ca47708e9569b5d732a26692428a8d..77b0ba2709335bc2a494b650c071cb4b7fac7ac4 100644 (file)
--- 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" />\r
     <Compile Include="System.Net.Sockets\SocketAsyncResult.cs" />\r
     <Compile Include="System.Net.Sockets\SocketOperation.cs" />\r
+    <Compile Include="System.Net.Sockets\SocketReceiveFromResult.cs" />\r
+    <Compile Include="System.Net.Sockets\SocketReceiveMessageFromResult.cs" />\r
+    <Compile Include="System.Net.Sockets\SocketTaskExtensions.cs" />\r
     <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />\r
     <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />\r
     <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />\r

diff --git a/mcs/class/System/System-net_4_x.csproj b/mcs/class/System/System-net_4_x.csproj
index 62daa34d9ee7e0caab17da1f31f10cacd6a9f196..3695bdb9a4a79e35f517461b65c1b9ae04cd1ddc 100644 (file)
--- 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" />\r
     <Compile Include="System.Net.Sockets\SocketAsyncResult.cs" />\r
     <Compile Include="System.Net.Sockets\SocketOperation.cs" />\r
+    <Compile Include="System.Net.Sockets\SocketReceiveFromResult.cs" />\r
+    <Compile Include="System.Net.Sockets\SocketReceiveMessageFromResult.cs" />\r
+    <Compile Include="System.Net.Sockets\SocketTaskExtensions.cs" />\r
     <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />\r
     <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />\r
     <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />\r

diff --git a/mcs/class/System/System-secxml-net_4_x.csproj b/mcs/class/System/System-secxml-net_4_x.csproj
index cd6f060736291efd57c549cf004b34f04e76cae9..f1d489f91443ba9fb20be4218e85f75303830256 100644 (file)
--- 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" />\r
     <Compile Include="System.Net.Sockets\SocketAsyncResult.cs" />\r
     <Compile Include="System.Net.Sockets\SocketOperation.cs" />\r
+    <Compile Include="System.Net.Sockets\SocketReceiveFromResult.cs" />\r
+    <Compile Include="System.Net.Sockets\SocketReceiveMessageFromResult.cs" />\r
+    <Compile Include="System.Net.Sockets\SocketTaskExtensions.cs" />\r
     <Compile Include="System.Net.WebSockets\ClientWebSocket.cs" />\r
     <Compile Include="System.Net.WebSockets\ClientWebSocketOptions.cs" />\r
     <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.cs" />\r

diff --git a/mcs/class/corlib/corlib-net_4_x.csproj b/mcs/class/corlib/corlib-net_4_x.csproj
index 1e89d68be88f68c5298b233ac1e8de7255eddbec..9ab59b3150348e5d7cd398c3ed89a2c972f6185f 100644 (file)
--- 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" />\r
     <Compile Include="System.Diagnostics.Tracing\EventCommand.cs" />\r
     <Compile Include="System.Diagnostics.Tracing\EventCommandEventArgs.cs" />\r
+    <Compile Include="System.Diagnostics.Tracing\EventCounter.cs" />\r
     <Compile Include="System.Diagnostics.Tracing\EventDataAttribute.cs" />\r
     <Compile Include="System.Diagnostics.Tracing\EventFieldAttribute.cs" />\r
     <Compile Include="System.Diagnostics.Tracing\EventFieldFormat.cs" />\r
@@ -1407,6 +1408,7 @@
     <Compile Include="System.Security.Cryptography\DESCryptoServiceProvider.cs" />\r
     <Compile Include="System.Security.Cryptography\DSACryptoServiceProvider.cs" />\r
     <Compile Include="System.Security.Cryptography\ICspAsymmetricAlgorithm.cs" />\r
+    <Compile Include="System.Security.Cryptography\IncrementalHash.cs" />\r
     <Compile Include="System.Security.Cryptography\KeyNumber.cs" />\r
     <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />\r
     <Compile Include="System.Security.Cryptography\RC2CryptoServiceProvider.cs" />\r

diff --git a/mcs/tools/mkbundle/mkbundle-net_4_x.csproj b/mcs/tools/mkbundle/mkbundle-net_4_x.csproj
index 014353d8bcc5a1a24b422558d2d47ef881bf83f7..f9ba0a189f33dca017f7f2f42800aca06c77cb91 100644 (file)
--- 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>\r
       <Name>System.Core-net_4_x</Name>\r
     </ProjectReference>\r
+    <ProjectReference Include="../../class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_x.csproj">\r
+      <Project>{9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}</Project>\r
+      <Name>System.IO.Compression.FileSystem-net_4_x</Name>\r
+    </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Folder Include="Properties\" />\r

diff --git a/msvc/scripts/order.xml b/msvc/scripts/order.xml
index 984496144c490ac942f2ffa3bdaa5391a9b575a7..2d2fd97ad83d5d118dfe488347318807c2a3a1cb 100644 (file)
--- 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>