Author: spouliot
Date: 2005-04-26 14:24:00 -0400 (Tue, 26 Apr 2005)
New Revision: 43611
Modified:
trunk/mcs/class/corlib/System.Security.Permissions/ChangeLog
trunk/mcs/class/corlib/System.Security.Permissions/IBuiltInPermission.cs
trunk/mcs/class/corlib/System.Security.Permissions/IsolatedStorageContainment.cs
trunk/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermission.cs
Log:
2005-04-26 Sebastien Pouliot <[EMAIL PROTECTED]>
* IBuiltInPermission.cs: Fixed index values for GacIdentityPermission
and KeyContainerPermission. Removed DataProtectionPermission.
* IsolatedStorageContainment.cs: Fixed ApplicationIsolationByUser
value to 0x15.
* UrlIdentityPermission.cs: Fixed differences between 1.x and 2.0.
Modified: trunk/mcs/class/corlib/System.Security.Permissions/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Security.Permissions/ChangeLog
2005-04-26 18:10:08 UTC (rev 43610)
+++ trunk/mcs/class/corlib/System.Security.Permissions/ChangeLog
2005-04-26 18:24:00 UTC (rev 43611)
@@ -1,3 +1,11 @@
+2005-04-26 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * IBuiltInPermission.cs: Fixed index values for GacIdentityPermission
+ and KeyContainerPermission. Removed DataProtectionPermission.
+ * IsolatedStorageContainment.cs: Fixed ApplicationIsolationByUser
+ value to 0x15.
+ * UrlIdentityPermission.cs: Fixed differences between 1.x and 2.0.
+
2005-03-24 Sebastien Pouliot <[EMAIL PROTECTED]>
* FileIOPermission.cs: Now use InsecureGetFullPath to add paths to
Modified:
trunk/mcs/class/corlib/System.Security.Permissions/IBuiltInPermission.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security.Permissions/IBuiltInPermission.cs
2005-04-26 18:10:08 UTC (rev 43610)
+++ trunk/mcs/class/corlib/System.Security.Permissions/IBuiltInPermission.cs
2005-04-26 18:24:00 UTC (rev 43611)
@@ -5,7 +5,7 @@
// Sebastien Pouliot <[EMAIL PROTECTED]>
//
// Copyright (C) 2003 Motus Technologies (http://www.motus.com)
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -50,10 +50,8 @@
// 11 12 StrongNameIdentityPermission
// 12 13 UrlIdentityPermission
// 13 14 ZoneIdentityPermission
- // N/A 15 ???
- // N/A 16 GacIdentityPermission
- // N/A 17 KeyContainerPermission
- // N/A 18 DataProtectionPermission
+ // N/A 15 GacIdentityPermission
+ // N/A 16 KeyContainerPermission
internal enum BuiltInToken {
Environment = 0,
@@ -78,9 +76,8 @@
StrongNameIdentity = 12,
UrlIdentity = 13,
ZoneIdentity = 14,
- GacIdentity = 16,
- KeyContainer = 17,
- DataProtection = 18,
+ GacIdentity = 15,
+ KeyContainer = 16,
#endif
}
}
Modified:
trunk/mcs/class/corlib/System.Security.Permissions/IsolatedStorageContainment.cs
===================================================================
---
trunk/mcs/class/corlib/System.Security.Permissions/IsolatedStorageContainment.cs
2005-04-26 18:10:08 UTC (rev 43610)
+++
trunk/mcs/class/corlib/System.Security.Permissions/IsolatedStorageContainment.cs
2005-04-26 18:24:00 UTC (rev 43611)
@@ -9,7 +9,7 @@
// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
//
// (C) 2001 Ximian, Inc. http://www.ximian.com
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -31,9 +31,14 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System.Runtime.InteropServices;
+
namespace System.Security.Permissions {
[Serializable]
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public enum IsolatedStorageContainment
{
None = 0x00,
@@ -44,7 +49,7 @@
AdministerIsolatedStorageByUser = 0x70,
UnrestrictedIsolatedStorage = 0xF0,
#if NET_2_0 || BOOTSTRAP_NET_2_0
- ApplicationIsolationByUser = 0x25,
+ ApplicationIsolationByUser = 0x15,
DomainIsolationByMachine = 0x30,
AssemblyIsolationByMachine = 0x40,
ApplicationIsolationByMachine = 0x45,
Modified:
trunk/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermission.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermission.cs
2005-04-26 18:10:08 UTC (rev 43610)
+++ trunk/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermission.cs
2005-04-26 18:24:00 UTC (rev 43611)
@@ -5,7 +5,7 @@
// Sebastien Pouliot <[EMAIL PROTECTED]>
//
// Copyright (C) 2003 Motus Technologies. http://www.motus.com
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -28,10 +28,14 @@
//
using System.Globalization;
+using System.Runtime.InteropServices;
namespace System.Security.Permissions {
[Serializable]
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public sealed class UrlIdentityPermission : CodeAccessPermission,
IBuiltInPermission {
private const int version = 1;
@@ -54,12 +58,16 @@
url = site;
}
+#if NET_2_0
public string Url {
+ get { return url; }
+ set { url = ((value == null) ? String.Empty : value); }
+ }
+#else
+ public string Url {
get {
-#if !NET_2_0
if (url == null)
throw new NullReferenceException
("Url");
-#endif
return url;
}
set {
@@ -68,6 +76,7 @@
url = value;
}
}
+#endif
public override IPermission Copy ()
{
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
