2007-12-18 Miguel de Icaza <miguel@novell.com>

	* 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

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/ChangeLog b/mcs/class/corlib/System.IO.IsolatedStorage/ChangeLog
index 9f8fd86126b7a4ccfd1d3016d47cb6e8229cfa94..7c7c9bcb36150cf76f9d4e344ae0e420f3db4950 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/ChangeLog
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/ChangeLog
@@ -1,3 +1,14 @@
+2007-12-18  Miguel de Icaza  <miguel@novell.com>
+
+       * 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  <sebastien@ximian.com>
 
        * IsolatedStorageFileStream.cs: Handle rooted paths. Patch by Jay

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs
index 7f64bbd0746452a348dffedc79dc9bbb37423b20..eb2746578e4a241d03d40ce079c084d3da90981b 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs
+++ b/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 
\ No newline at end of file

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs
index 992bd4722cf37df877a5cfb3523d71ee82ce2a67..050dedcb4ec637f6cd44d14e1c6748f9020753db 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFile.cs
+++ b/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
\ No newline at end of file

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs
index ad45ffacbd2ae3ccc18fea671d35e28884d5facb..fe5bced996a879e70843615afc25c9553a766649 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs
+++ b/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;\r
+using System.Globalization;
 using System.Reflection;
 using System.Security;
 using System.Security.Permissions;
@@ -245,3 +245,4 @@ namespace System.IO.IsolatedStorage {
                }
        }
 }
+#endif
\ No newline at end of file

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageScope.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageScope.cs
index a77dc7af55d629193197173850d7fbbf6e8ff98a..97edfa37cf1e99ef0ceb8239ecbca95f7d83a517 100644 (file)
--- a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageScope.cs
+++ b/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
        }
 }