Browse Source

* AssemblyTest.cs: Modified test to pass on 2.0 profile and .NET 2.0.
* Assembly.cs: On 2.0 profile, throw FileNotFoundException for
linked resources in GetManifestResourceStream when assembly is
loaded from byte array.

svn path=/trunk/mcs/; revision=63460

Gert Driesen 19 years ago
parent
commit
ef6e652215

+ 4 - 0
mcs/class/corlib/System.Reflection/Assembly.cs

@@ -272,7 +272,11 @@ namespace System.Reflection {
 				return info.ReferencedAssembly.GetManifestResourceStream (name);
 			if ((info.FileName != null) && (info.ResourceLocation == 0)) {
 				if (fromByteArray)
+#if NET_2_0
+					throw new FileNotFoundException (info.FileName);
+#else
 					return null;
+#endif
 
 				string filename = Path.Combine (Path.GetDirectoryName (Location),
 											info.FileName);

+ 6 - 0
mcs/class/corlib/System.Reflection/ChangeLog

@@ -1,3 +1,9 @@
+2006-08-08  Gert Driesen  <[email protected]>
+
+	* Assembly.cs: On 2.0 profile, throw FileNotFoundException for
+	linked resources in GetManifestResourceStream when assembly is
+	loaded from byte array.
+
 2006-07-12  Zoltan Varga  <[email protected]>
 
 	* MonoMethod.cs (ContainsGenericParameters): Implement.

+ 8 - 0
mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs

@@ -410,7 +410,15 @@ namespace MonoTests.System.Reflection
 				Assert.AreEqual ("readme.txt", resInfo.FileName, "#A6");
 				Assert.IsNull (resInfo.ReferencedAssembly, "#A7");
 				Assert.AreEqual ((ResourceLocation) 0, resInfo.ResourceLocation, "#A8");
+#if NET_2_0
+				try {
+					assembly.GetManifestResourceStream ("read");
+					Assert.Fail ("#A9");
+				} catch (FileNotFoundException) {
+				}
+#else
 				Assert.IsNull (assembly.GetManifestResourceStream ("read"), "#A9");
+#endif
 				try {
 					assembly.GetFile ("readme.txt");
 					Assert.Fail ("#A10");

+ 4 - 0
mcs/class/corlib/Test/System.Reflection/ChangeLog

@@ -1,3 +1,7 @@
+2006-08-08  Gert Driesen  <[email protected]>
+
+	* AssemblyTest.cs: Modified test to pass on 2.0 profile and .NET 2.0.
+
 2006-07-12  Zoltan Varga  <[email protected]>
 
 	* MethodInfoTest.cs: Add tests for ContainsGenericParameters ().