projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #487 from mayerwin/patch-1
[mono.git]
/
mcs
/
class
/
corlib
/
System.Runtime.InteropServices
/
_Assembly.cs
diff --git
a/mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs
b/mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs
index 531ec34351e522677f005af964089f1d0303dccc..a30e29ce22d696bd8a3b810212421137de6da3de 100644
(file)
--- a/
mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs
+++ b/
mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs
@@
-26,8
+26,6
@@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_1_1
-
using System.IO;
using System.Globalization;
using System.Reflection;
using System.IO;
using System.Globalization;
using System.Reflection;
@@
-36,13
+34,13
@@
using System.Security.Policy;
namespace System.Runtime.InteropServices
{
namespace System.Runtime.InteropServices
{
-#if NET_2_0
[ComVisible (true)]
[ComVisible (true)]
-#endif
[CLSCompliant (false)]
[InterfaceType (ComInterfaceType.InterfaceIsDual)]
[Guid ("17156360-2F1A-384A-BC52-FDE93C215C5B")]
[CLSCompliant (false)]
[InterfaceType (ComInterfaceType.InterfaceIsDual)]
[Guid ("17156360-2F1A-384A-BC52-FDE93C215C5B")]
+#if !FULL_AOT_RUNTIME
[TypeLibImportClass (typeof(Assembly))]
[TypeLibImportClass (typeof(Assembly))]
+#endif
public interface _Assembly
{
string ToString ();
public interface _Assembly
{
string ToString ();
@@
-89,7
+87,9
@@
namespace System.Runtime.InteropServices
string Location { get; }
string Location { get; }
+#if !NET_2_1
Evidence Evidence { get; }
Evidence Evidence { get; }
+#endif
object[] GetCustomAttributes (Type attributeType, bool inherit);
object[] GetCustomAttributes (Type attributeType, bool inherit);
@@
-129,10
+129,11
@@
namespace System.Runtime.InteropServices
AssemblyName[] GetReferencedAssemblies ();
AssemblyName[] GetReferencedAssemblies ();
+#if !NET_2_1
bool GlobalAssemblyCache { get; }
bool GlobalAssemblyCache { get; }
+#endif
event ModuleResolveEventHandler ModuleResolve;
}
}
event ModuleResolveEventHandler ModuleResolve;
}
}
-#endif