Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3

mcs/class/System.Windows.Forms/Assembly/AssemblyInfo.cs

@@ -35,7 +35,6 @@ using System.Diagnostics;
 [assembly: AllowPartiallyTrustedCallers]
 
 [assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../ecma.pub")]
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]

mcs/class/System.Windows.Forms/Makefile

@@ -4,6 +4,7 @@ include ../../build/rules.make
 LIBRARY = System.Windows.Forms.dll
 
 LIB_REFS = System System.Xml System.Drawing Accessibility System.Data Mono.Posix Mono.WebBrowser System.Configuration System.Runtime.Serialization.Formatters.Soap
+KEYFILE = ../ecma.pub
 LIB_MCS_FLAGS = /unsafe \
 	@System.Windows.Forms.dll.resources \
 	-nowarn:618,612,809
@@ -114,7 +115,7 @@ test-local: DummyAssembly.dll
 
 include ../../build/library.make
 
-TEST_HARNESS_EXCLUDES = -exclude=Interactive,NotWorking,ValueAdd,CAS,InetAccess
+TEST_HARNESS_EXCLUDES = -exclude=Interactive,NotWorking,CAS
 TEST_HARNESS_EXCLUDES_ONDOTNET = -exclude=Interactive,NotDotNet,CAS
 
 $(the_lib): $(RESOURCES)

mcs/class/System.Windows.Forms/System.Windows.Forms.Layout/TableLayoutSettingsTypeConverter.cs

@@ -118,7 +118,7 @@ namespace System.Windows.Forms.Layout
 
 			XmlDocument xmldoc = new XmlDocument();
 			xmldoc.LoadXml (value as string);
-			TableLayoutSettings settings = new TableLayoutSettings(new TableLayoutPanel());
+			TableLayoutSettings settings = new TableLayoutSettings(null);
 			int count = ParseControl (xmldoc, settings);
 			ParseColumnStyle (xmldoc, settings);
 			ParseRowStyle (xmldoc, settings);

mcs/class/System.Windows.Forms/System.Windows.Forms/TableLayoutStyleCollection.cs

@@ -38,9 +38,6 @@ namespace System.Windows.Forms {
 		
 		internal TableLayoutStyleCollection (TableLayoutPanel table)
 		{
-			if (table == null)
-				throw new ArgumentNullException("table");
-			
 			this.table = table;
 		}
 		
@@ -54,7 +51,8 @@ namespace System.Windows.Forms {
 			foreach (TableLayoutStyle style in al)
 				style.Owner = null;
 			al.Clear ();
-			table.PerformLayout ();
+			if (table != null)
+				table.PerformLayout ();
 		}
 		
 		public int Count {
@@ -65,7 +63,8 @@ namespace System.Windows.Forms {
 		{
 			((TableLayoutStyle)al[index]).Owner = null;
 			al.RemoveAt (index);
-			table.PerformLayout ();
+			if (table != null)
+				table.PerformLayout ();
 		}
 		
 #region IList methods
@@ -103,14 +102,16 @@ namespace System.Windows.Forms {
 				throw new ArgumentException ("Style is already owned");
 			((TableLayoutStyle)style).Owner = table;
 			al.Insert (index, (TableLayoutStyle) style);
-			table.PerformLayout ();
+			if (table != null)
+				table.PerformLayout ();
 		}
 
 		void IList.Remove (object style)
 		{
 			((TableLayoutStyle)style).Owner = null;
 			al.Remove ((TableLayoutStyle) style);
-			table.PerformLayout ();
+			if (table != null)
+				table.PerformLayout ();
 		}
 
 		bool IList.IsFixedSize {
@@ -134,7 +135,8 @@ namespace System.Windows.Forms {
 					throw new ArgumentException ("Style is already owned");
 				((TableLayoutStyle)value).Owner = table;
 				al [index] = value;
-				table.PerformLayout ();
+				if (table != null)
+					table.PerformLayout ();
 			}
 		}
 #endregion

mcs/class/System.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs.REMOVED.git-id

@@ -1 +1 @@
-1d090632a1ac178fa39c8d2a335a6c32534ba0f1
+b60c42b346611dc2e9d9b68824662ca4cb5f0d9f