Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -66,9 +66,6 @@ namespace System.Diagnostics
}
[DefaultValue ("")]
#if !NET_2_0
[MonitoringDescription ("PCI_CategoryHelp")]
#endif
public string CategoryHelp {
get {
return _categoryHelp;
@@ -96,9 +93,6 @@ namespace System.Diagnostics
}
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
#if !NET_2_0
[MonitoringDescription("PCI_Counters")]
#endif
public CounterCreationDataCollection Counters {
get {
return _counters;
@@ -106,9 +100,6 @@ namespace System.Diagnostics
}
[DefaultValue (UninstallAction.Remove)]
#if !NET_2_0
[MonitoringDescription ("PCI_UninstallAction")]
#endif
public UninstallAction UninstallAction {
get {
return _uninstallAction;
@@ -125,7 +116,6 @@ namespace System.Diagnostics
}
}
#if NET_2_0
[ComVisible (false)]
[DefaultValue (PerformanceCounterCategoryType.Unknown)]
public PerformanceCounterCategoryType CategoryType {
@@ -143,14 +133,11 @@ namespace System.Diagnostics
_categoryType = value;
}
}
#endif
private string _categoryHelp = string.Empty;
private string _categoryName = string.Empty;
private CounterCreationDataCollection _counters = new CounterCreationDataCollection ();
private UninstallAction _uninstallAction = UninstallAction.Remove;
#if NET_2_0
private PerformanceCounterCategoryType _categoryType;
#endif
}
}