[WindowsBase] Don't treat special file [Content-Types].xml as a part, ends up as...

diff --git a/mcs/class/WindowsBase/System.IO.Packaging/ZipPackage.cs b/mcs/class/WindowsBase/System.IO.Packaging/ZipPackage.cs
index 0a113364c520aeccf46720eca559177b4c1e9b7c..b6ff1ce50cb4e93c2083fdb4b1d4bb899cd9da91 100644 (file)
--- a/mcs/class/WindowsBase/System.IO.Packaging/ZipPackage.cs
+++ b/mcs/class/WindowsBase/System.IO.Packaging/ZipPackage.cs
@@ -157,6 +157,9 @@ namespace System.IO.Packaging {
 
                                        // The file names in the zip archive are not prepended with '/'
                                        foreach (string file in archive.GetFiles ()) {
+                                               if (file.Equals (ContentUri, StringComparison.Ordinal))
+                                                       continue;
+
                                                XmlNode node;
                                                CompressionOption compression = archive.GetCompressionLevel (file);
 

diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartTest.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartTest.cs
index 97aaa5b400d1b8c7ebdc525d7feec85c9d392529..0abdd2f23a12bf442efd10f0179f9d98b77e6bf3 100644 (file)
--- a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartTest.cs
+++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartTest.cs
@@ -325,11 +325,9 @@ namespace System.IO.Packaging.Tests {
         }\r
 \r
         [Test]\r
-        [ExpectedException (typeof (ArgumentException))]\r
-        [Ignore ("Proper validation of the Uris is not performed")]\r
         public void CheckContentTypes ()\r
         {\r
-            package.PartExists(new Uri ("/[Content_Types].xml", UriKind.Relative));\r
+               Assert.IsFalse (package.PartExists(new Uri ("[Content_Types].xml", UriKind.Relative)));\r
         }\r
     }\r
 }\r