2005-12-21 Carlos Alberto Cortez <calberto.cortez@gmail.com>

	* codegen.cs (AssemblyClass.CheckInternalsVisibleAttribute): Generate
	errors 1726 for strong named assemblies with InternalsVisibleToAttribute
	that doesn't contain the full public key. This is a update of the
	friend assemblies in .Net 2.0 release.

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

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index d593061139814ebc99c9fa7aebd4236e2ead8092..8d2e32dd2a05f27afb08156190da4848a7542823 100644 (file)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-21  Carlos Alberto Cortez <calberto.cortez@gmail.com>
+
+       * codegen.cs (AssemblyClass.CheckInternalsVisibleAttribute): Generate
+       errors 1726 for strong named assemblies with InternalsVisibleToAttribute 
+       that doesn't contain the full public key. This is a update of the
+       friend assemblies in .Net 2.0 release.
+       
 2005-12-18 Carlos Alberto Cortez <calberto.cortez@gmail.com>
 
        Fix #76995

diff --git a/mcs/gmcs/codegen.cs b/mcs/gmcs/codegen.cs
index 5fbe8999f7d178f9b75de802298f5bc57d58f498..bc4536c90ea964d0d60762540fedd8c5e46cc85f 100644 (file)
--- a/mcs/gmcs/codegen.cs
+++ b/mcs/gmcs/codegen.cs
@@ -1242,9 +1242,9 @@ namespace Mono.CSharp {
                        else if (aname.Version != null || aname.CultureInfo != null)
                                throw new Exception ("Friend assembly `" + a.GetString () + 
                                                "' is invalid. InternalsVisibleTo cannot have version or culture specified.");
-                       else if (aname.GetPublicKeyToken () == null && Name.GetPublicKeyToken () != null) {
+                       else if (aname.GetPublicKey () == null && Name.GetPublicKey () != null) {
                                Report.Error (1726, a.Location, "Friend assembly reference `" + aname.FullName + "' is invalid." +
-                                               " Strong named assemblies must specify a public key token in their InternalsVisibleTo declarations");
+                                               " Strong named assemblies must specify a public key in their InternalsVisibleTo declarations");
                                return false;
                        }