[jcw-gen] use Assembly Name instead of FullName for typemaps

Context: https://bugzilla.xamarin.com/show_bug.cgi?id=61073

The Java-to-Managed typemaps list types such as:
```
android/app/Activity
Android.App.Activity, Mono.Android, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=84e04ff9cfb79065
```

Let’s assume you have an Android project with the following
assembly-level attribute:
```
[assembly:AssemblyVersion("1.0.0.*")]
```

Then on *every* build, the typemap is invalidated because your version
number has been incremented.

The fix here is to use the assembly’s short name via `GetName ().Name`
or Mono.Cecil’s equivalent `AssemblyDefinition.Name.Name`. So the above
typemap would only be `Android.App.Activity, Mono.Android`. These
changes needed to happen in both `JavaNativeTypeManager` and
`TypeNameMapGenerator`.

Author: jonathanpeppers

src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGenerator.cs

@@ -141,7 +141,7 @@ public void WriteJavaToManaged (Stream output)
 			var typeMap = GetTypeMapping (
 					t => t.IsInterface || t.HasGenericParameters,
 					JavaNativeTypeManager.ToJniName,
-					t => t.GetAssemblyQualifiedName ());
+					GetTypeName);
 
 			WriteBinaryMapping (output, typeMap);
 		}
@@ -202,6 +202,15 @@ static void WriteBinaryMapping (Stream o, Dictionary<string, string> mapping)
 			o.WriteByte (0x0);
 		}
 
+		/// <summary>
+		/// We need the equivalent of GetAssemblyQualifiedName, but without the Assembly's FullName
+		/// NOTE: Cecil also uses / instead of + for nested types, see Java.Interop.Tools.Cecil.TypeDefinitionRocks.GetAssemblyQualifiedName
+		/// </summary>
+		static string GetTypeName (TypeDefinition type)
+		{
+			return type.FullName.Replace ('/', '+') + ", " + type.Module.Assembly.Name.Name;
+		}
+
 		static Dictionary<byte[], byte[]> ToBinary(Dictionary<string, string> map, Encoding encoding)
 		{
 			return map.ToDictionary (e => encoding.GetBytes (e.Key), e => encoding.GetBytes (e.Value));
@@ -234,7 +243,7 @@ public void WriteManagedToJava (Stream output)
 
 			var typeMap = GetTypeMapping (
 					t => false,
-					t => t.GetAssemblyQualifiedName (),
+					GetTypeName,
 					JavaNativeTypeManager.ToJniName);
 
 			WriteBinaryMapping (output, typeMap);

src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs

@@ -93,7 +93,7 @@ public void GenerateIndirectApplication (
 		)
 		{
 			var actual      = Generate (typeof (IndirectApplication), applicationJavaClass);
-			var expected    = @"package md5fef72cac46d04ae5bdc90af5bb6221ad;
+			var expected    = @"package md5f43cdfade412ae71b21bb70a5c2841ab;
 
 
 public class IndirectApplication
@@ -144,7 +144,7 @@ public void monodroidClearReferences ()
 		public void GenerateExportedMembers ()
 		{
 			var actual = Generate (typeof (ExportsMembers));
-			var expected = @"package md5fef72cac46d04ae5bdc90af5bb6221ad;
+			var expected = @"package md5f43cdfade412ae71b21bb70a5c2841ab;
 
 
 public class ExportsMembers
@@ -156,7 +156,7 @@ extends java.lang.Object
 	public static final String __md_methods;
 	static {
 		__md_methods = 
-			""n_GetInstance:()Lmd5fef72cac46d04ae5bdc90af5bb6221ad/ExportsMembers;:__export__\n"" +
+			""n_GetInstance:()Lmd5f43cdfade412ae71b21bb70a5c2841ab/ExportsMembers;:__export__\n"" +
 			""n_GetValue:()Ljava/lang/String;:__export__\n"" +
 			""n_methodNamesNotMangled:()V:__export__\n"" +
 			""n_CompletelyDifferentName:(Ljava/lang/String;I)Ljava/lang/String;:__export__\n"" +
@@ -167,17 +167,17 @@ extends java.lang.Object
 	}
 
 
-	public static md5fef72cac46d04ae5bdc90af5bb6221ad.ExportsMembers STATIC_INSTANCE = GetInstance ();
+	public static md5f43cdfade412ae71b21bb70a5c2841ab.ExportsMembers STATIC_INSTANCE = GetInstance ();
 
 
 	public java.lang.String VALUE = GetValue ();
 
-	public static md5fef72cac46d04ae5bdc90af5bb6221ad.ExportsMembers GetInstance ()
+	public static md5f43cdfade412ae71b21bb70a5c2841ab.ExportsMembers GetInstance ()
 	{
 		return n_GetInstance ();
 	}
 
-	private static native md5fef72cac46d04ae5bdc90af5bb6221ad.ExportsMembers n_GetInstance ();
+	private static native md5f43cdfade412ae71b21bb70a5c2841ab.ExportsMembers n_GetInstance ();
 
 	public java.lang.String GetValue ()
 	{
@@ -240,7 +240,7 @@ public void monodroidClearReferences ()
 		public void GenerateInnerClass ()
 		{
 			var actual = Generate (typeof (ExampleOuterClass));
-			var expected = @"package md5fef72cac46d04ae5bdc90af5bb6221ad;
+			var expected = @"package md5f43cdfade412ae71b21bb70a5c2841ab;
 
 
 public class ExampleOuterClass

src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGeneratorTests.cs

@@ -49,7 +49,7 @@ public void WriteJavaToManaged ()
 			v.WriteJavaToManaged (o);
 			var a = ToArray (o);
 			Save (a, "__j2m");
-			var length = 259;
+			var length = 204;
 			var offset = 90;
 			var e =
 				"version=1\u0000" +
@@ -59,12 +59,12 @@ public void WriteJavaToManaged ()
 				GetJ2MEntryLine (typeof (ActivityName),                             "activity/Name",                                                                                offset, length) +
 				GetJ2MEntryLine (typeof (ApplicationName),                          "application/Name",                                                                             offset, length) +
 				GetJ2MEntryLine (typeof (InstrumentationName),                      "instrumentation/Name",                                                                         offset, length) +
-				GetJ2MEntryLine (typeof (DefaultName),                              "md5fef72cac46d04ae5bdc90af5bb6221ad/DefaultName",                                              offset, length) +
-				GetJ2MEntryLine (typeof (DefaultName.A),                            "md5fef72cac46d04ae5bdc90af5bb6221ad/DefaultName_A",                                            offset, length) +
-				GetJ2MEntryLine (typeof (DefaultName.A.B),                          "md5fef72cac46d04ae5bdc90af5bb6221ad/DefaultName_A_B",                                          offset, length) +
-				GetJ2MEntryLine (typeof (DefaultName.C.D),                          "md5fef72cac46d04ae5bdc90af5bb6221ad/DefaultName_C_D",                                          offset, length) +
-				GetJ2MEntryLine (typeof (ExampleOuterClass),                        "md5fef72cac46d04ae5bdc90af5bb6221ad/ExampleOuterClass",                                        offset, length) +
-				GetJ2MEntryLine (typeof (ExampleOuterClass.ExampleInnerClass),      "md5fef72cac46d04ae5bdc90af5bb6221ad/ExampleOuterClass$ExampleOuterClass_ExampleInnerClass",    offset, length) +
+				GetJ2MEntryLine (typeof (DefaultName),                              "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName",                                              offset, length) +
+				GetJ2MEntryLine (typeof (DefaultName.A),                            "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName_A",                                            offset, length) +
+				GetJ2MEntryLine (typeof (DefaultName.A.B),                          "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName_A_B",                                          offset, length) +
+				GetJ2MEntryLine (typeof (DefaultName.C.D),                          "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName_C_D",                                          offset, length) +
+				GetJ2MEntryLine (typeof (ExampleOuterClass),                        "md5f43cdfade412ae71b21bb70a5c2841ab/ExampleOuterClass",                                        offset, length) +
+				GetJ2MEntryLine (typeof (ExampleOuterClass.ExampleInnerClass),      "md5f43cdfade412ae71b21bb70a5c2841ab/ExampleOuterClass$ExampleOuterClass_ExampleInnerClass",    offset, length) +
 				GetJ2MEntryLine (typeof (AbstractClass),                            "my/AbstractClass",                                                                             offset, length) +
 				GetJ2MEntryLine (typeof (ProviderName),                             "provider/Name",                                                                                offset, length) +
 				GetJ2MEntryLine (typeof (ReceiverName),                             "receiver/Name",                                                                                offset, length) +
@@ -97,7 +97,7 @@ static byte [] ToArray (MemoryStream stream)
 
 		static string GetJ2MEntryLine (Type type, string jniName, int offset, int length)
 		{
-			return GetEntryPart (jniName, offset) + GetEntryPart (type.AssemblyQualifiedName, length - offset);
+			return GetEntryPart (jniName, offset) + GetEntryPart (GetTypeName (type), length - offset);
 		}
 
 		static string GetEntryPart (string value, int length)
@@ -113,8 +113,8 @@ public void WriteManagedToJava ()
 			v.WriteManagedToJava (o);
 			var a = ToArray (o);
 			Save (a, "__m2j");
-			var length = 259;
-			var offset = 169;
+			var length = 204;
+			var offset = 114;
 			var e =
 				"version=1\u0000" +
 				"entry-count=19\u0000" +
@@ -124,12 +124,12 @@ public void WriteManagedToJava ()
 				GetM2JEntryLine (typeof (AbstractClassInvoker),                     "my/AbstractClass",                                                                             offset, length) +
 				GetM2JEntryLine (typeof (ActivityName),                             "activity/Name",                                                                                offset, length) +
 				GetM2JEntryLine (typeof (ApplicationName),                          "application/Name",                                                                             offset, length) +
-				GetM2JEntryLine (typeof (DefaultName.A.B),                          "md5fef72cac46d04ae5bdc90af5bb6221ad/DefaultName_A_B",                                          offset, length) +
-				GetM2JEntryLine (typeof (DefaultName.A),                            "md5fef72cac46d04ae5bdc90af5bb6221ad/DefaultName_A",                                            offset, length) +
-				GetM2JEntryLine (typeof (DefaultName.C.D),                          "md5fef72cac46d04ae5bdc90af5bb6221ad/DefaultName_C_D",                                          offset, length) +
-				GetM2JEntryLine (typeof (DefaultName),                              "md5fef72cac46d04ae5bdc90af5bb6221ad/DefaultName",                                              offset, length) +
-				GetM2JEntryLine (typeof (ExampleOuterClass.ExampleInnerClass),      "md5fef72cac46d04ae5bdc90af5bb6221ad/ExampleOuterClass$ExampleOuterClass_ExampleInnerClass",    offset, length) +
-				GetM2JEntryLine (typeof (ExampleOuterClass),                        "md5fef72cac46d04ae5bdc90af5bb6221ad/ExampleOuterClass",                                        offset, length) +
+				GetM2JEntryLine (typeof (DefaultName.A.B),                          "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName_A_B",                                          offset, length) +
+				GetM2JEntryLine (typeof (DefaultName.A),                            "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName_A",                                            offset, length) +
+				GetM2JEntryLine (typeof (DefaultName.C.D),                          "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName_C_D",                                          offset, length) +
+				GetM2JEntryLine (typeof (DefaultName),                              "md5f43cdfade412ae71b21bb70a5c2841ab/DefaultName",                                              offset, length) +
+				GetM2JEntryLine (typeof (ExampleOuterClass.ExampleInnerClass),      "md5f43cdfade412ae71b21bb70a5c2841ab/ExampleOuterClass$ExampleOuterClass_ExampleInnerClass",    offset, length) +
+				GetM2JEntryLine (typeof (ExampleOuterClass),                        "md5f43cdfade412ae71b21bb70a5c2841ab/ExampleOuterClass",                                        offset, length) +
 				GetM2JEntryLine (typeof (InstrumentationName),                      "instrumentation/Name",                                                                         offset, length) +
 				GetM2JEntryLine (typeof (NonStaticOuterClass.NonStaticInnerClass),  "register/NonStaticOuterClass$NonStaticInnerClass",                                             offset, length) +
 				GetM2JEntryLine (typeof (NonStaticOuterClass),                      "register/NonStaticOuterClass",                                                                 offset, length) +
@@ -147,7 +147,12 @@ public void WriteManagedToJava ()
 
 		static string GetM2JEntryLine (Type type, string jniName, int offset, int length)
 		{
-			return GetEntryPart (type.AssemblyQualifiedName, offset) + GetEntryPart (jniName, length - offset);
+			return GetEntryPart (GetTypeName (type), offset) + GetEntryPart (jniName, length - offset);
+		}
+
+		static string GetTypeName (Type type)
+		{
+			return type.FullName + ", " + type.Assembly.GetName ().Name;
 		}
 	}
 }

src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs

@@ -187,15 +187,16 @@ static bool IsPackageNamePreservedForAssembly (string assemblyName)
 
 		public static string GetPackageName (Type type)
 		{
-			if (IsPackageNamePreservedForAssembly (type.Assembly.GetName ().Name))
+			string assemblyName = type.Assembly.GetName ().Name;
+			if (IsPackageNamePreservedForAssembly (assemblyName))
 				return type.Namespace.ToLowerInvariant ();
 			switch (PackageNamingPolicy) {
 			case PackageNamingPolicy.Lowercase:
 				return type.Namespace.ToLowerInvariant ();
 			case PackageNamingPolicy.LowercaseWithAssemblyName:
-				return "assembly_" + (type.Assembly.GetName ().Name.Replace ('.', '_') + "." + type.Namespace).ToLowerInvariant ();
+				return "assembly_" + (assemblyName.Replace ('.', '_') + "." + type.Namespace).ToLowerInvariant ();
 			default:
-				return "md5" + ToMd5 (type.Namespace + ":" + type.Assembly.FullName);
+				return "md5" + ToMd5 (type.Namespace + ":" + assemblyName);
 			}
 		}
 
@@ -515,7 +516,7 @@ public static string GetPackageName (TypeDefinition type)
 			case PackageNamingPolicy.LowercaseWithAssemblyName:
 				return "assembly_" + (type.Module.Assembly.Name.Name.Replace ('.', '_') + "." + type.Namespace).ToLowerInvariant ();
 			default:
-				return "md5" + ToMd5 (type.Namespace + ":" + type.Module.Assembly.Name.FullName);
+				return "md5" + ToMd5 (type.Namespace + ":" + type.Module.Assembly.Name.Name);
 			}
 		}
 #endif