mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/System.Configuration.Install/System.Configuration.Install/IManagedInstaller.cs
View File

@ -33,9 +33,7 @@ namespace System.Configuration.Install
{
[Guid("1E233FE7-C16D-4512-8C3B-2E9988F08D38")]
[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
#if NET_2_0
[ComImport]
#endif
public interface IManagedInstaller
{
[return: MarshalAs(UnmanagedType.I4)]

3
mcs/class/System.Configuration.Install/System.Configuration.Install/InstallEventHandler.cs
View File

@ -31,8 +31,5 @@ using System.Runtime.Serialization;
namespace System.Configuration.Install
{
#if !NET_2_0
[Serializable]
#endif
public delegate void InstallEventHandler (object sender, InstallEventArgs e);
}

3
mcs/class/System.Configuration.Install/System.Configuration.Install/UninstallAction.cs
View File

@ -31,9 +31,6 @@
using System;
namespace System.Configuration.Install {
#if !NET_2_0
[Serializable]
#endif
public enum UninstallAction {
NoAction=0x01,
Remove=0x00

4
mcs/class/System.Configuration.Install/System.Diagnostics/EventLogInstaller.cs
View File

@ -41,7 +41,6 @@ namespace System.Diagnostics
{
}
#if NET_2_0
[MonoTODO]
[ComVisible (false)]
public int CategoryCount {
@ -75,7 +74,6 @@ namespace System.Diagnostics
get { return _parameterResourceFile; }
set { _parameterResourceFile = value; }
}
#endif
[MonoTODO]
public override void CopyFromComponent (IComponent component)
@ -150,10 +148,8 @@ namespace System.Diagnostics
private string _log;
private string _source;
private UninstallAction _uninstallAction = UninstallAction.Remove;
#if NET_2_0
private string _categoryResourceFile;
private string _messageResourceFile;
private string _parameterResourceFile;
#endif
}
}

13
mcs/class/System.Configuration.Install/System.Diagnostics/PerformanceCounterInstaller.cs
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
}
}