only add global from current asm

Author: StephaneDelcroix

src/Controls/src/Build.Tasks/XmlTypeExtensions.cs

@@ -20,12 +20,12 @@ static IList<XmlnsDefinitionAttribute> GatherXmlnsDefinitionAttributes(ModuleDef
 			{
 				// Search for the attribute in the assemblies being
 				// referenced.
-				GatherXmlnsDefinitionAttributes(xmlnsDefinitions, module.Assembly);
+				GatherXmlnsDefinitionAttributes(xmlnsDefinitions, module.Assembly, module.Assembly);
 
 				foreach (var asmRef in module.AssemblyReferences)
 				{
 					var asmDef = module.AssemblyResolver.Resolve(asmRef);
-					GatherXmlnsDefinitionAttributes(xmlnsDefinitions, asmDef);
+					GatherXmlnsDefinitionAttributes(xmlnsDefinitions, asmDef, module.Assembly);
 				}
 			}
 			else
@@ -59,13 +59,17 @@ static IList<XmlnsDefinitionAttribute> GatherXmlnsDefinitionAttributes(ModuleDef
 			return xmlnsDefinitions;
 		}
 
-		static void GatherXmlnsDefinitionAttributes(List<XmlnsDefinitionAttribute> xmlnsDefinitions, AssemblyDefinition asmDef)
+		static void GatherXmlnsDefinitionAttributes(List<XmlnsDefinitionAttribute> xmlnsDefinitions, AssemblyDefinition asmDef, AssemblyDefinition currentAssembly)
 		{
 			foreach (var ca in asmDef.CustomAttributes)
 			{
 				if (ca.AttributeType.FullName == _xmlnsDefinitionName)
 				{
 					var attr = GetXmlnsDefinition(ca, asmDef);
+					//only add globalxmlns definition from the current assembly
+					if (   attr.XmlNamespace == XamlParser.MauiGlobal
+						&& asmDef != currentAssembly)
+						continue;
 					xmlnsDefinitions.Add(attr);
 				}
 			}

src/Controls/src/SourceGen/CodeBehindGenerator.cs

@@ -231,6 +231,13 @@ static AssemblyCaches GetAssemblyAttributes(Compilation compilation, Cancellatio
 					{
 						xmlnsDef.AssemblyName = assembly.Name;
 					}
+					
+					//only add globalxmlns definition from the current assembly
+					if (   xmlnsDef.XmlNamespace == XamlParser.MauiGlobal 
+						&& !SymbolEqualityComparer.Default.Equals(assembly, compilation.Assembly))
+					{
+						continue;	
+					}
 
 					xmlnsDefinitions.Add(xmlnsDef);
 				}
@@ -258,7 +265,7 @@ static AssemblyCaches GetAssemblyAttributes(Compilation compilation, Cancellatio
 			}
 		}
 
-		return new AssemblyCaches(xmlnsDefinitions, internalsVisible);
+		return new AssemblyCaches([.. xmlnsDefinitions.Distinct()], internalsVisible);
 	}
 
 	static IDictionary<XmlType, string> GetTypeCache(Compilation compilation, CancellationToken cancellationToken)

src/Controls/src/Xaml/XamlParser.cs

@@ -333,7 +333,7 @@ static IValueNode GetValueNode(object value, XmlReader reader)
 
 		static IList<XmlnsDefinitionAttribute> s_xmlnsDefinitions;
 
-		static void GatherXmlnsDefinitionAttributes()
+		static void GatherXmlnsDefinitionAttributes(Assembly currentAssembly)
 		{
 			Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
 			s_xmlnsDefinitions = new List<XmlnsDefinitionAttribute>();
@@ -344,6 +344,10 @@ static void GatherXmlnsDefinitionAttributes()
 				{
 					foreach (XmlnsDefinitionAttribute attribute in assembly.GetCustomAttributes(typeof(XmlnsDefinitionAttribute)))
 					{
+						// Only add global xmlns definition from the current assembly
+						if (   attribute.XmlNamespace == XamlParser.MauiGlobal 
+							&& assembly != currentAssembly)
+							continue;
 						s_xmlnsDefinitions.Add(attribute);
 						attribute.AssemblyName = attribute.AssemblyName ?? assembly.FullName;
 					}
@@ -381,7 +385,7 @@ public static Type GetElementType(XmlType xmlType, IXmlLineInfo xmlInfo, Assembl
 
 		retry:
 			if (s_xmlnsDefinitions == null)
-				GatherXmlnsDefinitionAttributes();
+				GatherXmlnsDefinitionAttributes(currentAssembly);
 
 			Type type = xmlType.GetTypeReference(
 				s_xmlnsDefinitions,