Modernize C# code snippets (more System.ComponentModel)

snippets/csharp/System.ComponentModel.Composition.Hosting/CompositionContainer/Compose/program.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.ComponentModel.Composition;
 using System.ComponentModel.Composition.Hosting;
 using System.ComponentModel.Composition.Primitives;
@@ -12,7 +9,7 @@ namespace ConsoleApplication5
     [Export]
     class Part1
     {
-        public String data = "This is the example data!";
+        public string data { get; } = "This is the example data!";
     }
 
     [Export]
@@ -31,16 +28,16 @@ class Part3
 
     class Program
     {
-        static void Main(string[] args)
+        static void Main()
         {
-            CompositionContainer container = new CompositionContainer();
-            CompositionBatch batch = new CompositionBatch();
+            CompositionContainer container = new();
+            CompositionBatch batch = new();
             batch.AddPart(AttributedModelServices.CreatePart(new Part1()));
             batch.AddPart(AttributedModelServices.CreatePart(new Part2()));
             batch.AddPart(AttributedModelServices.CreatePart(new Part3()));
             container.Compose(batch);
-            Part3 _part = container.GetExportedValue<Part3>();
-            Console.WriteLine(_part.data.data.data);
+            Part3 part = container.GetExportedValue<Part3>();
+            Console.WriteLine(part.data.data.data);
             Console.ReadLine();
         }
     }

snippets/csharp/System.ComponentModel.Composition.Hosting/CompositionContainer/Overview/program.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.ComponentModel.Composition;
 using System.ComponentModel.Composition.Hosting;
 
@@ -11,7 +8,7 @@ namespace CompositionContainerExample
     [Export]
     class MyAddin
     {
-        public String myData { get { return "The data!"; } }
+        public string myData => "The data!";
     }
 
     class MyProgram
@@ -22,17 +19,17 @@ class MyProgram
 
     class Program
     {
-        static void Main(string[] args)
+        static void Main()
         {
-            AggregateCatalog catalog = new AggregateCatalog();
+            AggregateCatalog catalog = new();
             catalog.Catalogs.Add(new AssemblyCatalog(typeof(MyAddin).Assembly));
-            CompositionContainer _container = new CompositionContainer(catalog);
-            MyProgram myProgram = new MyProgram();
-            _container.SatisfyImportsOnce(myProgram);
+            CompositionContainer container = new(catalog);
+            MyProgram myProgram = new();
+            container.SatisfyImportsOnce(myProgram);
             Console.WriteLine(myProgram.myAddin.myData);
             Console.ReadLine();
 
-            _container.Dispose();
+            container.Dispose();
         }
     }
     //</snippet1>

snippets/csharp/System.ComponentModel.Composition.Hosting/DirectoryCatalog/classlibrary1/class1.cs

@@ -1,16 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ComponentModel.Composition;
+using System.ComponentModel.Composition;
 
 namespace ClassLibrary1
 {
     //<snippet2>
     [Export]
     public class Test1
     {
-        public String data = "The data!";
+        public string data { get; } = "The data!";
     }
     //</snippet2>
 }

snippets/csharp/System.ComponentModel.Composition.Hosting/DirectoryCatalog/consoleapplication7/program.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.ComponentModel.Composition;
 using System.ComponentModel.Composition.Hosting;
 using ClassLibrary1;
@@ -17,11 +14,11 @@ public class Test2
 
     class Program
     {
-        static void Main(string[] args)
+        static void Main()
         {
-            DirectoryCatalog catalog = new DirectoryCatalog(".");
-            CompositionContainer container = new CompositionContainer(catalog);
-            Test2 test = new Test2();
+            DirectoryCatalog catalog = new(".");
+            CompositionContainer container = new(catalog);
+            Test2 test = new();
             container.SatisfyImportsOnce(test);
             Console.WriteLine(test.data.data);
             Console.ReadLine();

snippets/csharp/System.ComponentModel.Composition/ExportAttribute/program.cs

@@ -10,7 +10,7 @@ namespace ConsoleApplication3
     [Export]
     public class MyExport1
     {
-        public string data = "Test Data 1.";
+        public string data { get; } = "Test Data 1.";
     }
 
     public class MyImporter1
@@ -28,7 +28,7 @@ public interface MyInterface
     [Export(typeof(MyInterface))]
     public class MyExport2 : MyInterface
     {
-        public string data = "Test Data 2.";
+        public string data { get; } = "Test Data 2.";
     }
 
     public class MyImporter2
@@ -43,7 +43,7 @@ public class MyImporter2
     [Export("MyContractName", typeof(MyInterface))]
     public class MyExport3 : MyInterface
     {
-        public string data = "Test Data 3.";
+        public string data { get; } = "Test Data 3.";
     }
 
     public class MyImporter3

snippets/csharp/System.ComponentModel.Design.Serialization/CodeDomSerializer/Overview/idesignerserializationmanagersample.cs

@@ -11,8 +11,8 @@ internal class MyCodeDomSerializer : CodeDomSerializer
         public override object Deserialize(IDesignerSerializationManager manager, object codeObject)
         {
             // Associate the component with the serializer.
-            CodeDomSerializer baseClassSerializer = (CodeDomSerializer)manager.
-            GetSerializer(typeof(MyComponent).BaseType, typeof(CodeDomSerializer));
+            CodeDomSerializer baseClassSerializer = (CodeDomSerializer)manager.GetSerializer(
+                typeof(MyComponent).BaseType, typeof(CodeDomSerializer));
 
             /* This is the simplest case, in which the class just calls the base class
                 to do the work. */
@@ -22,9 +22,9 @@ public override object Deserialize(IDesignerSerializationManager manager, object
         public override object Serialize(IDesignerSerializationManager manager, object value)
         {
             /* Associate the component with the serializer in the same manner as with
-                Deserialize */
-            CodeDomSerializer baseClassSerializer = (CodeDomSerializer)manager.
-                GetSerializer(typeof(MyComponent).BaseType, typeof(CodeDomSerializer));
+                Deserialize. */
+            CodeDomSerializer baseClassSerializer = (CodeDomSerializer)manager.GetSerializer(
+                typeof(MyComponent).BaseType, typeof(CodeDomSerializer));
 
             object codeObject = baseClassSerializer.Serialize(manager, value);
 

snippets/csharp/System.ComponentModel.Design.Serialization/CodeDomSerializerException/Overview/source.cs

@@ -1,7 +1,5 @@
 using System;
 using System.CodeDom;
-using System.ComponentModel;
-using System.ComponentModel.Design;
 using System.ComponentModel.Design.Serialization;
 
 namespace CodeDomSerializerExceptionExample
@@ -12,7 +10,7 @@ class CodeDomSerializerExceptionExample
         static void Main(string[] args)
         {
             //<Snippet1>
-            throw new CodeDomSerializerException("This exception was raised as an example.", new CodeLinePragma("Example.txt", 20));            
+            throw new CodeDomSerializerException("This exception was raised as an example.", new CodeLinePragma("Example.txt", 20));
             //</Snippet1>
         }
     }

snippets/csharp/System.ComponentModel.Design.Serialization/ContextStack/Overview/class1.cs

@@ -1,9 +1,6 @@
 //<Snippet1>
 using System;
-using System.ComponentModel;
-using System.ComponentModel.Design;
 using System.ComponentModel.Design.Serialization;
-using System.Windows.Forms;
 
 namespace ContextStackExample
 {
@@ -16,21 +13,23 @@ static void Main(string[] args)
             // Create a ContextStack.
             ContextStack stack = new ContextStack();
             //</Snippet2>
-            
+
             //<Snippet3>
             // Push ten items on to the stack and output the value of each.
-            for( int number = 0; number < 10; number ++ )
+            for (int number = 0; number < 10; number++)
             {
-                Console.WriteLine( "Value pushed to stack: "+number.ToString() );
-                stack.Push( number );
+                Console.WriteLine($"Value pushed to stack: {number}");
+                stack.Push(number);
             }
             //</Snippet3>
 
             //<Snippet4>
             // Pop each item off the stack.
             object item = null;
-            while( (item = stack.Pop()) != null )
-                Console.WriteLine( "Value popped from stack: "+item.ToString() );
+            while ((item = stack.Pop()) != null)
+            {
+                Console.WriteLine($"Value popped from stack: {item}");
+            }
             //</Snippet4>
         }
     }

snippets/csharp/System.ComponentModel.Design.Serialization/DesignerSerializerAttribute/Overview/source.cs

@@ -1,38 +1,21 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.ComponentModel.Design;
-using System.ComponentModel.Design.Serialization;
-using System.Drawing;
-using System.Data;
+using System.ComponentModel.Design.Serialization;
 using System.Windows.Forms;
 
 namespace ExampleControl
 {
     //<Snippet1>
     [DesignerSerializerAttribute(typeof(ExampleSerializer), typeof(CodeDomSerializer))]
-	public class ExampleControl : System.Windows.Forms.UserControl
-	{
-		public ExampleControl()
-		{
-		}
-	}
+    public class ExampleControl : UserControl
+    {
+    }
     //</Snippet1>
 
-    public class ExampleSerializer : System.ComponentModel.Design.Serialization.CodeDomSerializer
+    public class ExampleSerializer : CodeDomSerializer
     {
-        public ExampleSerializer()
-        {
-        }
-
-        public override object Deserialize(System.ComponentModel.Design.Serialization.IDesignerSerializationManager manager, object codeObject)
-        {
-            return null;
-        }
+        public override object Deserialize(IDesignerSerializationManager manager, object codeObject)
+            => null;
 
-        public override object Serialize(System.ComponentModel.Design.Serialization.IDesignerSerializationManager manager, object value)
-        {
-            return null;
-        }
+        public override object Serialize(IDesignerSerializationManager manager, object value)
+            => null;
     }
 }