Skip to content

Commit 89c5c33

Browse files
StephaneDelcroixStephaneDelcroix
committed
[X] global xmlns
Allow aggregating multiple xmlns into a single new global http://schemas.microsoft.com/dotnet/maui/global using XmlnsDefinition attribute, like this ```csharp [assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/maui/global", "http://schemas.microsoft.com/dotnet/2021/maui")] ``` the x: xmlns can not be aggregated, as it serves important purposes for the parsers this also brings #28090 to fix #28150 - fixes #28150 - fixes #28843 - closes #28090
1 parent 2cc5a76 commit 89c5c33

28 files changed

+840
-55
lines changed

‎Microsoft.Maui-vscode.sln‎

Lines changed: 603 additions & 0 deletions
Large diffs are not rendered by default.

‎src/Controls/docs/Microsoft.Maui.Controls/XmlnsDefinitionAttribute.xml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
</Docs>
2525
<Members>
2626
<Member MemberName=".ctor">
27-
<MemberSignature Language="C#" Value="public XmlnsDefinitionAttribute (string xmlNamespace, string clrNamespace);" />
28-
<MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string xmlNamespace, string clrNamespace) cil managed" />
27+
<MemberSignature Language="C#" Value="public XmlnsDefinitionAttribute (string xmlNamespace, string target);" />
28+
<MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string xmlNamespace, string target) cil managed" />
2929
<MemberSignature Language="DocId" Value="M:Microsoft.Maui.Controls.XmlnsDefinitionAttribute.#ctor(System.String,System.String)" />
3030
<MemberSignature Language="F#" Value="new Microsoft.Maui.Controls.XmlnsDefinitionAttribute : string * string -&gt; Microsoft.Maui.Controls.XmlnsDefinitionAttribute" Usage="new Microsoft.Maui.Controls.XmlnsDefinitionAttribute (xmlNamespace, clrNamespace)" />
3131
<MemberType>Constructor</MemberType>
@@ -35,11 +35,11 @@
3535
</AssemblyInfo>
3636
<Parameters>
3737
<Parameter Name="xmlNamespace" Type="System.String" />
38-
<Parameter Name="clrNamespace" Type="System.String" />
38+
<Parameter Name="target" Type="System.String" />
3939
</Parameters>
4040
<Docs>
4141
<param name="xmlNamespace">To be added.</param>
42-
<param name="clrNamespace">To be added.</param>
42+
<param name="target">To be added.</param>
4343
</Docs>
4444
</Member>
4545
<Member MemberName="AssemblyName">
@@ -74,6 +74,22 @@
7474
<Docs>
7575
</Docs>
7676
</Member>
77+
<Member MemberName="Target">
78+
<MemberSignature Language="C#" Value="public string Target { get; }" />
79+
<MemberSignature Language="ILAsm" Value=".property instance string Target" />
80+
<MemberSignature Language="DocId" Value="P:Microsoft.Maui.Controls.XmlnsDefinitionAttribute.ClrNamespace" />
81+
<MemberSignature Language="F#" Value="member this.ClrNamespace : string" Usage="Microsoft.Maui.Controls.XmlnsDefinitionAttribute.Target" />
82+
<MemberType>Property</MemberType>
83+
<AssemblyInfo>
84+
<AssemblyName>Microsoft.Maui.Controls.Core</AssemblyName>
85+
<AssemblyVersion>2.0.0.0</AssemblyVersion>
86+
</AssemblyInfo>
87+
<ReturnValue>
88+
<ReturnType>System.String</ReturnType>
89+
</ReturnValue>
90+
<Docs>
91+
</Docs>
92+
</Member>
7793
<Member MemberName="XmlNamespace">
7894
<MemberSignature Language="C#" Value="public string XmlNamespace { get; }" />
7995
<MemberSignature Language="ILAsm" Value=".property instance string XmlNamespace" />

‎src/Controls/src/Build.Tasks/XamlCTask.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.IO;
55
using System.Linq;
66
using System.Xml;
7+
using Microsoft.Build.Framework;
78
using Microsoft.Build.Utilities;
89
using Microsoft.Maui.Controls.Xaml;
910
using Mono.Cecil;

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

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ namespace Microsoft.Maui.Controls.Build.Tasks
1010
{
1111
static class XmlTypeExtensions
1212
{
13+
static readonly string _xmlnsDefinitionName = typeof(XmlnsDefinitionAttribute).FullName;
14+
1315
static IList<XmlnsDefinitionAttribute> GatherXmlnsDefinitionAttributes(ModuleDefinition module)
1416
{
1517
var xmlnsDefinitions = new List<XmlnsDefinitionAttribute>();
@@ -18,17 +20,12 @@ static IList<XmlnsDefinitionAttribute> GatherXmlnsDefinitionAttributes(ModuleDef
1820
{
1921
// Search for the attribute in the assemblies being
2022
// referenced.
23+
GatherXmlnsDefinitionAttributes(xmlnsDefinitions, module.Assembly);
24+
2125
foreach (var asmRef in module.AssemblyReferences)
2226
{
2327
var asmDef = module.AssemblyResolver.Resolve(asmRef);
24-
foreach (var ca in asmDef.CustomAttributes)
25-
{
26-
if (ca.AttributeType.FullName == typeof(XmlnsDefinitionAttribute).FullName)
27-
{
28-
var attr = GetXmlnsDefinition(ca, asmDef);
29-
xmlnsDefinitions.Add(attr);
30-
}
31-
}
28+
GatherXmlnsDefinitionAttributes(xmlnsDefinitions, asmDef);
3229
}
3330
}
3431
else
@@ -47,9 +44,33 @@ static IList<XmlnsDefinitionAttribute> GatherXmlnsDefinitionAttributes(ModuleDef
4744
}
4845
}
4946

47+
var globalXmlns = xmlnsDefinitions.Where(x => x.XmlNamespace == XamlParser.MauiGlobal).ToList();
48+
foreach (var global in globalXmlns)
49+
{
50+
var pointedXmlns = xmlnsDefinitions.Where(x => x.XmlNamespace == global.Target).ToList();
51+
foreach (var pointed in pointedXmlns)
52+
{
53+
xmlnsDefinitions.Add (new XmlnsDefinitionAttribute(global.XmlNamespace, pointed.Target)
54+
{
55+
AssemblyName = pointed.AssemblyName
56+
});
57+
}
58+
}
5059
return xmlnsDefinitions;
5160
}
5261

62+
static void GatherXmlnsDefinitionAttributes(List<XmlnsDefinitionAttribute> xmlnsDefinitions, AssemblyDefinition asmDef)
63+
{
64+
foreach (var ca in asmDef.CustomAttributes)
65+
{
66+
if (ca.AttributeType.FullName == _xmlnsDefinitionName)
67+
{
68+
var attr = GetXmlnsDefinition(ca, asmDef);
69+
xmlnsDefinitions.Add(attr);
70+
}
71+
}
72+
}
73+
5374
public static TypeReference GetTypeReference(XamlCache cache, string typeName, ModuleDefinition module, BaseNode node, bool expandToExtension = true)
5475
{
5576
try
@@ -76,6 +97,8 @@ public static bool TryGetTypeReference(this XmlType xmlType, XamlCache cache, Mo
7697

7798
TypeReference type = xmlType.GetTypeReference(xmlnsDefinitions, module.Assembly.Name.Name, (typeInfo) =>
7899
{
100+
if (typeInfo.clrNamespace.StartsWith("http")) //aggregated xmlns, might result in a typeload exception
101+
return null;
79102
string typeName = typeInfo.typeName.Replace('+', '/'); //Nested types
80103
var type = module.GetTypeDefinition(cache, (typeInfo.assemblyName, typeInfo.clrNamespace, typeName));
81104
if (type is not null && type.IsPublicOrVisibleInternal(module))
@@ -97,7 +120,7 @@ public static TypeReference GetTypeReference(this XmlType xmlType, XamlCache cac
97120
throw new BuildException(BuildExceptionCode.TypeResolution, xmlInfo, null, $"{xmlType.NamespaceUri}:{xmlType.Name}");
98121
}
99122

100-
public static XmlnsDefinitionAttribute GetXmlnsDefinition(this CustomAttribute ca, AssemblyDefinition asmDef)
123+
static XmlnsDefinitionAttribute GetXmlnsDefinition(this CustomAttribute ca, AssemblyDefinition asmDef)
101124
{
102125
var attr = new XmlnsDefinitionAttribute(
103126
ca.ConstructorArguments[0].Value as string,

‎src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1907,7 +1907,7 @@
19071907
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.AssemblyName.set -> void
19081908
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.ClrNamespace.get -> string
19091909
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.XmlNamespace.get -> string
1910-
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.XmlnsDefinitionAttribute(string xmlNamespace, string clrNamespace) -> void
1910+
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.XmlnsDefinitionAttribute(string xmlNamespace, string target) -> void
19111911
~Microsoft.Maui.Controls.XmlnsPrefixAttribute.Prefix.get -> string
19121912
~Microsoft.Maui.Controls.XmlnsPrefixAttribute.XmlNamespace.get -> string
19131913
~Microsoft.Maui.Controls.XmlnsPrefixAttribute.XmlnsPrefixAttribute(string xmlNamespace, string prefix) -> void

‎src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,5 @@ static readonly Microsoft.Maui.Controls.TitleBar.SubtitleProperty -> Microsoft.M
148148
static readonly Microsoft.Maui.Controls.TitleBar.TitleProperty -> Microsoft.Maui.Controls.BindableProperty!
149149
static readonly Microsoft.Maui.Controls.TitleBar.TrailingContentProperty -> Microsoft.Maui.Controls.BindableProperty!
150150
static readonly Microsoft.Maui.Controls.Window.TitleBarProperty -> Microsoft.Maui.Controls.BindableProperty!
151-
virtual Microsoft.Maui.Controls.Application.ActivateWindow(Microsoft.Maui.Controls.Window! window) -> void
151+
virtual Microsoft.Maui.Controls.Application.ActivateWindow(Microsoft.Maui.Controls.Window! window) -> void
152+
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.Target.get -> string

‎src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1866,7 +1866,7 @@
18661866
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.AssemblyName.set -> void
18671867
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.ClrNamespace.get -> string
18681868
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.XmlNamespace.get -> string
1869-
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.XmlnsDefinitionAttribute(string xmlNamespace, string clrNamespace) -> void
1869+
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.XmlnsDefinitionAttribute(string xmlNamespace, string target) -> void
18701870
~Microsoft.Maui.Controls.XmlnsPrefixAttribute.Prefix.get -> string
18711871
~Microsoft.Maui.Controls.XmlnsPrefixAttribute.XmlNamespace.get -> string
18721872
~Microsoft.Maui.Controls.XmlnsPrefixAttribute.XmlnsPrefixAttribute(string xmlNamespace, string prefix) -> void

‎src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,3 +348,4 @@ virtual Microsoft.Maui.Controls.Handlers.Items2.ItemsViewHandler2<TItemsView>.Up
348348
*REMOVED*override Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer.SetNeedsLayout() -> void
349349
*REMOVED*override Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer.MovedToWindow() -> void
350350
override Microsoft.Maui.Controls.Handlers.Compatibility.VisualElementRenderer<TElement>.MovedToWindow() -> void
351+
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.Target.get -> string

‎src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1866,7 +1866,7 @@
18661866
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.AssemblyName.set -> void
18671867
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.ClrNamespace.get -> string
18681868
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.XmlNamespace.get -> string
1869-
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.XmlnsDefinitionAttribute(string xmlNamespace, string clrNamespace) -> void
1869+
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.XmlnsDefinitionAttribute(string xmlNamespace, string target) -> void
18701870
~Microsoft.Maui.Controls.XmlnsPrefixAttribute.Prefix.get -> string
18711871
~Microsoft.Maui.Controls.XmlnsPrefixAttribute.XmlNamespace.get -> string
18721872
~Microsoft.Maui.Controls.XmlnsPrefixAttribute.XmlnsPrefixAttribute(string xmlNamespace, string prefix) -> void

‎src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,4 +347,5 @@ virtual Microsoft.Maui.Controls.Handlers.Items2.ItemsViewDelegator2<TItemsView,
347347
virtual Microsoft.Maui.Controls.Handlers.Items2.ItemsViewHandler2<TItemsView>.UpdateLayout() -> void
348348
*REMOVED*override Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer.SetNeedsLayout() -> void
349349
*REMOVED*override Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer.MovedToWindow() -> void
350-
override Microsoft.Maui.Controls.Handlers.Compatibility.VisualElementRenderer<TElement>.MovedToWindow() -> void
350+
override Microsoft.Maui.Controls.Handlers.Compatibility.VisualElementRenderer<TElement>.MovedToWindow() -> void
351+
~Microsoft.Maui.Controls.XmlnsDefinitionAttribute.Target.get -> string

0 commit comments

Comments
 (0)