XAML xmlns simplifications #29579
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -254,7 +254,8 @@ public static TypeDefinition GetTypeDefinition(this ModuleDefinition module, Xam | |
| { | ||
| return cache.GetOrAddTypeDefinition(module, type, x => | ||
| { | ||
| var assemblyName = module.Assembly.Name; | ||
| var asm = (assemblyName.Name == type.assemblyName || assemblyName.FullName == type.assemblyName) | ||
| ? module.Assembly | ||
| : module.AssemblyResolver.Resolve(AssemblyNameReference.Parse(type.assemblyName)); | ||
| var typeDef = asm.MainModule.GetType($"{type.clrNamespace}.{type.typeName}"); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -533,7 +533,7 @@ static bool TryCompileBindingPath(ElementNode node, ILContext context, VariableD | |
| } | ||
|
|
||
| if (n.XmlType.Name == nameof(Microsoft.Maui.Controls.DataTemplate) | ||
| && (n.XmlType.NamespaceUri == XamlParser.MauiUri) || n.XmlType.NamespaceUri == XamlParser.MauiGlobalUri) | ||
| { | ||
| xDataTypeIsInOuterScope = true; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,23 +9,14 @@ namespace Microsoft.Maui.Controls.Build.Tasks | |
| { | ||
| class TypeRefComparer : IEqualityComparer<TypeReference> | ||
| { | ||
| public bool Equals(TypeReference x, TypeReference y) | ||
| { | ||
| if (x == null && y == null) | ||
| return true; | ||
| if (x == null || y == null) | ||
| return false; | ||
|
|
||
| //strip the leading `&` as byref typeref fullnames have a `&` | ||
| var xname = x.FullName.EndsWith("&", StringComparison.InvariantCulture) ? x.FullName.Substring(0, x.FullName.Length - 1) : x.FullName; | ||
| var yname = y.FullName.EndsWith("&", StringComparison.InvariantCulture) ? y.FullName.Substring(0, y.FullName.Length - 1) : y.FullName; | ||
| if (xname != yname) | ||
|
|
@@ -34,27 +25,40 @@ public bool Equals(TypeReference x, TypeReference y) | |
| var yasm = GetAssemblyName(y); | ||
|
|
||
| //standard types comes from either mscorlib. System.Runtime or netstandard. Assume they are equivalent | ||
| if (IsSystemAssembly(xasm) && IsSystemAssembly(yasm)) | ||
| return true; | ||
| return xasm == yasm; | ||
| } | ||
|
|
||
| public int GetHashCode(TypeReference obj) | ||
| { | ||
| var assemblyName = GetAssemblyName(obj); | ||
| if (IsSystemAssembly(assemblyName)) | ||
| return obj.FullName.GetHashCode(); | ||
| return assemblyName.GetHashCode() ^ obj.FullName.GetHashCode(); | ||
| } | ||
|
|
||
| static string GetAssemblyName(TypeReference typeRef) | ||
| { | ||
| if (typeRef.Scope is ModuleDefinition md) | ||
| return md.Assembly.Name.Name; | ||
| if (typeRef.Scope is AssemblyNameReference anr) | ||
| return anr.Name; | ||
| throw new ArgumentOutOfRangeException(nameof(typeRef)); | ||
| } | ||
|
|
||
| bool IsSystemAssembly(string assemblyName) | ||
| { | ||
| return assemblyName.StartsWith("System", StringComparison.Ordinal) | ||
| || assemblyName.StartsWith("mscorlib", StringComparison.Ordinal) | ||
| || assemblyName.StartsWith("netstandard", StringComparison.Ordinal) | ||
| || assemblyName.StartsWith("System.Runtime", StringComparison.Ordinal) | ||
| || assemblyName.StartsWith("System.Xml", StringComparison.Ordinal) | ||
| || assemblyName.StartsWith("System.Private.CoreLib", StringComparison.Ordinal); | ||
| } | ||
|
|
||
| static TypeRefComparer s_default; | ||
| public static TypeRefComparer Default => s_default ??= new TypeRefComparer(); | ||
| } | ||
|
|
||
| static class TypeReferenceExtensions | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -285,7 +285,7 @@ public override bool Execute(out IList<Exception> thrownExceptions) | |
| ILRootNode rootnode = null; | ||
| try | ||
| { | ||
| rootnode = ParseXaml(resource.GetResourceStream(), module, typeDef); | ||
| if (rootnode == null) | ||
| { | ||
| LoggingHelper.LogMessage(Low, $"{new string(' ', 8)}failed."); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| using System.ComponentModel; | ||
| using System.Diagnostics; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Xml; | ||
| using Microsoft.Build.Framework; | ||
| using Microsoft.Build.Utilities; | ||
|
|
@@ -40,9 +41,23 @@ public bool Execute() | |
|
|
||
| public abstract bool Execute(out IList<Exception> thrownExceptions); | ||
|
|
||
| internal static ILRootNode ParseXaml(Stream stream, ModuleDefinition module, TypeReference typeReference) | ||
| { | ||
| var allowImplicitXmlns = module.Assembly.CustomAttributes.Any(a => | ||
| a.AttributeType.FullName == typeof(Microsoft.Maui.Controls.Xaml.Internals.AllowImplicitXmlnsDeclarationAttribute).FullName | ||
| && (a.ConstructorArguments.Count == 0 || a.ConstructorArguments[0].Value is bool b && b)); | ||
StephaneDelcroix marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| var nsmgr = new XmlNamespaceManager(new NameTable()); | ||
| if (allowImplicitXmlns) | ||
| { | ||
| nsmgr.AddNamespace("", XamlParser.DefaultImplicitUri); | ||
| foreach (var xmlnsPrefix in XmlTypeExtensions.GetXmlnsPrefixAttributes(module)) | ||
| nsmgr.AddNamespace(xmlnsPrefix.Prefix, xmlnsPrefix.XmlNamespace); | ||
| } | ||
|
|
||
| using (var reader = XmlReader.Create(stream, | ||
| new XmlReaderSettings { ConformanceLevel = allowImplicitXmlns ? ConformanceLevel.Fragment : ConformanceLevel.Document }, | ||
| new XmlParserContext(nsmgr.NameTable, nsmgr, null, XmlSpace.None))) | ||
| { | ||
| while (reader.Read()) | ||
| { | ||
|
|
@@ -73,8 +88,22 @@ public static bool IsXaml(this EmbeddedResource resource, XamlCache cache, Modul | |
| if (!resource.Name.EndsWith(".xaml", StringComparison.InvariantCulture)) | ||
| return false; | ||
|
|
||
| var allowImplicitXmlns = module.Assembly.CustomAttributes.Any(a => | ||
| a.AttributeType.FullName == typeof(Microsoft.Maui.Controls.Xaml.Internals.AllowImplicitXmlnsDeclarationAttribute).FullName | ||
| && (a.ConstructorArguments.Count == 0 || a.ConstructorArguments[0].Value is bool b && b)); | ||
|
|
||
| var nsmgr = new XmlNamespaceManager(new NameTable()); | ||
| nsmgr.AddNamespace("__f__", XamlParser.MauiUri); | ||
| if (allowImplicitXmlns) | ||
| { | ||
| nsmgr.AddNamespace("", XamlParser.DefaultImplicitUri); | ||
| foreach (var xmlnsPrefix in XmlTypeExtensions.GetXmlnsPrefixAttributes(module)) | ||
| nsmgr.AddNamespace(xmlnsPrefix.Prefix, xmlnsPrefix.XmlNamespace); | ||
| } | ||
| using (var resourceStream = resource.GetResourceStream()) | ||
| using (var reader = XmlReader.Create(resourceStream, | ||
| new XmlReaderSettings { ConformanceLevel = allowImplicitXmlns ? ConformanceLevel.Fragment : ConformanceLevel.Document }, | ||
| new XmlParserContext(nsmgr.NameTable, nsmgr, null, XmlSpace.None))) | ||
| { | ||
| // Read to the first Element | ||
| while (reader.Read() && reader.NodeType != XmlNodeType.Element) | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.