Prechádzať zdrojové kódy

2005-03-17 Sebastien Pouliot <[email protected]>

	* IsolatedStorageScope.cs: Add missing BOOTSTRAP_NET_2_0 to new enum 
	values. Fix #73046.
	* IsolatedStorageFile.cs: Remove commented security attributes.


svn path=/trunk/mcs/; revision=41959
Sebastien Pouliot 21 rokov pred
rodič
commit
dad261e68f

+ 6 - 0
mcs/class/corlib/System.IO.IsolatedStorage/ChangeLog

@@ -1,3 +1,9 @@
+2005-03-17  Sebastien Pouliot  <[email protected]>
+
+	* IsolatedStorageScope.cs: Add missing BOOTSTRAP_NET_2_0 to new enum 
+	values. Fix #73046.
+	* IsolatedStorageFile.cs: Remove commented security attributes.
+
 2005-03-15  Sebastien Pouliot  <[email protected]>
 
 	* IsolatedStorageFile.cs: Added CAS demands (imperative when possible)

+ 4 - 8
mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs

@@ -157,8 +157,7 @@ namespace System.IO.IsolatedStorage {
 			return storageFile;
 		}
 
-// waiting for fix to http://bugzilla.ximian.com/show_bug.cgi?id=73046
-//		[IsolatedStorageFilePermission (SecurityAction.Demand, UsageAllowed = IsolatedStorageContainment.ApplicationIsolationByMachine)]
+		[IsolatedStorageFilePermission (SecurityAction.Demand, UsageAllowed = IsolatedStorageContainment.ApplicationIsolationByMachine)]
 		public static IsolatedStorageFile GetMachineStoreForApplication ()
 		{
 			IsolatedStorageScope scope = IsolatedStorageScope.Machine | IsolatedStorageScope.Application;
@@ -168,8 +167,7 @@ namespace System.IO.IsolatedStorage {
 			return storageFile;
 		}
 
-// waiting for fix to http://bugzilla.ximian.com/show_bug.cgi?id=73046
-//		[IsolatedStorageFilePermission (SecurityAction.Demand, UsageAllowed = IsolatedStorageContainment.AssemblyIsolationByMachine)]
+		[IsolatedStorageFilePermission (SecurityAction.Demand, UsageAllowed = IsolatedStorageContainment.AssemblyIsolationByMachine)]
 		public static IsolatedStorageFile GetMachineStoreForAssembly ()
 		{
 			IsolatedStorageScope scope = IsolatedStorageScope.Machine | IsolatedStorageScope.Assembly;
@@ -179,8 +177,7 @@ namespace System.IO.IsolatedStorage {
 			return storageFile;
 		}
 
-// waiting for fix to http://bugzilla.ximian.com/show_bug.cgi?id=73046
-//		[IsolatedStorageFilePermission (SecurityAction.Demand, UsageAllowed = IsolatedStorageContainment.DomainIsolationByMachine)]
+		[IsolatedStorageFilePermission (SecurityAction.Demand, UsageAllowed = IsolatedStorageContainment.DomainIsolationByMachine)]
 		public static IsolatedStorageFile GetMachineStoreForDomain ()
 		{
 			IsolatedStorageScope scope = IsolatedStorageScope.Machine | IsolatedStorageScope.Domain | IsolatedStorageScope.Assembly;
@@ -191,8 +188,7 @@ namespace System.IO.IsolatedStorage {
 			return storageFile;
 		}
 
-// waiting for fix to http://bugzilla.ximian.com/show_bug.cgi?id=73046
-//		[IsolatedStorageFilePermission (SecurityAction.Demand, UsageAllowed = IsolatedStorageContainment.ApplicationIsolationByUser)]
+		[IsolatedStorageFilePermission (SecurityAction.Demand, UsageAllowed = IsolatedStorageContainment.ApplicationIsolationByUser)]
 		public static IsolatedStorageFile GetUserStoreForApplication ()
 		{
 			IsolatedStorageScope scope = IsolatedStorageScope.User | IsolatedStorageScope.Application;

+ 1 - 1
mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageScope.cs

@@ -43,7 +43,7 @@ namespace System.IO.IsolatedStorage {
 		// Documented in "C# In A Nutshell"
 		Roaming = 8,
 
-#if NET_2_0
+#if NET_2_0 || BOOTSTRAP_NET_2_0
 		Machine = 16,
 		Application = 32
 #endif