Imported Upstream version 4.0.1.34

Former-commit-id: 7cbb4dcca51973689b8ece97588cddda2e4d01bb
2015-05-15 05:29:36 -04:00
parent 2e0d90627e
commit 50adc63821
36 changed files with 41 additions and 70 deletions
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs
@@ -73,6 +73,8 @@ namespace Microsoft.Build.Tasks {
 			commandLine.AppendSwitchIfNotNull ("/main:", MainEntryPoint);

 			// NoStandardLib
+			if (Bag ["NoStandardLib"] != null && NoStandardLib)
+				commandLine.AppendSwitch ("/nostdlib");
 			
 			if (NoWarnings)
 				commandLine.AppendSwitch ("/nowarn");
--- a/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs
+++ b/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs
@@ -11,14 +11,17 @@ namespace System.Runtime.Caching {
     */
    internal class SRef {

-        private Object _sizedRef;
+//        private Object _sizedRef;

        internal SRef (Object target) {
-            _sizedRef = target;
+//            _sizedRef = target;
        }

        internal long ApproximateSize {
-            get { return (long) Marshal.SizeOf (_sizedRef.GetType ()); }
+            get {
+                // TODO: .net uses System.SizedReference which contains approximate size after Gen 2 collection
+                return 16;
+            }
        }

        internal void Dispose() {
--- a/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-62d516907d70ecf17d5514d0b95eca311ec777cf
+c0601b9f4009f1bab9950f13bfc47c1bd2ab0633
--- a/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-cd383f7f1e00c5c33b0d1ca418b3026590e16b82
+bc2a11adca47ad33d784d35d25efddb11b6d375e
--- a/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id
@@ -1 +1 @@
-0442610a0894deae436f4425d6ce61bfcf05f317
+ca052b55848fabd417bf3831574d8cf686d794e6
--- a/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-8b55e7bf143fa497a0beb1248953d8a153f92e6b
+8fa97ae80be483b7c5d6c93ca8d7eda2446b0a50
--- a/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-46943fbf58da39a463799c4588a4ae363eb08687
+e76deb5174269b77c69662a96fa3321b040d91c5
--- a/mcs/class/lib/monolite/System.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite/System.dll.REMOVED.git-id
@@ -1 +1 @@
-f5a92d1da2d627310094847f1caea53b06b9cb06
+ac019e412b2ae5715cf22065cd72c5765dd5aab5
--- a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id
@@ -1 +1 @@
-a41c331587790269dc8edeb917e32a18c54ab218
+57419ef38547f800bed1ac90debb76987485a936
--- a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-520a0a38f7184d287366c996c5ac92d8e7f5fac2
+273bd37add87ac232bce4ae964cbae67b9954f6b