Ver Fonte

2007-12-18 Miguel de Icaza <[email protected]>

	* Ifdef out the large bodies of code that will just not work with
	Silverlight, ran into this problem again trying to run
	http://fluxtools.net/emailphotos

	Its not worth trying to alter this implementation of
	IsolatedStorage to work in both the regular and the Moonlight
	profiles, instead am going to write a simple implementation while
	we wait for the real 2.0 API to come out.


svn path=/trunk/mcs/; revision=91511
Miguel de Icaza há 18 anos atrás
pai
commit
efd62ae019

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

@@ -1,3 +1,14 @@
+2007-12-18  Miguel de Icaza  <[email protected]>
+
+	* Ifdef out the large bodies of code that will just not work with
+	Silverlight, ran into this problem again trying to run
+	http://fluxtools.net/emailphotos
+
+	Its not worth trying to alter this implementation of
+	IsolatedStorage to work in both the regular and the Moonlight
+	profiles, instead am going to write a simple implementation while
+	we wait for the real 2.0 API to come out.
+
 2007-11-06  Sebastien Pouliot  <[email protected]>
 
 	* IsolatedStorageFileStream.cs: Handle rooted paths. Patch by Jay

+ 3 - 0
mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs

@@ -28,6 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
 using System.Globalization;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -159,3 +160,5 @@ namespace System.IO.IsolatedStorage {
 		public abstract void Remove ();
 	}
 }
+/* NET_2_1 */
+#endif 

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

@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-
+#if !NET_2_1
 using System.Collections;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -596,3 +596,4 @@ namespace System.IO.IsolatedStorage {
 		}
 	}
 }
+#endif

+ 3 - 2
mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs

@@ -27,9 +27,9 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-
+#if !NET_2_1
 using System.Diagnostics;
-using System.Globalization;
+using System.Globalization;
 using System.Reflection;
 using System.Security;
 using System.Security.Permissions;
@@ -245,3 +245,4 @@ namespace System.IO.IsolatedStorage {
 		}
 	}
 }
+#endif

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

@@ -43,6 +43,10 @@ namespace System.IO.IsolatedStorage {
 
 		None = 0,
 		User = 1,
+#if NET_2_1
+		// Available in Silverlight
+		Application = 32,
+#else
 		Domain = 2,
 		Assembly = 4,
 
@@ -52,6 +56,7 @@ namespace System.IO.IsolatedStorage {
 #if NET_2_0 || BOOTSTRAP_NET_2_0
 		Machine = 16,
 		Application = 32
+#endif
 #endif
 	}
 }