Merge pull request #225 from mistoll/master

[mono.git] / mcs / class / corlib / System.Reflection / ManifestResourceInfo.cs

diff --git a/mcs/class/corlib/System.Reflection/ManifestResourceInfo.cs b/mcs/class/corlib/System.Reflection/ManifestResourceInfo.cs
index 76565a0e60948058be17d8293659cad90861a933..a0f5f3713a285ccae35329f65e958697297dc6b4 100644 (file)
--- a/mcs/class/corlib/System.Reflection/ManifestResourceInfo.cs
+++ b/mcs/class/corlib/System.Reflection/ManifestResourceInfo.cs
@@ -5,23 +5,66 @@
 //
 // (C) Ximian, Inc. 2001
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System.Runtime.InteropServices;
+
 namespace System.Reflection
 {
+       [ComVisible (true)]
+       [StructLayout (LayoutKind.Sequential)]
        public class ManifestResourceInfo
        {
-               [MonoTODO]
+               private Assembly _assembly;
+               private string _filename;
+               private ResourceLocation _location;
+
+               internal ManifestResourceInfo ()
+               {
+               }
+
+#if NET_4_0
+               public
+#else
+               internal
+#endif
+               ManifestResourceInfo (Assembly containingAssembly, string containingFileName, ResourceLocation resourceLocation)
+               {
+                       _assembly = containingAssembly;
+                       _filename = containingFileName;
+                       _location = resourceLocation;
+               }
                public virtual string FileName {
-                       get { return null; }
+                       get { return _filename; }
                }
 
-               [MonoTODO]
                public virtual Assembly ReferencedAssembly {
-                       get { return null; }
+                       get { return _assembly; }
                }
 
-               [MonoTODO]
                public virtual ResourceLocation ResourceLocation {
-                       get { return 0; }
+                       get { return _location; }
                }
        }
 }