2003-07-17 Andreas Nahr <[email protected]>

	* CounterCreationData.cs:
	* EventLog.cs:
	* EventLogEntry.cs:
	* PerformanceCounter.cs:
	* Process.cs:
	* ProcessModule.cs:
	* ProcessStartInfo.cs:
	* ProcessThread.cs: Reworked attributes based on the new Consts scheme

svn path=/trunk/mcs/; revision=16339

mcs/class/System/System.Diagnostics/ChangeLog

@@ -1,3 +1,14 @@
+2003-07-17  Andreas Nahr <[email protected]>
+
+	* CounterCreationData.cs:
+	* EventLog.cs:
+	* EventLogEntry.cs:
+	* PerformanceCounter.cs:
+	* Process.cs:
+	* ProcessModule.cs:
+	* ProcessStartInfo.cs:
+	* ProcessThread.cs: Reworked attributes based on the new Consts scheme
+
 2003-07-14  Andreas Nahr <[email protected]>
 
 	* PerformanceCounterCategory.cs: Fixed signatures

mcs/class/System/System.Diagnostics/CounterCreationData.cs

@@ -15,12 +15,7 @@ using System.ComponentModel;
 namespace System.Diagnostics {
 
 	[Serializable]
-	#if (NET_1_0)
-		[TypeConverter ("System.Diagnostics.Design.CounterCreationDataConverter, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-	#endif
-	#if (NET_1_1)
-    		[TypeConverter ("System.Diagnostics.Design.CounterCreationDataConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-	#endif
+	[TypeConverter ("System.Diagnostics.Design.CounterCreationDataConverter, " + Consts.AssemblySystem_Design)]
 	public class CounterCreationData 
 	{
 
@@ -50,12 +45,7 @@ namespace System.Diagnostics {
 
 		[DefaultValue ("")]
 		[MonitoringDescription ("Name of this counter.")]
-		#if (NET_1_0)
-			[TypeConverter ("System.Diagnostics.Design.StringValueConverter, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
-		#if (NET_1_1)
-    			[TypeConverter ("System.Diagnostics.Design.StringValueConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
+		[TypeConverter ("System.Diagnostics.Design.StringValueConverter, " + Consts.AssemblySystem_Design)]
 		public string CounterName 
 		{
 			get {return name;}

mcs/class/System/System.Diagnostics/EventLog.cs

@@ -18,12 +18,7 @@ namespace System.Diagnostics {
 
 	[MonoTODO("This class is just stubbed out")]
 	[DefaultEvent ("EntryWritten"), InstallerType (typeof (EventLogInstaller))]
-	#if (NET_1_0)
-		[Designer ("Microsoft.VisualStudio.Install.EventLogInstallableComponentDesigner, Microsoft.VisualStudio, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))]
-	#endif
-	#if (NET_1_1)
-    		[Designer ("Microsoft.VisualStudio.Install.EventLogInstallableComponentDesigner, Microsoft.VisualStudio, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))]
-	#endif
+	[Designer ("Microsoft.VisualStudio.Install.EventLogInstallableComponentDesigner, " + Consts.AssemblyMicrosoft_VisualStudio, typeof (IDesigner))]
 	public class EventLog : Component, ISupportInitialize 
 	{
 
@@ -69,12 +64,7 @@ namespace System.Diagnostics {
 
 		[MonoTODO]
 		[ReadOnly (true), DefaultValue (""), RecommendedAsConfigurable (true)]
-		#if (NET_1_0)
-			[TypeConverter ("System.Diagnostics.Design.LogConverter, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
-		#if (NET_1_1)
-    			[TypeConverter ("System.Diagnostics.Design.LogConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
+		[TypeConverter ("System.Diagnostics.Design.LogConverter, " + Consts.AssemblySystem_Design)]
 		[MonitoringDescription ("Name of the log that is read and written.")]
 		public string Log {
 			get {return logName;}
@@ -97,12 +87,7 @@ namespace System.Diagnostics {
 
 		[MonoTODO]
 		[ReadOnly (true), DefaultValue (""), RecommendedAsConfigurable (true)]
-		#if (NET_1_0)
-			[TypeConverter ("System.Diagnostics.Design.StringValueConverter, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
-		#if (NET_1_1)
-    			[TypeConverter ("System.Diagnostics.Design.StringValueConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
+		[TypeConverter ("System.Diagnostics.Design.StringValueConverter, " + Consts.AssemblySystem_Design)]
 		[MonitoringDescription ("The application name that writes the log.")]
 		public string Source {
 			get {return source;}

mcs/class/System/System.Diagnostics/EventLogEntry.cs

@@ -69,12 +69,7 @@ namespace System.Diagnostics {
 		}
 
 		[MonoTODO]
-		#if (NET_1_0)
-			[Editor ("System.ComponentModel.Design.BinaryEditor, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
-		#if (NET_1_1)
-    			[Editor ("System.ComponentModel.Design.BinaryEditor, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
+		[Editor ("System.ComponentModel.Design.BinaryEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 		[MonitoringDescription ("The message of this event entry.")]
 		public string Message {
 			get {throw new NotImplementedException ();}

mcs/class/System/System.Diagnostics/PerformanceCounter.cs

@@ -17,12 +17,7 @@ using System.Diagnostics;
 namespace System.Diagnostics {
 
 	// must be safe for multithreaded operations
-	#if (NET_1_0)
-		[Designer ("Microsoft.VisualStudio.Install.PerformanceCounterDesigner, Microsoft.VisualStudio, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))]
-	#endif
-	#if (NET_1_1)
-		[Designer ("Microsoft.VisualStudio.Install.PerformanceCounterDesigner, Microsoft.VisualStudio, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))]
-	#endif
+	[Designer ("Microsoft.VisualStudio.Install.PerformanceCounterDesigner, Microsoft.VisualStudio, " + Consts.AssemblyMicrosoft_VisualStudio, typeof (IDesigner))]
 	[InstallerType (typeof (PerformanceCounterInstaller))]
 	public sealed class PerformanceCounter : Component, ISupportInitialize 
 	{
@@ -94,12 +89,7 @@ namespace System.Diagnostics {
 
 		// may throw ArgumentNullException
 		[DefaultValue (""), ReadOnly (true), RecommendedAsConfigurable (true)]
-		#if (NET_1_0)
-			[TypeConverter ("System.Diagnostics.Design.CategoryValueConverter, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
-		#if (NET_1_1)
-			[TypeConverter ("System.Diagnostics.Design.CategoryValueConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
+		[TypeConverter ("System.Diagnostics.Design.CategoryValueConverter, " + Consts.AssemblySystem_Design)]
 		public string CategoryName {
 			get {return categoryName;}
 			set {
@@ -119,12 +109,7 @@ namespace System.Diagnostics {
 
 		// may throw ArgumentNullException
 		[DefaultValue (""), ReadOnly (true), RecommendedAsConfigurable (true)]
-		#if (NET_1_0)
-			[TypeConverter ("System.Diagnostics.Design.CounterNameConverter, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
-		#if (NET_1_1)
-			[TypeConverter ("System.Diagnostics.Design.CounterNameConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
+		[TypeConverter ("System.Diagnostics.Design.CounterNameConverter, " + Consts.AssemblySystem_Design)]
 		public string CounterName 
 			{
 			get {return counterName;}
@@ -144,12 +129,7 @@ namespace System.Diagnostics {
 		}
 
 		[DefaultValue (""), ReadOnly (true), RecommendedAsConfigurable (true)]
-		#if (NET_1_0)
-			[TypeConverter ("System.Diagnostics.Design.InstanceNameConverter, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
-		#if (NET_1_1)
-			[TypeConverter ("System.Diagnostics.Design.InstanceNameConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
+		[TypeConverter ("System.Diagnostics.Design.InstanceNameConverter, " + Consts.AssemblySystem_Design)]
 		public string InstanceName 
 			{
 			get {return instanceName;}

mcs/class/System/System.Diagnostics/Process.cs

@@ -19,12 +19,7 @@ using System.Collections;
 
 namespace System.Diagnostics {
 	[DefaultEvent ("Exited"), DefaultProperty ("StartInfo")]
-	#if (NET_1_0)
-		[Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))]
-	#endif
-	#if (NET_1_1)
-    		[Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))]
-	#endif
+	[Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))]
 	public class Process : Component 
 	{
 		[StructLayout(LayoutKind.Sequential)]

mcs/class/System/System.Diagnostics/ProcessModule.cs

@@ -15,12 +15,7 @@ using System.ComponentModel.Design;
 
 namespace System.Diagnostics 
 {
-	#if (NET_1_0)
-		[Designer ("System.Diagnostics.Design.ProcessModuleDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))]
-	#endif
-	#if (NET_1_1)
-    		[Designer ("System.Diagnostics.Design.ProcessModuleDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))]
-	#endif
+	[Designer ("System.Diagnostics.Design.ProcessModuleDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))]
 	public class ProcessModule : Component 
 	{
 		private IntPtr baseaddr;

mcs/class/System/System.Diagnostics/ProcessStartInfo.cs

@@ -46,12 +46,8 @@ namespace System.Diagnostics
 		}
 
 		[RecommendedAsConfigurable (true), DefaultValue ("")]
-		#if (NET_1_0)
-			[TypeConverter ("System.Diagnostics.Design.StringValueConverter, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
-		#if (NET_1_1)
-    			[TypeConverter ("System.Diagnostics.Design.StringValueConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
+		[TypeConverter ("System.Diagnostics.Design.StringValueConverter, " + Consts.AssemblySystem_Design)]
+
 		[MonitoringDescription ("Command line agruments for this process.")]
 		public string Arguments {
 			get {
@@ -75,12 +71,7 @@ namespace System.Diagnostics
 
 		[MonoTODO("Need to read the env block somehow")]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content), DefaultValue (null)]
-		#if (NET_1_0)
-			[Editor ("System.Diagnostics.Design.StringDictionaryEditor, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
-		#if (NET_1_1)
-    			[Editor ("System.Diagnostics.Design.StringDictionaryEditor, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
+		[Editor ("System.Diagnostics.Design.StringDictionaryEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 		[MonitoringDescription ("Environment variables used for this process.")]
 		public StringDictionary EnvironmentVariables {
 			get {
@@ -110,14 +101,8 @@ namespace System.Diagnostics
 		}
 		
 		[RecommendedAsConfigurable (true), DefaultValue ("")]
-		#if (NET_1_0)
-			[Editor ("System.Diagnostics.Design.StartFileNameEditor, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-			[TypeConverter ("System.Diagnostics.Design.StringValueConverter, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
-		#if (NET_1_1)
-			[Editor ("System.Diagnostics.Design.StartFileNameEditor, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-    			[TypeConverter ("System.Diagnostics.Design.StringValueConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
+		[Editor ("System.Diagnostics.Design.StartFileNameEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
+		[TypeConverter ("System.Diagnostics.Design.StringValueConverter, " + Consts.AssemblySystem_Design)]
 		[MonitoringDescription ("The name of the resource to start this process.")]
 		public string FileName {
 			get {
@@ -173,12 +158,7 @@ namespace System.Diagnostics
 		}
 		
 		[DefaultValue ("")]
-		#if (NET_1_0)
-			[TypeConverter ("System.Diagnostics.Design.VerbConverter, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
-		#if (NET_1_1)
-    			[TypeConverter ("System.Diagnostics.Design.VerbConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
+		[TypeConverter ("System.Diagnostics.Design.VerbConverter, " + Consts.AssemblySystem_Design)]
 		[MonitoringDescription ("The verb to apply to a used document.")]
 		public string Verb {
 			get {
@@ -209,14 +189,8 @@ namespace System.Diagnostics
 		}
 		
 		[RecommendedAsConfigurable (true), DefaultValue ("")]
-		#if (NET_1_0)
-			[Editor ("System.Diagnostics.Design.WorkingDirectoryEditor, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-			[TypeConverter ("System.Diagnostics.Design.StringValueConverter, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
-		#if (NET_1_1)
-			[Editor ("System.Diagnostics.Design.WorkingDirectoryEditor, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-    			[TypeConverter ("System.Diagnostics.Design.StringValueConverter, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-		#endif
+		[Editor ("System.Diagnostics.Design.WorkingDirectoryEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
+		[TypeConverter ("System.Diagnostics.Design.StringValueConverter, " + Consts.AssemblySystem_Design)]
 		[MonitoringDescription ("The initial directory for this process.")]
 		public string WorkingDirectory {
 			get {

mcs/class/System/System.Diagnostics/ProcessThread.cs

@@ -13,12 +13,7 @@ using System.ComponentModel.Design;
 
 namespace System.Diagnostics 
 {
-	#if (NET_1_0)
-		[Designer ("System.Diagnostics.Design.ProcessThreadDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))]
-	#endif
-	#if (NET_1_1)
-    		[Designer ("System.Diagnostics.Design.ProcessThreadDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))]
-	#endif
+	[Designer ("System.Diagnostics.Design.ProcessThreadDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))]
 	public class ProcessThread : Component 
 	{