Eric comments

Author: TomFinley

src/Microsoft.ML.Core/Properties/AssemblyInfo.cs

@@ -5,4 +5,3 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TestFramework, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
-[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.CodeAnalyzer.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]

tools-local/Microsoft.ML.InternalCodeAnalyzer/BestFriendAnalyzer.cs

@@ -17,12 +17,14 @@ public sealed class BestFriendAnalyzer : DiagnosticAnalyzer
         private const string Category = "Access";
         internal const string DiagnosticId = "MSML_NoBestFriendInternal";
 
-        private const string Title = "Cross-assembly internal access requires.";
+        private const string Title = "Cross-assembly internal access requires referenced item to have " + AttributeName + " attribute.";
         private const string Format = "Access of '{0}' is a cross assembly internal " +
             "reference, and the declaring assembly wants these accesses to be on something " +
             "with the attribute " + AttributeName + ".";
         private const string Description =
-            "The ML.NET .";
+            "The identifier indicated is defined as an internal member of an assembly that has the " +
+            AssemblyAttributeName + " assembly-level attribute set. Even with friend access to that " +
+            "assembly, such a usage requires that the item have the " + AttributeName + " on it.";
 
         private static DiagnosticDescriptor Rule =
             new DiagnosticDescriptor(DiagnosticId, Title, Format, Category,
@@ -44,13 +46,13 @@ private void Analyze(SemanticModelAnalysisContext context)
             var model = context.SemanticModel;
             var comp = model.Compilation;
 
-            // Get the symbols of the key types we are analyzing. If we can't find any of them there is
-            // no point in going further.
-            var attrType = comp.GetTypeByMetadataName(AttributeName);
-            if (attrType == null)
+            // Get the symbols of the key types we are analyzing. If we can't find either
+            // of them there is no point in going further.
+            var bestFriendAttributeType = comp.GetTypeByMetadataName(AttributeName);
+            if (bestFriendAttributeType == null)
                 return;
-            var assemblyAttrType = comp.GetTypeByMetadataName(AssemblyAttributeName);
-            if (assemblyAttrType == null)
+            var wantsToBeBestFriendsAttributeType = comp.GetTypeByMetadataName(AssemblyAttributeName);
+            if (wantsToBeBestFriendsAttributeType == null)
                 return;
 
             var myAssembly = comp.Assembly;
@@ -87,12 +89,12 @@ private void Analyze(SemanticModelAnalysisContext context)
                 // further.
                 if (!assemblyHasAttrMap.TryGetValue(symbolAssembly, out bool assemblyWantsBestFriends))
                 {
-                    assemblyWantsBestFriends = symbolAssembly.GetAttributes().Any(a => a.AttributeClass == assemblyAttrType);
+                    assemblyWantsBestFriends = symbolAssembly.GetAttributes().Any(a => a.AttributeClass == wantsToBeBestFriendsAttributeType);
                     assemblyHasAttrMap[symbolAssembly] = assemblyWantsBestFriends;
                 }
                 if (!assemblyWantsBestFriends)
                     continue;
-                if (symbol.GetAttributes().Any(a => a.AttributeClass == attrType))
+                if (symbol.GetAttributes().Any(a => a.AttributeClass == bestFriendAttributeType))
                 {
                     // You're not just a friend, you're my best friend!
                     continue;