From 67a68a4441ef20de905ef9756629cd79a3ad8584 Mon Sep 17 00:00:00 2001
From: Morten Daniel Fornes <mdfornes@gmail.com>
Date: Thu, 5 Oct 2023 21:44:18 +0700
Subject: [PATCH 1/2] compiler: support lowerCamelCase in UxlParser

* Support lowerCamelCase in UXL files
* Robustness in BuildEnvironment.cs
* Update disasm tool
---
 src/common/Extensions.cs                 |   3 +
 src/compiler/core/BuildEnvironment.cs    |  12 +-
 src/compiler/core/Syntax/UxlProcessor.cs |  32 +--
 src/compiler/frontend/UxlParser.cs       | 272 +++++++++++------------
 src/disasm/core/ILView/ILItemBuilder.cs  |   6 +-
 5 files changed, 165 insertions(+), 160 deletions(-)

diff --git a/src/common/Extensions.cs b/src/common/Extensions.cs
index 1ac7dc64e..274788b3a 100644
--- a/src/common/Extensions.cs
+++ b/src/common/Extensions.cs
@@ -648,6 +648,7 @@ public static string ToLowerCamelCase(this string str)
             switch (str)
             {
                 case "cMake":
+                case "cPlusPlus":
                 case "dotNet":
                 case "iOS":
                 case "iPad":
@@ -658,6 +659,8 @@ public static string ToLowerCamelCase(this string str)
                 case "typeOf":
                 case "unoDoc":
                     return str.ToLowerInvariant();
+                case "pListDefaults":
+                    return "plistDefaults";
                 case "typeOfFunction":
                     return "typeofFunction";
                 case "typeOfType":
diff --git a/src/compiler/core/BuildEnvironment.cs b/src/compiler/core/BuildEnvironment.cs
index 811a3548c..a034002e8 100644
--- a/src/compiler/core/BuildEnvironment.cs
+++ b/src/compiler/core/BuildEnvironment.cs
@@ -38,8 +38,8 @@ public class BuildEnvironment : LogObject, IEnvironment
         public string BundleDirectory { get; }
         public string OutputDirectory { get; }
 
-        readonly Dictionary<string, bool> _cachedTests = new Dictionary<string, bool>();
-        readonly Dictionary<Key, Result> _cachedProperties = new Dictionary<Key, Result>();
+        readonly Dictionary<string, bool> _cachedTests = new();
+        readonly Dictionary<Key, Result> _cachedProperties = new();
 
         internal BuildEnvironment(
             Backend backend,
@@ -295,7 +295,7 @@ public bool GetBool(string propertyName, bool defaultValue = false)
 
         public string GetOutputPath(string key)
         {
-            return Path.Combine(OutputDirectory, GetString(key).UnixToNative());
+            return Path.Combine(OutputDirectory, (GetString(key) ?? "null").UnixToNative());
         }
 
         public string Combine(string path0, string path1, string path2)
@@ -415,9 +415,11 @@ List<string> GetSet(IEnumerable<SourceValue> values)
         public HashSet<string> GetWords(string key)
         {
             var result = new HashSet<string>();
+            var words = GetString(key);
 
-            foreach (var word in GetString(key).Split(' '))
-                result.Add(word.Trim());
+            if (!string.IsNullOrEmpty(words))
+                foreach (var word in words.Split(' '))
+                    result.Add(word.Trim());
 
             return result;
         }
diff --git a/src/compiler/core/Syntax/UxlProcessor.cs b/src/compiler/core/Syntax/UxlProcessor.cs
index 6ddc6ede2..035fed397 100644
--- a/src/compiler/core/Syntax/UxlProcessor.cs
+++ b/src/compiler/core/Syntax/UxlProcessor.cs
@@ -116,12 +116,12 @@ public void CompileDocuments()
 
                     if (def == null)
                     {
-                        Log.Error(e.Source, ErrorCode.E0000, "Unknown 'Type' attribute on <Declare> element (" + e.Type + ")");
+                        Log.Error(e.Source, ErrorCode.E0000, "Unknown 'type' attribute on <declare> element (" + e.Type + ")");
                         continue;
                     }
 
                     if (def.Contains(e.Key.String))
-                        Log.Error(e.Key.Source, ErrorCode.E0000, "A <Declare> element for " + e.Key.String.Quote() + " already exists");
+                        Log.Error(e.Key.Source, ErrorCode.E0000, "A <declare> element for " + e.Key.String.Quote() + " already exists");
                     else
                         def.Add(e.Key.String);
                 }
@@ -129,7 +129,7 @@ public void CompileDocuments()
                 foreach (var e in doc.Deprecations)
                 {
                     if (_deprecated.ContainsKey(e.OldName))
-                        Log.Error(e.Source, ErrorCode.E0000, "A <Deprecate> element for " + e.OldName.Quote() + " already exists");
+                        Log.Error(e.Source, ErrorCode.E0000, "A <deprecate> element for " + e.OldName.Quote() + " already exists");
                     else
                         _deprecated.Add(e.OldName, e.NewName);
                 }
@@ -151,9 +151,9 @@ public void CompileDocuments()
                         continue;
 
                     if (e.Type == UxlElementType.Set)
-                        Apply("Set", key, new Element(e.Value.Source, e.Value.String, e.Disambiguation, usings), _root.Properties);
+                        Apply("set", key, new Element(e.Value.Source, e.Value.String, e.Disambiguation, usings), _root.Properties);
                     else
-                        CompileExtensionElement(_root, "Extensions", key, e, usings);
+                        CompileExtensionElement(_root, "extensions", key, e, usings);
                 }
 
                 CompileFiles(_root, doc);
@@ -206,7 +206,7 @@ void CompileRequirements(ExtensionEntity ext)
                 {
                     ExtensionEntity template;
                     if (!_root.Templates.TryGetValue(e.String, out template))
-                        Log.Error(e.Source, ErrorCode.E0000, "Template " + e.String.Quote() + " is not defined (on this backend)");
+                        Log.Error(e.Source, ErrorCode.E0000, "template " + e.String.Quote() + " is not defined (on this backend)");
                     else
                         ext.RequiredTemplates.Add(template);
                 }
@@ -219,14 +219,14 @@ void CompileTemplate(UxlTemplate uxl, Namescope[] usings)
                 return;
 
             var template = new ExtensionEntity(uxl.Name.Source, uxl.Name.String, uxl.Disambiguation);
-            Apply("Template", uxl.Name.String, template, _root.Templates);
+            Apply("template", uxl.Name.String, template, _root.Templates);
 
             foreach (var e in uxl.Elements)
             {
                 if (!TryGetKey(e, out string key) || !Test(e.Condition))
                     continue;
 
-                CompileExtensionElement(template, "Template", key, e, usings);
+                CompileExtensionElement(template, "template", key, e, usings);
             }
 
             CompileFiles(template, uxl);
@@ -262,7 +262,7 @@ void CompileType(UxlType uxl, SourceBundle bundle, Namescope[] usings)
 
             var typeScopes = GetTypeScopes(dt, usings);
             var typeExt = new TypeExtension(uxl.Name.Source, dt, uxl.Disambiguation);
-            Apply("Type", dt, typeExt, _root.TypeExtensions);
+            Apply("type", dt, typeExt, _root.TypeExtensions);
 
             foreach (var e in uxl.Methods)
                 CompileMethod(e, dt, typeExt, typeScopes);
@@ -273,9 +273,9 @@ void CompileType(UxlType uxl, SourceBundle bundle, Namescope[] usings)
                     continue;
 
                 if (e.Type == UxlElementType.Set && _root.TypePropertyDefinitions.Contains(key))
-                    Apply("Set", key, new Element(e.Value.Source, e.Value.String, e.Disambiguation, typeScopes), typeExt.Properties);
+                    Apply("set", key, new Element(e.Value.Source, e.Value.String, e.Disambiguation, typeScopes), typeExt.Properties);
                 else
-                    CompileTypeElement(typeExt, "Type", key, e, typeScopes);
+                    CompileTypeElement(typeExt, "type", key, e, typeScopes);
             }
 
             CompileFiles(typeExt, uxl);
@@ -332,7 +332,7 @@ void CompileMethod(UxlMethod uxl, DataType dt, TypeExtension typeExt, Namescope[
                 return;
 
             var methodExt = new FunctionExtension(uxl.Signature.Source, method, uxl.Disambiguation, methodScopes);
-            Apply("Method", method, methodExt, typeExt.MethodExtensions);
+            Apply("method", method, methodExt, typeExt.MethodExtensions);
 
             foreach (var impl in uxl.Implementations)
             {
@@ -352,9 +352,9 @@ void CompileMethod(UxlMethod uxl, DataType dt, TypeExtension typeExt, Namescope[
                     continue;
 
                 if (e.Type == UxlElementType.Set && _root.MethodPropertyDefinitions.Contains(key))
-                    Apply("Set", key, new Element(e.Value.Source, e.Value.String, e.Disambiguation, methodScopes), methodExt.Properties);
+                    Apply("set", key, new Element(e.Value.Source, e.Value.String, e.Disambiguation, methodScopes), methodExt.Properties);
                 else
-                    CompileTypeElement(methodExt, "Method", key, e, methodScopes);
+                    CompileTypeElement(methodExt, "method", key, e, methodScopes);
             }
 
             CompileFiles(typeExt, uxl);
@@ -396,14 +396,14 @@ void CompileExtensionElement(ExtensionEntity ext, string type, string key, UxlEl
             if (elm.Type == UxlElementType.Require && _root.ElementDefinitions.Contains(key))
                 ext.Requirements.Add(key, new Element(elm.Value.Source, elm.Value.String, elm.Disambiguation, usings));
             else
-                Log.Error(elm.Source, ErrorCode.E0000, "<" + elm.Type + " Key=\"" + key + "\"> is not valid in <" + type + "> (on this backend)");
+                Log.Error(elm.Source, ErrorCode.E0000, "<" + elm.Type + " key=\"" + key + "\"> is not valid in <" + type + "> (on this backend)");
         }
 
         bool TryGetKey(UxlElement e, out string key)
         {
             if (string.IsNullOrEmpty(e.Key.String))
             {
-                Log.Error(e.Key.Source, ErrorCode.E0000, "<" + e.Type + "> must provide a non-empty 'Key' attribute");
+                Log.Error(e.Key.Source, ErrorCode.E0000, "<" + e.Type + "> must provide a non-empty 'key' attribute");
                 key = null;
                 return false;
             }
diff --git a/src/compiler/frontend/UxlParser.cs b/src/compiler/frontend/UxlParser.cs
index 0774b4db1..21828d119 100644
--- a/src/compiler/frontend/UxlParser.cs
+++ b/src/compiler/frontend/UxlParser.cs
@@ -35,19 +35,19 @@ public static bool Parse(Log log, SourceBundle bundle, string filename, List<Uxl
 
         bool Parse(List<UxlDocument> result)
         {
-            switch (FindRootElement())
+            switch (FindRootElement().ToLowerCamelCase())
             {
-                case "Extensions":
+                case "extensions":
                     result.Add(ParseDocument());
                     return Log.ErrorCount - StartErrorCount == 0;
 
-                case "Package":
+                case "package":
                     ParseAttributes(x => false);
                     ParseElements(name =>
                     {
-                        switch (name)
+                        switch (name.ToLowerCamelCase())
                         {
-                            case "Extensions":
+                            case "extensions":
                                 result.Add(ParseDocument());
                                 return true;
                             default:
@@ -58,7 +58,7 @@ bool Parse(List<UxlDocument> result)
                     return Log.ErrorCount - StartErrorCount == 0;
 
                 default:
-                    Log.Error(GetSource(), ErrorCode.E0000, "Expected <Extensions> element");
+                    Log.Error(GetSource(), ErrorCode.E0000, "Expected <extensions> element");
                     return false;
             }
         }
@@ -71,12 +71,12 @@ UxlDocument ParseDocument()
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Backend":
+                        case "backend":
                             backend = GetValue();
                             return true;
-                        case "Condition":
+                        case "condition":
                             cond = GetValue();
                             return true;
                         default:
@@ -87,8 +87,8 @@ UxlDocument ParseDocument()
             UxlBackendType backendType = 0;
 
             if (backend == null)
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'Backend' attribute on <Extensions>");
-            else if (!Enum.TryParse(backend.Value.String, out backendType) || backendType == UxlBackendType.Unknown)
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'backend' attribute on <extensions>");
+            else if (!Enum.TryParse(backend.Value.String, true, out backendType) || backendType == UxlBackendType.Unknown)
                 Log.Error(backend.Value.Source, ErrorCode.E0000, "Unknown backend " + backend.Value.String.Quote());
 
             var result = new UxlDocument(File.Bundle, backendType, cond);
@@ -96,36 +96,36 @@ UxlDocument ParseDocument()
             ParseElements(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Using":
+                        case "using":
                             ParseUsing(result);
                             return true;
-                        case "Define":
+                        case "define":
                             ParseDefine(result);
                             return true;
-                        case "Declare":
+                        case "declare":
                             ParseDeclare(result);
                             return true;
-                        case "Deprecate":
+                        case "deprecate":
                             ParseDeprecate(result);
                             return true;
-                        case "Definition":
-                            Log.Warning(GetSource(), ErrorCode.W0000, "<Definition> is deprecated, replace with <Declare>");
+                        case "definition":
+                            Log.Warning(GetSource(), ErrorCode.W0000, "<definition> is deprecated, replace with <declare>");
                             ParseDeclare(result);
                             return true;
-                        case "Type":
+                        case "type":
                             ParseType(name, result);
                             return true;
-                        case "Template":
+                        case "template":
                             ParseTemplate(name, result.Templates);
                             return true;
-                        case "Library":
-                            Log.Warning(GetSource(), ErrorCode.W0000, "<Library> is deprecated, replace with <Template>");
+                        case "library":
+                            Log.Warning(GetSource(), ErrorCode.W0000, "<library> is deprecated, replace with <template>");
                             ParseTemplate(name, result.Templates);
                             return true;
-                        case "Property":
-                            Log.Warning(GetSource(), ErrorCode.W0000, "<Property> is deprecated, replace with <Set>");
+                        case "property":
+                            Log.Warning(GetSource(), ErrorCode.W0000, "<property> is deprecated, replace with <set>");
                             ParseSet(name, result.Elements);
                             return true;
                         default:
@@ -143,9 +143,9 @@ void ParseUsing(UxlDocument doc)
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Namespace":
+                        case "namespace":
                             doc.Usings.Add(GetValue());
                             return foundNamespace = true;
                         default:
@@ -154,7 +154,7 @@ void ParseUsing(UxlDocument doc)
                 });
 
             if (!foundNamespace)
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'Namespace' attribute on <Using>");
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'namespace' attribute on <using>");
 
             ParseEmptyElement();
         }
@@ -167,7 +167,7 @@ void ParseDefine(UxlDocument doc)
             ParseAttributes(
                 name =>
                 {
-                    if (define == null && name != "Condition")
+                    if (define == null && name.ToLowerCamelCase() != "condition")
                     {
                         define = name;
                         expression = GetValue();
@@ -183,7 +183,7 @@ void ParseDefine(UxlDocument doc)
                 });
 
             if (define == null || !expression.HasValue)
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected a (Name)=\"(Expression)\" attribute on <Define>");
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected a (name)=\"(expression)\" attribute on <define>");
             else
                 doc.Defines.Add(new UxlDefine(define, expression.Value));
 
@@ -201,20 +201,20 @@ void ParseDeclare(UxlDocument doc)
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Condition":
+                        case "condition":
                             cond = GetValue();
                             return true;
-                        case "TargetDirectory":
+                        case "targetDirectory":
                             targetDir = GetValue();
                             return true;
                         default:
                             UxlDeclareType et;
-                            if (Enum.TryParse(name, out et) && et != UxlDeclareType.Unknown)
+                            if (Enum.TryParse(name, true, out et) && et != UxlDeclareType.Unknown)
                             {
                                 if (type != 0)
-                                    Log.Error(GetSource(), ErrorCode.E0000, "A (ElementType)=\"(Key)\" attribute was already found on <Declare>");
+                                    Log.Error(GetSource(), ErrorCode.E0000, "A (elementType)=\"(key)\" attribute was already found on <declare>");
 
                                 src = GetSource();
                                 type = et;
@@ -227,12 +227,12 @@ void ParseDeclare(UxlDocument doc)
                 });
 
             if (type == 0)
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected a (ElementType)=\"(Key)\" attribute on <Declare>");
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected a (elementType)=\"(key)\" attribute on <declare>");
             else
                 doc.Declarations.Add(new UxlDeclare(src, type, key ?? new SourceValue(), cond));
 
             if (targetDir != null && key != null)
-                doc.Elements.Add(new UxlElement(UxlElementType.Set, new SourceValue(targetDir.Value.Source, key.Value.String + ".TargetDirectory"), targetDir.Value, null, false));
+                doc.Elements.Add(new UxlElement(UxlElementType.Set, new SourceValue(targetDir.Value.Source, key.Value.String + ".targetDirectory"), targetDir.Value, null, false));
 
             ParseEmptyElement();
         }
@@ -245,7 +245,7 @@ void ParseDeprecate(UxlDocument doc)
             ParseAttributes(
                 name =>
                 {
-                    if (oldName == null && newName == null && name != "Condition")
+                    if (oldName == null && newName == null && name.ToLowerCamelCase() != "condition")
                     {
                         oldName = name;
                         newName = GetValue().String;
@@ -259,7 +259,7 @@ void ParseDeprecate(UxlDocument doc)
             ParseEmptyElement();
         }
 
-        // TODO: Deprecated
+        // Deprecated
         void ParseUnoReference(List<UxlElement> parent)
         {
             var foundEntity = false;
@@ -267,10 +267,10 @@ void ParseUnoReference(List<UxlElement> parent)
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Entity":
-                            parent.Add(new UxlElement(UxlElementType.Require, new SourceValue(GetSource(), "Entity"), GetValue(), null, false));
+                        case "entity":
+                            parent.Add(new UxlElement(UxlElementType.Require, new SourceValue(GetSource(), "entity"), GetValue(), null, false));
                             return foundEntity = true;
                         default:
                             return false;
@@ -278,7 +278,7 @@ void ParseUnoReference(List<UxlElement> parent)
                 });
 
             if (!foundEntity)
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'Entity' attribute on <UnoReference>");
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'entity' attribute on <unoReference>");
 
             ParseEmptyElement();
         }
@@ -295,29 +295,29 @@ void ParseCopyFile(string elmName, UxlEntity parent, bool process)
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Name":
+                        case "name":
                             sourceName = GetValue();
                             return true;
-                        case "TargetName":
+                        case "targetName":
                             targetName = GetValue();
                             return true;
-                        case "IsExecutable":
+                        case "isExecutable":
                             isExecutable = GetBool();
                             return true;
-                        case "Overwrite":
+                        case "overwrite":
                             overwrite = GetBool();
                             return true;
-                        case "Condition":
+                        case "condition":
                             cond = GetValue();
                             return true;
-                        case "Type":
+                        case "type":
                             type = GetValue();
                             return true;
                         default:
                             if (type != null || sourceName != null)
-                                Log.Error(GetSource(), ErrorCode.E0000, "A (Type)=\"(Name)\" was already found on <" + elmName + ">");
+                                Log.Error(GetSource(), ErrorCode.E0000, "A (type)=\"(name)\" was already found on <" + elmName + ">");
 
                             type = new SourceValue(GetSource(), name);
                             sourceName = GetValue();
@@ -327,7 +327,7 @@ void ParseCopyFile(string elmName, UxlEntity parent, bool process)
 
             if (sourceName == null)
             {
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected a 'Name' attribute on <" + elmName + ">");
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected a 'name' attribute on <" + elmName + ">");
             }
             else
             {
@@ -357,15 +357,15 @@ void ParseCopyDirectory(string elmName, List<CopyFile> parent)
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Name":
+                        case "name":
                             sourceName = GetValue();
                             return true;
-                        case "TargetName":
+                        case "targetName":
                             targetName = GetValue();
                             return true;
-                        case "Condition":
+                        case "condition":
                             cond = GetValue();
                             return true;
                         default:
@@ -374,7 +374,7 @@ void ParseCopyDirectory(string elmName, List<CopyFile> parent)
                 });
 
             if (sourceName == null)
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'Name' attribute on <" + elmName + ">");
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'name' attribute on <" + elmName + ">");
             else
                 parent.Add(new CopyFile(sourceName.Value, CopyFileFlags.IsDirectory, targetName, cond));
 
@@ -392,21 +392,21 @@ void ParseImageFile(string elmName, List<ImageFile> parent)
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Name":
+                        case "name":
                             sourceName = GetValue();
                             return true;
-                        case "TargetName":
+                        case "targetName":
                             targetName = GetValue();
                             return true;
-                        case "TargetWidth":
+                        case "targetWidth":
                             targetWidth = GetInt();
                             return true;
-                        case "TargetHeight":
+                        case "targetHeight":
                             targetHeight = GetInt();
                             return true;
-                        case "Condition":
+                        case "condition":
                             cond = GetValue();
                             return true;
                         default:
@@ -415,7 +415,7 @@ void ParseImageFile(string elmName, List<ImageFile> parent)
                 });
 
             if (sourceName == null)
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'Name' attribute on <" + elmName + ">");
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'name' attribute on <" + elmName + ">");
             else
                 parent.Add(new ImageFile(sourceName.Value, cond, targetName, targetWidth, targetHeight));
 
@@ -431,25 +431,25 @@ void ParseRequire(string elmName, List<UxlElement> parent)
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Condition":
+                        case "condition":
                             cond = GetValue();
                             return true;
-                        case "Key":
+                        case "key":
                             key = GetValue();
-                            Log.Warning(GetSource(), ErrorCode.W0000, "'Key' attribute is deprecated -- use (Key)=\"(Value)\" or set inner text");
+                            Log.Warning(GetSource(), ErrorCode.W0000, "'key' attribute is deprecated -- use (key)=\"(value)\" or set inner text");
                             return true;
-                        case "Type":
-                            Log.Warning(GetSource(), ErrorCode.W0000, "'Type' attribute is deprecated -- use (Type)=\"(Value)\" or set inner text");
+                        case "type":
+                            Log.Warning(GetSource(), ErrorCode.W0000, "'Type' attribute is deprecated -- use (type)=\"(value)\" or set inner text");
                             key = GetValue();
                             return true;
-                        case "Value":
-                            Log.Error(GetSource(), ErrorCode.E0000, "'Value' attribute is not allowed -- use (Name)=\"(Value)\" or set inner text on <" + elmName + ">");
+                        case "value":
+                            Log.Error(GetSource(), ErrorCode.E0000, "'value' attribute is not allowed -- use (name)=\"(value)\" or set inner text on <" + elmName + ">");
                             return true;
                         default:
                             if (key != null)
-                                Log.Error(GetSource(), ErrorCode.E0000, "A (Name)=\"(Value)\" was attribute already found on <" + elmName + ">");
+                                Log.Error(GetSource(), ErrorCode.E0000, "A (name)=\"(value)\" was attribute already found on <" + elmName + ">");
 
                             key = new SourceValue(GetSource(), name);
                             value = GetValue();
@@ -464,7 +464,7 @@ void ParseRequire(string elmName, List<UxlElement> parent)
                 ParseTextElement(true, out src, out text);
 
                 if (text == null && value == null)
-                    Log.Error(GetSource(), ErrorCode.E0000, "Expected (Name)=\"(Value)\" or inner text on <" + elmName + ">");
+                    Log.Error(GetSource(), ErrorCode.E0000, "Expected (name)=\"(value)\" or inner text on <" + elmName + ">");
                 else if (text != null)
                     value = new SourceValue(src, text);
             }
@@ -472,12 +472,12 @@ void ParseRequire(string elmName, List<UxlElement> parent)
                 ParseEmptyElement();
 
             if (key == null)
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected (Name)=\"(Value)\" or inner text on <" + elmName + ">");
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected (vame)=\"(value)\" or inner text on <" + elmName + ">");
             else
                 parent.Add(new UxlElement(UxlElementType.Require, key.Value, value ?? new SourceValue(), cond, false));
         }
 
-        // TODO: Deprecated method
+        // Deprecated
         void ParseLinkLibrary(string elmName, List<UxlElement> parent)
         {
             SourceValue? libraryName = null;
@@ -485,9 +485,9 @@ void ParseLinkLibrary(string elmName, List<UxlElement> parent)
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Name":
+                        case "name":
                             libraryName = GetValue();
                             return true;
                         default:
@@ -496,46 +496,46 @@ void ParseLinkLibrary(string elmName, List<UxlElement> parent)
                 });
 
             if (libraryName == null)
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'Name' attribute on <" + elmName + ">");
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'name' attribute on <" + elmName + ">");
             else
-                parent.Add(new UxlElement(UxlElementType.Require, new SourceValue(GetSource(), "Template"), libraryName.Value, null, false));
+                parent.Add(new UxlElement(UxlElementType.Require, new SourceValue(GetSource(), "template"), libraryName.Value, null, false));
 
             ParseEmptyElement();
         }
 
         bool TryParseEntity(string elmName, UxlEntity parent)
         {
-            switch (elmName)
+            switch (elmName.ToLowerCamelCase())
             {
-                case "Set":
+                case "set":
                     ParseSet(elmName, parent.Elements);
                     return true;
-                case "Require":
+                case "require":
                     ParseRequire(elmName, parent.Elements);
                     return true;
-                case "CopyFile":
+                case "copyFile":
                     ParseCopyFile(elmName, parent, false);
                     return true;
-                case "ProcessFile":
+                case "processFile":
                     ParseCopyFile(elmName, parent, true);
                     return true;
-                case "CopyDirectory":
+                case "copyDirectory":
                     ParseCopyDirectory(elmName, parent.CopyFiles);
                     return true;
-                case "ImageFile":
+                case "imageFile":
                     ParseImageFile(elmName, parent.ImageFiles);
                     return true;
                     // TODO: Remove deprecated stuff below
-                case "Element":
-                    Log.Warning(GetSource(), ErrorCode.W0000, "<Element> is deprecated, replace with <Require>");
+                case "element":
+                    Log.Warning(GetSource(), ErrorCode.W0000, "<element> is deprecated, replace with <require>");
                     ParseRequire(elmName, parent.Elements);
                     return true;
-                case "LinkLibrary":
-                    Log.Warning(GetSource(), ErrorCode.W0000, "<LinkLibrary> is deprecated, replace with <Require Template=\"$(name)\">");
+                case "linkLibrary":
+                    Log.Warning(GetSource(), ErrorCode.W0000, "<linkLibrary> is deprecated, replace with <require template=\"$(name)\">");
                     ParseLinkLibrary(elmName, parent.Elements);
                     return true;
-                case "UnoReference":
-                    Log.Warning(GetSource(), ErrorCode.W0000, "<UnoReference> is deprecated, replace with <Require Entity=\"$(entity)\">");
+                case "unoReference":
+                    Log.Warning(GetSource(), ErrorCode.W0000, "<unoReference> is deprecated, replace with <require entity=\"$(name)\">");
                     ParseUnoReference(parent.Elements);
                     return true;
                 default:
@@ -543,13 +543,13 @@ bool TryParseEntity(string elmName, UxlEntity parent)
             }
         }
 
-        // TODO: Deprecated method
+        // Deprecated
         bool TryParseTypeEntity(string elmName, UxlEntity parent)
         {
-            switch (elmName)
+            switch (elmName.ToLowerCamelCase())
             {
-                case "TypeElement":
-                    Log.Warning(GetSource(), ErrorCode.W0000, "<TypeElement> is deprecated, replace with <Require>");
+                case "typeElement":
+                    Log.Warning(GetSource(), ErrorCode.W0000, "<typeElement> is deprecated, replace with <require>");
                     ParseRequire(elmName, parent.Elements);
                     return true;
                 default:
@@ -566,15 +566,15 @@ void ParseTemplate(string elmName, List<UxlTemplate> parent)
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Name":
+                        case "name":
                             templateName = GetValue();
                             return true;
-                        case "Condition":
+                        case "condition":
                             cond = GetValue();
                             return true;
-                        case "IsDefault":
+                        case "isDefault":
                             def = GetBool();
                             return true;
                         default:
@@ -585,7 +585,7 @@ void ParseTemplate(string elmName, List<UxlTemplate> parent)
             var result = new UxlTemplate(templateName ?? new SourceValue(), cond, def);
 
             if (templateName == null)
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'Name' attribute on <" + elmName + ">");
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'name' attribute on <" + elmName + ">");
             else
                 parent.Add(result);
 
@@ -602,28 +602,28 @@ void ParseSet(string elmName, List<UxlElement> parent)
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Key":
+                        case "key":
                             key = GetValue();
-                            Log.Warning(GetSource(), ErrorCode.W0000, "'Key' attribute is deprecated -- use (Key)=\"(Value)\" or inner text");
+                            Log.Warning(GetSource(), ErrorCode.W0000, "'key' attribute is deprecated -- use (key)=\"(value)\" or inner text");
                             return true;
-                        case "Name":
+                        case "name":
                             key = GetValue();
-                            Log.Warning(GetSource(), ErrorCode.W0000, "'Name' attribute is deprecated -- use (Name)=\"(Value)\" or inner text");
+                            Log.Warning(GetSource(), ErrorCode.W0000, "'name' attribute is deprecated -- use (name)=\"(value)\" or inner text");
                             return true;
-                        case "Value":
-                            Log.Error(GetSource(), ErrorCode.E0000, "'Value' attribute is not supported -- use (Name)=\"(Value)\" or inner text");
+                        case "value":
+                            Log.Error(GetSource(), ErrorCode.E0000, "'value' attribute is not supported -- use (name)=\"(value)\" or inner text");
                             return true;
-                        case "Condition":
+                        case "condition":
                             cond = GetValue();
                             return true;
-                        case "IsDefault":
+                        case "isDefault":
                             def = GetBool();
                             return true;
                         default:
                             if (key != null)
-                                Log.Error(GetSource(), ErrorCode.E0000, "A (Name)=\"(Value)\" attribute was already found on <" + elmName + ">");
+                                Log.Error(GetSource(), ErrorCode.E0000, "A (name)=\"(value)\" attribute was already found on <" + elmName + ">");
 
                             key = new SourceValue(GetSource(), name);
                             value = GetValue();
@@ -638,7 +638,7 @@ void ParseSet(string elmName, List<UxlElement> parent)
                 ParseTextElement(true, out src, out text);
 
                 if (text == null && value == null)
-                    Log.Error(GetSource(), ErrorCode.E0000, "Expected a (Name)=\"(Value)\" attribute or non-empty inner text on <" + elmName + ">");
+                    Log.Error(GetSource(), ErrorCode.E0000, "Expected a (name)=\"(value)\" attribute or non-empty inner text on <" + elmName + ">");
                 else if (text != null)
                     value = new SourceValue(src, text);
             }
@@ -646,7 +646,7 @@ void ParseSet(string elmName, List<UxlElement> parent)
                 ParseEmptyElement();
 
             if (key == null)
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected a (Name) attribute on <" + elmName + ">");
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected a (name) attribute on <" + elmName + ">");
             else
                 parent.Add(new UxlElement(UxlElementType.Set, key.Value, value ?? new SourceValue(), cond, def));
         }
@@ -660,12 +660,12 @@ void ParseImplementation(ImplementationType type, List<UxlImplementation> parent
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Condition":
+                        case "condition":
                             cond = GetValue();
                             return true;
-                        case "IsDefault":
+                        case "isDefault":
                             def = GetBool();
                             return true;
                         default:
@@ -697,15 +697,15 @@ void ParseMethod(string elmName, UxlType parent)
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Signature":
+                        case "signature":
                             sig = GetValue();
                             return true;
-                        case "Condition":
+                        case "condition":
                             cond = GetValue();
                             return true;
-                        case "IsDefault":
+                        case "isDefault":
                             def = GetBool();
                             return true;
                         default:
@@ -719,19 +719,19 @@ void ParseMethod(string elmName, UxlType parent)
             ParseElements(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Body":
+                        case "body":
                             ParseImplementation(ImplementationType.Body, result.Implementations);
                             return true;
-                        case "EmptyBody":
+                        case "emptyBody":
                             ParseImplementation(ImplementationType.EmptyBody, result.Implementations);
                             return true;
-                        case "Expression":
+                        case "expression":
                             ParseImplementation(ImplementationType.Expression, result.Implementations);
                             return true;
-                        case "MethodProperty":
-                            Log.Warning(GetSource(), ErrorCode.W0000, "<MethodProperty> is deprecated, replace with <Set>");
+                        case "methodProperty":
+                            Log.Warning(GetSource(), ErrorCode.W0000, "<methodProperty> is deprecated, replace with <set>");
                             ParseSet(name, result.Elements);
                             return true;
                         default:
@@ -740,7 +740,7 @@ void ParseMethod(string elmName, UxlType parent)
                 });
 
             if (sig == null)
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'Signature' attribute on <" + elmName + "> element");
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'signature' attribute on <" + elmName + "> element");
             else
                 parent.Methods.Add(result);
         }
@@ -755,15 +755,15 @@ void ParseType(string elmName, UxlDocument doc)
             ParseAttributes(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Name":
+                        case "name":
                             typeName = GetValue();
                             return true;
-                        case "Condition":
+                        case "condition":
                             cond = GetValue();
                             return true;
-                        case "IsDefault":
+                        case "isDefault":
                             def = GetBool();
                             return true;
                         default:
@@ -777,13 +777,13 @@ void ParseType(string elmName, UxlDocument doc)
             ParseElements(
                 name =>
                 {
-                    switch (name)
+                    switch (name.ToLowerCamelCase())
                     {
-                        case "Method":
+                        case "method":
                             ParseMethod(name, result);
                             return true;
-                        case "TypeProperty":
-                            Log.Warning(GetSource(), ErrorCode.W0000, "<TypeProperty> is deprecated, replace with <Set>");
+                        case "typeProperty":
+                            Log.Warning(GetSource(), ErrorCode.W0000, "<typeProperty> is deprecated, replace with <Set>");
                             ParseSet(name, result.Elements);
                             return true;
                         default:
@@ -792,7 +792,7 @@ void ParseType(string elmName, UxlDocument doc)
                 });
 
             if (typeName == null)
-                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'Name' attribute on <" + elmName + "> element");
+                Log.Error(GetSource(), ErrorCode.E0000, "Expected 'name' attribute on <" + elmName + "> element");
             else
                 doc.Types.Add(result);
         }
diff --git a/src/disasm/core/ILView/ILItemBuilder.cs b/src/disasm/core/ILView/ILItemBuilder.cs
index 2ce7ad72f..62f787cdb 100644
--- a/src/disasm/core/ILView/ILItemBuilder.cs
+++ b/src/disasm/core/ILView/ILItemBuilder.cs
@@ -45,11 +45,11 @@ void Build(BuildResult build, IEnvironment env, ExtensionRoot root)
             // Find typed output files
             foreach (var p in root.Properties)
             {
-                if (p.Key.EndsWith(".TargetDirectory"))
+                if (p.Key.EndsWith(".targetDirectory"))
                 {
-                    var key = p.Key.Replace(".TargetDirectory", "");
+                    var key = p.Key.Replace(".targetDirectory", "");
                     var containingDir = env.GetOutputPath(p.Key);
-                    var folder = new BundleFolderItem(containingDir, key.Replace("File", " Files"));
+                    var folder = new BundleFolderItem(containingDir, key.Replace("File", " files"));
 
                     foreach (var f in build.Compiler.Environment.Enumerate(key))
                         folder.AddFile(containingDir, f.String);

From a00fcdac21b7f6e2a467248801832d0e2bf1d1d7 Mon Sep 17 00:00:00 2001
From: Morten Daniel Fornes <mdfornes@gmail.com>
Date: Thu, 5 Oct 2023 21:17:26 +0700
Subject: [PATCH 2/2] update uxl files

---
 lib/Uno.Data.Xml/cil/System.Xml.uxl           |   8 +-
 lib/Uno.Data.Xml/cpp/pugixml.uxl              |  40 +-
 lib/Uno.Graphics.Utils/dotnet/Uno.Native.uxl  |  14 +-
 .../ExperimentalHttp/HttpRequest.cpp.uxl      | 260 +++++-----
 lib/Uno.Net.Http/cil/CilHttpRequest.cil.uxl   |   6 +-
 lib/Uno.Net.Http/cpp/XliHttpRequest.cpp.uxl   |  52 +-
 lib/Uno.Net.Http/ios/iOSHttpRequest.cpp.uxl   |  24 +-
 .../ios/iOSHttpSharedCache.cpp.uxl            |  24 +-
 lib/Uno.Net.Sockets/System.Net.Sockets.uxl    |   6 +-
 lib/UnoCore/android/android.uxl               | 342 ++++++-------
 lib/UnoCore/android/api-refs.uxl              | 170 +++----
 lib/UnoCore/android/dependencies.uxl          |  26 +-
 .../android/uDroid/Bootstrapper.cpp.uxl       |  20 +-
 lib/UnoCore/android/uDroid/JNI.cpp.uxl        | 408 +++++++--------
 lib/UnoCore/android/uDroid/Primitives.cpp.uxl | 122 ++---
 lib/UnoCore/android/uDroid/Types.cpp.uxl      | 214 ++++----
 lib/UnoCore/android/uDroid/Wrappers.cpp.uxl   | 126 ++---
 lib/UnoCore/cil/app.cil.uxl                   | 474 +++++++++---------
 lib/UnoCore/cil/config.cil.uxl                |  48 +-
 lib/UnoCore/cil/console.cil.uxl               |  18 +-
 lib/UnoCore/cil/library.cil.uxl               |   6 +-
 lib/UnoCore/cil/test.cil.uxl                  |  24 +-
 lib/UnoCore/cpp/config.cpp.uxl                | 102 ++--
 lib/UnoCore/cpp/uno.cpp.uxl                   |  46 +-
 .../@(project.name)-Info.plist                |   6 +-
 lib/UnoCore/ios/MetalANGLE.uxl                |  12 +-
 lib/UnoCore/ios/Uno-iOS.uxl                   |  20 +-
 lib/UnoCore/ios/ios.uxl                       | 186 +++----
 lib/UnoCore/native/native.uxl                 |  84 ++--
 lib/UnoCore/pinvoke/pinvoke.uxl               |  52 +-
 lib/UnoCore/prebuilt/uno-base-pinvoke.uxl     | 166 +++---
 lib/UnoCore/prebuilt/uno-base.uxl             | 180 +++----
 .../Foreign/Android/ExternBlockHost.uxl       |  42 +-
 .../Foreign/Android/JavaUnoObject.uxl         |  12 +-
 .../Foreign/ObjC/ObjC.cpp.uxl                 |  36 +-
 lib/UnoCore/src/Uno/Platform/iOS/iOS.uxl      |  34 +-
 .../AutoReleasePoolStructTest/Defines.cpp.uxl |   8 +-
 tests/src/ForeignCPlusPlusTest/CIL.uxl        |   6 +-
 38 files changed, 1712 insertions(+), 1712 deletions(-)

diff --git a/lib/Uno.Data.Xml/cil/System.Xml.uxl b/lib/Uno.Data.Xml/cil/System.Xml.uxl
index 356cc0db0..6fe95038f 100644
--- a/lib/Uno.Data.Xml/cil/System.Xml.uxl
+++ b/lib/Uno.Data.Xml/cil/System.Xml.uxl
@@ -1,4 +1,4 @@
-<Extensions Backend="CIL">
-    <Require Assembly="System.Xml" />
-    <Require Assembly="System.Xml.Linq" />
-</Extensions>
+<extensions backend="cil">
+    <require assembly="System.Xml" />
+    <require assembly="System.Xml.Linq" />
+</extensions>
diff --git a/lib/Uno.Data.Xml/cpp/pugixml.uxl b/lib/Uno.Data.Xml/cpp/pugixml.uxl
index 8c3278c1e..79ea8e45f 100644
--- a/lib/Uno.Data.Xml/cpp/pugixml.uxl
+++ b/lib/Uno.Data.Xml/cpp/pugixml.uxl
@@ -1,18 +1,18 @@
-<Extensions Backend="CPlusPlus">
+<extensions backend="cplusplus">
 
-    <Type Name="Uno.Data.Xml.TargetSpecificXmlNode" />
-    <Type Name="Uno.Data.Xml.XmlNodeHandle" />
-    <Type Name="Uno.Data.Xml.XmlAttributeHandle" />
-    <Type Name="Uno.Data.Xml.XmlNodeImpl">
-        <CopyFile Type="HeaderFile" Name="pugixml.hpp" />
-        <CopyFile Type="HeaderFile" Name="pugiconfig.hpp" />
-        <CopyFile Type="SourceFile" Name="pugixml.cpp" />
+    <type name="Uno.Data.Xml.TargetSpecificXmlNode" />
+    <type name="Uno.Data.Xml.XmlNodeHandle" />
+    <type name="Uno.Data.Xml.XmlAttributeHandle" />
+    <type name="Uno.Data.Xml.XmlNodeImpl">
+        <copyFile type="headerFile" name="pugixml.hpp" />
+        <copyFile type="headerFile" name="pugiconfig.hpp" />
+        <copyFile type="sourceFile" name="pugixml.cpp" />
 
-        <Require Source.Include="pugixml.hpp" />
+        <require source.include="pugixml.hpp" />
 
-        <Method Signature="Parse(string):XmlNodeHandle">
-            <Require Source.Include="@{Uno.Data.Xml.XmlException:include}" />
-            <Body>
+        <method signature="Parse(string):XmlNodeHandle">
+            <require source.include="@{Uno.Data.Xml.XmlException:include}" />
+            <body>
                 pugi::xml_document doc;
                 pugi::xml_parse_result parseResult = doc.load_string(uCString($0).Ptr, pugi::parse_full);
 
@@ -32,11 +32,11 @@
 
                     U_THROW(@{Uno.Data.Xml.XmlException(string):new(uString::Utf8(errorMessages[parseResult.status]))});
                 }
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="GenerateXMLTree(Uno.Data.Xml.TargetSpecificXmlNode):XmlNodeHandle">
-            <Body>
+        <method signature="GenerateXMLTree(Uno.Data.Xml.TargetSpecificXmlNode):XmlNodeHandle">
+            <body>
                 pugi::xml_node node = *((pugi::xml_node*)$0);
                 @{Uno.Data.Xml.XmlNodeHandle} nodeHandle;
 
@@ -89,9 +89,9 @@
                 }
 
                 return nodeHandle;
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-    </Type>
+    </type>
 
-</Extensions>
+</extensions>
diff --git a/lib/Uno.Graphics.Utils/dotnet/Uno.Native.uxl b/lib/Uno.Graphics.Utils/dotnet/Uno.Native.uxl
index 9b111dc0d..3e83d4893 100644
--- a/lib/Uno.Graphics.Utils/dotnet/Uno.Native.uxl
+++ b/lib/Uno.Graphics.Utils/dotnet/Uno.Native.uxl
@@ -1,9 +1,9 @@
-<Extensions Backend="CIL">
+<extensions backend="cil">
 
-    <Template Name="Uno.Native">
-        <Require Assembly="@('Uno.Native/Uno.Native.dll':path)" />
-        <Require UnmanagedLibrary="@('Uno.Native/libuAsset.dylib':path)" Condition="HOST_MAC" />
-        <Require UnmanagedLibrary="@('Uno.Native/uAsset.dll':path)" Condition="HOST_WIN32" />
-    </Template>
+    <template name="Uno.Native">
+        <require assembly="@('Uno.Native/Uno.Native.dll':path)" />
+        <require unmanagedLibrary="@('Uno.Native/libuAsset.dylib':path)" condition="HOST_MAC" />
+        <require unmanagedLibrary="@('Uno.Native/uAsset.dll':path)" condition="HOST_WIN32" />
+    </template>
 
-</Extensions>
+</extensions>
diff --git a/lib/Uno.Net.Http/android/ExperimentalHttp/HttpRequest.cpp.uxl b/lib/Uno.Net.Http/android/ExperimentalHttp/HttpRequest.cpp.uxl
index 725b42b2a..5449e4eec 100644
--- a/lib/Uno.Net.Http/android/ExperimentalHttp/HttpRequest.cpp.uxl
+++ b/lib/Uno.Net.Http/android/ExperimentalHttp/HttpRequest.cpp.uxl
@@ -1,14 +1,14 @@
-<Extensions Backend="CPlusPlus" Condition="ANDROID">
-    <Using Namespace="Android.com.fuse.ExperimentalHttp" />
-    <Type Name="HttpRequest">
-        <Require Source.Include="@{Android.Base.AndroidBindingMacros:include}" />
-        <Require Android.Bindings.Bootstrapper.Include="#include <@{Android.com.fuse.ExperimentalHttp.HttpRequest:include}>" />
-        <Require Android.Bindings.Bootstrapper.Statement="@{Android.Base.Types.Bridge.RegisterUnoType(Android.Base.Primitives.ConstCharPtr,int,Uno.Type):call(&quot;com.fuse.ExperimentalHttp.HttpRequest&quot;,37,@{Android.com.fuse.ExperimentalHttp.HttpRequest:typeof})};" />
-        <Require Source.Include="@{Android.Base.Wrappers.JWrapper:include}" />
-        <Require Source.Include="@{Android.Base.JNI:include}" />
-        <Require Source.Include="@{Uno.Exception:include}" />
-        <Method Signature="HttpResponseTypeNone_GET_44276():int">
-            <Body>
+<extensions backend="cplusplus" condition="ANDROID">
+    <using namespace="Android.com.fuse.ExperimentalHttp" />
+    <type name="HttpRequest">
+        <require source.include="@{Android.Base.AndroidBindingMacros:include}" />
+        <require android.bindings.bootstrapper.include="#include <@{Android.com.fuse.ExperimentalHttp.HttpRequest:include}>" />
+        <require android.bindings.bootstrapper.statement="@{Android.Base.Types.Bridge.RegisterUnoType(Android.Base.Primitives.ConstCharPtr,int,Uno.Type):call(&quot;com.fuse.ExperimentalHttp.HttpRequest&quot;,37,@{Android.com.fuse.ExperimentalHttp.HttpRequest:typeof})};" />
+        <require source.include="@{Android.Base.Wrappers.JWrapper:include}" />
+        <require source.include="@{Android.Base.JNI:include}" />
+        <require source.include="@{Uno.Exception:include}" />
+        <method signature="HttpResponseTypeNone_GET_44276():int">
+            <body>
 INIT_JNI;
 CLASS_INIT(@{_javaClass},@{_Init():call()});
 if (uEnterCriticalIfNull(&@{HttpResponseTypeNone_44276_ID})) {
@@ -19,10 +19,10 @@ if (uEnterCriticalIfNull(&@{HttpResponseTypeNone_44276_ID})) {
 result = ((@{int})U_JNIVAR->GetStaticIntField(@{_javaClass}, @{HttpResponseTypeNone_44276_ID}));
 return result;
 
-</Body>
-        </Method>
-        <Method Signature="HttpResponseTypeString_GET_44277():int">
-            <Body>
+</body>
+        </method>
+        <method signature="HttpResponseTypeString_GET_44277():int">
+            <body>
 INIT_JNI;
 CLASS_INIT(@{_javaClass},@{_Init():call()});
 if (uEnterCriticalIfNull(&@{HttpResponseTypeString_44277_ID})) {
@@ -33,10 +33,10 @@ if (uEnterCriticalIfNull(&@{HttpResponseTypeString_44277_ID})) {
 result = ((@{int})U_JNIVAR->GetStaticIntField(@{_javaClass}, @{HttpResponseTypeString_44277_ID}));
 return result;
 
-</Body>
-        </Method>
-        <Method Signature="HttpResponseTypeByteArray_GET_44278():int">
-            <Body>
+</body>
+        </method>
+        <method signature="HttpResponseTypeByteArray_GET_44278():int">
+            <body>
 INIT_JNI;
 CLASS_INIT(@{_javaClass},@{_Init():call()});
 if (uEnterCriticalIfNull(&@{HttpResponseTypeByteArray_44278_ID})) {
@@ -47,10 +47,10 @@ if (uEnterCriticalIfNull(&@{HttpResponseTypeByteArray_44278_ID})) {
 result = ((@{int})U_JNIVAR->GetStaticIntField(@{_javaClass}, @{HttpResponseTypeByteArray_44278_ID}));
 return result;
 
-</Body>
-        </Method>
-        <Method Signature="InstallCache_IMPL_44279(Android.Base.Wrappers.IJWrapper,long):bool">
-            <Body>
+</body>
+        </method>
+        <method signature="InstallCache_IMPL_44279(Android.Base.Wrappers.IJWrapper,long):bool">
+            <body>
 INIT_JNI;
 jobject _obArg0 = ((!$0) ? nullptr : @{Android.Base.Wrappers.IJWrapper:of($0)._GetJavaObject():call()});
 @{bool} result;
@@ -61,10 +61,10 @@ result = ((@{bool})U_JNIVAR->CallStaticBooleanMethod(@{_javaClass}, @{InstallCac
 
 return result;
 
-</Body>
-        </Method>
-        <Method Signature="CacheRenew_IMPL_44280(Android.Base.Wrappers.IJWrapper)">
-            <Body>
+</body>
+        </method>
+        <method signature="CacheRenew_IMPL_44280(Android.Base.Wrappers.IJWrapper)">
+            <body>
 INIT_JNI;
 jobject _obArg0 = ((!$0) ? nullptr : @{Android.Base.Wrappers.IJWrapper:of($0)._GetJavaObject():call()});
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -73,10 +73,10 @@ U_JNIVAR->CallStaticVoidMethod(@{_javaClass}, @{CacheRenew_44280_ID}, _obArg0);
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="CacheClose_IMPL_44281()">
-            <Body>
+</body>
+        </method>
+        <method signature="CacheClose_IMPL_44281()">
+            <body>
 INIT_JNI;
 
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -85,10 +85,10 @@ U_JNIVAR->CallStaticVoidMethod(@{_javaClass}, @{CacheClose_44281_ID});
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="CacheDelete_IMPL_44282()">
-            <Body>
+</body>
+        </method>
+        <method signature="CacheDelete_IMPL_44282()">
+            <body>
 INIT_JNI;
 
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -97,10 +97,10 @@ U_JNIVAR->CallStaticVoidMethod(@{_javaClass}, @{CacheDelete_44282_ID});
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="CacheFlush_IMPL_44283()">
-            <Body>
+</body>
+        </method>
+        <method signature="CacheFlush_IMPL_44283()">
+            <body>
 INIT_JNI;
 
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -109,15 +109,15 @@ U_JNIVAR->CallStaticVoidMethod(@{_javaClass}, @{CacheFlush_44283_ID});
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="HttpRequest_IMPL_44284(Android.Base.Wrappers.IJWrapper,Android.Base.Wrappers.IJWrapper,Android.Base.Wrappers.IJWrapper,Android.Base.Wrappers.IJWrapper):Android.Base.Primitives.ujobject">
-            <ProcessFile Name="Android_com_fuse_ExperimentalHttp_HttpRequest.java" TargetName="@(java.sourceDirectory)/com/foreign/Android_com_fuse_ExperimentalHttp_HttpRequest.java" />
-            <ProcessFile Name="HttpRequest.java" TargetName="@(java.sourceDirectory)/com/fuse/ExperimentalHttp/HttpRequest.java" />
-            <ProcessFile Name="PRNGFixes.java" TargetName="@(java.sourceDirectory)/com/fuse/ExperimentalHttp/PRNGFixes.java" />
-            <ProcessFile Name="UploadTask.java" TargetName="@(java.sourceDirectory)/com/fuse/ExperimentalHttp/UploadTask.java" />
-            <ProcessFile Name="DownloadTask.java" TargetName="@(java.sourceDirectory)/com/fuse/ExperimentalHttp/DownloadTask.java" />
-            <Body>
+</body>
+        </method>
+        <method signature="HttpRequest_IMPL_44284(Android.Base.Wrappers.IJWrapper,Android.Base.Wrappers.IJWrapper,Android.Base.Wrappers.IJWrapper,Android.Base.Wrappers.IJWrapper):Android.Base.Primitives.ujobject">
+            <processFile name="Android_com_fuse_ExperimentalHttp_HttpRequest.java" targetName="@(java.sourceDirectory)/com/foreign/Android_com_fuse_ExperimentalHttp_HttpRequest.java" />
+            <processFile name="HttpRequest.java" targetName="@(java.sourceDirectory)/com/fuse/ExperimentalHttp/HttpRequest.java" />
+            <processFile name="PRNGFixes.java" targetName="@(java.sourceDirectory)/com/fuse/ExperimentalHttp/PRNGFixes.java" />
+            <processFile name="UploadTask.java" targetName="@(java.sourceDirectory)/com/fuse/ExperimentalHttp/UploadTask.java" />
+            <processFile name="DownloadTask.java" targetName="@(java.sourceDirectory)/com/fuse/ExperimentalHttp/DownloadTask.java" />
+            <body>
 INIT_JNI;
 CLASS_INIT(@{_javaClass},@{_Init():call()});
 CACHE_METHOD(@{HttpRequest_44284_ID_c},@{_javaClass},"<init>","(Landroid/app/Activity;Ljava/lang/String;Ljava/lang/String;)V",GetMethodID,"Id for fallback method com.fuse.ExperimentalHttp.HttpRequest.<init> could not be cached",87);
@@ -143,10 +143,10 @@ if (!$0) {
 U_JNIVAR->DeleteLocalRef(_tmp);
 return result;
 
-</Body>
-        </Method>
-        <Method Signature="SetResponseType_IMPL_44292(bool,Android.Base.Primitives.ujobject,int)">
-            <Body>
+</body>
+        </method>
+        <method signature="SetResponseType_IMPL_44292(bool,Android.Base.Primitives.ujobject,int)">
+            <body>
 INIT_JNI;
 
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -161,10 +161,10 @@ else
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="SetHeader_IMPL_44293(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper,Android.Base.Wrappers.IJWrapper)">
-            <Body>
+</body>
+        </method>
+        <method signature="SetHeader_IMPL_44293(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper,Android.Base.Wrappers.IJWrapper)">
+            <body>
 INIT_JNI;
 jobject _obArg2 = ((!$2) ? nullptr : @{Android.Base.Wrappers.IJWrapper:of($2)._GetJavaObject():call()});
 jobject _obArg3 = ((!$3) ? nullptr : @{Android.Base.Wrappers.IJWrapper:of($3)._GetJavaObject():call()});
@@ -180,10 +180,10 @@ else
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="SetTimeout_IMPL_44294(bool,Android.Base.Primitives.ujobject,int)">
-            <Body>
+</body>
+        </method>
+        <method signature="SetTimeout_IMPL_44294(bool,Android.Base.Primitives.ujobject,int)">
+            <body>
 INIT_JNI;
 
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -198,10 +198,10 @@ else
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="SetCaching_IMPL_44295(bool,Android.Base.Primitives.ujobject,bool)">
-            <Body>
+</body>
+        </method>
+        <method signature="SetCaching_IMPL_44295(bool,Android.Base.Primitives.ujobject,bool)">
+            <body>
 INIT_JNI;
 
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -216,10 +216,10 @@ else
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="CacheResponseString_IMPL_44296(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper)">
-            <Body>
+</body>
+        </method>
+        <method signature="CacheResponseString_IMPL_44296(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper)">
+            <body>
 INIT_JNI;
 jobject _obArg2 = ((!$2) ? nullptr : @{Android.Base.Wrappers.IJWrapper:of($2)._GetJavaObject():call()});
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -234,10 +234,10 @@ else
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="GetResponseString_IMPL_44297(bool,Android.Base.Primitives.ujobject):Android.Base.Wrappers.IJWrapper">
-            <Body>
+</body>
+        </method>
+        <method signature="GetResponseString_IMPL_44297(bool,Android.Base.Primitives.ujobject):Android.Base.Wrappers.IJWrapper">
+            <body>
 INIT_JNI;
 
 @{Android.Base.Wrappers.IJWrapper} result;
@@ -254,10 +254,10 @@ else
 
 return result;
 
-</Body>
-        </Method>
-        <Method Signature="SendAsync_IMPL_44299(bool,Android.Base.Primitives.ujobject)">
-            <Body>
+</body>
+        </method>
+        <method signature="SendAsync_IMPL_44299(bool,Android.Base.Primitives.ujobject)">
+            <body>
 INIT_JNI;
 
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -272,10 +272,10 @@ else
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="SendAsyncBuf_IMPL_44300(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper)">
-            <Body>
+</body>
+        </method>
+        <method signature="SendAsyncBuf_IMPL_44300(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper)">
+            <body>
 INIT_JNI;
 jobject _obArg2 = ((!$2) ? nullptr : @{Android.Base.Wrappers.IJWrapper:of($2)._GetJavaObject():call()});
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -290,10 +290,10 @@ else
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="SendAsyncStr_IMPL_44301(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper)">
-            <Body>
+</body>
+        </method>
+        <method signature="SendAsyncStr_IMPL_44301(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper)">
+            <body>
 INIT_JNI;
 jobject _obArg2 = ((!$2) ? nullptr : @{Android.Base.Wrappers.IJWrapper:of($2)._GetJavaObject():call()});
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -308,10 +308,10 @@ else
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="UploadDone_IMPL_44302(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper,Android.Base.Wrappers.IJWrapper,int,Android.Base.Wrappers.IJWrapper)">
-            <Body>
+</body>
+        </method>
+        <method signature="UploadDone_IMPL_44302(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper,Android.Base.Wrappers.IJWrapper,int,Android.Base.Wrappers.IJWrapper)">
+            <body>
 INIT_JNI;
 jobject _obArg2 = ((!$2) ? nullptr : @{Android.Base.Wrappers.IJWrapper:of($2)._GetJavaObject():call()});
 jobject _obArg3 = ((!$3) ? nullptr : @{Android.Base.Wrappers.IJWrapper:of($3)._GetJavaObject():call()});
@@ -328,10 +328,10 @@ else
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="DownloadDone_IMPL_44303(bool,Android.Base.Primitives.ujobject)">
-            <Body>
+</body>
+        </method>
+        <method signature="DownloadDone_IMPL_44303(bool,Android.Base.Primitives.ujobject)">
+            <body>
 INIT_JNI;
 
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -346,10 +346,10 @@ else
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="StartDownload_IMPL_44304(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper)">
-            <Body>
+</body>
+        </method>
+        <method signature="StartDownload_IMPL_44304(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper)">
+            <body>
 INIT_JNI;
 jobject _obArg2 = ((!$2) ? nullptr : @{Android.Base.Wrappers.IJWrapper:of($2)._GetJavaObject():call()});
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -364,10 +364,10 @@ else
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="Abort_IMPL_44305(bool,Android.Base.Primitives.ujobject)">
-            <Body>
+</body>
+        </method>
+        <method signature="Abort_IMPL_44305(bool,Android.Base.Primitives.ujobject)">
+            <body>
 INIT_JNI;
 
 CLASS_INIT(@{_javaClass},@{_Init():call()});
@@ -382,10 +382,10 @@ else
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 
 
-</Body>
-        </Method>
-        <Method Signature="GetResponseStatus_IMPL_44306(bool,Android.Base.Primitives.ujobject):int">
-            <Body>
+</body>
+        </method>
+        <method signature="GetResponseStatus_IMPL_44306(bool,Android.Base.Primitives.ujobject):int">
+            <body>
 INIT_JNI;
 
 @{int} result;
@@ -402,10 +402,10 @@ else
 
 return result;
 
-</Body>
-        </Method>
-        <Method Signature="GetResponseHeader_IMPL_44307(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper):Android.Base.Wrappers.IJWrapper">
-            <Body>
+</body>
+        </method>
+        <method signature="GetResponseHeader_IMPL_44307(bool,Android.Base.Primitives.ujobject,Android.Base.Wrappers.IJWrapper):Android.Base.Wrappers.IJWrapper">
+            <body>
 INIT_JNI;
 jobject _obArg2 = ((!$2) ? nullptr : @{Android.Base.Wrappers.IJWrapper:of($2)._GetJavaObject():call()});
 @{Android.Base.Wrappers.IJWrapper} result;
@@ -422,10 +422,10 @@ else
 
 return result;
 
-</Body>
-        </Method>
-        <Method Signature="GetResponseHeaders_IMPL_44308(bool,Android.Base.Primitives.ujobject):Android.Base.Wrappers.IJWrapper">
-            <Body>
+</body>
+        </method>
+        <method signature="GetResponseHeaders_IMPL_44308(bool,Android.Base.Primitives.ujobject):Android.Base.Wrappers.IJWrapper">
+            <body>
 INIT_JNI;
 
 @{Android.Base.Wrappers.IJWrapper} result;
@@ -442,10 +442,10 @@ else
 
 return result;
 
-</Body>
-        </Method>
-        <Method Signature="_IsThisType(Android.Base.Wrappers.IJWrapper):bool">
-            <Body>int N = 44;
+</body>
+        </method>
+        <method signature="_IsThisType(Android.Base.Wrappers.IJWrapper):bool">
+            <body>int N = 44;
 const char* typ = "Android.com.fuse.ExperimentalHttp.HttpRequest";
 const char* potential = $0->__type->FullName;
 for (int i = 0; i < N; ++i)
@@ -455,10 +455,10 @@ for (int i = 0; i < N; ++i)
     }
 }
 return false;
-</Body>
-        </Method>
-        <Method Signature="_Init()">
-            <Body>
+</body>
+        </method>
+        <method signature="_Init()">
+            <body>
 if (@{_javaClass}) { return; }
 INIT_JNI;
 @{_javaClass} = NEW_GLOBAL_REF(jclass,LOAD_SYS_CLASS("com/fuse/ExperimentalHttp/HttpRequest"));
@@ -466,10 +466,10 @@ INIT_JNI;
 if (!@{_javaClass}) { THROW_UNO_EXCEPTION("Unable to cache class 'com.fuse.ExperimentalHttp.HttpRequest'", 61);; }
 
 
-</Body>
-        </Method>
-        <Method Signature="_InitProxy()">
-            <Body>
+</body>
+        </method>
+        <method signature="_InitProxy()">
+            <body>
 if (@{_javaProxyClass}) { return; }
 INIT_JNI;
 @{_javaProxyClass} = NEW_GLOBAL_REF(jclass,@{Android.Base.JNI.LoadClass(Android.Base.Primitives.JNIEnvPtr,Android.Base.Primitives.ConstCharPtr):call(jni, "com.foreign.Android_com_fuse_ExperimentalHttp_HttpRequest")});
@@ -500,9 +500,9 @@ REG_MTD(6,"__n_OnProgress","(JIIZJJJ)V",::Android_com_fuse_ExperimentalHttp_Http
 #endif
 COMMIT_REG_MTD(@{_javaProxyClass});
 
-</Body>
-        </Method>
-        <Require Source.Declaration>
+</body>
+        </method>
+        <require source.declaration>
 #if !@{Android.com.fuse.ExperimentalHttp.HttpRequest.OnDataReceived(Android.Base.Wrappers.IJWrapper,int):isStripped}
 JNFUN(void,Android_com_fuse_ExperimentalHttp_HttpRequest__OnDataReceived44285,jlong ujPtr, jobject arg0, jint arg1, jlong arg2, jlong arg3) {
     INITCALLBACK(uPtr,@{Android.com.fuse.ExperimentalHttp.HttpRequest});
@@ -570,6 +570,6 @@ JNFUN(void,Android_com_fuse_ExperimentalHttp_HttpRequest__OnProgress44291,jlong
     JCATCH
 }
 #endif
-</Require>
-    </Type>
-</Extensions>
+</require>
+    </type>
+</extensions>
diff --git a/lib/Uno.Net.Http/cil/CilHttpRequest.cil.uxl b/lib/Uno.Net.Http/cil/CilHttpRequest.cil.uxl
index 42905f4b4..49275dafb 100644
--- a/lib/Uno.Net.Http/cil/CilHttpRequest.cil.uxl
+++ b/lib/Uno.Net.Http/cil/CilHttpRequest.cil.uxl
@@ -1,5 +1,5 @@
-<Extensions Backend="CIL">
+<extensions backend="cil">
 
-    <Require Assembly="Uno.Net.Http.Implementation.dll" />
+    <require assembly="Uno.Net.Http.Implementation.dll" />
 
-</Extensions>
+</extensions>
diff --git a/lib/Uno.Net.Http/cpp/XliHttpRequest.cpp.uxl b/lib/Uno.Net.Http/cpp/XliHttpRequest.cpp.uxl
index c703f4985..ffe52e182 100644
--- a/lib/Uno.Net.Http/cpp/XliHttpRequest.cpp.uxl
+++ b/lib/Uno.Net.Http/cpp/XliHttpRequest.cpp.uxl
@@ -1,39 +1,39 @@
-<Extensions Backend="CPlusPlus" Condition="LINUX || MSVC">
+<extensions backend="cplusplus" condition="LINUX || MSVC">
 
-    <Using Namespace="Uno.Net.Http.Implementation" />
+    <using namespace="Uno.Net.Http.Implementation" />
 
-    <Type Name="XliHttpClientHandle"
-        TypeName="::Xli::HttpClient*"
-        Include="XliHttpClient/HttpClient.h" />
+    <type name="XliHttpClientHandle"
+        typeName="::Xli::HttpClient*"
+        include="XliHttpClient/HttpClient.h" />
 
-    <Type Name="XliHttpRequestHandle"
-        TypeName="::Xli::HttpRequest*"
-        Include="XliHttpClient/HttpClient.h" />
+    <type name="XliHttpRequestHandle"
+        typeName="::Xli::HttpRequest*"
+        include="XliHttpClient/HttpClient.h" />
 
-    <Type Name="XliHttpMessageHandler">
-        <ProcessFile HeaderFile="XliHttpEventHandler.h" />
+    <type name="XliHttpMessageHandler">
+        <processFile headerFile="XliHttpEventHandler.h" />
 
-        <Require Source.Include="XliHttpClient/HttpClient.h" />
-        <Require Source.Include="XliHttpEventHandler.h" />
-    </Type>
+        <require source.include="XliHttpClient/HttpClient.h" />
+        <require source.include="XliHttpEventHandler.h" />
+    </type>
 
-    <Type Name="XliHttpRequest">
-        <Require Template="XliHttpClient" />
+    <type name="XliHttpRequest">
+        <require template="XliHttpClient" />
 
-        <Require Source.Include="XliHttpClient/HttpClient.h" />
+        <require source.include="XliHttpClient/HttpClient.h" />
 
-        <Method Signature="GetResponseHeader(string):string">
-            <Body>
+        <method signature="GetResponseHeader(string):string">
+            <body>
                 uBase::String result;
                 if (@{$$._requestHandle}->TryGetResponseHeader(uCString($0).Ptr, result))
                     return uString::Utf8(result.Ptr());
                 else
                     return nullptr;
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="GetResponseHeaders():string">
-            <Body>
+        <method signature="GetResponseHeaders():string">
+            <body>
                 Xli::HttpRequest* req = @{$$._requestHandle};
                 uBase::String result = "";
                 bool first = true;
@@ -47,8 +47,8 @@
                 }
 
                 return uString::Utf8(result.Ptr());
-            </Body>
-        </Method>
-    </Type>
+            </body>
+        </method>
+    </type>
 
-</Extensions>
+</extensions>
diff --git a/lib/Uno.Net.Http/ios/iOSHttpRequest.cpp.uxl b/lib/Uno.Net.Http/ios/iOSHttpRequest.cpp.uxl
index 699c4bce6..12fe98e5f 100644
--- a/lib/Uno.Net.Http/ios/iOSHttpRequest.cpp.uxl
+++ b/lib/Uno.Net.Http/ios/iOSHttpRequest.cpp.uxl
@@ -1,15 +1,15 @@
-<Extensions Backend="CPlusPlus" Condition="APPLE">
-    <Using Namespace="Uno.Net.Http.Implementation" />
+<extensions backend="cplusplus" condition="APPLE">
+    <using namespace="Uno.Net.Http.Implementation" />
 
-    <Type Name="iOSHttpRequestHandle"
-        TypeName="::Uno::Net::Http::iOS::HttpRequest*"
-        Include="HttpRequest.h" />
+    <type name="iOSHttpRequestHandle"
+        typeName="::Uno::Net::Http::iOS::HttpRequest*"
+        include="HttpRequest.h" />
 
-    <Type Name="iOSHttpRequest">
-        <ProcessFile HeaderFile="HttpRequest.h" />
-        <ProcessFile SourceFile="HttpRequest.mm" />
+    <type name="iOSHttpRequest">
+        <processFile headerFile="HttpRequest.h" />
+        <processFile sourceFile="HttpRequest.mm" />
 
-        <Require Condition="IOS" Xcode.Plist.Element>
+        <require condition="IOS" xcode.plist.element>
             <![CDATA[
                 <key>NSAppTransportSecurity</key>
                 <dict>
@@ -17,6 +17,6 @@
                     <true/>
                 </dict>
             ]]>
-        </Require>
-    </Type>
-</Extensions>
+        </require>
+    </type>
+</extensions>
diff --git a/lib/Uno.Net.Http/ios/iOSHttpSharedCache.cpp.uxl b/lib/Uno.Net.Http/ios/iOSHttpSharedCache.cpp.uxl
index 74c0868bc..364b8220e 100644
--- a/lib/Uno.Net.Http/ios/iOSHttpSharedCache.cpp.uxl
+++ b/lib/Uno.Net.Http/ios/iOSHttpSharedCache.cpp.uxl
@@ -1,14 +1,14 @@
-<Extensions Backend="CPlusPlus" Condition="APPLE">
-    <Using Namespace="Uno.Net.Http.Implementation" />
+<extensions backend="cplusplus" condition="APPLE">
+    <using namespace="Uno.Net.Http.Implementation" />
 
-    <Type Name="iOSHttpSharedCache">
-        <Require Source.Include="HttpRequest.h" />
+    <type name="iOSHttpSharedCache">
+        <require source.include="HttpRequest.h" />
 
-        <Method Signature="SetupSharedCache(bool,long)">
-            <Expression>::Uno::Net::Http::iOS::SetupSharedCache($0, size_t($1))</Expression>
-        </Method>
-        <Method Signature="PurgeSharedCache()">
-            <Expression>::Uno::Net::Http::iOS::PurgeSharedCache()</Expression>
-        </Method>
-    </Type>
-</Extensions>
+        <method signature="SetupSharedCache(bool,long)">
+            <expression>::Uno::Net::Http::iOS::SetupSharedCache($0, size_t($1))</expression>
+        </method>
+        <method signature="PurgeSharedCache()">
+            <expression>::Uno::Net::Http::iOS::PurgeSharedCache()</expression>
+        </method>
+    </type>
+</extensions>
diff --git a/lib/Uno.Net.Sockets/System.Net.Sockets.uxl b/lib/Uno.Net.Sockets/System.Net.Sockets.uxl
index 2e702b15b..f0204ddc4 100644
--- a/lib/Uno.Net.Sockets/System.Net.Sockets.uxl
+++ b/lib/Uno.Net.Sockets/System.Net.Sockets.uxl
@@ -1,3 +1,3 @@
-<Extensions Backend="CIL">
-    <Require Assembly="System.Net.Sockets" />
-</Extensions>
+<extensions backend="cil">
+    <require assembly="System.Net.Sockets" />
+</extensions>
diff --git a/lib/UnoCore/android/android.uxl b/lib/UnoCore/android/android.uxl
index 10a8574ef..0d4c2e7ad 100644
--- a/lib/UnoCore/android/android.uxl
+++ b/lib/UnoCore/android/android.uxl
@@ -1,221 +1,221 @@
-<Extensions Backend="CPlusPlus" Condition="ANDROID">
+<extensions backend="cplusplus" condition="ANDROID">
 
     <!-- Backend config -->
 
-    <Define MOBILE />
-    <Define UNIX />
+    <define MOBILE />
+    <define UNIX />
 
-    <Set BundleDirectory="app/src/main/assets" />
-    <Set HeaderDirectory="app/src/main/include" />
-    <Set SourceDirectory="app/src/main/jni" />
-    <Set BinaryDirectory="app/src/main/jniLibs" />
-    <Set PathSeparator="@(HOST_WIN32:defined:test(';', ':'))" />
+    <set bundleDirectory="app/src/main/assets" />
+    <set headerDirectory="app/src/main/include" />
+    <set sourceDirectory="app/src/main/jni" />
+    <set binaryDirectory="app/src/main/jniLibs" />
+    <set pathSeparator="@(HOST_WIN32:defined:test(';', ':'))" />
 
     <!-- Deprecated -->
-    <Set ABI="${ANDROID_ABI}" />
-    <Set NDK.Directory="@(config.android.ndk:path || config.android.ndk.directory:path || ANDROID_NDK:env)" />
+    <set ABI="${ANDROID_ABI}" />
+    <set ndk.directory="@(config.android.ndk:path || config.android.ndk.directory:path || ANDROID_NDK:env)" />
 
     <!-- Build tools config -->
 
-    <Set JDK.Directory="@(config.java.jdk:path || config.java.jdk.directory:path || JAVA_HOME:env)" />
-    <Set NDK.PlatformVersion="@(project.android.ndk.platformVersion || config.android.ndk.platformVersion || '16')" />
-    <Set NDK.Version="@(project.android.ndk.version || config.android.ndk.version || '21.4.7075529')" />
-    <Set SDK.BuildToolsVersion="@(project.android.sdk.buildToolsVersion || config.android.sdk.buildToolsVersion || '33.0.1')" />
-    <Set SDK.CompileVersion="@(project.android.sdk.compileVersion || config.android.sdk.compileVersion || '33')" />
-    <Set SDK.Directory="@(config.android.sdk:path || config.android.sdk.directory:path || ANDROID_SDK:env)" />
-    <Set SDK.MinVersion="@(project.android.sdk.minVersion || config.android.sdk.minVersion || '19')" />
-    <Set SDK.TargetVersion="@(project.android.sdk.targetVersion || config.android.sdk.targetVersion || '33')" />
+    <set jdk.directory="@(config.java.jdk:path || config.java.jdk.directory:path || JAVA_HOME:env)" />
+    <set ndk.platformVersion="@(project.android.ndk.platformVersion || config.android.ndk.platformVersion || '16')" />
+    <set ndk.version="@(project.android.ndk.version || config.android.ndk.version || '21.4.7075529')" />
+    <set sdk.buildToolsVersion="@(project.android.sdk.buildToolsVersion || config.android.sdk.buildToolsVersion || '33.0.1')" />
+    <set sdk.compileVersion="@(project.android.sdk.compileVersion || config.android.sdk.compileVersion || '33')" />
+    <set sdk.directory="@(config.android.sdk:path || config.android.sdk.directory:path || ANDROID_SDK:env)" />
+    <set sdk.minVersion="@(project.android.sdk.minVersion || config.android.sdk.minVersion || '19')" />
+    <set sdk.targetVersion="@(project.android.sdk.targetVersion || config.android.sdk.targetVersion || '33')" />
 
     <!-- Build properties -->
 
-    <Declare Element="Activity.Class.Declaration" />
-    <Declare Element="Activity.File.Declaration" />
-    <Declare Element="Activity.OnActivityResult.Declaration" />
-    <Declare Element="Activity.OnConfigurationChanged.Declaration" />
-    <Declare Element="Activity.OnKeyDown.Declaration" />
-    <Declare Element="Activity.OnKeyUp.Declaration" />
-    <Declare Element="Activity.OnLowMemory.Declaration" />
-    <Declare Element="Activity.OnPermissionsResult" />
-    <Declare Element="Activity.OnNewIntent.Declaration" />
-    <Declare Element="Activity.OnWindowFocusChanged.Declaration" />
-    <Declare Element="Android.ResStrings.Declaration" />
-    <Declare Element="AndroidManifest.ActivityAttribute" />
-    <Declare Element="AndroidManifest.ActivityElement" />
-    <Declare Element="AndroidManifest.ApplicationAttribute" />
-    <Declare Element="AndroidManifest.ApplicationElement" />
-    <Declare Element="AndroidManifest.ManifestAttribute" />
-    <Declare Element="AndroidManifest.Permission" />
-    <Declare Element="AndroidManifest.RootElement" />
-    <Declare Element="AndroidManifest.Activity.ViewIntentFilter" />
-    <Declare Element="Gradle.Properties" />
-    <Declare Element="Gradle.Settings" />
-    <Declare Element="Gradle.Dependency" />
-    <Declare Element="Gradle.Dependency.ClassPath" />
-    <Declare Element="Gradle.Dependency.Implementation" />
-    <Declare Element="Gradle.Dependency.DebugImplementation" />
-    <Declare Element="Gradle.Dependency.ReleaseImplementation" />
-    <Declare Element="Gradle.Dependency.NativeImplementation" />
-    <Declare Element="Gradle.BuildFile.End" />
-    <Declare Element="Gradle.Repository" />
-    <Declare Element="Gradle.BuildScript.Repository" />
-    <Declare Element="Gradle.AllProjects.Repository" />
-    <Declare Element="Java.Extern.RegisterFunction" />
-    <Declare Element="SharedLibrary" />
-    <Declare Element="StaticLibrary" />
-    <Declare Element="LoadLibrary" />
-    <Declare Element="Project.Property" />
-
-    <Require AndroidManifest.Permission="android.permission.WAKE_LOCK" />
-    <Require AndroidManifest.Permission="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <Require AndroidManifest.Permission="android.permission.INTERNET" />
-    <Require AndroidManifest.Permission="android.permission.ACCESS_NETWORK_STATE" />
-    <Require AndroidManifest.Permission="android.permission.VIBRATE" />
-
-    <Set Activity.BaseClass="androidx.appcompat.app.AppCompatActivity" />
-    <Set Activity.Name="@(project.android.activity || project.name:identifier)" />
-    <Set Activity.Package="@(project.android.package || 'com.apps.@(project.name:qidentifier:toLower)')" />
+    <declare element="activity.class.declaration" />
+    <declare element="activity.file.declaration" />
+    <declare element="activity.onActivityResult.declaration" />
+    <declare element="activity.onConfigurationChanged.declaration" />
+    <declare element="activity.onKeyDown.declaration" />
+    <declare element="activity.onKeyUp.declaration" />
+    <declare element="activity.onLowMemory.declaration" />
+    <declare element="activity.onPermissionsResult" />
+    <declare element="activity.onNewIntent.declaration" />
+    <declare element="activity.onWindowFocusChanged.declaration" />
+    <declare element="android.resStrings.declaration" />
+    <declare element="androidManifest.activityAttribute" />
+    <declare element="androidManifest.activityElement" />
+    <declare element="androidManifest.applicationAttribute" />
+    <declare element="androidManifest.applicationElement" />
+    <declare element="androidManifest.manifestAttribute" />
+    <declare element="androidManifest.permission" />
+    <declare element="androidManifest.rootElement" />
+    <declare element="androidManifest.activity.viewIntentFilter" />
+    <declare element="gradle.properties" />
+    <declare element="gradle.settings" />
+    <declare element="gradle.dependency" />
+    <declare element="gradle.dependency.classPath" />
+    <declare element="gradle.dependency.implementation" />
+    <declare element="gradle.dependency.debugImplementation" />
+    <declare element="gradle.dependency.releaseImplementation" />
+    <declare element="gradle.dependency.nativeImplementation" />
+    <declare element="gradle.buildFile.end" />
+    <declare element="gradle.repository" />
+    <declare element="gradle.buildScript.repository" />
+    <declare element="gradle.allProjects.repository" />
+    <declare element="java.extern.registerFunction" />
+    <declare element="sharedLibrary" />
+    <declare element="staticLibrary" />
+    <declare element="loadLibrary" />
+    <declare element="project.property" />
+
+    <require androidManifest.permission="android.permission.WAKE_LOCK" />
+    <require androidManifest.permission="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <require androidManifest.permission="android.permission.INTERNET" />
+    <require androidManifest.permission="android.permission.ACCESS_NETWORK_STATE" />
+    <require androidManifest.permission="android.permission.VIBRATE" />
+
+    <set activity.baseClass="androidx.appcompat.app.AppCompatActivity" />
+    <set activity.name="@(project.android.activity || project.name:identifier)" />
+    <set activity.package="@(project.android.package || 'com.apps.@(project.name:qidentifier:toLower)')" />
 
     <!-- Build configuration -->
 
-    <Set Condition="LIBRARY" Build.Configuration="@('!@(DEBUG:defined)':test('Release', 'Debug'))" />
-    <Set Condition="!LIBRARY" Build.Configuration="@('!@(DEBUG:defined) && @(project.android.key.store:isSet)':test('Release', 'Debug'))" />
+    <set condition="LIBRARY" build.configuration="@('!@(DEBUG:defined)':test('Release', 'Debug'))" />
+    <set condition="!LIBRARY" build.configuration="@('!@(DEBUG:defined) && @(project.android.key.store:isSet)':test('Release', 'Debug'))" />
 
-    <Set Gradle.AssembleTask="assemble@(build.configuration)" />
-    <Set Gradle.BundleTask="bundle@(build.configuration)" />
+    <set gradle.assembleTask="assemble@(build.configuration)" />
+    <set gradle.bundleTask="bundle@(build.configuration)" />
 
-    <Set Outputs.AAR="app/build/outputs/aar/app-@(build.configuration:toLower).aar" />
-    <Set Outputs.APK="app/build/outputs/apk/@(build.configuration:toLower)/app-@(build.configuration:toLower).apk" />
-    <Set Outputs.Bundle="app/build/outputs/bundle/@(build.configuration:toLower)/app-@(build.configuration:toLower).aab" />
+    <set outputs.aar="app/build/outputs/aar/app-@(build.configuration:toLower).aar" />
+    <set outputs.apk="app/build/outputs/apk/@(build.configuration:toLower)/app-@(build.configuration:toLower).apk" />
+    <set outputs.bundle="app/build/outputs/bundle/@(build.configuration:toLower)/app-@(build.configuration:toLower).aab" />
 
     <!-- Run-time properties -->
 
-    <Set Runtime.CatchCppExceptions="2" />
-    <Set Runtime.CppMainLoop="Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN" />
-    <Set Runtime.DebugPauseMilliseconds="0" />
-    <Set Runtime.KillActivityOnDestroy="true" />
-    <Set Runtime.SeperateUnoThread="AppRuntimeSettings.CppMainLoop" />
+    <set runtime.catchCppExceptions="2" />
+    <set runtime.cppMainLoop="Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN" />
+    <set runtime.debugPauseMilliseconds="0" />
+    <set runtime.killActivityOnDestroy="true" />
+    <set runtime.seperateUnoThread="AppRuntimeSettings.CppMainLoop" />
 
     <!-- Output files -->
 
-    <Set Condition="LIBRARY" Product="@(project.name).aar" />
-    <Set Condition="!LIBRARY" Product="@(project.name).apk" />
-    <Set Condition="!LIBRARY" Bundle="@(project.name).aab" />
+    <set condition="LIBRARY" product="@(project.name).aar" />
+    <set condition="!LIBRARY" product="@(project.name).apk" />
+    <set condition="!LIBRARY" bundle="@(project.name).aab" />
 
     <!-- Deprecated properties -->
 
-    <Deprecate Gradle.Dependency.Compile="Gradle.Dependency.Implementation" />
-    <Deprecate Gradle.Model.Repository="Gradle.Repository" />
-    <Deprecate JNI.SharedLibrary="SharedLibrary" />
-    <Deprecate JNI.StaticLibrary="StaticLibrary" />
-    <Deprecate JNI.SystemLibrary="LoadLibrary" />
+    <deprecate gradle.dependency.compile="Gradle.Dependency.Implementation" />
+    <deprecate gradle.model.repository="Gradle.Repository" />
+    <deprecate jni.sharedLibrary="SharedLibrary" />
+    <deprecate jni.staticLibrary="StaticLibrary" />
+    <deprecate jni.systemLibrary="LoadLibrary" />
 
     <!-- STL config -->
 
-    <Set STL="c++_static" />
+    <set STL="c++_static" />
 
     <!-- C++ source -->
 
-    <ProcessFile SourceFile="uDroid/EntryPoints.cpp" />
-    <ProcessFile HeaderFile="uDroid/GLHelper.h" />
-    <ProcessFile SourceFile="uDroid/GLHelper.cpp" />
-    <ProcessFile HeaderFile="uDroid/JNIHelper.h" />
-    <ProcessFile SourceFile="uDroid/JNIHelper.cpp" />
+    <processFile sourceFile="uDroid/EntryPoints.cpp" />
+    <processFile headerFile="uDroid/GLHelper.h" />
+    <processFile sourceFile="uDroid/GLHelper.cpp" />
+    <processFile headerFile="uDroid/JNIHelper.h" />
+    <processFile sourceFile="uDroid/JNIHelper.cpp" />
 
     <!-- Java source -->
 
-    <Set Java.ProjectDirectory="app/src" />
-    <Set Java.LibsDirectory="@(java.projectDirectory)/main/libs" />
-    <Set Java.SourceDirectory="@(java.projectDirectory)/main/java" />
-    <Set Java.PackageDirectory="@(java.sourceDirectory)/@(activity.package:replace('.', '/'))" />
+    <set java.projectDirectory="app/src" />
+    <set java.libsDirectory="@(java.projectDirectory)/main/libs" />
+    <set java.sourceDirectory="@(java.projectDirectory)/main/java" />
+    <set java.packageDirectory="@(java.sourceDirectory)/@(activity.package:replace('.', '/'))" />
 
-    <Declare Element="JavaFile" TargetDirectory="@(java.sourceDirectory)" />
+    <declare element="javaFile" targetDirectory="@(java.sourceDirectory)" />
 
-    <ProcessFile Name="@(java.packageDirectory)/@(activity.name).java" />
-    <ProcessFile JavaFile="com/foreign/UnoWrapped.java" />
-    <ProcessFile JavaFile="com/fuse/Activity.java" />
-    <ProcessFile JavaFile="com/fuse/ActivityNativeEntryPoints.java" />
-    <ProcessFile JavaFile="com/fuse/ActivityState.java" />
-    <ProcessFile JavaFile="com/fuse/App.java" />
-    <ProcessFile JavaFile="com/fuse/AppRuntimeSettings.java" />
-    <ProcessFile JavaFile="com/fuse/R.java" />
-    <ProcessFile JavaFile="com/uno/CppManager.java" />
+    <processFile name="@(java.packageDirectory)/@(activity.name).java" />
+    <processFile javaFile="com/foreign/UnoWrapped.java" />
+    <processFile javaFile="com/fuse/Activity.java" />
+    <processFile javaFile="com/fuse/ActivityNativeEntryPoints.java" />
+    <processFile javaFile="com/fuse/ActivityState.java" />
+    <processFile javaFile="com/fuse/App.java" />
+    <processFile javaFile="com/fuse/AppRuntimeSettings.java" />
+    <processFile javaFile="com/fuse/R.java" />
+    <processFile javaFile="com/uno/CppManager.java" />
 
     <!-- Icons -->
 
-    <ImageFile Name="@(project.android.icons.ldpi:path || '@//assets/icon.png')"
-        TargetWidth="36" TargetName="app/src/main/res/mipmap-ldpi/icon.png" />
-    <ImageFile Name="@(project.android.icons.mdpi:path || '@//assets/icon.png')"
-        TargetWidth="48" TargetName="app/src/main/res/mipmap-mdpi/icon.png" />
-    <ImageFile Name="@(project.android.icons.hdpi:path || '@//assets/icon.png')"
-        TargetWidth="72" TargetName="app/src/main/res/mipmap-hdpi/icon.png" />
-    <ImageFile Name="@(project.android.icons.xhdpi:path || '@//assets/icon.png')"
-        TargetWidth="96" TargetName="app/src/main/res/mipmap-xhdpi/icon.png" />
-    <ImageFile Name="@(project.android.icons.xxhdpi:path || '@//assets/icon.png')"
-        TargetWidth="144" TargetName="app/src/main/res/mipmap-xxhdpi/icon.png" />
-    <ImageFile Name="@(project.android.icons.xxxhdpi:path || '@//assets/icon.png')"
-        TargetWidth="192" TargetName="app/src/main/res/mipmap-xxxhdpi/icon.png" />
-    <CopyFile Condition="USE_ADAPTIVE_ICON || USE_ROUND_ADAPTIVE_ICON" Name="@(project.android.icons.anydpi_v26:path || '@//assets/adaptive_icon/mipmap-anydpi-v26/icon.xml')" TargetName="app/src/main/res/mipmap-anydpi-v26/icon.xml" />
-
-    <ImageFile Condition="USE_ROUND_ADAPTIVE_ICON" Name="@(project.android.icons.mdpi_round:path || '@//assets/adaptive_icon/mipmap-mdpi/icon_round.png')"
-        TargetWidth="48" TargetName="app/src/main/res/mipmap-mdpi/icon_round.png" />
-    <ImageFile Condition="USE_ROUND_ADAPTIVE_ICON" Name="@(project.android.icons.hdpi_round:path || '@//assets/adaptive_icon/mipmap-hdpi/icon_round.png')"
-        TargetWidth="72" TargetName="app/src/main/res/mipmap-hdpi/icon_round.png" />
-    <ImageFile Condition="USE_ROUND_ADAPTIVE_ICON" Name="@(project.android.icons.xhdpi_round:path || '@//assets/adaptive_icon/mipmap-xhdpi/icon_round.png')"
-        TargetWidth="96" TargetName="app/src/main/res/mipmap-xhdpi/icon_round.png" />
-    <ImageFile Condition="USE_ROUND_ADAPTIVE_ICON" Name="@(project.android.icons.xxhdpi_round:path || '@//assets/adaptive_icon/mipmap-xxhdpi/icon_round.png')"
-        TargetWidth="144" TargetName="app/src/main/res/mipmap-xxhdpi/icon_round.png" />
-    <ImageFile Condition="USE_ROUND_ADAPTIVE_ICON" Name="@(project.android.icons.xxxhdpi_round:path || '@//assets/adaptive_icon/mipmap-xxxhdpi/icon_round.png')"
-        TargetWidth="192" TargetName="app/src/main/res/mipmap-xxxhdpi/icon_round.png" />
-    <CopyFile Condition="USE_ROUND_ADAPTIVE_ICON" Name="@(project.android.icons.anydpi_v26_round:path || '@//assets/adaptive_icon/mipmap-anydpi-v26/icon_round.xml')" TargetName="app/src/main/res/mipmap-anydpi-v26/icon_round.xml" />
-
-    <CopyFile Condition="USE_ADAPTIVE_ICON || USE_ROUND_ADAPTIVE_ICON" Name="@(project.android.icons.foreground:path || '@//assets/adaptive_icon/drawable/icon_foreground.xml')" TargetName="app/src/main/res/drawable/icon_foreground.xml" />
-    <CopyFile Condition="USE_ADAPTIVE_ICON || USE_ROUND_ADAPTIVE_ICON" Name="@(project.android.icons.background:path || '@//assets/adaptive_icon/drawable/icon_background.xml')" TargetName="app/src/main/res/drawable/icon_background.xml" />
+    <imageFile name="@(project.android.icons.ldpi:path || '@//assets/icon.png')"
+        targetWidth="36" targetName="app/src/main/res/mipmap-ldpi/icon.png" />
+    <imageFile name="@(project.android.icons.mdpi:path || '@//assets/icon.png')"
+        targetWidth="48" targetName="app/src/main/res/mipmap-mdpi/icon.png" />
+    <imageFile name="@(project.android.icons.hdpi:path || '@//assets/icon.png')"
+        targetWidth="72" targetName="app/src/main/res/mipmap-hdpi/icon.png" />
+    <imageFile name="@(project.android.icons.xhdpi:path || '@//assets/icon.png')"
+        targetWidth="96" targetName="app/src/main/res/mipmap-xhdpi/icon.png" />
+    <imageFile name="@(project.android.icons.xxhdpi:path || '@//assets/icon.png')"
+        targetWidth="144" targetName="app/src/main/res/mipmap-xxhdpi/icon.png" />
+    <imageFile name="@(project.android.icons.xxxhdpi:path || '@//assets/icon.png')"
+        targetWidth="192" targetName="app/src/main/res/mipmap-xxxhdpi/icon.png" />
+    <copyFile condition="USE_ADAPTIVE_ICON || USE_ROUND_ADAPTIVE_ICON" name="@(project.android.icons.anydpi_v26:path || '@//assets/adaptive_icon/mipmap-anydpi-v26/icon.xml')" targetName="app/src/main/res/mipmap-anydpi-v26/icon.xml" />
+
+    <imageFile condition="USE_ROUND_ADAPTIVE_ICON" name="@(project.android.icons.mdpi_round:path || '@//assets/adaptive_icon/mipmap-mdpi/icon_round.png')"
+        targetWidth="48" targetName="app/src/main/res/mipmap-mdpi/icon_round.png" />
+    <imageFile condition="USE_ROUND_ADAPTIVE_ICON" name="@(project.android.icons.hdpi_round:path || '@//assets/adaptive_icon/mipmap-hdpi/icon_round.png')"
+        targetWidth="72" targetName="app/src/main/res/mipmap-hdpi/icon_round.png" />
+    <imageFile condition="USE_ROUND_ADAPTIVE_ICON" name="@(project.android.icons.xhdpi_round:path || '@//assets/adaptive_icon/mipmap-xhdpi/icon_round.png')"
+        targetWidth="96" targetName="app/src/main/res/mipmap-xhdpi/icon_round.png" />
+    <imageFile condition="USE_ROUND_ADAPTIVE_ICON" name="@(project.android.icons.xxhdpi_round:path || '@//assets/adaptive_icon/mipmap-xxhdpi/icon_round.png')"
+        targetWidth="144" targetName="app/src/main/res/mipmap-xxhdpi/icon_round.png" />
+    <imageFile condition="USE_ROUND_ADAPTIVE_ICON" name="@(project.android.icons.xxxhdpi_round:path || '@//assets/adaptive_icon/mipmap-xxxhdpi/icon_round.png')"
+        targetWidth="192" targetName="app/src/main/res/mipmap-xxxhdpi/icon_round.png" />
+    <copyFile condition="USE_ROUND_ADAPTIVE_ICON" name="@(project.android.icons.anydpi_v26_round:path || '@//assets/adaptive_icon/mipmap-anydpi-v26/icon_round.xml')" targetName="app/src/main/res/mipmap-anydpi-v26/icon_round.xml" />
+
+    <copyFile condition="USE_ADAPTIVE_ICON || USE_ROUND_ADAPTIVE_ICON" name="@(project.android.icons.foreground:path || '@//assets/adaptive_icon/drawable/icon_foreground.xml')" targetName="app/src/main/res/drawable/icon_foreground.xml" />
+    <copyFile condition="USE_ADAPTIVE_ICON || USE_ROUND_ADAPTIVE_ICON" name="@(project.android.icons.background:path || '@//assets/adaptive_icon/drawable/icon_background.xml')" targetName="app/src/main/res/drawable/icon_background.xml" />
 
     <!-- Build system -->
 
-    <Set Commands.Build="@(HOST_WIN32:defined:test('build.bat', 'bash build.sh'))" />
-    <Set Commands.Run="@(HOST_WIN32:defined:test('run.bat', 'bash run.sh'))" />
-
-    <ProcessFile Name="app/build.gradle" />
-    <ProcessFile Name="app/src/main/AndroidManifest.xml" />
-    <ProcessFile Name="app/src/main/CMakeLists.txt" />
-    <CopyFile Condition="Android" Name="@(project.android.splash.splashLogo:path || '@//assets/icon.png')" TargetName="app/src/main/res/drawable/splash_logo.png" />
-    <CopyFile Condition="Android" Name="@(project.android.icons.vector:path || '@//assets/icon.xml')" TargetName="app/src/main/res/drawable/icon.xml" />
-    <ProcessFile Name="app/src/main/res/drawable/splash_background.xml" />
-    <ProcessFile Name="app/src/main/res/values/colors.xml" />
-    <ProcessFile Name="app/src/main/res/values/strings.xml" />
-    <ProcessFile Name="app/src/main/res/values/styles.xml" />
-    <ProcessFile Name="build.gradle" />
-    <CopyFile Name="gradle/wrapper/gradle-wrapper.jar" />
-    <ProcessFile Name="gradle/wrapper/gradle-wrapper.properties" />
-    <ProcessFile Name="gradlew.bat" Condition="HOST_WIN32" />
-    <ProcessFile Name="gradlew" Condition="HOST_UNIX" IsExecutable="true" />
-    <ProcessFile Name="settings.gradle" />
-
-    <ProcessFile Name="build.bat" Condition="HOST_WIN32" />
-    <ProcessFile Name="build.sh" Condition="HOST_UNIX" IsExecutable="true" />
-
-    <ProcessFile Name="run.bat" Condition="HOST_WIN32" />
-    <ProcessFile Name="run.sh" Condition="HOST_UNIX" IsExecutable="true" />
-    <ProcessFile Name="gradle.properties" />
-    <ProcessFile Name="local.properties" />
-    <ProcessFile Name="gradlew.bat" />
-    <ProcessFile Name="gradlew" />
-    <ProcessFile Name="build.gradle" />
+    <set commands.build="@(HOST_WIN32:defined:test('build.bat', 'bash build.sh'))" />
+    <set commands.run="@(HOST_WIN32:defined:test('run.bat', 'bash run.sh'))" />
+
+    <processFile name="app/build.gradle" />
+    <processFile name="app/src/main/AndroidManifest.xml" />
+    <processFile name="app/src/main/CMakeLists.txt" />
+    <copyFile condition="ANDROID" name="@(project.android.splash.splashLogo:path || '@//assets/icon.png')" targetName="app/src/main/res/drawable/splash_logo.png" />
+    <copyFile condition="ANDROID" name="@(project.android.icons.vector:path || '@//assets/icon.xml')" targetName="app/src/main/res/drawable/icon.xml" />
+    <processFile name="app/src/main/res/drawable/splash_background.xml" />
+    <processFile name="app/src/main/res/values/colors.xml" />
+    <processFile name="app/src/main/res/values/strings.xml" />
+    <processFile name="app/src/main/res/values/styles.xml" />
+    <processFile name="build.gradle" />
+    <copyFile name="gradle/wrapper/gradle-wrapper.jar" />
+    <processFile name="gradle/wrapper/gradle-wrapper.properties" />
+    <processFile name="gradlew.bat" condition="HOST_WIN32" />
+    <processFile name="gradlew" condition="HOST_UNIX" isExecutable="true" />
+    <processFile name="settings.gradle" />
+
+    <processFile name="build.bat" condition="HOST_WIN32" />
+    <processFile name="build.sh" condition="HOST_UNIX" isExecutable="true" />
+
+    <processFile name="run.bat" condition="HOST_WIN32" />
+    <processFile name="run.sh" condition="HOST_UNIX" isExecutable="true" />
+    <processFile name="gradle.properties" />
+    <processFile name="local.properties" />
+    <processFile name="gradlew.bat" />
+    <processFile name="gradlew" />
+    <processFile name="build.gradle" />
 
     <!-- Android Studio project -->
 
-    <ProcessFile Name=".idea/copyright/profiles_settings.xml" Overwrite="false" />
-    <ProcessFile Name=".idea/.name" Overwrite="false" />
-    <ProcessFile Name=".idea/compiler.xml" Overwrite="false" />
-    <ProcessFile Name=".idea/gradle.xml" Overwrite="false" />
-    <ProcessFile Name=".idea/misc.xml" Overwrite="false" />
-    <ProcessFile Name=".idea/modules.xml" Overwrite="false" />
-    <ProcessFile Name=".idea/runConfigurations.xml" Overwrite="false" />
-    <ProcessFile Name=".idea/vcs.xml" Overwrite="false" />
+    <processFile name=".idea/copyright/profiles_settings.xml" overwrite="false" />
+    <processFile name=".idea/.name" overwrite="false" />
+    <processFile name=".idea/compiler.xml" overwrite="false" />
+    <processFile name=".idea/gradle.xml" overwrite="false" />
+    <processFile name=".idea/misc.xml" overwrite="false" />
+    <processFile name=".idea/modules.xml" overwrite="false" />
+    <processFile name=".idea/runConfigurations.xml" overwrite="false" />
+    <processFile name=".idea/vcs.xml" overwrite="false" />
 
     <!-- Git ignore -->
 
-    <ProcessFile Name="gitignore" TargetName=".gitignore" />
+    <processFile name="gitignore" targetName=".gitignore" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/android/api-refs.uxl b/lib/UnoCore/android/api-refs.uxl
index d6606cc44..a92f84325 100644
--- a/lib/UnoCore/android/api-refs.uxl
+++ b/lib/UnoCore/android/api-refs.uxl
@@ -1,89 +1,89 @@
-<Extensions Backend="CPlusPlus" Condition="ANDROID">
+<extensions backend="cplusplus" condition="ANDROID">
 
     <!-- Don't strip the following (legacy): -->
 
-    <Require Entity="Android.Bootstrapper" />
-    <Require Entity="Android.Base.JNI" />
-    <Require Entity="Android.Base.JNI.Init(Android.Base.Primitives.ujobject)" />
-    <Require Entity="Android.Base.JNI.LoadClass(Android.Base.Primitives.JNIEnvPtr,Android.Base.Primitives.ConstCharPtr)" />
-    <Require Entity="Android.Base.JNI.CheckException()" />
-    <Require Entity="Android.Base.Types.Bridge" />
-    <Require Entity="Android.Base.Types.String.UnoToJava(string)" />
-    <Require Entity="Android.Base.AndroidBindingMacros" />
-    <Require Entity="Android.Base.Types.Bridge.RegisterUnoType(Android.Base.Primitives.ConstCharPtr,int,Uno.Type)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.ExternBlockHost" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.ExternBlockHost.RegisterFunctions()" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject" />
-    <Require Entity="Android.Base.Wrappers.JavaObjectHelper.JObjectToJWrapper(Android.Base.Primitives.ujobject, bool)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(object)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(bool[])" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(sbyte[])" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(byte[])" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(short[])" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(int[])" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(long[])" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(float[])" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(double[])" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(string[])" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(object[])" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.BoxDelegate(object,Android.Base.Primitives.ConstCharPtr)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Unbox(Android.Base.Primitives.ujobject)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.UnboxFreeingLocalRef(Android.Base.Primitives.ujobject)" />
-    <Require Entity="Uno.Platform.EventSources.InterAppInvoke.ReceivedURI" />
-    <Require Entity="Uno.Platform.EventSources.InterAppInvoke.OnReceivedURI(string)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetBool(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetByte(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetShort(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetInt(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetLong(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetFloat(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetDouble(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetString(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetObject(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getBool(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getByte(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getShort(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getInt(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setInt(object,int,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getLong(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getFloat(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getDouble(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getString(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getObject(object,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetBool(object,int,bool)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetByte(object,int,sbyte)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetShort(object,int,short)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetInt(object,int,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetLong(object,int,long)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetFloat(object,int,float)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetDouble(object,int,double)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetString(object,int,string)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetObject(object,int,object)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setBool(object,int,bool)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setByte(object,int,sbyte)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setShort(object,int,short)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setInt(object,int,int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setLong(object,int,long)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setFloat(object,int,float)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setDouble(object,int,double)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setString(object,int,string)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setObject(object,int,object)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewBoolArrayPtr(int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewByteArrayPtr(int,bool)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewCharArrayPtr(int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewShortArrayPtr(int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewIntArrayPtr(int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewLongArrayPtr(int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewFloatArrayPtr(int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewDoubleArrayPtr(int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewStringArrayPtr(int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewObjectArrayPtr(int)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.BoolArrayToUnoArrayPtr(Java.Object)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.ByteArrayToUnoArrayPtr(Java.Object)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.ShortArrayToUnoArrayPtr(Java.Object)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.IntArrayToUnoArrayPtr(Java.Object)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.LongArrayToUnoArrayPtr(Java.Object)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.FloatArrayToUnoArrayPtr(Java.Object)" />
-    <Require Entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.DoubleArrayToUnoArrayPtr(Java.Object)" />
+    <require entity="Android.Bootstrapper" />
+    <require entity="Android.Base.JNI" />
+    <require entity="Android.Base.JNI.Init(Android.Base.Primitives.ujobject)" />
+    <require entity="Android.Base.JNI.LoadClass(Android.Base.Primitives.JNIEnvPtr,Android.Base.Primitives.ConstCharPtr)" />
+    <require entity="Android.Base.JNI.CheckException()" />
+    <require entity="Android.Base.Types.Bridge" />
+    <require entity="Android.Base.Types.String.UnoToJava(string)" />
+    <require entity="Android.Base.AndroidBindingMacros" />
+    <require entity="Android.Base.Types.Bridge.RegisterUnoType(Android.Base.Primitives.ConstCharPtr,int,Uno.Type)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.ExternBlockHost" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.ExternBlockHost.RegisterFunctions()" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject" />
+    <require entity="Android.Base.Wrappers.JavaObjectHelper.JObjectToJWrapper(Android.Base.Primitives.ujobject, bool)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(object)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(bool[])" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(sbyte[])" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(byte[])" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(short[])" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(int[])" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(long[])" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(float[])" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(double[])" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(string[])" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Box(object[])" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.BoxDelegate(object,Android.Base.Primitives.ConstCharPtr)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.Unbox(Android.Base.Primitives.ujobject)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject.UnboxFreeingLocalRef(Android.Base.Primitives.ujobject)" />
+    <require entity="Uno.Platform.EventSources.InterAppInvoke.ReceivedURI" />
+    <require entity="Uno.Platform.EventSources.InterAppInvoke.OnReceivedURI(string)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetBool(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetByte(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetShort(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetInt(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetLong(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetFloat(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetDouble(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetString(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.GetObject(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getBool(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getByte(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getShort(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getInt(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setInt(object,int,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getLong(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getFloat(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getDouble(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getString(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.getObject(object,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetBool(object,int,bool)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetByte(object,int,sbyte)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetShort(object,int,short)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetInt(object,int,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetLong(object,int,long)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetFloat(object,int,float)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetDouble(object,int,double)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetString(object,int,string)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.SetObject(object,int,object)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setBool(object,int,bool)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setByte(object,int,sbyte)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setShort(object,int,short)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setInt(object,int,int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setLong(object,int,long)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setFloat(object,int,float)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setDouble(object,int,double)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setString(object,int,string)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.setObject(object,int,object)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewBoolArrayPtr(int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewByteArrayPtr(int,bool)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewCharArrayPtr(int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewShortArrayPtr(int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewIntArrayPtr(int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewLongArrayPtr(int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewFloatArrayPtr(int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewDoubleArrayPtr(int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewStringArrayPtr(int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.NewObjectArrayPtr(int)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.BoolArrayToUnoArrayPtr(Java.Object)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.ByteArrayToUnoArrayPtr(Java.Object)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.ShortArrayToUnoArrayPtr(Java.Object)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.IntArrayToUnoArrayPtr(Java.Object)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.LongArrayToUnoArrayPtr(Java.Object)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.FloatArrayToUnoArrayPtr(Java.Object)" />
+    <require entity="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaToUnoArrayEntrypoints.DoubleArrayToUnoArrayPtr(Java.Object)" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/android/dependencies.uxl b/lib/UnoCore/android/dependencies.uxl
index a58e61a3a..b11e41321 100644
--- a/lib/UnoCore/android/dependencies.uxl
+++ b/lib/UnoCore/android/dependencies.uxl
@@ -1,18 +1,18 @@
-<Extensions Backend="CPlusPlus" Condition="ANDROID">
+<extensions backend="cplusplus" condition="ANDROID">
 
-    <Require Gradle.AllProjects.Repository="google()" />
-    <Require Gradle.AllProjects.Repository="mavenCentral()" />
-    <Require Gradle.BuildScript.Repository="google()" />
-    <Require Gradle.BuildScript.Repository="mavenCentral()" />
-    <Require Gradle.Repository="maven { url 'https://maven.google.com' }" />
+    <require gradle.allProjects.repository="google()" />
+    <require gradle.allProjects.repository="mavenCentral()" />
+    <require gradle.buildScript.repository="google()" />
+    <require gradle.buildScript.repository="mavenCentral()" />
+    <require gradle.repository="maven { url 'https://maven.google.com' }" />
 
-    <Require Gradle.Dependency.ClassPath="com.android.tools.build:gradle:8.1.0" />
-    <Require Gradle.Dependency.Implementation="androidx.appcompat:appcompat:1.4.2" />
-    <Require Gradle.Dependency.Implementation="com.google.android.material:material:1.6.1" />
+    <require gradle.dependency.classPath="com.android.tools.build:gradle:8.1.0" />
+    <require gradle.dependency.implementation="androidx.appcompat:appcompat:1.4.2" />
+    <require gradle.dependency.implementation="com.google.android.material:material:1.6.1" />
 
     <!-- Kotlin support. -->
-    <Require Condition="KOTLIN" Gradle.Dependency.Implementation="androidx.core:core-ktx:+" />
-    <Require Condition="KOTLIN" Gradle.Dependency.Implementation="org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.70" />
-    <Require Condition="KOTLIN" Gradle.Dependency.ClassPath="org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70" />
+    <require condition="KOTLIN" gradle.dependency.implementation="androidx.core:core-ktx:+" />
+    <require condition="KOTLIN" gradle.dependency.implementation="org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.70" />
+    <require condition="KOTLIN" gradle.dependency.classPath="org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/android/uDroid/Bootstrapper.cpp.uxl b/lib/UnoCore/android/uDroid/Bootstrapper.cpp.uxl
index 27e8f2596..01c1ab25c 100644
--- a/lib/UnoCore/android/uDroid/Bootstrapper.cpp.uxl
+++ b/lib/UnoCore/android/uDroid/Bootstrapper.cpp.uxl
@@ -1,10 +1,10 @@
-<Extensions Backend="CPlusPlus" Condition="ANDROID">
-    <Using Namespace="Android" />
-    <Using Namespace="Android.Base.Primitives" />
-    <Declare Element="Android.Bindings.Bootstrapper.Include" />
-    <Declare Element="Android.Bindings.Bootstrapper.Statement" />
-    <Type Name="Bootstrapper">
-        <ProcessFile SourceFile="BootstrapperImpl_Android.cpp" />
-        <ProcessFile HeaderFile="BootstrapperImpl_Android.h" />
-    </Type>
-</Extensions>
+<extensions backend="cplusplus" condition="ANDROID">
+    <using namespace="Android" />
+    <using namespace="Android.Base.Primitives" />
+    <declare element="android.bindings.bootstrapper.include" />
+    <declare element="android.bindings.bootstrapper.statement" />
+    <type name="Bootstrapper">
+        <processFile sourceFile="BootstrapperImpl_Android.cpp" />
+        <processFile headerFile="BootstrapperImpl_Android.h" />
+    </type>
+</extensions>
diff --git a/lib/UnoCore/android/uDroid/JNI.cpp.uxl b/lib/UnoCore/android/uDroid/JNI.cpp.uxl
index 91e4c3953..0c41254a7 100644
--- a/lib/UnoCore/android/uDroid/JNI.cpp.uxl
+++ b/lib/UnoCore/android/uDroid/JNI.cpp.uxl
@@ -1,119 +1,119 @@
-<Extensions Backend="CPlusPlus" Condition="ANDROID">
-    <Using Namespace="Android.Base" />
-    <Using Namespace="Android.Base.Primitives" />
-    <Using Namespace="Android.Base.Wrappers" />
-
-    <Require Entity="Android.Base.Primitives.JNIEnvPtr" />
-
-    <Require Entity="Uno.Exception" />
-    <Require Entity="Uno.Exception.Message" />
-
-    <Require Entity="Android.Base.Wrappers.IJWrapper" />
-    <Require Entity="Android.Base.Wrappers.IJWrapper._IsSubclassed()" />
-    <Require Entity="Android.Base.Wrappers.IJWrapper._GetJavaObject()" />
-
-    <Require Entity="Android.Base.Wrappers.JWrapper" />
-    <Require Entity="Android.Base.Wrappers.JWrapper(Android.Base.Primitives.ujobject,Uno.Type,bool,bool)" />
-
-    <Require Entity="Android.Base.JNI.GetEnvPtr()" />
-    <Require Entity="Android.Base.JNI.GetUnoRef(Android.Base.Primitives.ujobject)" />
-    <Require Entity="Android.Base.JNI.ThrowNewException(string)" />
-    <Require Entity="Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr)" />
-
-    <Type Name="JNI">
-        <Require Header.Include="android/log.h" />
-        <Require Header.Include="jni.h" />
-        <Require Header.Include="uDroid/JNIHelper.h" />
-        <Require Header.Include="@{Uno.Exception:include}" />
-        <Require Entity="Android.Base.Types.Bridge" />
-        <Require Entity="Android.Base.Types.ByteBuffer" />
-        <Require Entity="Android.Base.Types.String" />
-        <Require Entity="Android.Base.Types.Arrays" />
-        <Require Entity="Android.Base.Wrappers.JWrapper" />
-        <Require Entity="Android.Base.Wrappers.IJWrapper" />
-
-        <Require Entity="JNI.GetVM()" />
-        <Require Entity="JNI.GetEnvPtr()" />
-        <Require Entity="JNI.GetActivityObject()" />
-        <Require Entity="JNI.GetActivityClass()" />
-        <Require Entity="JNI.NewGlobalRef(ujobject)" />
-        <Require Entity="JNI.NewWeakGlobalRef(ujobject)" />
-        <Require Entity="JNI.DeleteGlobalRef(ujobject)" />
-        <Require Entity="JNI.DeleteWeakGlobalRef(ujobject)" />
-        <Require Entity="JNI.IsSameObject(ujobject,ujobject)" />
-        <Require Entity="JNI.CheckException(JNIEnvPtr)" />
-        <Require Entity="JNI.ThrowNewException(string)" />
-
-        <Method Signature="GetEnvPtr():JNIEnvPtr">
-            <Body>
+<extensions backend="cplusplus" condition="ANDROID">
+    <using namespace="Android.Base" />
+    <using namespace="Android.Base.Primitives" />
+    <using namespace="Android.Base.Wrappers" />
+
+    <require entity="Android.Base.Primitives.JNIEnvPtr" />
+
+    <require entity="Uno.Exception" />
+    <require entity="Uno.Exception.Message" />
+
+    <require entity="Android.Base.Wrappers.IJWrapper" />
+    <require entity="Android.Base.Wrappers.IJWrapper._IsSubclassed()" />
+    <require entity="Android.Base.Wrappers.IJWrapper._GetJavaObject()" />
+
+    <require entity="Android.Base.Wrappers.JWrapper" />
+    <require entity="Android.Base.Wrappers.JWrapper(Android.Base.Primitives.ujobject,Uno.Type,bool,bool)" />
+
+    <require entity="Android.Base.JNI.GetEnvPtr()" />
+    <require entity="Android.Base.JNI.GetUnoRef(Android.Base.Primitives.ujobject)" />
+    <require entity="Android.Base.JNI.ThrowNewException(string)" />
+    <require entity="Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr)" />
+
+    <type name="JNI">
+        <require header.include="android/log.h" />
+        <require header.include="jni.h" />
+        <require header.include="uDroid/JNIHelper.h" />
+        <require header.include="@{Uno.Exception:include}" />
+        <require entity="Android.Base.Types.Bridge" />
+        <require entity="Android.Base.Types.ByteBuffer" />
+        <require entity="Android.Base.Types.String" />
+        <require entity="Android.Base.Types.Arrays" />
+        <require entity="Android.Base.Wrappers.JWrapper" />
+        <require entity="Android.Base.Wrappers.IJWrapper" />
+
+        <require entity="JNI.GetVM()" />
+        <require entity="JNI.GetEnvPtr()" />
+        <require entity="JNI.GetActivityObject()" />
+        <require entity="JNI.GetActivityClass()" />
+        <require entity="JNI.NewGlobalRef(ujobject)" />
+        <require entity="JNI.NewWeakGlobalRef(ujobject)" />
+        <require entity="JNI.DeleteGlobalRef(ujobject)" />
+        <require entity="JNI.DeleteWeakGlobalRef(ujobject)" />
+        <require entity="JNI.IsSameObject(ujobject,ujobject)" />
+        <require entity="JNI.CheckException(JNIEnvPtr)" />
+        <require entity="JNI.ThrowNewException(string)" />
+
+        <method signature="GetEnvPtr():JNIEnvPtr">
+            <body>
 
                      JNIEnv* jni;
                      JniHelper::GetVM()->AttachCurrentThread(&jni, nullptr);
                      return jni;
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="GetVM():JavaVMPtr">
-            <Body>
+        <method signature="GetVM():JavaVMPtr">
+            <body>
 
                      return JniHelper::GetVM();
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="NewWeakGlobalRef(ujobject):ujobject">
-            <Body>
+        <method signature="NewWeakGlobalRef(ujobject):ujobject">
+            <body>
 
                      return (jobject)reinterpret_cast<jweak>(@{GetEnvPtr():call()}->NewWeakGlobalRef($0));
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="DeleteGlobalRef(ujobject)">
-            <Body>
+        <method signature="DeleteGlobalRef(ujobject)">
+            <body>
 
                      @{GetEnvPtr():call()}->DeleteGlobalRef($0);
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="DeleteWeakGlobalRef(ujobject)">
-            <Body>
+        <method signature="DeleteWeakGlobalRef(ujobject)">
+            <body>
 
                      @{GetEnvPtr():call()}->DeleteWeakGlobalRef($0);
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="IsSameObject(ujobject,ujobject):bool">
-            <Body>
+        <method signature="IsSameObject(ujobject,ujobject):bool">
+            <body>
 
                      return (bool)@{GetEnvPtr():call()}->IsSameObject($0,$1);
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="ThrowNewException(string)">
-            <Body>
+        <method signature="ThrowNewException(string)">
+            <body>
 
                          char* message = uAllocCStr($0);
                          @{GetEnvPtr():call()}->ThrowNew(@{exceptionClass}, message);
                          free(message);
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="GetArrayLength(ujobject):int">
-            <Body>
+        <method signature="GetArrayLength(ujobject):int">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      return (int)jni->GetArrayLength((jarray)$0);
 
-            </Body>
-        </Method>
-        <Method Signature="NewBooleanArray(int):ujobject">
-            <Body>
+            </body>
+        </method>
+        <method signature="NewBooleanArray(int):ujobject">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jobject rtn = jni->NewBooleanArray((jsize)$0);
@@ -121,10 +121,10 @@
                      jni->DeleteLocalRef(rtn);
                      return newArray;
 
-            </Body>
-        </Method>
-        <Method Signature="NewByteArray(int):ujobject">
-            <Body>
+            </body>
+        </method>
+        <method signature="NewByteArray(int):ujobject">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jobject rtn = jni->NewByteArray((jsize)$0);
@@ -132,10 +132,10 @@
                      jni->DeleteLocalRef(rtn);
                      return newArray;
 
-            </Body>
-        </Method>
-        <Method Signature="NewCharArray(int):ujobject">
-            <Body>
+            </body>
+        </method>
+        <method signature="NewCharArray(int):ujobject">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jobject rtn = jni->NewCharArray((jsize)$0);
@@ -143,10 +143,10 @@
                      jni->DeleteLocalRef(rtn);
                      return newArray;
 
-            </Body>
-        </Method>
-        <Method Signature="NewShortArray(int):ujobject">
-            <Body>
+            </body>
+        </method>
+        <method signature="NewShortArray(int):ujobject">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jobject rtn = jni->NewShortArray((jsize)$0);
@@ -154,10 +154,10 @@
                      jni->DeleteLocalRef(rtn);
                      return newArray;
 
-            </Body>
-        </Method>
-        <Method Signature="NewIntArray(int):ujobject">
-            <Body>
+            </body>
+        </method>
+        <method signature="NewIntArray(int):ujobject">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jobject rtn = jni->NewIntArray((jsize)$0);
@@ -165,10 +165,10 @@
                      jni->DeleteLocalRef(rtn);
                      return newArray;
 
-            </Body>
-        </Method>
-        <Method Signature="NewLongArray(int):ujobject">
-            <Body>
+            </body>
+        </method>
+        <method signature="NewLongArray(int):ujobject">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jobject rtn = jni->NewLongArray((jsize)$0);
@@ -176,10 +176,10 @@
                      jni->DeleteLocalRef(rtn);
                      return newArray;
 
-            </Body>
-        </Method>
-        <Method Signature="NewFloatArray(int):ujobject">
-            <Body>
+            </body>
+        </method>
+        <method signature="NewFloatArray(int):ujobject">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jobject rtn = jni->NewFloatArray((jsize)$0);
@@ -187,10 +187,10 @@
                      jni->DeleteLocalRef(rtn);
                      return newArray;
 
-            </Body>
-        </Method>
-        <Method Signature="NewDoubleArray(int):ujobject">
-            <Body>
+            </body>
+        </method>
+        <method signature="NewDoubleArray(int):ujobject">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jobject rtn = jni->NewDoubleArray((jsize)$0);
@@ -198,10 +198,10 @@
                      jni->DeleteLocalRef(rtn);
                      return newArray;
 
-            </Body>
-        </Method>
-        <Method Signature="NewObjectArray(ujclass,int):ujobject">
-            <Body>
+            </body>
+        </method>
+        <method signature="NewObjectArray(ujclass,int):ujobject">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jobject rtn = jni->NewObjectArray((jsize)$1, $0, nullptr);
@@ -209,205 +209,205 @@
                      jni->DeleteLocalRef(rtn);
                      return newArray;
 
-            </Body>
-        </Method>
-        <Method Signature="GetBooleanArrayElement(IJWrapper,int):bool">
-            <Body>
+            </body>
+        </method>
+        <method signature="GetBooleanArrayElement(IJWrapper,int):bool">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jboolean result;
                      jni->GetBooleanArrayRegion((jbooleanArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &result);
                      return (bool)result;
 
-            </Body>
-        </Method>
-        <Method Signature="GetByteArrayElement(IJWrapper,int):sbyte">
-            <Body>
+            </body>
+        </method>
+        <method signature="GetByteArrayElement(IJWrapper,int):sbyte">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jbyte result;
                      jni->GetByteArrayRegion((jbyteArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &result);
                      return (@{sbyte})result;
 
-            </Body>
-        </Method>
-        <Method Signature="GetCharArrayElement(IJWrapper,int):char">
-            <Body>
+            </body>
+        </method>
+        <method signature="GetCharArrayElement(IJWrapper,int):char">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jchar result;
                      jni->GetCharArrayRegion((jcharArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &result);
                      return (@{char})result;
 
-            </Body>
-        </Method>
-        <Method Signature="GetShortArrayElement(IJWrapper,int):short">
-            <Body>
+            </body>
+        </method>
+        <method signature="GetShortArrayElement(IJWrapper,int):short">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jshort result;
                      jni->GetShortArrayRegion((jshortArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &result);
                      return (@{short})result;
 
-            </Body>
-        </Method>
-        <Method Signature="GetIntArrayElement(IJWrapper,int):int">
-            <Body>
+            </body>
+        </method>
+        <method signature="GetIntArrayElement(IJWrapper,int):int">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jint result;
                      jni->GetIntArrayRegion((jintArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &result);
                      return (@{int})result;
 
-            </Body>
-        </Method>
-        <Method Signature="GetLongArrayElement(IJWrapper,int):long">
-            <Body>
+            </body>
+        </method>
+        <method signature="GetLongArrayElement(IJWrapper,int):long">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jlong result;
                      jni->GetLongArrayRegion((jlongArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &result);
                      return (@{long})result;
 
-            </Body>
-        </Method>
-        <Method Signature="GetFloatArrayElement(IJWrapper,int):float">
-            <Body>
+            </body>
+        </method>
+        <method signature="GetFloatArrayElement(IJWrapper,int):float">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jfloat result;
                      jni->GetFloatArrayRegion((jfloatArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &result);
                      return (@{float})result;
 
-            </Body>
-        </Method>
-        <Method Signature="GetDoubleArrayElement(IJWrapper,int):double">
-            <Body>
+            </body>
+        </method>
+        <method signature="GetDoubleArrayElement(IJWrapper,int):double">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jdouble result;
                      jni->GetDoubleArrayRegion((jdoubleArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &result);
                      return (@{double})result;
 
-            </Body>
-        </Method>
-        <Method Signature="GetObjectArrayElement(IJWrapper,int):ujobject">
-            <Body>
+            </body>
+        </method>
+        <method signature="GetObjectArrayElement(IJWrapper,int):ujobject">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      return reinterpret_cast<jobject>(jni->NewGlobalRef(jni->GetObjectArrayElement((jobjectArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1)));
 
-            </Body>
-        </Method>
-        <Method Signature="SetBooleanArrayElement(IJWrapper,int,bool)">
-            <Body>
+            </body>
+        </method>
+        <method signature="SetBooleanArrayElement(IJWrapper,int,bool)">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jboolean val = (jboolean)$2;
                      jni->SetBooleanArrayRegion((jbooleanArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &val);
 
-            </Body>
-        </Method>
-        <Method Signature="SetByteArrayElement(IJWrapper,int,sbyte)">
-            <Body>
+            </body>
+        </method>
+        <method signature="SetByteArrayElement(IJWrapper,int,sbyte)">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jbyte val = (jbyte)$2;
                      jni->SetByteArrayRegion((jbyteArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &val);
 
-            </Body>
-        </Method>
-        <Method Signature="SetByteArrayElement(IJWrapper,int,byte)">
-            <Body>
+            </body>
+        </method>
+        <method signature="SetByteArrayElement(IJWrapper,int,byte)">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jbyte val = (jbyte)(@{sbyte})$2;
                      jni->SetByteArrayRegion((jbyteArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &val);
 
-            </Body>
-        </Method>
-        <Method Signature="SetCharArrayElement(IJWrapper,int,char)">
-            <Body>
+            </body>
+        </method>
+        <method signature="SetCharArrayElement(IJWrapper,int,char)">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jchar val = (jchar)$2;
                      jni->SetCharArrayRegion((jcharArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &val);
 
-            </Body>
-        </Method>
-        <Method Signature="SetShortArrayElement(IJWrapper,int,short)">
-            <Body>
+            </body>
+        </method>
+        <method signature="SetShortArrayElement(IJWrapper,int,short)">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jshort val = (jshort)$2;
                      jni->SetShortArrayRegion((jshortArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &val);
 
-            </Body>
-        </Method>
-        <Method Signature="SetIntArrayElement(IJWrapper,int,int)">
-            <Body>
+            </body>
+        </method>
+        <method signature="SetIntArrayElement(IJWrapper,int,int)">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jint val = (jint)$2;
                      jni->SetIntArrayRegion((jintArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &val);
 
-            </Body>
-        </Method>
-        <Method Signature="SetLongArrayElement(IJWrapper,int,long)">
-            <Body>
+            </body>
+        </method>
+        <method signature="SetLongArrayElement(IJWrapper,int,long)">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jlong val = (jlong)$2;
                      jni->SetLongArrayRegion((jlongArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &val);
 
-            </Body>
-        </Method>
-        <Method Signature="SetFloatArrayElement(IJWrapper,int,float)">
-            <Body>
+            </body>
+        </method>
+        <method signature="SetFloatArrayElement(IJWrapper,int,float)">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jfloat val = (jfloat)$2;
                      jni->SetFloatArrayRegion((jfloatArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &val);
 
-            </Body>
-        </Method>
-        <Method Signature="SetDoubleArrayElement(IJWrapper,int,double)">
-            <Body>
+            </body>
+        </method>
+        <method signature="SetDoubleArrayElement(IJWrapper,int,double)">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jdouble val = (jdouble)$2;
                      jni->SetDoubleArrayRegion((jdoubleArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, 1, &val);
 
-            </Body>
-        </Method>
-        <Method Signature="SetObjectArrayElement(IJWrapper,int,ujobject)">
-            <Body>
+            </body>
+        </method>
+        <method signature="SetObjectArrayElement(IJWrapper,int,ujobject)">
+            <body>
 
                      @{JNIEnvPtr} jni = @{Android.Base.JNI.GetEnvPtr():call()};
                      jni->SetObjectArrayElement((jobjectArray)@{IJWrapper:of($0)._GetJavaObject():call()}, $1, $2);
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="GetDefaultObject():ujobject">
-            <Body>
+        <method signature="GetDefaultObject():ujobject">
+            <body>
 
                     return (jobject)0;
 
-            </Body>
-        </Method>
-        <Method Signature="GetDefaultType():Uno.Type">
-            <Body>
+            </body>
+        </method>
+        <method signature="GetDefaultType():Uno.Type">
+            <body>
 
                     return (@{Uno.Type})0;
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-    </Type>
+    </type>
 
-    <Type Name="AndroidBindingMacros">
-        <Require Header.Declaration>
+    <type name="AndroidBindingMacros">
+        <require header.declaration>
         #include <jni.h>
         #include <@{Uno.Type:include}>
         #include <@{Uno.Exception:include}>
@@ -456,6 +456,6 @@
         #define CACHE_FIELD(ID,CLASSFIELD,NAMESTR,SIGSTR,FLDGETFUNC,MTDEXCEPTIONMSG,MTDEXCEPTIONLEN) if (uEnterCriticalIfNull(&ID)) { ID = U_JNIVAR->FLDGETFUNC(CLASSFIELD, NAMESTR, SIGSTR); CHECK_JNI_EXCEPTIONS; if (((long)ID) == 0) { THROW_UNO_EXCEPTION(MTDEXCEPTIONMSG,MTDEXCEPTIONLEN); } uExitCritical(); }
 
         #define STATICACHE_FIELD(ID,CLASSFIELD,NAMESTR,SIGSTR,FLDGETFUNC,MTDEXCEPTIONMSG,MTDEXCEPTIONLEN) static jfieldID ID = U_JNIVAR->FLDGETFUNC(CLASSFIELD, NAMESTR, SIGSTR); if (uEnterCriticalIfNull(&ID)) { CHECK_JNI_EXCEPTIONS; if (!ID) { THROW_UNO_EXCEPTION(MTDEXCEPTIONMSG,MTDEXCEPTIONLEN); } uExitCritical(); }
-        </Require>
-    </Type>
-</Extensions>
+        </require>
+    </type>
+</extensions>
diff --git a/lib/UnoCore/android/uDroid/Primitives.cpp.uxl b/lib/UnoCore/android/uDroid/Primitives.cpp.uxl
index 9147a1e25..13271bdeb 100644
--- a/lib/UnoCore/android/uDroid/Primitives.cpp.uxl
+++ b/lib/UnoCore/android/uDroid/Primitives.cpp.uxl
@@ -1,81 +1,81 @@
-<Extensions Backend="CPlusPlus" Condition="ANDROID">
-    <Using Namespace="Android.Base.Primitives" />
+<extensions backend="cplusplus" condition="ANDROID">
+    <using namespace="Android.Base.Primitives" />
 
-    <Type Name="ujvalue" Condition="ANDROID"
-          TypeName="jvalue"
-          Include="jni.h" />
+    <type name="ujvalue" condition="ANDROID"
+          typeName="jvalue"
+          include="jni.h" />
 
-    <Type Name="ConstCharPtr" Condition="ANDROID"
-          TypeName="const char*" />
+    <type name="ConstCharPtr" condition="ANDROID"
+          typeName="const char*" />
 
-    <Type Name="JavaVMPtr" Condition="ANDROID"
-          TypeName="JavaVM*"
-          Include="jni.h" />
+    <type name="JavaVMPtr" condition="ANDROID"
+          typeName="JavaVM*"
+          include="jni.h" />
 
-    <Type Name="JNIEnvPtr" Condition="ANDROID"
-          TypeName="JNIEnv*"
-          Include="jni.h" />
+    <type name="JNIEnvPtr" condition="ANDROID"
+          typeName="JNIEnv*"
+          include="jni.h" />
 
-    <Type Name="ujobject" Condition="ANDROID"
-          TypeName="jobject"
-          Include="jni.h" />
+    <type name="ujobject" condition="ANDROID"
+          typeName="jobject"
+          include="jni.h" />
 
-    <Type Name="ujboolean" Condition="ANDROID"
-          TypeName="jboolean"
-          Include="jni.h" />
+    <type name="ujboolean" condition="ANDROID"
+          typeName="jboolean"
+          include="jni.h" />
 
-    <Type Name="ujbyte" Condition="ANDROID"
-          TypeName="jbyte"
-          Include="jni.h" />
+    <type name="ujbyte" condition="ANDROID"
+          typeName="jbyte"
+          include="jni.h" />
 
-    <Type Name="ujchar" Condition="ANDROID"
-          TypeName="jchar"
-          Include="jni.h" />
+    <type name="ujchar" condition="ANDROID"
+          typeName="jchar"
+          include="jni.h" />
 
-    <Type Name="ujshort" Condition="ANDROID"
-          TypeName="jshort"
-          Include="jni.h" />
+    <type name="ujshort" condition="ANDROID"
+          typeName="jshort"
+          include="jni.h" />
 
-    <Type Name="ujint" Condition="ANDROID"
-          TypeName="jint"
-          Include="jni.h" />
+    <type name="ujint" condition="ANDROID"
+          typeName="jint"
+          include="jni.h" />
 
-    <Type Name="ujlong" Condition="ANDROID"
-          TypeName="jlong"
-          Include="jni.h" />
+    <type name="ujlong" condition="ANDROID"
+          typeName="jlong"
+          include="jni.h" />
 
-    <Type Name="ujfloat" Condition="ANDROID"
-          TypeName="jfloat"
-          Include="jni.h" />
+    <type name="ujfloat" condition="ANDROID"
+          typeName="jfloat"
+          include="jni.h" />
 
-    <Type Name="ujdouble" Condition="ANDROID"
-          TypeName="jdouble"
-          Include="jni.h" />
+    <type name="ujdouble" condition="ANDROID"
+          typeName="jdouble"
+          include="jni.h" />
 
-    <Type Name="jweak" Condition="ANDROID"
-          TypeName="jweak"
-          Include="jni.h" />
+    <type name="jweak" condition="ANDROID"
+          typeName="jweak"
+          include="jni.h" />
 
-    <Type Name="uweakptr" Condition="ANDROID"
-          TypeName="uWeakObject*" />
+    <type name="uweakptr" condition="ANDROID"
+          typeName="uWeakObject*" />
 
-    <Type Name="ujstring" Condition="ANDROID"
-          TypeName="jstring"
-          Include="jni.h" />
+    <type name="ujstring" condition="ANDROID"
+          typeName="jstring"
+          include="jni.h" />
 
-    <Type Name="ujclass" Condition="ANDROID"
-          TypeName="jclass"
-          Include="jni.h" />
+    <type name="ujclass" condition="ANDROID"
+          typeName="jclass"
+          include="jni.h" />
 
-    <Type Name="jmethodID" Condition="ANDROID"
-          TypeName="jmethodID"
-          Include="jni.h" />
+    <type name="jmethodID" condition="ANDROID"
+          typeName="jmethodID"
+          include="jni.h" />
 
-    <Type Name="jfieldID" Condition="ANDROID"
-          TypeName="jfieldID"
-          Include="jni.h" />
+    <type name="jfieldID" condition="ANDROID"
+          typeName="jfieldID"
+          include="jni.h" />
 
-    <Type Name="JNINativeMethod" Condition="ANDROID"
-          TypeName="JNINativeMethod"
-          Include="jni.h" />
-</Extensions>
+    <type name="JNINativeMethod" condition="ANDROID"
+          typeName="JNINativeMethod"
+          include="jni.h" />
+</extensions>
diff --git a/lib/UnoCore/android/uDroid/Types.cpp.uxl b/lib/UnoCore/android/uDroid/Types.cpp.uxl
index 3bfa848ab..caf0f10c2 100644
--- a/lib/UnoCore/android/uDroid/Types.cpp.uxl
+++ b/lib/UnoCore/android/uDroid/Types.cpp.uxl
@@ -1,16 +1,16 @@
-<Extensions Backend="CPlusPlus" Condition="ANDROID">
-    <Using Namespace="Android.Base.Types" />
-    <Using Namespace="Android.Base.Primitives" />
-    <Using Namespace="Android.Base.Wrappers" />
+<extensions backend="cplusplus" condition="ANDROID">
+    <using namespace="Android.Base.Types" />
+    <using namespace="Android.Base.Primitives" />
+    <using namespace="Android.Base.Wrappers" />
 
-    <Type Name="Bridge">
-        <ProcessFile Name="UnoHelper.java" TargetName="@(java.sourceDirectory)/com/foreign/UnoHelper.java" />
-        <Require Header.Include="android/log.h" />
-        <Require Header.Include="@{Android.Base.JNI:include}" />
-        <Require Header.Include="@{Uno.Exception:include}" />
+    <type name="Bridge">
+        <processFile name="UnoHelper.java" targetName="@(java.sourceDirectory)/com/foreign/UnoHelper.java" />
+        <require header.include="android/log.h" />
+        <require header.include="@{Android.Base.JNI:include}" />
+        <require header.include="@{Uno.Exception:include}" />
 
-        <Method Signature="Init()">
-            <Body>
+        <method signature="Init()">
+            <body>
 
                     if (@{_inited}) { return; }
                     @{JNIEnvPtr} jni = @{JNI.GetEnvPtr():call()};
@@ -29,11 +29,11 @@
                     }
                     @{_inited} = true;
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="RegisterUnoType(ConstCharPtr,int,Uno.Type)">
-            <Body>
+        <method signature="RegisterUnoType(ConstCharPtr,int,Uno.Type)">
+            <body>
 
                      if (!@{_inited}) { @{Bridge.Init():call()}; }
                      @{JNIEnvPtr} jni = @{JNI.GetEnvPtr():call()};
@@ -47,11 +47,11 @@
                      jni->DeleteLocalRef(javaTypeName);
                      free(buf);
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="RegisterUnoFallback(ConstCharPtr,int,Uno.Type)">
-            <Body>
+        <method signature="RegisterUnoFallback(ConstCharPtr,int,Uno.Type)">
+            <body>
 
                      if (!@{_inited}) { @{Bridge.Init():call()}; }
                      @{JNIEnvPtr} jni = @{JNI.GetEnvPtr():call()};
@@ -65,11 +65,11 @@
                      jni->DeleteLocalRef(javaTypeName);
                      free(buf);
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="SetWrapperType(JWrapper,ujobject,Uno.Type,bool,bool)">
-            <Body>
+        <method signature="SetWrapperType(JWrapper,ujobject,Uno.Type,bool,bool)">
+            <body>
 
                      if (!$0) {
                          U_THROW(@{Uno.Exception(string):new(uString::Utf8("Trying to set type of null object",33))});
@@ -84,73 +84,73 @@
                          }
                      }
 
-            </Body>
-        </Method>
-    </Type>
+            </body>
+        </method>
+    </type>
 
-    <Type Name="ByteBuffer">
-        <Require Header.Include="android/log.h" />
-        <Require Header.Include="@{Android.Base.JNI:include}" />
+    <type name="ByteBuffer">
+        <require header.include="android/log.h" />
+        <require header.include="@{Android.Base.JNI:include}" />
 
-        <Method Signature="NewDirectByteBuffer(byte[]):ujobject">
-            <Body>
+        <method signature="NewDirectByteBuffer(byte[]):ujobject">
+            <body>
 
                          if (!$0) return nullptr;
                          return @{JNI.GetEnvPtr():call()}->NewDirectByteBuffer($0->Ptr(), (jlong)$0->Length());
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="NewDirectByteBuffer(sbyte[]):ujobject">
-            <Body>
+        <method signature="NewDirectByteBuffer(sbyte[]):ujobject">
+            <body>
 
                          if (!$0) return nullptr;
                          return @{JNI.GetEnvPtr():call()}->NewDirectByteBuffer($0->Ptr(), (jlong)$0->Length());
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="NewDirectByteBuffer(Uno.IntPtr,long):ujobject">
-            <Body>
+        <method signature="NewDirectByteBuffer(Uno.IntPtr,long):ujobject">
+            <body>
 
                          if (!$0) return nullptr;
                          return @{JNI.GetEnvPtr():call()}->NewDirectByteBuffer($0, (jlong)$1);
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="ValidDirectByteBuffer(ujobject):bool">
-            <Body>
+        <method signature="ValidDirectByteBuffer(ujobject):bool">
+            <body>
 
                          return (@{JNI.GetEnvPtr():call()}->GetDirectBufferAddress($0) != nullptr);
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="GetDirectBufferAddress(ujobject):Uno.IntPtr">
-            <Body>
+        <method signature="GetDirectBufferAddress(ujobject):Uno.IntPtr">
+            <body>
 
                          if (!$0) return nullptr;
                          return (@{Uno.IntPtr})@{JNI.GetEnvPtr():call()}->GetDirectBufferAddress($0);
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="GetDirectBufferCapacity(ujobject):long">
-            <Body>
+        <method signature="GetDirectBufferCapacity(ujobject):long">
+            <body>
 
                          return (@{long})@{JNI.GetEnvPtr():call()}->GetDirectBufferCapacity($0);
 
-            </Body>
-        </Method>
-    </Type>
+            </body>
+        </method>
+    </type>
 
-    <Type Name="String">
-        <Require Header.Include="android/log.h" />
-        <Require Header.Include="@{Android.Base.JNI:include}" />
+    <type name="String">
+        <require header.include="android/log.h" />
+        <require header.include="@{Android.Base.JNI:include}" />
 
-        <Method Signature="JavaToUno(JNIEnvPtr,ujobject):string">
-            <Body>
+        <method signature="JavaToUno(JNIEnvPtr,ujobject):string">
+            <body>
 
                          if (!$1) { return nullptr; }
                          jobject str = $0->NewLocalRef($1);
@@ -163,24 +163,24 @@
                          $0->DeleteLocalRef(str);
                          return result;
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="UnoToJava(JNIEnvPtr,string):ujobject">
-            <Body>
+        <method signature="UnoToJava(JNIEnvPtr,string):ujobject">
+            <body>
 
                          return (jobject)($0->NewString((const jchar*) $1->_ptr, $1->_length));
 
-            </Body>
-        </Method>
-    </Type>
+            </body>
+        </method>
+    </type>
 
-    <Type Name="Arrays">
-        <Require Header.Include="android/log.h" />
-        <Require Header.Include="@{Android.Base.JNI:include}" />
+    <type name="Arrays">
+        <require header.include="android/log.h" />
+        <require header.include="@{Android.Base.JNI:include}" />
 
-        <Method Signature="JavaToUnoBoolArray(ujobject,long):bool[]">
-            <Body>
+        <method signature="JavaToUnoBoolArray(ujobject,long):bool[]">
+            <body>
 
                      if (!$0) return nullptr;
                      @{JNIEnvPtr} jni = @{JNI.GetEnvPtr():call()};
@@ -190,10 +190,10 @@
                      jni->GetBooleanArrayRegion(jarr, 0, len, (jboolean*)arr->_ptr);
                      return arr;
 
-            </Body>
-        </Method>
-        <Method Signature="JavaToUnoSByteArray(ujobject,long):sbyte[]">
-            <Body>
+            </body>
+        </method>
+        <method signature="JavaToUnoSByteArray(ujobject,long):sbyte[]">
+            <body>
 
                      if (!$0) return nullptr;
                      @{JNIEnvPtr} jni = @{JNI.GetEnvPtr():call()};
@@ -203,10 +203,10 @@
                      jni->GetByteArrayRegion(jarr, 0, len, (jbyte*)arr->_ptr);
                      return arr;
 
-            </Body>
-        </Method>
-        <Method Signature="JavaToUnoByteArray(ujobject,long):byte[]">
-            <Body>
+            </body>
+        </method>
+        <method signature="JavaToUnoByteArray(ujobject,long):byte[]">
+            <body>
 
                      if (!$0) return nullptr;
                      @{JNIEnvPtr} jni = @{JNI.GetEnvPtr():call()};
@@ -216,10 +216,10 @@
                      jni->GetByteArrayRegion(jarr, 0, len, (jbyte*)arr->_ptr);
                      return arr;
 
-            </Body>
-        </Method>
-        <Method Signature="JavaToUnoCharArray(ujobject,long):char[]">
-            <Body>
+            </body>
+        </method>
+        <method signature="JavaToUnoCharArray(ujobject,long):char[]">
+            <body>
 
                      if (!$0) return nullptr;
                      @{JNIEnvPtr} jni = @{JNI.GetEnvPtr():call()};
@@ -229,10 +229,10 @@
                      jni->GetCharArrayRegion(jarr, 0, len, (jchar*)arr->_ptr);
                      return arr;
 
-            </Body>
-        </Method>
-        <Method Signature="JavaToUnoShortArray(ujobject,long):short[]">
-            <Body>
+            </body>
+        </method>
+        <method signature="JavaToUnoShortArray(ujobject,long):short[]">
+            <body>
 
                      if (!$0) return nullptr;
                      @{JNIEnvPtr} jni = @{JNI.GetEnvPtr():call()};
@@ -242,10 +242,10 @@
                      jni->GetShortArrayRegion(jarr, 0, len, (jshort*)arr->_ptr);
                      return arr;
 
-            </Body>
-        </Method>
-        <Method Signature="JavaToUnoIntArray(ujobject,long):int[]">
-            <Body>
+            </body>
+        </method>
+        <method signature="JavaToUnoIntArray(ujobject,long):int[]">
+            <body>
 
                      if (!$0) return nullptr;
                      @{JNIEnvPtr} jni = @{JNI.GetEnvPtr():call()};
@@ -255,10 +255,10 @@
                      jni->GetIntArrayRegion(jarr, 0, len, (jint*)arr->_ptr);
                      return arr;
 
-            </Body>
-        </Method>
-        <Method Signature="JavaToUnoLongArray(ujobject,long):long[]">
-            <Body>
+            </body>
+        </method>
+        <method signature="JavaToUnoLongArray(ujobject,long):long[]">
+            <body>
 
                      if (!$0) return nullptr;
                      @{JNIEnvPtr} jni = @{JNI.GetEnvPtr():call()};
@@ -268,10 +268,10 @@
                      jni->GetLongArrayRegion(jarr, 0, len, (jlong*)arr->_ptr);
                      return arr;
 
-            </Body>
-        </Method>
-        <Method Signature="JavaToUnoFloatArray(ujobject,long):float[]">
-            <Body>
+            </body>
+        </method>
+        <method signature="JavaToUnoFloatArray(ujobject,long):float[]">
+            <body>
 
                      if (!$0) return nullptr;
                      @{JNIEnvPtr} jni = @{JNI.GetEnvPtr():call()};
@@ -281,10 +281,10 @@
                      jni->GetFloatArrayRegion(jarr, 0, len, (jfloat*)arr->_ptr);
                      return arr;
 
-            </Body>
-        </Method>
-        <Method Signature="JavaToUnoDoubleArray(ujobject,long):double[]">
-            <Body>
+            </body>
+        </method>
+        <method signature="JavaToUnoDoubleArray(ujobject,long):double[]">
+            <body>
 
                      if (!$0) return nullptr;
                      @{JNIEnvPtr} jni = @{JNI.GetEnvPtr():call()};
@@ -294,7 +294,7 @@
                      jni->GetDoubleArrayRegion(jarr, 0, len, (jdouble*)arr->_ptr);
                      return arr;
 
-            </Body>
-        </Method>
-    </Type>
-</Extensions>
+            </body>
+        </method>
+    </type>
+</extensions>
diff --git a/lib/UnoCore/android/uDroid/Wrappers.cpp.uxl b/lib/UnoCore/android/uDroid/Wrappers.cpp.uxl
index 0944d8239..2f9e4663b 100644
--- a/lib/UnoCore/android/uDroid/Wrappers.cpp.uxl
+++ b/lib/UnoCore/android/uDroid/Wrappers.cpp.uxl
@@ -1,43 +1,43 @@
-<Extensions Backend="CPlusPlus" Condition="ANDROID">
-    <Using Namespace="Android.Base" />
-    <Using Namespace="Android.Base.Wrappers" />
-    <Using Namespace="Android.Base.Primitives" />
-
-    <Type Name="Android.Base.Wrappers.JWrapper">
-        <Require Header.Include="@{Android.Base.JNI:include}" />
-        <Require Header.Include="@{Uno.Exception:include}" />
-
-        <Require Entity="IJWrapper._GetJavaObject()" />
-        <Require Entity="IJWrapper._IsSubclassed()" />
-
-        <Require Entity="JWrapper(Android.Base.Primitives.ujobject,Uno.Type,bool,bool)" />
-        <Require Entity="JWrapper(Android.Base.Primitives.ujobject,Uno.Type,bool,bool,bool)" />
-        <Require Entity="JWrapper._GetJavaObject()" />
-        <Require Entity="JWrapper._IsSubclassed()" />
-        <Require Entity="JWrapper.SetInternalObj(ujobject,bool)" />
-        <Require Entity="Android.Base.Primitives.ConstCharPtr" />
-        <Require Entity="Android.Base.Primitives.JNIEnvPtr" />
-        <Require Entity="Android.Base.Primitives.jweak" />
-        <Require Entity="Android.Base.Primitives.uweakptr" />
-        <Require Entity="Android.Base.Primitives.ujclass" />
-        <Require Entity="Android.Base.Primitives.ujvalue" />
-        <Require Entity="Android.Base.Primitives.ujobject" />
-        <Require Entity="Android.Base.Primitives.ujstring" />
-        <Require Entity="Android.Base.Primitives.ujboolean" />
-        <Require Entity="Android.Base.Primitives.ujbyte" />
-        <Require Entity="Android.Base.Primitives.ujchar" />
-        <Require Entity="Android.Base.Primitives.ujshort" />
-        <Require Entity="Android.Base.Primitives.ujint" />
-        <Require Entity="Android.Base.Primitives.ujlong" />
-        <Require Entity="Android.Base.Primitives.ujfloat" />
-        <Require Entity="Android.Base.Primitives.ujdouble" />
-        <Require Entity="Android.Base.Primitives.JNINativeMethod" />
-        <Require Entity="Android.Base.Primitives.jmethodID" />
-        <Require Entity="Android.Base.Primitives.jfieldID" />
-        <Require Entity="Android.Base.AndroidBindingMacros" />
-        <Require Entity="JNI.LoadClass(JNIEnvPtr,ConstCharPtr)" />
-        <Require Header.Include="@{Android.Base.AndroidBindingMacros:include}" />
-        <Require Header.Declaration>
+<extensions backend="cplusplus" condition="ANDROID">
+    <using namespace="Android.Base" />
+    <using namespace="Android.Base.Wrappers" />
+    <using namespace="Android.Base.Primitives" />
+
+    <type name="Android.Base.Wrappers.JWrapper">
+        <require header.include="@{Android.Base.JNI:include}" />
+        <require header.include="@{Uno.Exception:include}" />
+
+        <require entity="IJWrapper._GetJavaObject()" />
+        <require entity="IJWrapper._IsSubclassed()" />
+
+        <require entity="JWrapper(Android.Base.Primitives.ujobject,Uno.Type,bool,bool)" />
+        <require entity="JWrapper(Android.Base.Primitives.ujobject,Uno.Type,bool,bool,bool)" />
+        <require entity="JWrapper._GetJavaObject()" />
+        <require entity="JWrapper._IsSubclassed()" />
+        <require entity="JWrapper.SetInternalObj(ujobject,bool)" />
+        <require entity="Android.Base.Primitives.ConstCharPtr" />
+        <require entity="Android.Base.Primitives.JNIEnvPtr" />
+        <require entity="Android.Base.Primitives.jweak" />
+        <require entity="Android.Base.Primitives.uweakptr" />
+        <require entity="Android.Base.Primitives.ujclass" />
+        <require entity="Android.Base.Primitives.ujvalue" />
+        <require entity="Android.Base.Primitives.ujobject" />
+        <require entity="Android.Base.Primitives.ujstring" />
+        <require entity="Android.Base.Primitives.ujboolean" />
+        <require entity="Android.Base.Primitives.ujbyte" />
+        <require entity="Android.Base.Primitives.ujchar" />
+        <require entity="Android.Base.Primitives.ujshort" />
+        <require entity="Android.Base.Primitives.ujint" />
+        <require entity="Android.Base.Primitives.ujlong" />
+        <require entity="Android.Base.Primitives.ujfloat" />
+        <require entity="Android.Base.Primitives.ujdouble" />
+        <require entity="Android.Base.Primitives.JNINativeMethod" />
+        <require entity="Android.Base.Primitives.jmethodID" />
+        <require entity="Android.Base.Primitives.jfieldID" />
+        <require entity="Android.Base.AndroidBindingMacros" />
+        <require entity="JNI.LoadClass(JNIEnvPtr,ConstCharPtr)" />
+        <require header.include="@{Android.Base.AndroidBindingMacros:include}" />
+        <require header.declaration>
         #define MAYBEPROXIFYARG(NUM,ID,NEW) bool subclassed ## NUM = (!ID) ? false : (@{Android.Base.Wrappers.IJWrapper:of(ID)._IsSubclassed():call()}); jobject _iProx ## NUM = (!ID) ? nullptr : (subclassed ## NUM ? NEW : @{Android.Base.Wrappers.IJWrapper:of(ID)._GetJavaObject():call()});
 
         #define FREEPROXIED(NUM)if (subclassed ## NUM) { U_JNIVAR->DeleteLocalRef(_iProx ## NUM); }
@@ -45,30 +45,30 @@
         #define UNOCALLANDRETURN(CALL) @{Android.Base.Primitives.JNIEnvPtr} _cb_jni = @{Android.Base.JNI.GetEnvPtr():call()};@{Android.Base.Wrappers.JWrapper} _res = (@{Android.Base.Wrappers.JWrapper})CALL;if (_res) { return _cb_jni->NewLocalRef(@{Android.Base.Wrappers.JWrapper:of(_res)._javaObject}); } else { return nullptr; }
 
         #define NEW_UNO(LINE,RETURNVAR,TYPEOF,UNOTYPE,FALLBACK,RESOLVE) U_JOBJECT tmpRes = LINE; @{Android.Base.JNI.CheckException():call()}; @{long} unoRef = @{Android.Base.JNI.GetUnoRef(Android.Base.Primitives.ujobject):call(tmpRes)}; if (unoRef==0) { RETURNVAR = nullptr; } else if (unoRef>0) { RETURNVAR = (UNOTYPE)uLoadWeak((uWeakObject*)unoRef); @{Android.Base.Primitives.JNIEnvPtr} __cb_jni = @{Android.Base.JNI.GetEnvPtr():call()}; if (__cb_jni->GetObjectRefType(tmpRes)==JNILocalRefType) { __cb_jni->DeleteLocalRef(tmpRes); }} else { RETURNVAR = ((UNOTYPE)@{Android.Base.Wrappers.JWrapper(Android.Base.Primitives.ujobject,Uno.Type,bool,bool):new(tmpRes, (@{Uno.Type})TYPEOF, FALLBACK, RESOLVE)}); }
-        </Require>
+        </require>
 
-        <Method Signature="_DisposeJavaObject()">
-            <Body>
+        <method signature="_DisposeJavaObject()">
+            <body>
 
                      if (!@{$$._javaObject}) return;
                      @{JNI.DeleteGlobalRef(ujobject):call(@{$$._javaObject})};
                      @{$$._javaObject} = 0;
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="_Init()">
-            <Body>
+        <method signature="_Init()">
+            <body>
 if (@{_jlangObjectClass}) { return; }
 INIT_JNI;
 @{_jlangObjectClass} = NEW_GLOBAL_REF(jclass,LOAD_SYS_CLASS("java/lang/Object"));
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 if (!@{_jlangObjectClass}) { THROW_UNO_EXCEPTION("Unable to cache class 'java.lang.Object' for JWrapper", 53); }
-</Body>
-        </Method>
+</body>
+        </method>
 
-        <Method Signature="equals(JWrapper):bool">
-            <Body>
+        <method signature="equals(JWrapper):bool">
+            <body>
 
 INIT_JNI;
 jobject _obArg2 = ((!$0) ? nullptr : @{Android.Base.Wrappers.IJWrapper:of($0)._GetJavaObject():call()});
@@ -79,11 +79,11 @@ CACHE_METHOD(@{_jlangObjectEqualsMid},@{_jlangObjectClass},"equals","(Ljava/lang
 return result;
 
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Method Signature="hashCode():int">
-            <Body>
+        <method signature="hashCode():int">
+            <body>
 
 INIT_JNI;
 CLASS_INIT(@{_jlangObjectClass},@{_Init():call()});
@@ -92,10 +92,10 @@ CACHE_METHOD(@{_jlangObjectHashCodeMid},@{_jlangObjectClass},"hashCode","()I",Ge
 @{Android.Base.JNI.CheckException(Android.Base.Primitives.JNIEnvPtr):call(U_JNIVAR)};
 return result;
 
-            </Body>
-        </Method>
+            </body>
+        </method>
 
-        <Require Source.Declaration>
+        <require source.declaration>
         bool __JWrapper_WeakCallback(uWeakStateIntercept::Event e, uObject* obj)
         {
             @{Android.Base.JNI.CheckException():call()};
@@ -130,8 +130,8 @@ return result;
             }
             return false;
         }
-        </Require>
-        <Require Source.Declaration>
+        </require>
+        <require source.declaration>
         bool __JWrapper_Callbacks_Registered = false;
         void __JWrapper_Finalizer(JNIEnv *env , jclass clazz, jlong ptr)
         {
@@ -150,7 +150,7 @@ return result;
                 U_THROW(@{Uno.Exception(string):new(uString::Utf8("Could not register the instantiation callback function",54))});
             }
         }
-        </Require>
-    </Type>
+        </require>
+    </type>
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/cil/app.cil.uxl b/lib/UnoCore/cil/app.cil.uxl
index 9b53902ac..843e38b2c 100644
--- a/lib/UnoCore/cil/app.cil.uxl
+++ b/lib/UnoCore/cil/app.cil.uxl
@@ -1,251 +1,251 @@
-<Extensions Backend="CIL" Condition="!CONSOLE && !LIBRARY && !PREVIEW && !TEST || APPTEST">
+<extensions backend="cil" condition="!CONSOLE && !LIBRARY && !PREVIEW && !TEST || APPTEST">
 
-    <Set AppDirectory="@(project.name).app" Condition="HOST_MAC" />
-    <Set AssemblyDirectory="@(HOST_MAC:defined:test('@(appDirectory)/Contents/MonoBundle', '.'))" />
-    <Set Product="@(HOST_MAC:defined:test('@(appDirectory)/Contents/MacOS/@(project.name)', '@(project.name).exe.dll'))" />
+    <set appDirectory="@(project.name).app" condition="HOST_MAC" />
+    <set assemblyDirectory="@(HOST_MAC:defined:test('@(appDirectory)/Contents/MonoBundle', '.'))" />
+    <set product="@(HOST_MAC:defined:test('@(appDirectory)/Contents/MacOS/@(project.name)', '@(project.name).exe.dll'))" />
 
     <!-- AppLoader & dependencies -->
-    <Set AppLoader.Assembly="@(config.appLoader.assembly:path)" />
-    <Set AppLoader.Class="Uno.AppLoader.Program" />
-    <Set AppLoader.Method="UnoGenerated" />
+    <set appLoader.assembly="@(config.appLoader.assembly:path)" />
+    <set appLoader.class="Uno.AppLoader.Program" />
+    <set appLoader.method="UnoGenerated" />
 
     <!-- Windows -->
-    <Set Commands.Run="run.bat" Condition="HOST_WIN32" />
-    <ProcessFile Name="run.bat" Condition="HOST_WIN32" />
+    <set commands.run="run.bat" condition="HOST_WIN32" />
+    <processFile name="run.bat" condition="HOST_WIN32" />
 
-    <Require UnmanagedLibrary="@(config.appLoader.windows:path)/OpenTK.dll" Condition="HOST_WIN32" />
-    <Require UnmanagedLibrary="@(config.appLoader.windows:path)/libEGL.dll" Condition="HOST_WIN32" />
-    <Require UnmanagedLibrary="@(config.appLoader.windows:path)/libGLESv2.dll" Condition="HOST_WIN32" />
-    <Require UnmanagedLibrary="@(config.appLoader.windows:path)/d3dcompiler_47.dll" Condition="HOST_WIN32" />
-    <CopyFile Name="@(config.appLoader.windows:path)/uno-app.runtimeconfig.json" TargetName="@(assemblyDirectory)/@(project.name).exe.runtimeconfig.json" Condition="HOST_WIN32" />
+    <require unmanagedLibrary="@(config.appLoader.windows:path)/OpenTK.dll" condition="HOST_WIN32" />
+    <require unmanagedLibrary="@(config.appLoader.windows:path)/libEGL.dll" condition="HOST_WIN32" />
+    <require unmanagedLibrary="@(config.appLoader.windows:path)/libGLESv2.dll" condition="HOST_WIN32" />
+    <require unmanagedLibrary="@(config.appLoader.windows:path)/d3dcompiler_47.dll" condition="HOST_WIN32" />
+    <copyFile name="@(config.appLoader.windows:path)/uno-app.runtimeconfig.json" targetName="@(assemblyDirectory)/@(project.name).exe.runtimeconfig.json" condition="HOST_WIN32" />
 
     <!-- Linux -->
-    <Set Commands.Run="run.sh" Condition="HOST_LINUX" />
-    <ProcessFile Name="run.sh" Condition="HOST_LINUX" IsExecutable="true" />
+    <set commands.run="run.sh" condition="HOST_LINUX" />
+    <processFile name="run.sh" condition="HOST_LINUX" isExecutable="true" />
 
-    <CopyFile Name="@(config.appLoader.console:path)/uno-app.runtimeconfig.json" TargetName="@(assemblyDirectory)/@(project.name).exe.runtimeconfig.json" Condition="HOST_LINUX" />
+    <copyFile name="@(config.appLoader.console:path)/uno-app.runtimeconfig.json" targetName="@(assemblyDirectory)/@(project.name).exe.runtimeconfig.json" condition="HOST_LINUX" />
 
     <!-- macOS -->
-    <Set Commands.Run="@('@(product)':quoteSpace)" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/../MacOS/uno-app-loader" TargetName="@(product)" Condition="HOST_MAC" IsExecutable="true" />
+    <set commands.run="@('@(product)':quoteSpace)" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/../MacOS/uno-app-loader" targetName="@(product)" condition="HOST_MAC" isExecutable="true" />
 
-    <Set BundleIdentifier="@(project.mac.bundleIdentifier || 'com.apps.@(project.name:qidentifier:replace('_', '-'):toLower)')" Condition="HOST_MAC" />
-    <Set LoaderDirectory="@('mac-x64/uno-app-loader.app/Contents/MonoBundle':path)" Condition="HOST_MAC" />
-    <ProcessFile Name="@(appDirectory)/Contents/Info.plist" Condition="HOST_MAC" />
-    <CopyFile Name="@(project.mac.icon:path || @//assets/icon.icns)" TargetName="@(appDirectory)/Contents/Resources/Icon.icns" Condition="HOST_MAC" />
+    <set bundleIdentifier="@(project.mac.bundleIdentifier || 'com.apps.@(project.name:qidentifier:replace('_', '-'):toLower)')" condition="HOST_MAC" />
+    <set loaderDirectory="@('mac-x64/uno-app-loader.app/Contents/MonoBundle':path)" condition="HOST_MAC" />
+    <processFile name="@(appDirectory)/Contents/Info.plist" condition="HOST_MAC" />
+    <copyFile name="@(project.mac.icon:path || @//assets/icon.icns)" targetName="@(appDirectory)/Contents/Resources/Icon.icns" condition="HOST_MAC" />
 
-    <CopyFile Name="@(loaderDirectory)/Microsoft.CSharp.dll" TargetName="@(assemblyDirectory)/Microsoft.CSharp.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/Microsoft.VisualBasic.Core.dll" TargetName="@(assemblyDirectory)/Microsoft.VisualBasic.Core.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/Microsoft.VisualBasic.dll" TargetName="@(assemblyDirectory)/Microsoft.VisualBasic.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/Microsoft.Win32.Primitives.dll" TargetName="@(assemblyDirectory)/Microsoft.Win32.Primitives.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/Microsoft.Win32.Registry.dll" TargetName="@(assemblyDirectory)/Microsoft.Win32.Registry.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/Microsoft.Win32.SystemEvents.dll" TargetName="@(assemblyDirectory)/Microsoft.Win32.SystemEvents.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/Microsoft.macOS.dll" TargetName="@(assemblyDirectory)/Microsoft.macOS.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/OpenTK.dll" TargetName="@(assemblyDirectory)/OpenTK.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.AppContext.dll" TargetName="@(assemblyDirectory)/System.AppContext.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Buffers.dll" TargetName="@(assemblyDirectory)/System.Buffers.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Collections.Concurrent.dll" TargetName="@(assemblyDirectory)/System.Collections.Concurrent.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Collections.Immutable.dll" TargetName="@(assemblyDirectory)/System.Collections.Immutable.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Collections.NonGeneric.dll" TargetName="@(assemblyDirectory)/System.Collections.NonGeneric.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Collections.Specialized.dll" TargetName="@(assemblyDirectory)/System.Collections.Specialized.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Collections.dll" TargetName="@(assemblyDirectory)/System.Collections.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.ComponentModel.Annotations.dll" TargetName="@(assemblyDirectory)/System.ComponentModel.Annotations.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.ComponentModel.DataAnnotations.dll" TargetName="@(assemblyDirectory)/System.ComponentModel.DataAnnotations.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.ComponentModel.EventBasedAsync.dll" TargetName="@(assemblyDirectory)/System.ComponentModel.EventBasedAsync.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.ComponentModel.Primitives.dll" TargetName="@(assemblyDirectory)/System.ComponentModel.Primitives.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.ComponentModel.TypeConverter.dll" TargetName="@(assemblyDirectory)/System.ComponentModel.TypeConverter.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.ComponentModel.dll" TargetName="@(assemblyDirectory)/System.ComponentModel.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Configuration.ConfigurationManager.dll" TargetName="@(assemblyDirectory)/System.Configuration.ConfigurationManager.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Configuration.dll" TargetName="@(assemblyDirectory)/System.Configuration.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Console.dll" TargetName="@(assemblyDirectory)/System.Console.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Core.dll" TargetName="@(assemblyDirectory)/System.Core.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Data.Common.dll" TargetName="@(assemblyDirectory)/System.Data.Common.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Data.DataSetExtensions.dll" TargetName="@(assemblyDirectory)/System.Data.DataSetExtensions.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Data.dll" TargetName="@(assemblyDirectory)/System.Data.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Diagnostics.Contracts.dll" TargetName="@(assemblyDirectory)/System.Diagnostics.Contracts.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Diagnostics.Debug.dll" TargetName="@(assemblyDirectory)/System.Diagnostics.Debug.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Diagnostics.DiagnosticSource.dll" TargetName="@(assemblyDirectory)/System.Diagnostics.DiagnosticSource.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Diagnostics.FileVersionInfo.dll" TargetName="@(assemblyDirectory)/System.Diagnostics.FileVersionInfo.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Diagnostics.Process.dll" TargetName="@(assemblyDirectory)/System.Diagnostics.Process.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Diagnostics.StackTrace.dll" TargetName="@(assemblyDirectory)/System.Diagnostics.StackTrace.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Diagnostics.TextWriterTraceListener.dll" TargetName="@(assemblyDirectory)/System.Diagnostics.TextWriterTraceListener.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Diagnostics.Tools.dll" TargetName="@(assemblyDirectory)/System.Diagnostics.Tools.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Diagnostics.TraceSource.dll" TargetName="@(assemblyDirectory)/System.Diagnostics.TraceSource.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Diagnostics.Tracing.dll" TargetName="@(assemblyDirectory)/System.Diagnostics.Tracing.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Drawing.Common.dll" TargetName="@(assemblyDirectory)/System.Drawing.Common.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Drawing.Primitives.dll" TargetName="@(assemblyDirectory)/System.Drawing.Primitives.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Drawing.dll" TargetName="@(assemblyDirectory)/System.Drawing.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Dynamic.Runtime.dll" TargetName="@(assemblyDirectory)/System.Dynamic.Runtime.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Formats.Asn1.dll" TargetName="@(assemblyDirectory)/System.Formats.Asn1.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Globalization.Calendars.dll" TargetName="@(assemblyDirectory)/System.Globalization.Calendars.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Globalization.Extensions.dll" TargetName="@(assemblyDirectory)/System.Globalization.Extensions.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Globalization.dll" TargetName="@(assemblyDirectory)/System.Globalization.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.Compression.Brotli.dll" TargetName="@(assemblyDirectory)/System.IO.Compression.Brotli.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.Compression.FileSystem.dll" TargetName="@(assemblyDirectory)/System.IO.Compression.FileSystem.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.Compression.ZipFile.dll" TargetName="@(assemblyDirectory)/System.IO.Compression.ZipFile.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.Compression.dll" TargetName="@(assemblyDirectory)/System.IO.Compression.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.FileSystem.AccessControl.dll" TargetName="@(assemblyDirectory)/System.IO.FileSystem.AccessControl.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.FileSystem.DriveInfo.dll" TargetName="@(assemblyDirectory)/System.IO.FileSystem.DriveInfo.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.FileSystem.Primitives.dll" TargetName="@(assemblyDirectory)/System.IO.FileSystem.Primitives.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.FileSystem.Watcher.dll" TargetName="@(assemblyDirectory)/System.IO.FileSystem.Watcher.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.FileSystem.dll" TargetName="@(assemblyDirectory)/System.IO.FileSystem.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.IsolatedStorage.dll" TargetName="@(assemblyDirectory)/System.IO.IsolatedStorage.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.MemoryMappedFiles.dll" TargetName="@(assemblyDirectory)/System.IO.MemoryMappedFiles.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.Pipes.AccessControl.dll" TargetName="@(assemblyDirectory)/System.IO.Pipes.AccessControl.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.Pipes.dll" TargetName="@(assemblyDirectory)/System.IO.Pipes.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.UnmanagedMemoryStream.dll" TargetName="@(assemblyDirectory)/System.IO.UnmanagedMemoryStream.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.IO.dll" TargetName="@(assemblyDirectory)/System.IO.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Linq.Expressions.dll" TargetName="@(assemblyDirectory)/System.Linq.Expressions.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Linq.Parallel.dll" TargetName="@(assemblyDirectory)/System.Linq.Parallel.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Linq.Queryable.dll" TargetName="@(assemblyDirectory)/System.Linq.Queryable.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Linq.dll" TargetName="@(assemblyDirectory)/System.Linq.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Memory.dll" TargetName="@(assemblyDirectory)/System.Memory.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.Http.Json.dll" TargetName="@(assemblyDirectory)/System.Net.Http.Json.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.Http.dll" TargetName="@(assemblyDirectory)/System.Net.Http.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.HttpListener.dll" TargetName="@(assemblyDirectory)/System.Net.HttpListener.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.Mail.dll" TargetName="@(assemblyDirectory)/System.Net.Mail.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.NameResolution.dll" TargetName="@(assemblyDirectory)/System.Net.NameResolution.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.NetworkInformation.dll" TargetName="@(assemblyDirectory)/System.Net.NetworkInformation.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.Ping.dll" TargetName="@(assemblyDirectory)/System.Net.Ping.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.Primitives.dll" TargetName="@(assemblyDirectory)/System.Net.Primitives.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.Quic.dll" TargetName="@(assemblyDirectory)/System.Net.Quic.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.Requests.dll" TargetName="@(assemblyDirectory)/System.Net.Requests.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.Security.dll" TargetName="@(assemblyDirectory)/System.Net.Security.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.ServicePoint.dll" TargetName="@(assemblyDirectory)/System.Net.ServicePoint.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.Sockets.dll" TargetName="@(assemblyDirectory)/System.Net.Sockets.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.WebClient.dll" TargetName="@(assemblyDirectory)/System.Net.WebClient.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.WebHeaderCollection.dll" TargetName="@(assemblyDirectory)/System.Net.WebHeaderCollection.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.WebProxy.dll" TargetName="@(assemblyDirectory)/System.Net.WebProxy.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.WebSockets.Client.dll" TargetName="@(assemblyDirectory)/System.Net.WebSockets.Client.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.WebSockets.dll" TargetName="@(assemblyDirectory)/System.Net.WebSockets.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Net.dll" TargetName="@(assemblyDirectory)/System.Net.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Numerics.Vectors.dll" TargetName="@(assemblyDirectory)/System.Numerics.Vectors.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Numerics.dll" TargetName="@(assemblyDirectory)/System.Numerics.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.ObjectModel.dll" TargetName="@(assemblyDirectory)/System.ObjectModel.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Private.CoreLib.dll" TargetName="@(assemblyDirectory)/System.Private.CoreLib.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Private.DataContractSerialization.dll" TargetName="@(assemblyDirectory)/System.Private.DataContractSerialization.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Private.Uri.dll" TargetName="@(assemblyDirectory)/System.Private.Uri.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Private.Xml.Linq.dll" TargetName="@(assemblyDirectory)/System.Private.Xml.Linq.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Private.Xml.dll" TargetName="@(assemblyDirectory)/System.Private.Xml.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Reflection.DispatchProxy.dll" TargetName="@(assemblyDirectory)/System.Reflection.DispatchProxy.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Reflection.Emit.ILGeneration.dll" TargetName="@(assemblyDirectory)/System.Reflection.Emit.ILGeneration.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Reflection.Emit.Lightweight.dll" TargetName="@(assemblyDirectory)/System.Reflection.Emit.Lightweight.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Reflection.Emit.dll" TargetName="@(assemblyDirectory)/System.Reflection.Emit.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Reflection.Extensions.dll" TargetName="@(assemblyDirectory)/System.Reflection.Extensions.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Reflection.Metadata.dll" TargetName="@(assemblyDirectory)/System.Reflection.Metadata.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Reflection.Primitives.dll" TargetName="@(assemblyDirectory)/System.Reflection.Primitives.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Reflection.TypeExtensions.dll" TargetName="@(assemblyDirectory)/System.Reflection.TypeExtensions.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Reflection.dll" TargetName="@(assemblyDirectory)/System.Reflection.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Resources.Reader.dll" TargetName="@(assemblyDirectory)/System.Resources.Reader.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Resources.ResourceManager.dll" TargetName="@(assemblyDirectory)/System.Resources.ResourceManager.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Resources.Writer.dll" TargetName="@(assemblyDirectory)/System.Resources.Writer.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.CompilerServices.Unsafe.dll" TargetName="@(assemblyDirectory)/System.Runtime.CompilerServices.Unsafe.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.CompilerServices.VisualC.dll" TargetName="@(assemblyDirectory)/System.Runtime.CompilerServices.VisualC.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.Extensions.dll" TargetName="@(assemblyDirectory)/System.Runtime.Extensions.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.Handles.dll" TargetName="@(assemblyDirectory)/System.Runtime.Handles.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.InteropServices.RuntimeInformation.dll" TargetName="@(assemblyDirectory)/System.Runtime.InteropServices.RuntimeInformation.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.InteropServices.dll" TargetName="@(assemblyDirectory)/System.Runtime.InteropServices.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.Intrinsics.dll" TargetName="@(assemblyDirectory)/System.Runtime.Intrinsics.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.Loader.dll" TargetName="@(assemblyDirectory)/System.Runtime.Loader.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.Numerics.dll" TargetName="@(assemblyDirectory)/System.Runtime.Numerics.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.Serialization.Formatters.dll" TargetName="@(assemblyDirectory)/System.Runtime.Serialization.Formatters.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.Serialization.Json.dll" TargetName="@(assemblyDirectory)/System.Runtime.Serialization.Json.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.Serialization.Primitives.dll" TargetName="@(assemblyDirectory)/System.Runtime.Serialization.Primitives.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.Serialization.Xml.dll" TargetName="@(assemblyDirectory)/System.Runtime.Serialization.Xml.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.Serialization.dll" TargetName="@(assemblyDirectory)/System.Runtime.Serialization.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Runtime.dll" TargetName="@(assemblyDirectory)/System.Runtime.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.AccessControl.dll" TargetName="@(assemblyDirectory)/System.Security.AccessControl.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.Claims.dll" TargetName="@(assemblyDirectory)/System.Security.Claims.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.Cryptography.Algorithms.dll" TargetName="@(assemblyDirectory)/System.Security.Cryptography.Algorithms.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.Cryptography.Cng.dll" TargetName="@(assemblyDirectory)/System.Security.Cryptography.Cng.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.Cryptography.Csp.dll" TargetName="@(assemblyDirectory)/System.Security.Cryptography.Csp.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.Cryptography.Encoding.dll" TargetName="@(assemblyDirectory)/System.Security.Cryptography.Encoding.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.Cryptography.OpenSsl.dll" TargetName="@(assemblyDirectory)/System.Security.Cryptography.OpenSsl.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.Cryptography.Primitives.dll" TargetName="@(assemblyDirectory)/System.Security.Cryptography.Primitives.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.Cryptography.ProtectedData.dll" TargetName="@(assemblyDirectory)/System.Security.Cryptography.ProtectedData.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.Cryptography.X509Certificates.dll" TargetName="@(assemblyDirectory)/System.Security.Cryptography.X509Certificates.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.Permissions.dll" TargetName="@(assemblyDirectory)/System.Security.Permissions.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.Principal.Windows.dll" TargetName="@(assemblyDirectory)/System.Security.Principal.Windows.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.Principal.dll" TargetName="@(assemblyDirectory)/System.Security.Principal.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.SecureString.dll" TargetName="@(assemblyDirectory)/System.Security.SecureString.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Security.dll" TargetName="@(assemblyDirectory)/System.Security.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.ServiceModel.Web.dll" TargetName="@(assemblyDirectory)/System.ServiceModel.Web.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.ServiceProcess.dll" TargetName="@(assemblyDirectory)/System.ServiceProcess.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Text.Encoding.CodePages.dll" TargetName="@(assemblyDirectory)/System.Text.Encoding.CodePages.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Text.Encoding.Extensions.dll" TargetName="@(assemblyDirectory)/System.Text.Encoding.Extensions.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Text.Encoding.dll" TargetName="@(assemblyDirectory)/System.Text.Encoding.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Text.Encodings.Web.dll" TargetName="@(assemblyDirectory)/System.Text.Encodings.Web.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Text.Json.dll" TargetName="@(assemblyDirectory)/System.Text.Json.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Text.RegularExpressions.dll" TargetName="@(assemblyDirectory)/System.Text.RegularExpressions.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Threading.Channels.dll" TargetName="@(assemblyDirectory)/System.Threading.Channels.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Threading.Overlapped.dll" TargetName="@(assemblyDirectory)/System.Threading.Overlapped.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Threading.Tasks.Dataflow.dll" TargetName="@(assemblyDirectory)/System.Threading.Tasks.Dataflow.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Threading.Tasks.Extensions.dll" TargetName="@(assemblyDirectory)/System.Threading.Tasks.Extensions.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Threading.Tasks.Parallel.dll" TargetName="@(assemblyDirectory)/System.Threading.Tasks.Parallel.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Threading.Tasks.dll" TargetName="@(assemblyDirectory)/System.Threading.Tasks.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Threading.Thread.dll" TargetName="@(assemblyDirectory)/System.Threading.Thread.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Threading.ThreadPool.dll" TargetName="@(assemblyDirectory)/System.Threading.ThreadPool.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Threading.Timer.dll" TargetName="@(assemblyDirectory)/System.Threading.Timer.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Threading.dll" TargetName="@(assemblyDirectory)/System.Threading.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Transactions.Local.dll" TargetName="@(assemblyDirectory)/System.Transactions.Local.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Transactions.dll" TargetName="@(assemblyDirectory)/System.Transactions.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.ValueTuple.dll" TargetName="@(assemblyDirectory)/System.ValueTuple.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Web.HttpUtility.dll" TargetName="@(assemblyDirectory)/System.Web.HttpUtility.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Web.dll" TargetName="@(assemblyDirectory)/System.Web.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Windows.Extensions.dll" TargetName="@(assemblyDirectory)/System.Windows.Extensions.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Windows.dll" TargetName="@(assemblyDirectory)/System.Windows.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Xml.Linq.dll" TargetName="@(assemblyDirectory)/System.Xml.Linq.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Xml.ReaderWriter.dll" TargetName="@(assemblyDirectory)/System.Xml.ReaderWriter.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Xml.Serialization.dll" TargetName="@(assemblyDirectory)/System.Xml.Serialization.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Xml.XDocument.dll" TargetName="@(assemblyDirectory)/System.Xml.XDocument.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Xml.XPath.XDocument.dll" TargetName="@(assemblyDirectory)/System.Xml.XPath.XDocument.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Xml.XPath.dll" TargetName="@(assemblyDirectory)/System.Xml.XPath.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Xml.XmlDocument.dll" TargetName="@(assemblyDirectory)/System.Xml.XmlDocument.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Xml.XmlSerializer.dll" TargetName="@(assemblyDirectory)/System.Xml.XmlSerializer.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.Xml.dll" TargetName="@(assemblyDirectory)/System.Xml.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/System.dll" TargetName="@(assemblyDirectory)/System.dll" Condition="HOST_MAC" />
-    <!--<CopyFile Name="@(loaderDirectory)/UnoCore.dll" TargetName="@(assemblyDirectory)/UnoCore.dll" Condition="HOST_MAC" />-->
-    <CopyFile Name="@(loaderDirectory)/WindowsBase.dll" TargetName="@(assemblyDirectory)/WindowsBase.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/createdump" TargetName="@(assemblyDirectory)/createdump" Condition="HOST_MAC" IsExecutable="true" />
-    <CopyFile Name="@(loaderDirectory)/libSystem.Globalization.Native.dylib" TargetName="@(assemblyDirectory)/libSystem.Globalization.Native.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libSystem.IO.Compression.Native.dylib" TargetName="@(assemblyDirectory)/libSystem.IO.Compression.Native.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libSystem.Native.dylib" TargetName="@(assemblyDirectory)/libSystem.Native.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libSystem.Net.Security.Native.dylib" TargetName="@(assemblyDirectory)/libSystem.Net.Security.Native.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libSystem.Security.Cryptography.Native.Apple.dylib" TargetName="@(assemblyDirectory)/libSystem.Security.Cryptography.Native.Apple.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libSystem.Security.Cryptography.Native.OpenSsl.dylib" TargetName="@(assemblyDirectory)/libSystem.Security.Cryptography.Native.OpenSsl.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libX11.6.dylib" TargetName="@(assemblyDirectory)/libX11.6.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libXau.6.dylib" TargetName="@(assemblyDirectory)/libXau.6.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libXdmcp.6.dylib" TargetName="@(assemblyDirectory)/libXdmcp.6.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libXext.6.dylib" TargetName="@(assemblyDirectory)/libXext.6.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libXrender.1.dylib" TargetName="@(assemblyDirectory)/libXrender.1.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libcairo.2.dylib" TargetName="@(assemblyDirectory)/libcairo.2.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libclrjit.dylib" TargetName="@(assemblyDirectory)/libclrjit.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libcoreclr.dylib" TargetName="@(assemblyDirectory)/libcoreclr.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libdbgshim.dylib" TargetName="@(assemblyDirectory)/libdbgshim.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libfontconfig.1.dylib" TargetName="@(assemblyDirectory)/libfontconfig.1.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libfreetype.6.dylib" TargetName="@(assemblyDirectory)/libfreetype.6.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libgdiplus.0.dylib" TargetName="@(assemblyDirectory)/libgdiplus.0.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libgdiplus.dylib" TargetName="@(assemblyDirectory)/libgdiplus.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libgif.dylib" TargetName="@(assemblyDirectory)/libgif.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libglib-2.0.0.dylib" TargetName="@(assemblyDirectory)/libglib-2.0.0.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libhostfxr.dylib" TargetName="@(assemblyDirectory)/libhostfxr.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libhostpolicy.dylib" TargetName="@(assemblyDirectory)/libhostpolicy.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libintl.8.dylib" TargetName="@(assemblyDirectory)/libintl.8.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libjpeg.9.dylib" TargetName="@(assemblyDirectory)/libjpeg.9.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libmscordaccore.dylib" TargetName="@(assemblyDirectory)/libmscordaccore.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libmscordbi.dylib" TargetName="@(assemblyDirectory)/libmscordbi.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libpcre.1.dylib" TargetName="@(assemblyDirectory)/libpcre.1.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libpixman-1.0.dylib" TargetName="@(assemblyDirectory)/libpixman-1.0.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libpng16.16.dylib" TargetName="@(assemblyDirectory)/libpng16.16.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libtiff.5.dylib" TargetName="@(assemblyDirectory)/libtiff.5.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libxcb-render.0.dylib" TargetName="@(assemblyDirectory)/libxcb-render.0.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libxcb-shm.0.dylib" TargetName="@(assemblyDirectory)/libxcb-shm.0.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/libxcb.1.dylib" TargetName="@(assemblyDirectory)/libxcb.1.dylib" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/mscorlib.dll" TargetName="@(assemblyDirectory)/mscorlib.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/netstandard.dll" TargetName="@(assemblyDirectory)/netstandard.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/plist-cil.dll" TargetName="@(assemblyDirectory)/plist-cil.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/runtime.osx.10.10-x64.CoreCompat.System.Drawing.dll" TargetName="@(assemblyDirectory)/runtime.osx.10.10-x64.CoreCompat.System.Drawing.dll" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/runtimeconfig.bin" TargetName="@(assemblyDirectory)/runtimeconfig.bin" Condition="HOST_MAC" />
-    <CopyFile Name="@(loaderDirectory)/uno-app-loader.dll" TargetName="@(assemblyDirectory)/uno-app-loader.dll" Condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/Microsoft.CSharp.dll" targetName="@(assemblyDirectory)/Microsoft.CSharp.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/Microsoft.VisualBasic.Core.dll" targetName="@(assemblyDirectory)/Microsoft.VisualBasic.Core.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/Microsoft.VisualBasic.dll" targetName="@(assemblyDirectory)/Microsoft.VisualBasic.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/Microsoft.Win32.Primitives.dll" targetName="@(assemblyDirectory)/Microsoft.Win32.Primitives.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/Microsoft.Win32.Registry.dll" targetName="@(assemblyDirectory)/Microsoft.Win32.Registry.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/Microsoft.Win32.SystemEvents.dll" targetName="@(assemblyDirectory)/Microsoft.Win32.SystemEvents.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/Microsoft.macOS.dll" targetName="@(assemblyDirectory)/Microsoft.macOS.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/OpenTK.dll" targetName="@(assemblyDirectory)/OpenTK.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.AppContext.dll" targetName="@(assemblyDirectory)/System.AppContext.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Buffers.dll" targetName="@(assemblyDirectory)/System.Buffers.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Collections.Concurrent.dll" targetName="@(assemblyDirectory)/System.Collections.Concurrent.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Collections.Immutable.dll" targetName="@(assemblyDirectory)/System.Collections.Immutable.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Collections.NonGeneric.dll" targetName="@(assemblyDirectory)/System.Collections.NonGeneric.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Collections.Specialized.dll" targetName="@(assemblyDirectory)/System.Collections.Specialized.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Collections.dll" targetName="@(assemblyDirectory)/System.Collections.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.ComponentModel.Annotations.dll" targetName="@(assemblyDirectory)/System.ComponentModel.Annotations.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.ComponentModel.DataAnnotations.dll" targetName="@(assemblyDirectory)/System.ComponentModel.DataAnnotations.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.ComponentModel.EventBasedAsync.dll" targetName="@(assemblyDirectory)/System.ComponentModel.EventBasedAsync.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.ComponentModel.Primitives.dll" targetName="@(assemblyDirectory)/System.ComponentModel.Primitives.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.ComponentModel.TypeConverter.dll" targetName="@(assemblyDirectory)/System.ComponentModel.TypeConverter.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.ComponentModel.dll" targetName="@(assemblyDirectory)/System.ComponentModel.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Configuration.ConfigurationManager.dll" targetName="@(assemblyDirectory)/System.Configuration.ConfigurationManager.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Configuration.dll" targetName="@(assemblyDirectory)/System.Configuration.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Console.dll" targetName="@(assemblyDirectory)/System.Console.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Core.dll" targetName="@(assemblyDirectory)/System.Core.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Data.Common.dll" targetName="@(assemblyDirectory)/System.Data.Common.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Data.DataSetExtensions.dll" targetName="@(assemblyDirectory)/System.Data.DataSetExtensions.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Data.dll" targetName="@(assemblyDirectory)/System.Data.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Diagnostics.Contracts.dll" targetName="@(assemblyDirectory)/System.Diagnostics.Contracts.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Diagnostics.Debug.dll" targetName="@(assemblyDirectory)/System.Diagnostics.Debug.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Diagnostics.DiagnosticSource.dll" targetName="@(assemblyDirectory)/System.Diagnostics.DiagnosticSource.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Diagnostics.FileVersionInfo.dll" targetName="@(assemblyDirectory)/System.Diagnostics.FileVersionInfo.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Diagnostics.Process.dll" targetName="@(assemblyDirectory)/System.Diagnostics.Process.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Diagnostics.StackTrace.dll" targetName="@(assemblyDirectory)/System.Diagnostics.StackTrace.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Diagnostics.TextWriterTraceListener.dll" targetName="@(assemblyDirectory)/System.Diagnostics.TextWriterTraceListener.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Diagnostics.Tools.dll" targetName="@(assemblyDirectory)/System.Diagnostics.Tools.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Diagnostics.TraceSource.dll" targetName="@(assemblyDirectory)/System.Diagnostics.TraceSource.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Diagnostics.Tracing.dll" targetName="@(assemblyDirectory)/System.Diagnostics.Tracing.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Drawing.Common.dll" targetName="@(assemblyDirectory)/System.Drawing.Common.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Drawing.Primitives.dll" targetName="@(assemblyDirectory)/System.Drawing.Primitives.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Drawing.dll" targetName="@(assemblyDirectory)/System.Drawing.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Dynamic.Runtime.dll" targetName="@(assemblyDirectory)/System.Dynamic.Runtime.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Formats.Asn1.dll" targetName="@(assemblyDirectory)/System.Formats.Asn1.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Globalization.Calendars.dll" targetName="@(assemblyDirectory)/System.Globalization.Calendars.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Globalization.Extensions.dll" targetName="@(assemblyDirectory)/System.Globalization.Extensions.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Globalization.dll" targetName="@(assemblyDirectory)/System.Globalization.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.Compression.Brotli.dll" targetName="@(assemblyDirectory)/System.IO.Compression.Brotli.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.Compression.FileSystem.dll" targetName="@(assemblyDirectory)/System.IO.Compression.FileSystem.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.Compression.ZipFile.dll" targetName="@(assemblyDirectory)/System.IO.Compression.ZipFile.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.Compression.dll" targetName="@(assemblyDirectory)/System.IO.Compression.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.FileSystem.AccessControl.dll" targetName="@(assemblyDirectory)/System.IO.FileSystem.AccessControl.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.FileSystem.DriveInfo.dll" targetName="@(assemblyDirectory)/System.IO.FileSystem.DriveInfo.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.FileSystem.Primitives.dll" targetName="@(assemblyDirectory)/System.IO.FileSystem.Primitives.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.FileSystem.Watcher.dll" targetName="@(assemblyDirectory)/System.IO.FileSystem.Watcher.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.FileSystem.dll" targetName="@(assemblyDirectory)/System.IO.FileSystem.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.IsolatedStorage.dll" targetName="@(assemblyDirectory)/System.IO.IsolatedStorage.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.MemoryMappedFiles.dll" targetName="@(assemblyDirectory)/System.IO.MemoryMappedFiles.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.Pipes.AccessControl.dll" targetName="@(assemblyDirectory)/System.IO.Pipes.AccessControl.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.Pipes.dll" targetName="@(assemblyDirectory)/System.IO.Pipes.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.UnmanagedMemoryStream.dll" targetName="@(assemblyDirectory)/System.IO.UnmanagedMemoryStream.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.IO.dll" targetName="@(assemblyDirectory)/System.IO.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Linq.Expressions.dll" targetName="@(assemblyDirectory)/System.Linq.Expressions.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Linq.Parallel.dll" targetName="@(assemblyDirectory)/System.Linq.Parallel.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Linq.Queryable.dll" targetName="@(assemblyDirectory)/System.Linq.Queryable.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Linq.dll" targetName="@(assemblyDirectory)/System.Linq.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Memory.dll" targetName="@(assemblyDirectory)/System.Memory.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.Http.Json.dll" targetName="@(assemblyDirectory)/System.Net.Http.Json.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.Http.dll" targetName="@(assemblyDirectory)/System.Net.Http.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.HttpListener.dll" targetName="@(assemblyDirectory)/System.Net.HttpListener.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.Mail.dll" targetName="@(assemblyDirectory)/System.Net.Mail.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.NameResolution.dll" targetName="@(assemblyDirectory)/System.Net.NameResolution.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.NetworkInformation.dll" targetName="@(assemblyDirectory)/System.Net.NetworkInformation.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.Ping.dll" targetName="@(assemblyDirectory)/System.Net.Ping.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.Primitives.dll" targetName="@(assemblyDirectory)/System.Net.Primitives.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.Quic.dll" targetName="@(assemblyDirectory)/System.Net.Quic.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.Requests.dll" targetName="@(assemblyDirectory)/System.Net.Requests.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.Security.dll" targetName="@(assemblyDirectory)/System.Net.Security.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.ServicePoint.dll" targetName="@(assemblyDirectory)/System.Net.ServicePoint.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.Sockets.dll" targetName="@(assemblyDirectory)/System.Net.Sockets.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.WebClient.dll" targetName="@(assemblyDirectory)/System.Net.WebClient.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.WebHeaderCollection.dll" targetName="@(assemblyDirectory)/System.Net.WebHeaderCollection.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.WebProxy.dll" targetName="@(assemblyDirectory)/System.Net.WebProxy.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.WebSockets.Client.dll" targetName="@(assemblyDirectory)/System.Net.WebSockets.Client.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.WebSockets.dll" targetName="@(assemblyDirectory)/System.Net.WebSockets.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Net.dll" targetName="@(assemblyDirectory)/System.Net.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Numerics.Vectors.dll" targetName="@(assemblyDirectory)/System.Numerics.Vectors.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Numerics.dll" targetName="@(assemblyDirectory)/System.Numerics.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.ObjectModel.dll" targetName="@(assemblyDirectory)/System.ObjectModel.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Private.CoreLib.dll" targetName="@(assemblyDirectory)/System.Private.CoreLib.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Private.DataContractSerialization.dll" targetName="@(assemblyDirectory)/System.Private.DataContractSerialization.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Private.Uri.dll" targetName="@(assemblyDirectory)/System.Private.Uri.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Private.Xml.Linq.dll" targetName="@(assemblyDirectory)/System.Private.Xml.Linq.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Private.Xml.dll" targetName="@(assemblyDirectory)/System.Private.Xml.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Reflection.DispatchProxy.dll" targetName="@(assemblyDirectory)/System.Reflection.DispatchProxy.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Reflection.Emit.ILGeneration.dll" targetName="@(assemblyDirectory)/System.Reflection.Emit.ILGeneration.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Reflection.Emit.Lightweight.dll" targetName="@(assemblyDirectory)/System.Reflection.Emit.Lightweight.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Reflection.Emit.dll" targetName="@(assemblyDirectory)/System.Reflection.Emit.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Reflection.Extensions.dll" targetName="@(assemblyDirectory)/System.Reflection.Extensions.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Reflection.Metadata.dll" targetName="@(assemblyDirectory)/System.Reflection.Metadata.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Reflection.Primitives.dll" targetName="@(assemblyDirectory)/System.Reflection.Primitives.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Reflection.TypeExtensions.dll" targetName="@(assemblyDirectory)/System.Reflection.TypeExtensions.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Reflection.dll" targetName="@(assemblyDirectory)/System.Reflection.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Resources.Reader.dll" targetName="@(assemblyDirectory)/System.Resources.Reader.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Resources.ResourceManager.dll" targetName="@(assemblyDirectory)/System.Resources.ResourceManager.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Resources.Writer.dll" targetName="@(assemblyDirectory)/System.Resources.Writer.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.CompilerServices.Unsafe.dll" targetName="@(assemblyDirectory)/System.Runtime.CompilerServices.Unsafe.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.CompilerServices.VisualC.dll" targetName="@(assemblyDirectory)/System.Runtime.CompilerServices.VisualC.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.Extensions.dll" targetName="@(assemblyDirectory)/System.Runtime.Extensions.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.Handles.dll" targetName="@(assemblyDirectory)/System.Runtime.Handles.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.InteropServices.RuntimeInformation.dll" targetName="@(assemblyDirectory)/System.Runtime.InteropServices.RuntimeInformation.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.InteropServices.dll" targetName="@(assemblyDirectory)/System.Runtime.InteropServices.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.Intrinsics.dll" targetName="@(assemblyDirectory)/System.Runtime.Intrinsics.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.Loader.dll" targetName="@(assemblyDirectory)/System.Runtime.Loader.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.Numerics.dll" targetName="@(assemblyDirectory)/System.Runtime.Numerics.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.Serialization.Formatters.dll" targetName="@(assemblyDirectory)/System.Runtime.Serialization.Formatters.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.Serialization.Json.dll" targetName="@(assemblyDirectory)/System.Runtime.Serialization.Json.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.Serialization.Primitives.dll" targetName="@(assemblyDirectory)/System.Runtime.Serialization.Primitives.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.Serialization.Xml.dll" targetName="@(assemblyDirectory)/System.Runtime.Serialization.Xml.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.Serialization.dll" targetName="@(assemblyDirectory)/System.Runtime.Serialization.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Runtime.dll" targetName="@(assemblyDirectory)/System.Runtime.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.AccessControl.dll" targetName="@(assemblyDirectory)/System.Security.AccessControl.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.Claims.dll" targetName="@(assemblyDirectory)/System.Security.Claims.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.Cryptography.Algorithms.dll" targetName="@(assemblyDirectory)/System.Security.Cryptography.Algorithms.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.Cryptography.Cng.dll" targetName="@(assemblyDirectory)/System.Security.Cryptography.Cng.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.Cryptography.Csp.dll" targetName="@(assemblyDirectory)/System.Security.Cryptography.Csp.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.Cryptography.Encoding.dll" targetName="@(assemblyDirectory)/System.Security.Cryptography.Encoding.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.Cryptography.OpenSsl.dll" targetName="@(assemblyDirectory)/System.Security.Cryptography.OpenSsl.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.Cryptography.Primitives.dll" targetName="@(assemblyDirectory)/System.Security.Cryptography.Primitives.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.Cryptography.ProtectedData.dll" targetName="@(assemblyDirectory)/System.Security.Cryptography.ProtectedData.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.Cryptography.X509Certificates.dll" targetName="@(assemblyDirectory)/System.Security.Cryptography.X509Certificates.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.Permissions.dll" targetName="@(assemblyDirectory)/System.Security.Permissions.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.Principal.Windows.dll" targetName="@(assemblyDirectory)/System.Security.Principal.Windows.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.Principal.dll" targetName="@(assemblyDirectory)/System.Security.Principal.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.SecureString.dll" targetName="@(assemblyDirectory)/System.Security.SecureString.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Security.dll" targetName="@(assemblyDirectory)/System.Security.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.ServiceModel.Web.dll" targetName="@(assemblyDirectory)/System.ServiceModel.Web.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.ServiceProcess.dll" targetName="@(assemblyDirectory)/System.ServiceProcess.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Text.Encoding.CodePages.dll" targetName="@(assemblyDirectory)/System.Text.Encoding.CodePages.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Text.Encoding.Extensions.dll" targetName="@(assemblyDirectory)/System.Text.Encoding.Extensions.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Text.Encoding.dll" targetName="@(assemblyDirectory)/System.Text.Encoding.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Text.Encodings.Web.dll" targetName="@(assemblyDirectory)/System.Text.Encodings.Web.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Text.Json.dll" targetName="@(assemblyDirectory)/System.Text.Json.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Text.RegularExpressions.dll" targetName="@(assemblyDirectory)/System.Text.RegularExpressions.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Threading.Channels.dll" targetName="@(assemblyDirectory)/System.Threading.Channels.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Threading.Overlapped.dll" targetName="@(assemblyDirectory)/System.Threading.Overlapped.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Threading.Tasks.Dataflow.dll" targetName="@(assemblyDirectory)/System.Threading.Tasks.Dataflow.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Threading.Tasks.Extensions.dll" targetName="@(assemblyDirectory)/System.Threading.Tasks.Extensions.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Threading.Tasks.Parallel.dll" targetName="@(assemblyDirectory)/System.Threading.Tasks.Parallel.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Threading.Tasks.dll" targetName="@(assemblyDirectory)/System.Threading.Tasks.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Threading.Thread.dll" targetName="@(assemblyDirectory)/System.Threading.Thread.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Threading.ThreadPool.dll" targetName="@(assemblyDirectory)/System.Threading.ThreadPool.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Threading.Timer.dll" targetName="@(assemblyDirectory)/System.Threading.Timer.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Threading.dll" targetName="@(assemblyDirectory)/System.Threading.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Transactions.Local.dll" targetName="@(assemblyDirectory)/System.Transactions.Local.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Transactions.dll" targetName="@(assemblyDirectory)/System.Transactions.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.ValueTuple.dll" targetName="@(assemblyDirectory)/System.ValueTuple.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Web.HttpUtility.dll" targetName="@(assemblyDirectory)/System.Web.HttpUtility.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Web.dll" targetName="@(assemblyDirectory)/System.Web.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Windows.Extensions.dll" targetName="@(assemblyDirectory)/System.Windows.Extensions.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Windows.dll" targetName="@(assemblyDirectory)/System.Windows.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Xml.Linq.dll" targetName="@(assemblyDirectory)/System.Xml.Linq.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Xml.ReaderWriter.dll" targetName="@(assemblyDirectory)/System.Xml.ReaderWriter.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Xml.Serialization.dll" targetName="@(assemblyDirectory)/System.Xml.Serialization.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Xml.XDocument.dll" targetName="@(assemblyDirectory)/System.Xml.XDocument.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Xml.XPath.XDocument.dll" targetName="@(assemblyDirectory)/System.Xml.XPath.XDocument.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Xml.XPath.dll" targetName="@(assemblyDirectory)/System.Xml.XPath.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Xml.XmlDocument.dll" targetName="@(assemblyDirectory)/System.Xml.XmlDocument.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Xml.XmlSerializer.dll" targetName="@(assemblyDirectory)/System.Xml.XmlSerializer.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.Xml.dll" targetName="@(assemblyDirectory)/System.Xml.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/System.dll" targetName="@(assemblyDirectory)/System.dll" condition="HOST_MAC" />
+    <!--<copyFile name="@(loaderDirectory)/UnoCore.dll" targetName="@(assemblyDirectory)/UnoCore.dll" condition="HOST_MAC" />-->
+    <copyFile name="@(loaderDirectory)/WindowsBase.dll" targetName="@(assemblyDirectory)/WindowsBase.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/createdump" targetName="@(assemblyDirectory)/createdump" condition="HOST_MAC" isExecutable="true" />
+    <copyFile name="@(loaderDirectory)/libSystem.Globalization.Native.dylib" targetName="@(assemblyDirectory)/libSystem.Globalization.Native.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libSystem.IO.Compression.Native.dylib" targetName="@(assemblyDirectory)/libSystem.IO.Compression.Native.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libSystem.Native.dylib" targetName="@(assemblyDirectory)/libSystem.Native.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libSystem.Net.Security.Native.dylib" targetName="@(assemblyDirectory)/libSystem.Net.Security.Native.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libSystem.Security.Cryptography.Native.Apple.dylib" targetName="@(assemblyDirectory)/libSystem.Security.Cryptography.Native.Apple.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libSystem.Security.Cryptography.Native.OpenSsl.dylib" targetName="@(assemblyDirectory)/libSystem.Security.Cryptography.Native.OpenSsl.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libX11.6.dylib" targetName="@(assemblyDirectory)/libX11.6.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libXau.6.dylib" targetName="@(assemblyDirectory)/libXau.6.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libXdmcp.6.dylib" targetName="@(assemblyDirectory)/libXdmcp.6.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libXext.6.dylib" targetName="@(assemblyDirectory)/libXext.6.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libXrender.1.dylib" targetName="@(assemblyDirectory)/libXrender.1.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libcairo.2.dylib" targetName="@(assemblyDirectory)/libcairo.2.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libclrjit.dylib" targetName="@(assemblyDirectory)/libclrjit.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libcoreclr.dylib" targetName="@(assemblyDirectory)/libcoreclr.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libdbgshim.dylib" targetName="@(assemblyDirectory)/libdbgshim.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libfontconfig.1.dylib" targetName="@(assemblyDirectory)/libfontconfig.1.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libfreetype.6.dylib" targetName="@(assemblyDirectory)/libfreetype.6.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libgdiplus.0.dylib" targetName="@(assemblyDirectory)/libgdiplus.0.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libgdiplus.dylib" targetName="@(assemblyDirectory)/libgdiplus.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libgif.dylib" targetName="@(assemblyDirectory)/libgif.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libglib-2.0.0.dylib" targetName="@(assemblyDirectory)/libglib-2.0.0.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libhostfxr.dylib" targetName="@(assemblyDirectory)/libhostfxr.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libhostpolicy.dylib" targetName="@(assemblyDirectory)/libhostpolicy.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libintl.8.dylib" targetName="@(assemblyDirectory)/libintl.8.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libjpeg.9.dylib" targetName="@(assemblyDirectory)/libjpeg.9.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libmscordaccore.dylib" targetName="@(assemblyDirectory)/libmscordaccore.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libmscordbi.dylib" targetName="@(assemblyDirectory)/libmscordbi.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libpcre.1.dylib" targetName="@(assemblyDirectory)/libpcre.1.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libpixman-1.0.dylib" targetName="@(assemblyDirectory)/libpixman-1.0.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libpng16.16.dylib" targetName="@(assemblyDirectory)/libpng16.16.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libtiff.5.dylib" targetName="@(assemblyDirectory)/libtiff.5.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libxcb-render.0.dylib" targetName="@(assemblyDirectory)/libxcb-render.0.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libxcb-shm.0.dylib" targetName="@(assemblyDirectory)/libxcb-shm.0.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/libxcb.1.dylib" targetName="@(assemblyDirectory)/libxcb.1.dylib" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/mscorlib.dll" targetName="@(assemblyDirectory)/mscorlib.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/netstandard.dll" targetName="@(assemblyDirectory)/netstandard.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/plist-cil.dll" targetName="@(assemblyDirectory)/plist-cil.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/runtime.osx.10.10-x64.CoreCompat.System.Drawing.dll" targetName="@(assemblyDirectory)/runtime.osx.10.10-x64.CoreCompat.System.Drawing.dll" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/runtimeconfig.bin" targetName="@(assemblyDirectory)/runtimeconfig.bin" condition="HOST_MAC" />
+    <copyFile name="@(loaderDirectory)/uno-app-loader.dll" targetName="@(assemblyDirectory)/uno-app-loader.dll" condition="HOST_MAC" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/cil/config.cil.uxl b/lib/UnoCore/cil/config.cil.uxl
index 170808ba6..25927d89e 100644
--- a/lib/UnoCore/cil/config.cil.uxl
+++ b/lib/UnoCore/cil/config.cil.uxl
@@ -1,35 +1,35 @@
-<Extensions Backend="CIL">
+<extensions backend="cil">
 
     <!-- Avoid warning when conflicting with the build target "dotnet" -->
-    <Define DOTNET="!DOTNET" />
+    <define DOTNET="!DOTNET" />
 
     <!-- Dependency support -->
-    <Declare Element="Assembly" />
-    <Declare Element="UnmanagedLibrary" />
-    <Declare Element="UnmanagedLibrary.x86" />
-    <Declare Element="UnmanagedLibrary.x64" />
+    <declare element="assembly" />
+    <declare element="unmanagedLibrary" />
+    <declare element="unmanagedLibrary.x86" />
+    <declare element="unmanagedLibrary.x64" />
 
     <!-- Architecture (override by -DX86 or -DX64) -->
-    <Define X86="HOST_X86 && !X64" />
-    <Define X64="HOST_X64 && !X86" />
+    <define X86="HOST_X86 && !X64" />
+    <define X64="HOST_X64 && !X86" />
 
     <!-- Assembly information -->
-    <Set AssemblyProduct="@(project.dotnet.assemblyProduct || project.name)" />
-    <Set AssemblyTitle="@(project.dotnet.assemblyTitle || project.title)" />
-    <Set AssemblyFileVersion="@(project.dotnet.assemblyFileVersion || project.version)" />
-    <Set AssemblyInformationalVersion="@(project.dotnet.assemblyInformationalVersion || project.version)" />
-    <Set AssemblyDescription="@(project.dotnet.assemblyDescription || project.description)" />
-    <Set AssemblyCompany="@(project.dotnet.assemblyCompany || project.publisher)" />
-    <Set AssemblyCopyright="@(project.dotnet.assemblyCopyright || project.copyright)" />
-    <Set AssemblyConfiguration="@(project.dotnet.assemblyConfiguration || configuration)" />
-    <Set AssemblyTrademark="@(project.dotnet.assemblyTrademark)" />
+    <set assemblyProduct="@(project.dotnet.assemblyProduct || project.name)" />
+    <set assemblyTitle="@(project.dotnet.assemblyTitle || project.title)" />
+    <set assemblyFileVersion="@(project.dotnet.assemblyFileVersion || project.version)" />
+    <set assemblyInformationalVersion="@(project.dotnet.assemblyInformationalVersion || project.version)" />
+    <set assemblyDescription="@(project.dotnet.assemblyDescription || project.description)" />
+    <set assemblyCompany="@(project.dotnet.assemblyCompany || project.publisher)" />
+    <set assemblyCopyright="@(project.dotnet.assemblyCopyright || project.copyright)" />
+    <set assemblyConfiguration="@(project.dotnet.assemblyConfiguration || configuration)" />
+    <set assemblyTrademark="@(project.dotnet.assemblyTrademark)" />
 
     <!-- Core assemblies -->
-    <Require Assembly="System" />
-    <Require Assembly="System.Core" />
-    <Require Assembly="System.Collections" />
-    <Require Assembly="System.Console" />
-    <Require Assembly="System.Runtime" />
-    <Require Assembly="System.Threading" />
+    <require assembly="System" />
+    <require assembly="System.Core" />
+    <require assembly="System.Collections" />
+    <require assembly="System.Console" />
+    <require assembly="System.Runtime" />
+    <require assembly="System.Threading" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/cil/console.cil.uxl b/lib/UnoCore/cil/console.cil.uxl
index 408394999..527a348c6 100644
--- a/lib/UnoCore/cil/console.cil.uxl
+++ b/lib/UnoCore/cil/console.cil.uxl
@@ -1,16 +1,16 @@
-<Extensions Backend="CIL" Condition="CONSOLE">
+<extensions backend="cil" condition="CONSOLE">
 
-    <CopyFile Name="@(config.appLoader.console:path)/uno-app.runtimeconfig.json"
-        TargetName="@(project.name).runtimeconfig.json" />
+    <copyFile name="@(config.appLoader.console:path)/uno-app.runtimeconfig.json"
+        targetName="@(project.name).runtimeconfig.json" />
 
-    <Set Product="@(project.name).dll" />
+    <set product="@(project.name).dll" />
 
     <!-- Windows -->
-    <Set Commands.Run="run.bat" Condition="HOST_WIN32" />
-    <ProcessFile Name="run.bat" Condition="HOST_WIN32" />
+    <set commands.run="run.bat" condition="HOST_WIN32" />
+    <processFile name="run.bat" condition="HOST_WIN32" />
 
     <!-- UNIX -->
-    <Set Commands.Run="run.sh" Condition="HOST_UNIX" />
-    <ProcessFile Name="run.sh" Condition="HOST_UNIX" IsExecutable="true" />
+    <set commands.run="run.sh" condition="HOST_UNIX" />
+    <processFile name="run.sh" condition="HOST_UNIX" isExecutable="true" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/cil/library.cil.uxl b/lib/UnoCore/cil/library.cil.uxl
index 5785e6bef..11dec26dd 100644
--- a/lib/UnoCore/cil/library.cil.uxl
+++ b/lib/UnoCore/cil/library.cil.uxl
@@ -1,3 +1,3 @@
-<Extensions Backend="CIL" Condition="LIBRARY">
-    <Set Product="@(project.name).dll" />
-</Extensions>
+<extensions backend="cil" condition="LIBRARY">
+    <set product="@(project.name).dll" />
+</extensions>
diff --git a/lib/UnoCore/cil/test.cil.uxl b/lib/UnoCore/cil/test.cil.uxl
index d18b23816..3c4886d72 100644
--- a/lib/UnoCore/cil/test.cil.uxl
+++ b/lib/UnoCore/cil/test.cil.uxl
@@ -1,20 +1,20 @@
-<Extensions Backend="CIL" Condition="TEST && !APPTEST">
+<extensions backend="cil" condition="TEST && !APPTEST">
 
-    <Set AppLoader.Assembly="@(config.appLoader.console:path)/uno-app.dll" />
-    <Set AppLoader.Class="Uno.AppLoader.Program" />
-    <Set AppLoader.Method="UnoGenerated" />
+    <set appLoader.assembly="@(config.appLoader.console:path)/uno-app.dll" />
+    <set appLoader.class="Uno.AppLoader.Program" />
+    <set appLoader.method="UnoGenerated" />
 
-    <CopyFile Name="@(config.appLoader.console:path)/uno-app.runtimeconfig.json"
-        TargetName="@(project.name).exe.runtimeconfig.json" />
+    <copyFile name="@(config.appLoader.console:path)/uno-app.runtimeconfig.json"
+        targetName="@(project.name).exe.runtimeconfig.json" />
 
-    <Set Product="@(project.name).exe.dll" />
+    <set product="@(project.name).exe.dll" />
 
     <!-- Windows -->
-    <Set Commands.Run="run.bat" Condition="HOST_WIN32" />
-    <ProcessFile Name="run.bat" Condition="HOST_WIN32" />
+    <set commands.run="run.bat" condition="HOST_WIN32" />
+    <processFile name="run.bat" condition="HOST_WIN32" />
 
     <!-- UNIX -->
-    <Set Commands.Run="run.sh" Condition="HOST_UNIX" />
-    <ProcessFile Name="run.sh" Condition="HOST_UNIX" IsExecutable="true" />
+    <set commands.run="run.sh" condition="HOST_UNIX" />
+    <processFile name="run.sh" condition="HOST_UNIX" isExecutable="true" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/cpp/config.cpp.uxl b/lib/UnoCore/cpp/config.cpp.uxl
index c42d0413c..c4b221818 100644
--- a/lib/UnoCore/cpp/config.cpp.uxl
+++ b/lib/UnoCore/cpp/config.cpp.uxl
@@ -1,71 +1,71 @@
-<Extensions Backend="CPlusPlus">
+<extensions backend="cplusplus">
 
-    <Define REFLECTION="DEBUG_DUMPS" />
-    <Define DEBUG_NATIVE="O0" />
+    <define REFLECTION="DEBUG_DUMPS" />
+    <define DEBUG_NATIVE="O0" />
 
     <!-- Output configuration -->
-    <Set BundleDirectory="data" IsDefault="true" />
-    <Set HeaderDirectory="include" IsDefault="true" />
-    <Set SourceDirectory="src" IsDefault="true" />
-    <Set BinaryDirectory="." IsDefault="true" />
+    <set bundleDirectory="data" isDefault="true" />
+    <set headerDirectory="include" isDefault="true" />
+    <set sourceDirectory="src" isDefault="true" />
+    <set binaryDirectory="." isDefault="true" />
 
     <!-- Codegen extensions -->
-    <Declare TypeElement="Header.Declaration" />
-    <Declare TypeElement="Header.Include" />
-    <Declare TypeElement="Header.Import" />
-    <Declare TypeElement="Source.Declaration" />
-    <Declare TypeElement="Source.Include" />
-    <Declare TypeElement="Source.Import" />
-    <Declare TypeProperty="ForwardDeclaration" />
-    <Declare TypeProperty="Include" />
-    <Declare TypeProperty="TypeName" />
-    <Declare TypeProperty="DefaultValue" />
-    <Declare TypeProperty="TypeOfType" />
-    <Declare TypeProperty="TypeOfFunction" />
-    <Declare TypeProperty="BaseType" />
-    <Declare TypeProperty="BoxFunction" />
-    <Declare TypeProperty="FileExtension" />
-    <Declare MethodProperty="IsIntrinsic" />
-    <Declare MethodProperty="FunctionName" />
+    <declare typeElement="header.declaration" />
+    <declare typeElement="header.include" />
+    <declare typeElement="header.import" />
+    <declare typeElement="source.declaration" />
+    <declare typeElement="source.include" />
+    <declare typeElement="source.import" />
+    <declare typeProperty="forwardDeclaration" />
+    <declare typeProperty="include" />
+    <declare typeProperty="typeName" />
+    <declare typeProperty="defaultValue" />
+    <declare typeProperty="typeofType" />
+    <declare typeProperty="typeofFunction" />
+    <declare typeProperty="baseType" />
+    <declare typeProperty="boxFunction" />
+    <declare typeProperty="fileExtension" />
+    <declare methodProperty="isIntrinsic" />
+    <declare methodProperty="functionName" />
 
     <!-- File types -->
-    <Declare Element="FontFile" TargetDirectory="@(bundleDirectory)" />
-    <Declare Element="HeaderFile" TargetDirectory="@(headerDirectory)" />
-    <Declare Element="SourceFile" TargetDirectory="@(sourceDirectory)" />
+    <declare element="fontFile" targetDirectory="@(bundleDirectory)" />
+    <declare element="headerFile" targetDirectory="@(headerDirectory)" />
+    <declare element="sourceFile" targetDirectory="@(sourceDirectory)" />
 
     <!-- Build extensions -->
-    <Declare Element="IncludeDirectory" />
-    <Declare Element="LinkDirectory" />
-    <Declare Element="LinkLibrary" />
-    <Declare Element="PreprocessorDefinition" />
+    <declare element="includeDirectory" />
+    <declare element="linkDirectory" />
+    <declare element="linkLibrary" />
+    <declare element="preprocessorDefinition" />
 
-    <Set CppStandard="c++17" IsDefault="true" />
-    <Set CStandard="c99" IsDefault="true" />
+    <set cppStandard="c++17" isDefault="true" />
+    <set cStandard="c99" isDefault="true" />
 
-    <Require PreprocessorDefinition="DEBUG_ARC=0" Condition="DEBUG_ARC0" />
-    <Require PreprocessorDefinition="DEBUG_ARC=1" Condition="DEBUG_ARC1" />
-    <Require PreprocessorDefinition="DEBUG_ARC=2" Condition="DEBUG_ARC2" />
-    <Require PreprocessorDefinition="DEBUG_ARC=3" Condition="DEBUG_ARC3" />
-    <Require PreprocessorDefinition="DEBUG_ARC=4" Condition="DEBUG_ARC4" />
-    <Require PreprocessorDefinition="DEBUG_DUMPS=1" Condition="DEBUG_DUMPS" />
-    <Require PreprocessorDefinition="DEBUG_GC=1" Condition="DEBUG_GC" />
-    <Require PreprocessorDefinition="DEBUG_UNSAFE=1" Condition="DEBUG_UNSAFE" />
+    <require preprocessorDefinition="DEBUG_ARC=0" condition="DEBUG_ARC0" />
+    <require preprocessorDefinition="DEBUG_ARC=1" condition="DEBUG_ARC1" />
+    <require preprocessorDefinition="DEBUG_ARC=2" condition="DEBUG_ARC2" />
+    <require preprocessorDefinition="DEBUG_ARC=3" condition="DEBUG_ARC3" />
+    <require preprocessorDefinition="DEBUG_ARC=4" condition="DEBUG_ARC4" />
+    <require preprocessorDefinition="DEBUG_DUMPS=1" condition="DEBUG_DUMPS" />
+    <require preprocessorDefinition="DEBUG_GC=1" condition="DEBUG_GC" />
+    <require preprocessorDefinition="DEBUG_UNSAFE=1" condition="DEBUG_UNSAFE" />
 
     <!-- UnoCore extensions -->
-    <Declare Element="Main.Include" />
-    <Declare Element="TypeObjects.Declaration" />
-    <Declare Element="TypeObjects.FunctionPointer" />
+    <declare element="main.include" />
+    <declare element="typeObjects.declaration" />
+    <declare element="typeObjects.functionPointer" />
 
     <!-- Native build -->
-    <Set Native.Configuration="@(DEBUG_NATIVE:defined:test('Debug', 'Release'))" />
+    <set native.configuration="@(DEBUG_NATIVE:defined:test('Debug', 'Release'))" />
 
     <!-- Mobile settings -->
-    <Set Mobile.DisableStatusbar="@('@(MOBILE:defined) && !@(project.mobile.showStatusbar)':test(1, 0))" />
-    <Set Mobile.DisableBatterySaver="@('@(MOBILE:defined) && @(project.mobile.keepAlive)':test(1, 0))" />
-    <Set Mobile.DisableBackgroundProcess="@('@(MOBILE:defined) && !@(project.mobile.runsInBackground)':test(1, 0))" />
+    <set mobile.disableStatusbar="@('@(MOBILE:defined) && !@(project.mobile.showStatusbar)':test(1, 0))" />
+    <set mobile.disableBatterySaver="@('@(MOBILE:defined) && @(project.mobile.keepAlive)':test(1, 0))" />
+    <set mobile.disableBackgroundProcess="@('@(MOBILE:defined) && !@(project.mobile.runsInBackground)':test(1, 0))" />
 
     <!-- Keywords -->
-    <Set Keywords>
+    <set keywords>
         alignas alignof and and_eq asm auto bitand bitor bool
         break case catch char char16_t char32_t class compl concept
         const constexpr const_cast continue decltype default delete do
@@ -82,6 +82,6 @@
         int8_t int16_t int32_t int64_t uint8_t uint16_t uint32_t
         uint64_t DBL_MAX DBL_INF DBL_NAN FLT_INF FLT_NAN
         op_Implicit op_Explicit
-    </Set>
+    </set>
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/cpp/uno.cpp.uxl b/lib/UnoCore/cpp/uno.cpp.uxl
index 68a25326c..aa9166bb2 100644
--- a/lib/UnoCore/cpp/uno.cpp.uxl
+++ b/lib/UnoCore/cpp/uno.cpp.uxl
@@ -1,31 +1,31 @@
-<Extensions Backend="CPlusPlus">
+<extensions backend="cplusplus">
 
-    <Require Template="XliPlatform" />
+    <require template="XliPlatform" />
 
     <!-- Core source code -->
-    <ProcessFile HeaderFile="uno.h" />
-    <ProcessFile HeaderFile="uno/_internal.h" />
-    <ProcessFile SourceFile="uno/_invoke.cpp" />
-    <ProcessFile HeaderFile="uno/Config.h" />
-    <ProcessFile SourceFile="uno/Memory.cpp" />
-    <ProcessFile HeaderFile="uno/Memory.h" />
-    <ProcessFile SourceFile="uno/ObjectModel.cpp" />
-    <ProcessFile HeaderFile="uno/ObjectModel.h" />
-    <ProcessFile HeaderFile="uno/ObjectMonitor.h" />
-    <ProcessFile SourceFile="uno/Reflection.cpp" Condition="REFLECTION" />
-    <ProcessFile HeaderFile="uno/Reflection.h" Condition="REFLECTION" />
-    <ProcessFile SourceFile="uno/Support.cpp" />
-    <ProcessFile SourceFile="uno/Support.mm" Condition="APPLE" />
-    <ProcessFile HeaderFile="uno/ThreadUtils.h" />
-    <ProcessFile HeaderFile="uno/WinAPI.h" Condition="WIN32" />
+    <processFile headerFile="uno.h" />
+    <processFile headerFile="uno/_internal.h" />
+    <processFile sourceFile="uno/_invoke.cpp" />
+    <processFile headerFile="uno/Config.h" />
+    <processFile sourceFile="uno/Memory.cpp" />
+    <processFile headerFile="uno/Memory.h" />
+    <processFile sourceFile="uno/ObjectModel.cpp" />
+    <processFile headerFile="uno/ObjectModel.h" />
+    <processFile headerFile="uno/ObjectMonitor.h" />
+    <processFile sourceFile="uno/Reflection.cpp" condition="REFLECTION" />
+    <processFile headerFile="uno/Reflection.h" condition="REFLECTION" />
+    <processFile sourceFile="uno/Support.cpp" />
+    <processFile sourceFile="uno/Support.mm" condition="APPLE" />
+    <processFile headerFile="uno/ThreadUtils.h" />
+    <processFile headerFile="uno/WinAPI.h" condition="WIN32" />
 
     <!-- Graphics headers -->
-    <ProcessFile HeaderFile="uPlatform/GraphicsContext.h" Condition="!MOBILE && OPENGL" />
-    <ProcessFile HeaderFile="uPlatform/GLHelper.h" Condition="OPENGL" />
+    <processFile headerFile="uPlatform/GraphicsContext.h" condition="!MOBILE && OPENGL" />
+    <processFile headerFile="uPlatform/GLHelper.h" condition="OPENGL" />
 
     <!-- Entrypoint -->
-    <ProcessFile SourceFile="main-app.cpp" Condition="!MOBILE && !CONSOLE"/>
-    <ProcessFile SourceFile="main-console.cpp" Condition="!MOBILE && CONSOLE"/>
-    <ProcessFile SourceFile="main-mobile.cpp" Condition="MOBILE" />
+    <processFile sourceFile="main-app.cpp" condition="!MOBILE && !CONSOLE"/>
+    <processFile sourceFile="main-console.cpp" condition="!MOBILE && CONSOLE"/>
+    <processFile sourceFile="main-mobile.cpp" condition="MOBILE" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/ios/@(project.name)/@(project.name)-Info.plist b/lib/UnoCore/ios/@(project.name)/@(project.name)-Info.plist
index a271f0304..381b69b3e 100644
--- a/lib/UnoCore/ios/@(project.name)/@(project.name)-Info.plist
+++ b/lib/UnoCore/ios/@(project.name)/@(project.name)-Info.plist
@@ -82,13 +82,13 @@
 	@(xcode.plist.element:join('\n\t'))
 
 	<key>NSCameraUsageDescription</key>
-	<string>@(project.ios.plist.NSCameraUsageDescription || pListDefaults.NSCameraUsageDescription)</string>
+	<string>@(project.ios.plist.NSCameraUsageDescription || plistDefaults.NSCameraUsageDescription)</string>
 
 	<key>NSMicrophoneUsageDescription</key>
-	<string>@(project.ios.plist.NSMicrophoneUsageDescription || pListDefaults.NSMicrophoneUsageDescription)</string>
+	<string>@(project.ios.plist.NSMicrophoneUsageDescription || plistDefaults.NSMicrophoneUsageDescription)</string>
 
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>@(project.ios.plist.NSPhotoLibraryUsageDescription || pListDefaults.NSPhotoLibraryUsageDescription)</string>
+	<string>@(project.ios.plist.NSPhotoLibraryUsageDescription || plistDefaults.NSPhotoLibraryUsageDescription)</string>
 
 #if @(project.ios.plist.MKDirectionsApplicationSupportedModes:isSet)
 	<key>MKDirectionsApplicationSupportedModes</key>
diff --git a/lib/UnoCore/ios/MetalANGLE.uxl b/lib/UnoCore/ios/MetalANGLE.uxl
index 94c6593a8..527ea9dbd 100644
--- a/lib/UnoCore/ios/MetalANGLE.uxl
+++ b/lib/UnoCore/ios/MetalANGLE.uxl
@@ -1,9 +1,9 @@
-<Extensions Backend="CPlusPlus" Condition="IOS && METAL">
+<extensions backend="cplusplus" condition="IOS && METAL">
 
-    <Require Condition="!IOS_SIMULATOR" Xcode.Framework="@('MetalANGLE.framework.ios/MetalANGLE.framework':path)" />
-    <Require Condition=" IOS_SIMULATOR" Xcode.Framework="@('MetalANGLE.framework.ios.simulator/MetalANGLE.framework':path)" />
+    <require condition="!IOS_SIMULATOR" xcode.framework="@('MetalANGLE.framework.ios/MetalANGLE.framework':path)" />
+    <require condition=" IOS_SIMULATOR" xcode.framework="@('MetalANGLE.framework.ios.simulator/MetalANGLE.framework':path)" />
 
-    <Require Condition="!IOS_SIMULATOR" Xcode.EmbeddedFramework="@('MetalANGLE.framework.ios/MetalANGLE.framework':path)" />
-    <Require Condition=" IOS_SIMULATOR" Xcode.EmbeddedFramework="@('MetalANGLE.framework.ios.simulator/MetalANGLE.framework':path)" />
+    <require condition="!IOS_SIMULATOR" xcode.embeddedFramework="@('MetalANGLE.framework.ios/MetalANGLE.framework':path)" />
+    <require condition=" IOS_SIMULATOR" xcode.embeddedFramework="@('MetalANGLE.framework.ios.simulator/MetalANGLE.framework':path)" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/ios/Uno-iOS.uxl b/lib/UnoCore/ios/Uno-iOS.uxl
index 2cd50cdbf..88c6ca9f5 100644
--- a/lib/UnoCore/ios/Uno-iOS.uxl
+++ b/lib/UnoCore/ios/Uno-iOS.uxl
@@ -1,13 +1,13 @@
-<Extensions Backend="CPlusPlus" Condition="iOS">
+<extensions backend="cplusplus" condition="IOS">
 
-    <ProcessFile HeaderFile="Uno-iOS/AppDelegate.h" />
-    <ProcessFile SourceFile="Uno-iOS/AppDelegate.mm" />
-    <ProcessFile HeaderFile="Uno-iOS/Context.h" />
-    <CopyFile SourceFile="Uno-iOS/Main.mm" />
-    <ProcessFile HeaderFile="Uno-iOS/Uno-iOS.h" />
-    <ProcessFile SourceFile="Uno-iOS/Uno-iOS.mm" />
+    <processFile headerFile="Uno-iOS/AppDelegate.h" />
+    <processFile sourceFile="Uno-iOS/AppDelegate.mm" />
+    <processFile headerFile="Uno-iOS/Context.h" />
+    <copyFile sourceFile="Uno-iOS/Main.mm" />
+    <processFile headerFile="Uno-iOS/Uno-iOS.h" />
+    <processFile sourceFile="Uno-iOS/Uno-iOS.mm" />
 
-    <Require Condition="LIBRARY" Xcode.PublicHeader="Uno-iOS/Context.h" />
-    <Require Condition="!METAL" PreprocessorDefinition="GLES_SILENCE_DEPRECATION" />
+    <require condition="LIBRARY" xcode.publicHeader="Uno-iOS/Context.h" />
+    <require condition="!METAL" preprocessorDefinition="GLES_SILENCE_DEPRECATION" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/ios/ios.uxl b/lib/UnoCore/ios/ios.uxl
index 2fc95c7aa..c574fc970 100644
--- a/lib/UnoCore/ios/ios.uxl
+++ b/lib/UnoCore/ios/ios.uxl
@@ -1,114 +1,114 @@
-<Extensions Backend="CPlusPlus" Condition="IOS">
+<extensions backend="cplusplus" condition="IOS">
 
     <!-- Backend config -->
 
-    <Define APPLE />
-    <Define MOBILE />
-    <Define UNIX />
+    <define APPLE />
+    <define MOBILE />
+    <define UNIX />
 
     <!-- Build properties -->
 
-    <Declare Element="iOS.BackgroundModes" />
-    <Declare Element="Xcode.EmbeddedFramework" />
-    <Declare Element="Xcode.Framework" />
-    <Declare Element="Xcode.FrameworkDirectory" />
-    <Declare Element="Xcode.Plist.Element" />
-    <Declare Element="Xcode.PrefixHeader.Declaration" />
-    <Declare Element="Xcode.PublicHeader" />
-    <Declare Element="Xcode.ShellScript" />
-    <Declare Element="Cocoapods.Platform.Name" />
-    <Declare Element="Cocoapods.Platform.Version" />
-    <Declare Element="Cocoapods.Podfile.Pre" />
-    <Declare Element="Cocoapods.Podfile.Target" />
-    <Declare Element="Cocoapods.Podfile.Post" />
-    <Declare Element="AppDelegate.HeaderFile.Declaration" />
-    <Declare Element="AppDelegate.SourceFile.Declaration" />
-    <Declare Element="AppDelegate.SourceFile.ImplementationScope" />
-    <Declare Element="AppDelegate.SourceFile.DidFinishLaunchingWithOptions" />
-    <Declare Element="AppDelegate.SourceFile.OpenURLLegacy" />
-    <Declare Element="AppDelegate.SourceFile.OpenURL" />
-
-    <Declare Element="AppDelegate.Implements" />
-    <Require AppDelegate.Implements="UIApplicationDelegate" />
-
-    <Declare Element="uContext.SourceFile.Declaration" />
-    <Declare Element="uContext.SourceFile.DidFinishLaunching" />
-
-    <Set Product="build/@(pbxproj.configuration)-iphoneos/@(project.name).app/@(project.name)" />
-    <Set BundleIdentifier="@(project.ios.bundleIdentifier || 'com.apps.@(project.name:qidentifier:replace('_', '-'):toLower)')" />
-    <Set Pbxproj.Configuration="@(DEBUG_NATIVE:defined:test('Debug', 'Release'))" />
+    <declare element="ios.backgroundModes" />
+    <declare element="xcode.embeddedFramework" />
+    <declare element="xcode.framework" />
+    <declare element="xcode.frameworkDirectory" />
+    <declare element="xcode.plist.element" />
+    <declare element="xcode.prefixHeader.declaration" />
+    <declare element="xcode.publicHeader" />
+    <declare element="xcode.shellScript" />
+    <declare element="cocoapods.platform.name" />
+    <declare element="cocoapods.platform.version" />
+    <declare element="cocoapods.podfile.pre" />
+    <declare element="cocoapods.podfile.target" />
+    <declare element="cocoapods.podfile.post" />
+    <declare element="appDelegate.headerFile.declaration" />
+    <declare element="appDelegate.sourceFile.declaration" />
+    <declare element="appDelegate.sourceFile.implementationScope" />
+    <declare element="appDelegate.sourceFile.didFinishLaunchingWithOptions" />
+    <declare element="appDelegate.sourceFile.openURLLegacy" />
+    <declare element="appDelegate.sourceFile.openURL" />
+
+    <declare element="appDelegate.implements" />
+    <require appDelegate.implements="UIApplicationDelegate" />
+
+    <declare element="uContext.sourceFile.declaration" />
+    <declare element="uContext.sourceFile.didFinishLaunching" />
+
+    <set product="build/@(pbxproj.configuration)-iphoneos/@(project.name).app/@(project.name)" />
+    <set bundleIdentifier="@(project.ios.bundleIdentifier || 'com.apps.@(project.name:qidentifier:replace('_', '-'):toLower)')" />
+    <set pbxproj.configuration="@(DEBUG_NATIVE:defined:test('Debug', 'Release'))" />
 
     <!-- Project and build scripts -->
 
-    <Set Commands.Build="bash build.sh" Condition="HOST_MAC" />
-    <Set Commands.Run="bash run.sh" Condition="HOST_MAC" />
+    <set commands.build="bash build.sh" condition="HOST_MAC" />
+    <set commands.run="bash run.sh" condition="HOST_MAC" />
 
-    <ProcessFile Name="@(project.name).xcodeproj/project.xcworkspace/contents.xcworkspacedata" />
-    <ProcessFile Name="@(project.name).xcodeproj/project.pbxproj" />
-    <ProcessFile Name="@(project.name)/@(project.name)-Info.plist" />
-    <ProcessFile Name="@(project.name)/@(project.name)-Prefix.pch" />
-    <ProcessFile Name="@(project.name)/@(project.name).entitlements" />
-    <ProcessFile Name="@(project.name)/LaunchScreen.storyboard" />
-    <ProcessFile Name="build.sh" IsExecutable="true" />
-    <ProcessFile Name="run.sh" IsExecutable="true" />
-    <ProcessFile Name="Podfile" Condition="COCOAPODS" />
+    <processFile name="@(project.name).xcodeproj/project.xcworkspace/contents.xcworkspacedata" />
+    <processFile name="@(project.name).xcodeproj/project.pbxproj" />
+    <processFile name="@(project.name)/@(project.name)-Info.plist" />
+    <processFile name="@(project.name)/@(project.name)-Prefix.pch" />
+    <processFile name="@(project.name)/@(project.name).entitlements" />
+    <processFile name="@(project.name)/LaunchScreen.storyboard" />
+    <processFile name="build.sh" isExecutable="true" />
+    <processFile name="run.sh" isExecutable="true" />
+    <processFile name="Podfile" condition="COCOAPODS" />
 
     <!-- Icons -->
 
     <!-- Image for Launch Screen Storyboard -->
-    <CopyFile Name="@(project.ios.launchScreen.image:path || '@//assets/icon.png')"
-        TargetName="@(project.name)/LaunchScreen.png" />
-
-    <Set Icons="@(project.name)/Images.xcassets/AppIcon.appiconset" />
-    <ProcessFile Name="@(icons)/Contents.json" />
-
-    <ImageFile Name="@(project.ios.icons.iphone_20_2x:path || '@//assets/icon.png')"
-        TargetWidth="40" TargetName="@(icons)/iPhone_20_2x.png" />
-    <ImageFile Name="@(project.ios.icons.iphone_20_3x:path || '@//assets/icon.png')"
-        TargetWidth="60" TargetName="@(icons)/iPhone_20_3x.png" />
-    <ImageFile Name="@(project.ios.icons.iphone_29_2x:path || '@//assets/icon.png')"
-        TargetWidth="58" TargetName="@(icons)/iPhone_29_2x.png" />
-    <ImageFile Name="@(project.ios.icons.iphone_29_3x:path || '@//assets/icon.png')"
-        TargetWidth="87" TargetName="@(icons)/iPhone_29_3x.png" />
-    <ImageFile Name="@(project.ios.icons.iphone_40_2x:path || '@//assets/icon.png')"
-        TargetWidth="80" TargetName="@(icons)/iPhone_40_2x.png" />
-    <ImageFile Name="@(project.ios.icons.iphone_40_3x:path || '@//assets/icon.png')"
-        TargetWidth="120" TargetName="@(icons)/iPhone_40_3x.png" />
-    <ImageFile Name="@(project.ios.icons.iphone_60_2x:path || '@//assets/icon.png')"
-        TargetWidth="120" TargetName="@(icons)/iPhone_60_2x.png" />
-    <ImageFile Name="@(project.ios.icons.iphone_60_3x:path || '@//assets/icon.png')"
-        TargetWidth="180" TargetName="@(icons)/iPhone_60_3x.png" />
-    <ImageFile Name="@(project.ios.icons.ipad_20_1x:path || '@//assets/icon.png')"
-        TargetWidth="20" TargetName="@(icons)/iPad_20_1x.png" />
-    <ImageFile Name="@(project.ios.icons.ipad_20_2x:path || '@//assets/icon.png')"
-        TargetWidth="40" TargetName="@(icons)/iPad_20_2x.png" />
-    <ImageFile Name="@(project.ios.icons.ipad_29_1x:path || '@//assets/icon.png')"
-        TargetWidth="29" TargetName="@(icons)/iPad_29_1x.png" />
-    <ImageFile Name="@(project.ios.icons.ipad_29_2x:path || '@//assets/icon.png')"
-        TargetWidth="58" TargetName="@(icons)/iPad_29_2x.png" />
-    <ImageFile Name="@(project.ios.icons.ipad_40_1x:path || '@//assets/icon.png')"
-        TargetWidth="40" TargetName="@(icons)/iPad_40_1x.png" />
-    <ImageFile Name="@(project.ios.icons.ipad_40_2x:path || '@//assets/icon.png')"
-        TargetWidth="80" TargetName="@(icons)/iPad_40_2x.png" />
-    <ImageFile Name="@(project.ios.icons.ipad_76_1x:path || '@//assets/icon.png')"
-        TargetWidth="76" TargetName="@(icons)/iPad_76_1x.png" />
-    <ImageFile Name="@(project.ios.icons.ipad_76_2x:path || '@//assets/icon.png')"
-        TargetWidth="152" TargetName="@(icons)/iPad_76_2x.png" />
-    <ImageFile Name="@(project.ios.icons.ipad_83.5_2x:path || '@//assets/icon.png')"
-        TargetWidth="167" TargetName="@(icons)/iPad_83.5_2x.png" />
-    <ImageFile Name="@(project.ios.icons.ios_marketing_1024_1x:path || '@//assets/icon.png')"
-        TargetWidth="1024" TargetName="@(icons)/iOS_Marketing_1024_1x.png" />
+    <copyFile name="@(project.ios.launchScreen.image:path || '@//assets/icon.png')"
+        targetName="@(project.name)/LaunchScreen.png" />
+
+    <set icons="@(project.name)/Images.xcassets/AppIcon.appiconset" />
+    <processFile name="@(icons)/Contents.json" />
+
+    <imageFile name="@(project.ios.icons.iphone_20_2x:path || '@//assets/icon.png')"
+        targetWidth="40" targetName="@(icons)/iPhone_20_2x.png" />
+    <imageFile name="@(project.ios.icons.iphone_20_3x:path || '@//assets/icon.png')"
+        targetWidth="60" targetName="@(icons)/iPhone_20_3x.png" />
+    <imageFile name="@(project.ios.icons.iphone_29_2x:path || '@//assets/icon.png')"
+        targetWidth="58" targetName="@(icons)/iPhone_29_2x.png" />
+    <imageFile name="@(project.ios.icons.iphone_29_3x:path || '@//assets/icon.png')"
+        targetWidth="87" targetName="@(icons)/iPhone_29_3x.png" />
+    <imageFile name="@(project.ios.icons.iphone_40_2x:path || '@//assets/icon.png')"
+        targetWidth="80" targetName="@(icons)/iPhone_40_2x.png" />
+    <imageFile name="@(project.ios.icons.iphone_40_3x:path || '@//assets/icon.png')"
+        targetWidth="120" targetName="@(icons)/iPhone_40_3x.png" />
+    <imageFile name="@(project.ios.icons.iphone_60_2x:path || '@//assets/icon.png')"
+        targetWidth="120" targetName="@(icons)/iPhone_60_2x.png" />
+    <imageFile name="@(project.ios.icons.iphone_60_3x:path || '@//assets/icon.png')"
+        targetWidth="180" targetName="@(icons)/iPhone_60_3x.png" />
+    <imageFile name="@(project.ios.icons.ipad_20_1x:path || '@//assets/icon.png')"
+        targetWidth="20" targetName="@(icons)/iPad_20_1x.png" />
+    <imageFile name="@(project.ios.icons.ipad_20_2x:path || '@//assets/icon.png')"
+        targetWidth="40" targetName="@(icons)/iPad_20_2x.png" />
+    <imageFile name="@(project.ios.icons.ipad_29_1x:path || '@//assets/icon.png')"
+        targetWidth="29" targetName="@(icons)/iPad_29_1x.png" />
+    <imageFile name="@(project.ios.icons.ipad_29_2x:path || '@//assets/icon.png')"
+        targetWidth="58" targetName="@(icons)/iPad_29_2x.png" />
+    <imageFile name="@(project.ios.icons.ipad_40_1x:path || '@//assets/icon.png')"
+        targetWidth="40" targetName="@(icons)/iPad_40_1x.png" />
+    <imageFile name="@(project.ios.icons.ipad_40_2x:path || '@//assets/icon.png')"
+        targetWidth="80" targetName="@(icons)/iPad_40_2x.png" />
+    <imageFile name="@(project.ios.icons.ipad_76_1x:path || '@//assets/icon.png')"
+        targetWidth="76" targetName="@(icons)/iPad_76_1x.png" />
+    <imageFile name="@(project.ios.icons.ipad_76_2x:path || '@//assets/icon.png')"
+        targetWidth="152" targetName="@(icons)/iPad_76_2x.png" />
+    <imageFile name="@(project.ios.icons.ipad_83.5_2x:path || '@//assets/icon.png')"
+        targetWidth="167" targetName="@(icons)/iPad_83.5_2x.png" />
+    <imageFile name="@(project.ios.icons.ios_marketing_1024_1x:path || '@//assets/icon.png')"
+        targetWidth="1024" targetName="@(icons)/iOS_Marketing_1024_1x.png" />
 
     <!-- Default plist descriptions -->
 
-    <Set PListDefaults.NSCameraUsageDescription="@(project.name) would like to take pictures or recordings with the camera." />
-    <Set PListDefaults.NSMicrophoneUsageDescription="@(project.name) uses audio recordings in its user experience." />
-    <Set PListDefaults.NSPhotoLibraryUsageDescription="@(project.name) allows importing images from the PhotoLibrary." />
+    <set plistDefaults.NSCameraUsageDescription="@(project.name) would like to take pictures or recordings with the camera." />
+    <set plistDefaults.NSMicrophoneUsageDescription="@(project.name) uses audio recordings in its user experience." />
+    <set plistDefaults.NSPhotoLibraryUsageDescription="@(project.name) allows importing images from the PhotoLibrary." />
 
     <!-- Create schemes for Release build in Xcode -->
 
-    <Set Schemes="@(project.name).xcodeproj/xcuserdata/@(LOGNAME:env).xcuserdatad/xcschemes" />
-    <ProcessFile Name="@(schemes)/@(project.name).xcscheme" Overwrite="false" />
-    <ProcessFile Name="@(schemes)/xcschememanagement.plist" Overwrite="false" />
+    <set schemes="@(project.name).xcodeproj/xcuserdata/@(LOGNAME:env).xcuserdatad/xcschemes" />
+    <processFile name="@(schemes)/@(project.name).xcscheme" overwrite="false" />
+    <processFile name="@(schemes)/xcschememanagement.plist" overwrite="false" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/native/native.uxl b/lib/UnoCore/native/native.uxl
index a583b5cce..654336183 100644
--- a/lib/UnoCore/native/native.uxl
+++ b/lib/UnoCore/native/native.uxl
@@ -1,57 +1,57 @@
-<Extensions Backend="CPlusPlus" Condition="NATIVE">
+<extensions backend="cplusplus" condition="NATIVE">
 
     <!-- Platform -->
-    <Define APPLE="HOST_MAC" />
-    <Define LINUX="HOST_LINUX" />
-    <Define MAC="HOST_MAC" />
-    <Define OSX="HOST_OSX" />
-    <Define UNIX="HOST_UNIX" />
-    <Define WIN32="HOST_WIN32" />
+    <define APPLE="HOST_MAC" />
+    <define LINUX="HOST_LINUX" />
+    <define MAC="HOST_MAC" />
+    <define OSX="HOST_OSX" />
+    <define UNIX="HOST_UNIX" />
+    <define WIN32="HOST_WIN32" />
 
     <!-- Environment -->
-    <Define MSVC="HOST_WIN32" />
+    <define MSVC="HOST_WIN32" />
 
     <!-- Architecture (override by -DX86 or -DX64) -->
-    <Define ARM="HOST_ARM" />
-    <Define X86="HOST_X86 && !X64" />
-    <Define X64="HOST_X64 && !X86" />
+    <define ARM="HOST_ARM" />
+    <define X86="HOST_X86 && !X64" />
+    <define X64="HOST_X64 && !X86" />
 
     <!-- Build system -->
-    <Declare Element="LinkLibrary.Debug" />
-    <Declare Element="LinkLibrary.Release" />
-    <Declare Element="SharedLibrary" />
-    <Declare Element="SharedLibrary.x86" />
-    <Declare Element="SharedLibrary.x64" />
-    <Declare Element="Xcode.Framework" />
-
-    <Set AppDirectory="@(project.name).app" Condition="MAC && !LIBRARY" />
-    <Set BinaryDirectory="@(appDirectory)/MacOS" Condition="MAC && !LIBRARY" />
-    <Set BundleDirectory="@(binaryDirectory)/data" Condition="MAC && !LIBRARY" />
-
-    <Set Condition="!WIN32 && !LIBRARY" Product="@(binaryDirectory)/@(project.name)" />
-    <Set Condition="!WIN32 && LIBRARY" Product="@(binaryDirectory)/lib@(project.name).@(MAC:defined:test('dylib', 'so'))" />
-    <Set Condition="WIN32" Product="@(binaryDirectory)/@(project.name).@(LIBRARY:defined:test('dll', 'exe'))" />
-
-    <Set Commands.Build="@(WIN32:defined:test('build.bat', 'bash build.sh'))" />
-    <Set Commands.Run="@(WIN32:defined:test('run.bat', 'bash run.sh'))" />
-
-    <ProcessFile Name="build.sh" Condition="UNIX" IsExecutable="true" />
-    <ProcessFile Name="run.sh" Condition="UNIX" IsExecutable="true" />
-    <ProcessFile Name="build.bat" Condition="WIN32" />
-    <ProcessFile Name="run.bat" Condition="WIN32" />
-    <ProcessFile Name="CMakeLists.txt" />
+    <declare element="linkLibrary.debug" />
+    <declare element="linkLibrary.release" />
+    <declare element="sharedLibrary" />
+    <declare element="sharedLibrary.x86" />
+    <declare element="sharedLibrary.x64" />
+    <declare element="xcode.framework" />
+
+    <set appDirectory="@(project.name).app" condition="MAC && !LIBRARY" />
+    <set binaryDirectory="@(appDirectory)/MacOS" condition="MAC && !LIBRARY" />
+    <set bundleDirectory="@(binaryDirectory)/data" condition="MAC && !LIBRARY" />
+
+    <set condition="!WIN32 && !LIBRARY" product="@(binaryDirectory)/@(project.name)" />
+    <set condition="!WIN32 && LIBRARY" product="@(binaryDirectory)/lib@(project.name).@(MAC:defined:test('dylib', 'so'))" />
+    <set condition="WIN32" product="@(binaryDirectory)/@(project.name).@(LIBRARY:defined:test('dll', 'exe'))" />
+
+    <set commands.build="@(WIN32:defined:test('build.bat', 'bash build.sh'))" />
+    <set commands.run="@(WIN32:defined:test('run.bat', 'bash run.sh'))" />
+
+    <processFile name="build.sh" condition="UNIX" isExecutable="true" />
+    <processFile name="run.sh" condition="UNIX" isExecutable="true" />
+    <processFile name="build.bat" condition="WIN32" />
+    <processFile name="run.bat" condition="WIN32" />
+    <processFile name="CMakeLists.txt" />
 
     <!-- macOS bundle -->
-    <Set BundleIdentifier="@(project.mac.bundleIdentifier || 'com.apps.@(project.name:qidentifier:replace('_', '-'):toLower)')" Condition="MAC && !LIBRARY" />
-    <ProcessFile Name="@(appDirectory)/Contents/Info.plist" Condition="MAC && !LIBRARY" />
-    <CopyFile Name="@(project.mac.icon:path || @//assets/icon.icns)" TargetName="@(appDirectory)/Contents/Resources/Icon.icns" Condition="MAC && !LIBRARY" />
+    <set bundleIdentifier="@(project.mac.bundleIdentifier || 'com.apps.@(project.name:qidentifier:replace('_', '-'):toLower)')" condition="MAC && !LIBRARY" />
+    <processFile name="@(appDirectory)/Contents/Info.plist" condition="MAC && !LIBRARY" />
+    <copyFile name="@(project.mac.icon:path || @//assets/icon.icns)" targetName="@(appDirectory)/Contents/Resources/Icon.icns" condition="MAC && !LIBRARY" />
 
     <!-- Win32 resources -->
-    <CopyFile Name="@(project.windows.icon:path || @//assets/icon.ico)" TargetName="rc/icon.ico" Condition="WIN32 && !LIBRARY" />
-    <CopyFile Name="rc/icon.rc" Condition="WIN32 && !LIBRARY" />
+    <copyFile name="@(project.windows.icon:path || @//assets/icon.ico)" targetName="rc/icon.ico" condition="WIN32 && !LIBRARY" />
+    <copyFile name="rc/icon.rc" condition="WIN32 && !LIBRARY" />
 
     <!-- VC++ debugger visualizers -->
-    <CopyFile Condition="MSVC" Name="natvis/uno.natstepfilter" />
-    <CopyFile Condition="MSVC" Name="natvis/uno.natvis" />
+    <copyFile condition="MSVC" name="natvis/uno.natstepfilter" />
+    <copyFile condition="MSVC" name="natvis/uno.natvis" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/pinvoke/pinvoke.uxl b/lib/UnoCore/pinvoke/pinvoke.uxl
index c61a16acd..18177dcae 100644
--- a/lib/UnoCore/pinvoke/pinvoke.uxl
+++ b/lib/UnoCore/pinvoke/pinvoke.uxl
@@ -1,34 +1,34 @@
-<Extensions Backend="PInvoke">
+<extensions backend="pinvoke">
 
-    <Define APPLE="HOST_MAC" />
-    <Define ARM="HOST_ARM" />
-    <Define LINUX="HOST_LINUX" />
-    <Define MAC="HOST_MAC" />
-    <Define OSX="HOST_OSX" />
-    <Define UNIX="HOST_UNIX" />
-    <Define WIN32="HOST_WIN32" />
+    <define APPLE="HOST_MAC" />
+    <define ARM="HOST_ARM" />
+    <define LINUX="HOST_LINUX" />
+    <define MAC="HOST_MAC" />
+    <define OSX="HOST_OSX" />
+    <define UNIX="HOST_UNIX" />
+    <define WIN32="HOST_WIN32" />
 
-    <Set HeaderDirectory="include" />
-    <Set SourceDirectory="src" />
-    <Set Commands.Build="@(HOST_WIN32:defined:test('build.bat', 'bash build.sh'))" />
-    <Set PInvoke.Configuration="@(DEBUG_NATIVE:defined:test('Debug', 'Release'))" />
+    <set headerDirectory="include" />
+    <set sourceDirectory="src" />
+    <set commands.build="@(HOST_WIN32:defined:test('build.bat', 'bash build.sh'))" />
+    <set pinvoke.configuration="@(DEBUG_NATIVE:defined:test('Debug', 'Release'))" />
 
-    <Declare Element="SourceFile" TargetDirectory="@(sourceDirectory)" />
-    <Declare Element="HeaderFile" TargetDirectory="@(headerDirectory)" />
+    <declare element="sourceFile" targetDirectory="@(sourceDirectory)" />
+    <declare element="headerFile" targetDirectory="@(headerDirectory)" />
 
-    <Declare Element="IncludeDirectory" />
-    <Declare Element="LinkDirectory" />
-    <Declare Element="LinkLibrary" />
-    <Declare Element="PreprocessorDefinition" />
+    <declare element="includeDirectory" />
+    <declare element="linkDirectory" />
+    <declare element="linkLibrary" />
+    <declare element="preprocessorDefinition" />
 
-    <Set CppStandard="c++17" IsDefault="true" />
-    <Set CStandard="c99" IsDefault="true" />
+    <set cppStandard="c++17" isDefault="true" />
+    <set cStandard="c99" isDefault="true" />
 
-    <Declare Element="Xcode.Framework" />
-    <Declare Element="Xcode.FrameworkDirectory" />
+    <declare element="xcode.framework" />
+    <declare element="xcode.frameworkDirectory" />
 
-    <ProcessFile Name="build.sh" Condition="HOST_UNIX" IsExecutable="true" />
-    <ProcessFile Name="build.bat" Condition="HOST_WIN32" />
-    <ProcessFile Name="CMakeLists.txt" />
+    <processFile name="build.sh" condition="HOST_UNIX" isExecutable="true" />
+    <processFile name="build.bat" condition="HOST_WIN32" />
+    <processFile name="CMakeLists.txt" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/prebuilt/uno-base-pinvoke.uxl b/lib/UnoCore/prebuilt/uno-base-pinvoke.uxl
index 42d343a0b..538e7c625 100644
--- a/lib/UnoCore/prebuilt/uno-base-pinvoke.uxl
+++ b/lib/UnoCore/prebuilt/uno-base-pinvoke.uxl
@@ -1,97 +1,97 @@
-<Extensions Backend="PInvoke">
+<extensions backend="pinvoke">
 
-    <Set Base.Directory="@('Android':path)" Condition="ANDROID" />
-    <Set Base.Directory="@('iOS':path)" Condition="IOS" />
-    <Set Base.Directory="@('OSX':path)" Condition="OSX" />
-    <Set Base.Directory="@('Win32':path)" Condition="WIN32" />
-    <Set Base.LinkDirectory="@(base.directory:path)/lib/${ANDROID_ABI}" Condition="ANDROID" />
-    <Set Base.LinkDirectory="@(base.directory:path)/lib/$CONFIGURATION$EFFECTIVE_PLATFORM_NAME" Condition="IOS" />
-    <Set Base.LinkDirectory="@(base.directory:path)/lib" />
-    <Set Base.IncludeDirectory="@(base.directory:path)/include" />
+    <set base.directory="@('Android':path)" condition="ANDROID" />
+    <set base.directory="@('iOS':path)" condition="IOS" />
+    <set base.directory="@('OSX':path)" condition="OSX" />
+    <set base.directory="@('Win32':path)" condition="WIN32" />
+    <set base.linkDirectory="@(base.directory:path)/lib/${ANDROID_ABI}" condition="ANDROID" />
+    <set base.linkDirectory="@(base.directory:path)/lib/$CONFIGURATION$EFFECTIVE_PLATFORM_NAME" condition="IOS" />
+    <set base.linkDirectory="@(base.directory:path)/lib" />
+    <set base.includeDirectory="@(base.directory:path)/include" />
 
-    <Require IncludeDirectory="@(base.includeDirectory)" />
-    <Require LinkDirectory="@(base.linkDirectory)" />
+    <require includeDirectory="@(base.includeDirectory)" />
+    <require linkDirectory="@(base.linkDirectory)" />
 
-    <Template Name="freetype">
-        <Require LinkLibrary="freetype" Condition="!ANDROID" />
-        <Require StaticLibrary="@(base.linkDirectory)/libfreetype.a" Condition="ANDROID" />
-    </Template>
+    <template name="freetype">
+        <require linkLibrary="freetype" condition="!ANDROID" />
+        <require staticLibrary="@(base.linkDirectory)/libfreetype.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="jpeg">
-        <Require LinkLibrary="jpeg" Condition="!ANDROID" />
-        <Require StaticLibrary="@(base.linkDirectory)/libjpeg.a" Condition="ANDROID" />
-    </Template>
+    <template name="jpeg">
+        <require linkLibrary="jpeg" condition="!ANDROID" />
+        <require staticLibrary="@(base.linkDirectory)/libjpeg.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="png">
-        <Require LinkLibrary="png" Condition="!ANDROID" />
-        <Require StaticLibrary="@(base.linkDirectory)/libpng.a" Condition="ANDROID" />
-    </Template>
+    <template name="png">
+        <require linkLibrary="png" condition="!ANDROID" />
+        <require staticLibrary="@(base.linkDirectory)/libpng.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="uBase">
-        <Require LinkLibrary="uBase" Condition="!ANDROID" />
-        <Require StaticLibrary="@(base.linkDirectory)/libuBase.a" Condition="ANDROID" />
-    </Template>
+    <template name="uBase">
+        <require linkLibrary="uBase" condition="!ANDROID" />
+        <require staticLibrary="@(base.linkDirectory)/libuBase.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="uImage">
-        <Require Template="uBase" />
-        <Require Template="freetype" />
-        <Require Template="jpeg" />
-        <Require Template="png" />
-        <Require LinkLibrary="uImage" Condition="!ANDROID" />
-        <Require LinkLibrary="z" />
-        <Require LinkLibrary="bz2" Condition="OSX" />
-        <Require StaticLibrary="@(base.linkDirectory)/libuImage.a" Condition="ANDROID" />
-    </Template>
+    <template name="uImage">
+        <require template="uBase" />
+        <require template="freetype" />
+        <require template="jpeg" />
+        <require template="png" />
+        <require linkLibrary="uImage" condition="!ANDROID" />
+        <require linkLibrary="z" />
+        <require linkLibrary="bz2" condition="OSX" />
+        <require staticLibrary="@(base.linkDirectory)/libuImage.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="XliPlatform">
-        <Require Template="uBase" />
-        <Require LinkLibrary="XliPlatform" Condition="!ANDROID" />
-        <Require LinkLibrary="EGL" Condition="ANDROID || LINUX && ARM" />
-        <Require LinkLibrary="GLESv2" Condition="ANDROID || LINUX && ARM" />
-        <Require LinkLibrary="GLEW" Condition="OSX || LINUX && !ARM || WIN32" />
-        <Require LinkLibrary="SDL2" Condition="OSX || LINUX" />
-        <Require StaticLibrary="@(base.linkDirectory)/libXliPlatform.a" Condition="ANDROID" />
-    </Template>
+    <template name="XliPlatform">
+        <require template="uBase" />
+        <require linkLibrary="XliPlatform" condition="!ANDROID" />
+        <require linkLibrary="EGL" condition="ANDROID || LINUX && ARM" />
+        <require linkLibrary="GLESv2" condition="ANDROID || LINUX && ARM" />
+        <require linkLibrary="GLEW" condition="OSX || LINUX && !ARM || WIN32" />
+        <require linkLibrary="SDL2" condition="OSX || LINUX" />
+        <require staticLibrary="@(base.linkDirectory)/libXliPlatform.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="XliHttpClient">
-        <Require Template="uBase" />
-        <Require LinkLibrary="XliHttpClient" Condition="!ANDROID" />
-        <Require LinkLibrary="curl" Condition="OSX || LINUX || WIN32" />
-        <Require StaticLibrary="@(base.linkDirectory)/libXliHttpClient.a" Condition="ANDROID" />
-    </Template>
+    <template name="XliHttpClient">
+        <require template="uBase" />
+        <require linkLibrary="XliHttpClient" condition="!ANDROID" />
+        <require linkLibrary="curl" condition="OSX || LINUX || WIN32" />
+        <require staticLibrary="@(base.linkDirectory)/libXliHttpClient.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="XliSoundPlayer">
-        <Require Template="uBase" />
-        <Require LinkLibrary="XliSoundPlayer" Condition="!ANDROID" />
-        <Require LinkLibrary="OpenSLES" Condition="ANDROID" />
-        <Require StaticLibrary="@(base.linkDirectory)/libXliSoundPlayer.a" Condition="ANDROID" />
-    </Template>
+    <template name="XliSoundPlayer">
+        <require template="uBase" />
+        <require linkLibrary="XliSoundPlayer" condition="!ANDROID" />
+        <require linkLibrary="OpenSLES" condition="ANDROID" />
+        <require staticLibrary="@(base.linkDirectory)/libXliSoundPlayer.a" condition="ANDROID" />
+    </template>
 
-    <Require Condition="ANDROID" LinkLibrary="android" />
-    <Require Condition="ANDROID" LinkLibrary="log" />
+    <require condition="ANDROID" linkLibrary="android" />
+    <require condition="ANDROID" linkLibrary="log" />
 
-    <Require Condition="IOS" Xcode.Framework="AudioToolbox" />
-    <Require Condition="IOS" Xcode.Framework="AVFoundation" />
-    <Require Condition="IOS" Xcode.Framework="CFNetwork" />
-    <Require Condition="IOS" Xcode.Framework="CoreAudio" />
-    <Require Condition="IOS" Xcode.Framework="CoreGraphics" />
-    <Require Condition="IOS" Xcode.Framework="CoreMotion" />
-    <Require Condition="IOS" Xcode.Framework="Foundation" />
-    <Require Condition="IOS" Xcode.Framework="OpenGLES" />
-    <Require Condition="IOS" Xcode.Framework="QuartzCore" />
-    <Require Condition="IOS" Xcode.Framework="UIKit" />
+    <require condition="IOS" xcode.framework="AudioToolbox" />
+    <require condition="IOS" xcode.framework="AVFoundation" />
+    <require condition="IOS" xcode.framework="CFNetwork" />
+    <require condition="IOS" xcode.framework="CoreAudio" />
+    <require condition="IOS" xcode.framework="CoreGraphics" />
+    <require condition="IOS" xcode.framework="CoreMotion" />
+    <require condition="IOS" xcode.framework="Foundation" />
+    <require condition="IOS" xcode.framework="OpenGLES" />
+    <require condition="IOS" xcode.framework="QuartzCore" />
+    <require condition="IOS" xcode.framework="UIKit" />
 
-    <Require Condition="OSX" LinkLibrary="m" />
-    <Require Condition="OSX" LinkLibrary="iconv" />
-    <Require Condition="OSX" Xcode.Framework="OpenGL" />
-    <Require Condition="OSX" Xcode.Framework="ForceFeedback" />
-    <Require Condition="OSX" Xcode.Framework="Cocoa" />
-    <Require Condition="OSX" Xcode.Framework="Carbon" />
-    <Require Condition="OSX" Xcode.Framework="IOKit" />
-    <Require Condition="OSX" Xcode.Framework="CoreAudio" />
-    <Require Condition="OSX" Xcode.Framework="CoreVideo" />
-    <Require Condition="OSX" Xcode.Framework="AudioToolbox" />
-    <Require Condition="OSX" Xcode.Framework="AudioUnit" />
-    <Require Condition="OSX" Xcode.Framework="AVFoundation" />
+    <require condition="OSX" linkLibrary="m" />
+    <require condition="OSX" linkLibrary="iconv" />
+    <require condition="OSX" xcode.framework="OpenGL" />
+    <require condition="OSX" xcode.framework="ForceFeedback" />
+    <require condition="OSX" xcode.framework="Cocoa" />
+    <require condition="OSX" xcode.framework="Carbon" />
+    <require condition="OSX" xcode.framework="IOKit" />
+    <require condition="OSX" xcode.framework="CoreAudio" />
+    <require condition="OSX" xcode.framework="CoreVideo" />
+    <require condition="OSX" xcode.framework="AudioToolbox" />
+    <require condition="OSX" xcode.framework="AudioUnit" />
+    <require condition="OSX" xcode.framework="AVFoundation" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/prebuilt/uno-base.uxl b/lib/UnoCore/prebuilt/uno-base.uxl
index 85c8579fb..a379bdd7f 100644
--- a/lib/UnoCore/prebuilt/uno-base.uxl
+++ b/lib/UnoCore/prebuilt/uno-base.uxl
@@ -1,104 +1,104 @@
-<Extensions Backend="CPlusPlus">
+<extensions backend="cplusplus">
 
-    <Set Base.Directory="@('Android':path)" Condition="ANDROID" />
-    <Set Base.Directory="@('iOS':path)" Condition="IOS" />
-    <Set Base.Directory="@('OSX':path)" Condition="OSX" />
-    <Set Base.Directory="@('Win32':path)" Condition="WIN32" />
-    <Set Base.Directory="@('Linux':path)" Condition="LINUX" />
-    <Set Base.LinkDirectory="@(base.directory:path)/lib/${ANDROID_ABI}" Condition="ANDROID" />
-    <Set Base.LinkDirectory="@(base.directory:path)/lib/$CONFIGURATION$EFFECTIVE_PLATFORM_NAME" Condition="IOS" />
-    <Set Base.LinkDirectory="@(base.directory:path)/lib" />
-    <Set Base.IncludeDirectory="@(base.directory:path)/include" />
+    <set base.directory="@('Android':path)" condition="ANDROID" />
+    <set base.directory="@('iOS':path)" condition="IOS" />
+    <set base.directory="@('OSX':path)" condition="OSX" />
+    <set base.directory="@('Win32':path)" condition="WIN32" />
+    <set base.directory="@('Linux':path)" condition="LINUX" />
+    <set base.linkDirectory="@(base.directory:path)/lib/${ANDROID_ABI}" condition="ANDROID" />
+    <set base.linkDirectory="@(base.directory:path)/lib/$CONFIGURATION$EFFECTIVE_PLATFORM_NAME" condition="IOS" />
+    <set base.linkDirectory="@(base.directory:path)/lib" />
+    <set base.includeDirectory="@(base.directory:path)/include" />
 
-    <Require IncludeDirectory="@(base.includeDirectory)" />
-    <Require LinkDirectory="@(base.linkDirectory)" />
+    <require includeDirectory="@(base.includeDirectory)" />
+    <require linkDirectory="@(base.linkDirectory)" />
 
-    <Template Name="freetype">
-        <Require IncludeDirectory="/usr/include/freetype2" Condition="LINUX" />
-        <Require LinkLibrary="freetype" Condition="!ANDROID" />
-        <Require StaticLibrary="@(base.linkDirectory)/libfreetype.a" Condition="ANDROID" />
-    </Template>
+    <template name="freetype">
+        <require includeDirectory="/usr/include/freetype2" condition="LINUX" />
+        <require linkLibrary="freetype" condition="!ANDROID" />
+        <require staticLibrary="@(base.linkDirectory)/libfreetype.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="jpeg">
-        <Require LinkLibrary="jpeg" Condition="!ANDROID" />
-        <Require StaticLibrary="@(base.linkDirectory)/libjpeg.a" Condition="ANDROID" />
-    </Template>
+    <template name="jpeg">
+        <require linkLibrary="jpeg" condition="!ANDROID" />
+        <require staticLibrary="@(base.linkDirectory)/libjpeg.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="png">
-        <Require LinkLibrary="png" Condition="!ANDROID" />
-        <Require StaticLibrary="@(base.linkDirectory)/libpng.a" Condition="ANDROID" />
-    </Template>
+    <template name="png">
+        <require linkLibrary="png" condition="!ANDROID" />
+        <require staticLibrary="@(base.linkDirectory)/libpng.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="uBase">
-        <Require LinkLibrary="uBase" Condition="!ANDROID" />
-        <Require StaticLibrary="@(base.linkDirectory)/libuBase.a" Condition="ANDROID" />
-    </Template>
+    <template name="uBase">
+        <require linkLibrary="uBase" condition="!ANDROID" />
+        <require staticLibrary="@(base.linkDirectory)/libuBase.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="uImage">
-        <Require Template="uBase" />
-        <Require Template="freetype" />
-        <Require Template="jpeg" />
-        <Require Template="png" />
-        <Require LinkLibrary="uImage" Condition="!ANDROID" />
-        <Require LinkLibrary="z" />
-        <Require LinkLibrary="bz2" Condition="OSX" />
-        <Require StaticLibrary="@(base.linkDirectory)/libuImage.a" Condition="ANDROID" />
-    </Template>
+    <template name="uImage">
+        <require template="uBase" />
+        <require template="freetype" />
+        <require template="jpeg" />
+        <require template="png" />
+        <require linkLibrary="uImage" condition="!ANDROID" />
+        <require linkLibrary="z" />
+        <require linkLibrary="bz2" condition="OSX" />
+        <require staticLibrary="@(base.linkDirectory)/libuImage.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="XliPlatform">
-        <Require Template="uBase" />
-        <Require LinkLibrary="XliPlatform" Condition="!ANDROID" />
-        <Require LinkLibrary="EGL" Condition="ANDROID || LINUX && ARM" />
-        <Require LinkLibrary="GLESv2" Condition="ANDROID || LINUX && ARM" />
-        <Require LinkLibrary="GLEW" Condition="OSX || LINUX && !ARM || WIN32" />
-        <Require LinkLibrary="SDL2" Condition="OSX || LINUX" />
-        <Require LinkLibrary="GL" Condition="LINUX" />
-        <Require LinkLibrary="pthread" Condition="LINUX" />
-        <Require StaticLibrary="@(base.linkDirectory)/libXliPlatform.a" Condition="ANDROID" />
-    </Template>
+    <template name="XliPlatform">
+        <require template="uBase" />
+        <require linkLibrary="XliPlatform" condition="!ANDROID" />
+        <require linkLibrary="EGL" condition="ANDROID || LINUX && ARM" />
+        <require linkLibrary="GLESv2" condition="ANDROID || LINUX && ARM" />
+        <require linkLibrary="GLEW" condition="OSX || LINUX && !ARM || WIN32" />
+        <require linkLibrary="SDL2" condition="OSX || LINUX" />
+        <require linkLibrary="GL" condition="LINUX" />
+        <require linkLibrary="pthread" condition="LINUX" />
+        <require staticLibrary="@(base.linkDirectory)/libXliPlatform.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="XliHttpClient">
-        <Require Template="uBase" />
-        <Require LinkLibrary="XliHttpClient" Condition="!ANDROID" />
-        <Require LinkLibrary="curl" Condition="OSX || LINUX || WIN32" />
-        <Require LinkLibrary="ws2_32" Condition="MSVC" />
-        <Require LinkLibrary="wldap32" Condition="MSVC" />
-        <Require LinkLibrary="advapi32" Condition="MSVC" />
-        <Require StaticLibrary="@(base.linkDirectory)/libXliHttpClient.a" Condition="ANDROID" />
-    </Template>
+    <template name="XliHttpClient">
+        <require template="uBase" />
+        <require linkLibrary="XliHttpClient" condition="!ANDROID" />
+        <require linkLibrary="curl" condition="OSX || LINUX || WIN32" />
+        <require linkLibrary="ws2_32" condition="MSVC" />
+        <require linkLibrary="wldap32" condition="MSVC" />
+        <require linkLibrary="advapi32" condition="MSVC" />
+        <require staticLibrary="@(base.linkDirectory)/libXliHttpClient.a" condition="ANDROID" />
+    </template>
 
-    <Template Name="XliSoundPlayer">
-        <Require Template="uBase" />
-        <Require LinkLibrary="XliSoundPlayer" Condition="!ANDROID" />
-        <Require LinkLibrary="OpenSLES" Condition="ANDROID" />
-        <Require StaticLibrary="@(base.linkDirectory)/libXliSoundPlayer.a" Condition="ANDROID" />
-    </Template>
+    <template name="XliSoundPlayer">
+        <require template="uBase" />
+        <require linkLibrary="XliSoundPlayer" condition="!ANDROID" />
+        <require linkLibrary="OpenSLES" condition="ANDROID" />
+        <require staticLibrary="@(base.linkDirectory)/libXliSoundPlayer.a" condition="ANDROID" />
+    </template>
 
-    <Require Condition="ANDROID" LinkLibrary="android" />
-    <Require Condition="ANDROID" LinkLibrary="log" />
+    <require condition="ANDROID" linkLibrary="android" />
+    <require condition="ANDROID" linkLibrary="log" />
 
-    <Require Condition="IOS" Xcode.Framework="AudioToolbox" />
-    <Require Condition="IOS" Xcode.Framework="AVFoundation" />
-    <Require Condition="IOS" Xcode.Framework="CFNetwork" />
-    <Require Condition="IOS" Xcode.Framework="CoreAudio" />
-    <Require Condition="IOS" Xcode.Framework="CoreGraphics" />
-    <Require Condition="IOS" Xcode.Framework="CoreMotion" />
-    <Require Condition="IOS" Xcode.Framework="Foundation" />
-    <Require Condition="IOS && !METAL" Xcode.Framework="OpenGLES" />
-    <Require Condition="IOS" Xcode.Framework="QuartzCore" />
-    <Require Condition="IOS" Xcode.Framework="UIKit" />
+    <require condition="IOS" xcode.framework="AudioToolbox" />
+    <require condition="IOS" xcode.framework="AVFoundation" />
+    <require condition="IOS" xcode.framework="CFNetwork" />
+    <require condition="IOS" xcode.framework="CoreAudio" />
+    <require condition="IOS" xcode.framework="CoreGraphics" />
+    <require condition="IOS" xcode.framework="CoreMotion" />
+    <require condition="IOS" xcode.framework="Foundation" />
+    <require condition="IOS && !METAL" xcode.framework="OpenGLES" />
+    <require condition="IOS" xcode.framework="QuartzCore" />
+    <require condition="IOS" xcode.framework="UIKit" />
 
-    <Require Condition="OSX" LinkLibrary="m" />
-    <Require Condition="OSX" LinkLibrary="iconv" />
-    <Require Condition="OSX" Xcode.Framework="OpenGL" />
-    <Require Condition="OSX" Xcode.Framework="ForceFeedback" />
-    <Require Condition="OSX" Xcode.Framework="Cocoa" />
-    <Require Condition="OSX" Xcode.Framework="Carbon" />
-    <Require Condition="OSX" Xcode.Framework="IOKit" />
-    <Require Condition="OSX" Xcode.Framework="CoreAudio" />
-    <Require Condition="OSX" Xcode.Framework="CoreVideo" />
-    <Require Condition="OSX" Xcode.Framework="AudioToolbox" />
-    <Require Condition="OSX" Xcode.Framework="AudioUnit" />
-    <Require Condition="OSX" Xcode.Framework="AVFoundation" />
+    <require condition="OSX" linkLibrary="m" />
+    <require condition="OSX" linkLibrary="iconv" />
+    <require condition="OSX" xcode.framework="OpenGL" />
+    <require condition="OSX" xcode.framework="ForceFeedback" />
+    <require condition="OSX" xcode.framework="Cocoa" />
+    <require condition="OSX" xcode.framework="Carbon" />
+    <require condition="OSX" xcode.framework="IOKit" />
+    <require condition="OSX" xcode.framework="CoreAudio" />
+    <require condition="OSX" xcode.framework="CoreVideo" />
+    <require condition="OSX" xcode.framework="AudioToolbox" />
+    <require condition="OSX" xcode.framework="AudioUnit" />
+    <require condition="OSX" xcode.framework="AVFoundation" />
 
-</Extensions>
+</extensions>
diff --git a/lib/UnoCore/src/Uno/Compiler/ExportTargetInterop/Foreign/Android/ExternBlockHost.uxl b/lib/UnoCore/src/Uno/Compiler/ExportTargetInterop/Foreign/Android/ExternBlockHost.uxl
index f51e0b6f3..fd451b1de 100644
--- a/lib/UnoCore/src/Uno/Compiler/ExportTargetInterop/Foreign/Android/ExternBlockHost.uxl
+++ b/lib/UnoCore/src/Uno/Compiler/ExportTargetInterop/Foreign/Android/ExternBlockHost.uxl
@@ -1,25 +1,25 @@
-<Extensions Backend="CPlusPlus" Condition="Android">
-    <Using Namespace="Uno.Compiler.ExportTargetInterop.Foreign.Android" />
+<extensions backend="cplusplus" condition="ANDROID">
+    <using namespace="Uno.Compiler.ExportTargetInterop.Foreign.Android" />
 
-    <Type Name="ExternBlockHost" Condition="Android">
-        <ProcessFile Name="UnoObject.java" TargetName="@(java.sourceDirectory)/com/uno/UnoObject.java" />
-        <ProcessFile Name="BoolArray.java" TargetName="@(java.sourceDirectory)/com/uno/BoolArray.java" />
-        <ProcessFile Name="ByteArray.java" TargetName="@(java.sourceDirectory)/com/uno/ByteArray.java" />
-        <ProcessFile Name="CharArray.java" TargetName="@(java.sourceDirectory)/com/uno/CharArray.java" />
-        <ProcessFile Name="ShortArray.java" TargetName="@(java.sourceDirectory)/com/uno/ShortArray.java" />
-        <ProcessFile Name="IntArray.java" TargetName="@(java.sourceDirectory)/com/uno/IntArray.java" />
-        <ProcessFile Name="LongArray.java" TargetName="@(java.sourceDirectory)/com/uno/LongArray.java" />
-        <ProcessFile Name="FloatArray.java" TargetName="@(java.sourceDirectory)/com/uno/FloatArray.java" />
-        <ProcessFile Name="DoubleArray.java" TargetName="@(java.sourceDirectory)/com/uno/DoubleArray.java" />
-        <ProcessFile Name="StringArray.java" TargetName="@(java.sourceDirectory)/com/uno/StringArray.java" />
-        <ProcessFile Name="ObjectArray.java" TargetName="@(java.sourceDirectory)/com/uno/ObjectArray.java" />
-        <ProcessFile Name="UnoBackedByteBuffer.java" TargetName="@(java.sourceDirectory)/com/uno/UnoBackedByteBuffer.java" />
+    <type name="ExternBlockHost" condition="ANDROID">
+        <processFile name="UnoObject.java" targetName="@(java.sourceDirectory)/com/uno/UnoObject.java" />
+        <processFile name="BoolArray.java" targetName="@(java.sourceDirectory)/com/uno/BoolArray.java" />
+        <processFile name="ByteArray.java" targetName="@(java.sourceDirectory)/com/uno/ByteArray.java" />
+        <processFile name="CharArray.java" targetName="@(java.sourceDirectory)/com/uno/CharArray.java" />
+        <processFile name="ShortArray.java" targetName="@(java.sourceDirectory)/com/uno/ShortArray.java" />
+        <processFile name="IntArray.java" targetName="@(java.sourceDirectory)/com/uno/IntArray.java" />
+        <processFile name="LongArray.java" targetName="@(java.sourceDirectory)/com/uno/LongArray.java" />
+        <processFile name="FloatArray.java" targetName="@(java.sourceDirectory)/com/uno/FloatArray.java" />
+        <processFile name="DoubleArray.java" targetName="@(java.sourceDirectory)/com/uno/DoubleArray.java" />
+        <processFile name="StringArray.java" targetName="@(java.sourceDirectory)/com/uno/StringArray.java" />
+        <processFile name="ObjectArray.java" targetName="@(java.sourceDirectory)/com/uno/ObjectArray.java" />
+        <processFile name="UnoBackedByteBuffer.java" targetName="@(java.sourceDirectory)/com/uno/UnoBackedByteBuffer.java" />
 
-        <Method Signature="RegisterFunctions()">
-            <Body><![CDATA[
+        <method signature="RegisterFunctions()">
+            <body><![CDATA[
                 JniHelper jni;
                 @(java.extern.registerFunction:join('\n'):trim())
-            ]]></Body>
-        </Method>
-    </Type>
-</Extensions>
+            ]]></body>
+        </method>
+    </type>
+</extensions>
diff --git a/lib/UnoCore/src/Uno/Compiler/ExportTargetInterop/Foreign/Android/JavaUnoObject.uxl b/lib/UnoCore/src/Uno/Compiler/ExportTargetInterop/Foreign/Android/JavaUnoObject.uxl
index a06fbc078..086864f7b 100644
--- a/lib/UnoCore/src/Uno/Compiler/ExportTargetInterop/Foreign/Android/JavaUnoObject.uxl
+++ b/lib/UnoCore/src/Uno/Compiler/ExportTargetInterop/Foreign/Android/JavaUnoObject.uxl
@@ -1,11 +1,11 @@
-<Extensions Backend="CPlusPlus" Condition="Android">
-    <Type Name="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject">
-        <Require Source.Declaration>
+<extensions backend="cplusplus" condition="ANDROID">
+    <type name="Uno.Compiler.ExportTargetInterop.Foreign.Android.JavaUnoObject">
+        <require source.declaration>
 void __JavaUnoObject_Finalizer(JNIEnv *env , jclass clazz, jlong ptr)
 {
     uAutoReleasePool pool;
     uRelease((@{JavaUnoObject})ptr);
 }
-        </Require>
-    </Type>
-</Extensions>
+        </require>
+    </type>
+</extensions>
diff --git a/lib/UnoCore/src/Uno/Compiler/ExportTargetInterop/Foreign/ObjC/ObjC.cpp.uxl b/lib/UnoCore/src/Uno/Compiler/ExportTargetInterop/Foreign/ObjC/ObjC.cpp.uxl
index cca53e3d9..1b3c0b100 100644
--- a/lib/UnoCore/src/Uno/Compiler/ExportTargetInterop/Foreign/ObjC/ObjC.cpp.uxl
+++ b/lib/UnoCore/src/Uno/Compiler/ExportTargetInterop/Foreign/ObjC/ObjC.cpp.uxl
@@ -1,18 +1,18 @@
-<Extensions Backend="CPlusPlus">
-    <Define FOREIGN_OBJC_SUPPORTED="IOS || NATIVE && HOST_MAC" />
-    <ProcessFile Condition="FOREIGN_OBJC_SUPPORTED" HeaderFile="uObjC.Foreign.h" />
-    <CopyFile Condition="FOREIGN_OBJC_SUPPORTED" HeaderFile="uObjC.Box.h" />
-    <CopyFile Condition="FOREIGN_OBJC_SUPPORTED" HeaderFile="uObjC.Function.h" />
-    <CopyFile Condition="FOREIGN_OBJC_SUPPORTED" HeaderFile="uObjC.String.h" />
-    <CopyFile Condition="FOREIGN_OBJC_SUPPORTED" HeaderFile="uObjC.UnoArray.h" />
-    <CopyFile Condition="FOREIGN_OBJC_SUPPORTED" HeaderFile="uObjC.UnoObject.h" />
-    <CopyFile Condition="FOREIGN_OBJC_SUPPORTED" SourceFile="uObjC.String.mm" />
-    <ProcessFile Condition="FOREIGN_OBJC_SUPPORTED" SourceFile="uObjC.UnoArray.mm" />
-    <CopyFile Condition="FOREIGN_OBJC_SUPPORTED" SourceFile="uObjC.UnoObject.mm" />
-    <Require Condition="FOREIGN_OBJC_SUPPORTED" LinkLibrary="objc" />
-    <Require Condition="FOREIGN_OBJC_SUPPORTED" Entity="ObjC.Object" />
-    <Require Condition="FOREIGN_OBJC_SUPPORTED" Entity="ObjC.Object.Handle" />
-    <Require Condition="FOREIGN_OBJC_SUPPORTED" Entity="ObjC.Object(ObjC.ID)" />
-    <Require Condition="FOREIGN_OBJC_SUPPORTED" Entity="ObjC.Object.Create(ObjC.ID)" />
-    <Require Condition="FOREIGN_OBJC_SUPPORTED" Entity="ObjC.Object.GetHandle(ObjC.Object)" />
-</Extensions>
+<extensions backend="cplusplus">
+    <define FOREIGN_OBJC_SUPPORTED="IOS || NATIVE && HOST_MAC" />
+    <processFile condition="FOREIGN_OBJC_SUPPORTED" headerFile="uObjC.Foreign.h" />
+    <copyFile condition="FOREIGN_OBJC_SUPPORTED" headerFile="uObjC.Box.h" />
+    <copyFile condition="FOREIGN_OBJC_SUPPORTED" headerFile="uObjC.Function.h" />
+    <copyFile condition="FOREIGN_OBJC_SUPPORTED" headerFile="uObjC.String.h" />
+    <copyFile condition="FOREIGN_OBJC_SUPPORTED" headerFile="uObjC.UnoArray.h" />
+    <copyFile condition="FOREIGN_OBJC_SUPPORTED" headerFile="uObjC.UnoObject.h" />
+    <copyFile condition="FOREIGN_OBJC_SUPPORTED" sourceFile="uObjC.String.mm" />
+    <processFile condition="FOREIGN_OBJC_SUPPORTED" sourceFile="uObjC.UnoArray.mm" />
+    <copyFile condition="FOREIGN_OBJC_SUPPORTED" sourceFile="uObjC.UnoObject.mm" />
+    <require condition="FOREIGN_OBJC_SUPPORTED" linkLibrary="objc" />
+    <require condition="FOREIGN_OBJC_SUPPORTED" entity="ObjC.Object" />
+    <require condition="FOREIGN_OBJC_SUPPORTED" entity="ObjC.Object.Handle" />
+    <require condition="FOREIGN_OBJC_SUPPORTED" entity="ObjC.Object(ObjC.ID)" />
+    <require condition="FOREIGN_OBJC_SUPPORTED" entity="ObjC.Object.Create(ObjC.ID)" />
+    <require condition="FOREIGN_OBJC_SUPPORTED" entity="ObjC.Object.GetHandle(ObjC.Object)" />
+</extensions>
diff --git a/lib/UnoCore/src/Uno/Platform/iOS/iOS.uxl b/lib/UnoCore/src/Uno/Platform/iOS/iOS.uxl
index c26d9b6e4..667752761 100644
--- a/lib/UnoCore/src/Uno/Platform/iOS/iOS.uxl
+++ b/lib/UnoCore/src/Uno/Platform/iOS/iOS.uxl
@@ -1,22 +1,22 @@
-<Extensions Backend="CPlusPlus" Condition="iOS">
-    <ProcessFile SourceFile="Display.mm" />
-    <ProcessFile HeaderFile="Window.h" />
-    <ProcessFile SourceFile="Window.mm" />
+<extensions backend="cplusplus" condition="IOS">
+    <processFile sourceFile="Display.mm" />
+    <processFile headerFile="Window.h" />
+    <processFile sourceFile="Window.mm" />
 
-    <Type Name="Uno.Platform.iOS.UIImage"
-        TypeName="::UIImage *"
-        Include="Uno-iOS/Uno-iOS.h" />
+    <type name="Uno.Platform.iOS.UIImage"
+          typeName="::UIImage *"
+          include="Uno-iOS/Uno-iOS.h" />
 
-    <Type Name="Uno.Platform.iOS.uCGRect"
-        TypeName="CGRect"
-        Include="CoreGraphics/CoreGraphics.h" />
+    <type name="Uno.Platform.iOS.uCGRect"
+          typeName="CGRect"
+          include="CoreGraphics/CoreGraphics.h" />
 
-    <Type Name="Uno.Platform.iOS.uCGSize"
-        TypeName="CGSize"
-        Include="CoreGraphics/CoreGraphics.h" />
+    <type name="Uno.Platform.iOS.uCGSize"
+          typeName="CGSize"
+          include="CoreGraphics/CoreGraphics.h" />
 
-    <Type Name="Uno.Platform.iOS.uCGPoint"
-        TypeName="CGPoint"
-        Include="CoreGraphics/CoreGraphics.h" />
+    <type name="Uno.Platform.iOS.uCGPoint"
+          typeName="CGPoint"
+          include="CoreGraphics/CoreGraphics.h" />
 
-</Extensions>
+</extensions>
diff --git a/tests/src/AutoReleasePoolStructTest/Defines.cpp.uxl b/tests/src/AutoReleasePoolStructTest/Defines.cpp.uxl
index 9659614e3..dcee715f6 100644
--- a/tests/src/AutoReleasePoolStructTest/Defines.cpp.uxl
+++ b/tests/src/AutoReleasePoolStructTest/Defines.cpp.uxl
@@ -1,4 +1,4 @@
-<Extensions Backend="CPlusPlus">
-    <Define REFLECTION />
-    <Define ARC_DEBUG />
-</Extensions>
\ No newline at end of file
+<extensions backend="cplusplus">
+    <define REFLECTION />
+    <define ARC_DEBUG />
+</extensions>
\ No newline at end of file
diff --git a/tests/src/ForeignCPlusPlusTest/CIL.uxl b/tests/src/ForeignCPlusPlusTest/CIL.uxl
index f95dd00c1..e86663755 100644
--- a/tests/src/ForeignCPlusPlusTest/CIL.uxl
+++ b/tests/src/ForeignCPlusPlusTest/CIL.uxl
@@ -1,4 +1,4 @@
-<Extensions Backend="CIL">
-    <CopyFile Condition="HOST_OSX && ENABLE_CIL_TESTS" Name="@('build/PInvoke/Release/libForeignCPlusPlusTest-PInvoke.dylib':path)" TargetName="@(assemblyDirectory)" />
-</Extensions>
+<extensions backend="cil">
+    <copyFile condition="HOST_OSX && ENABLE_CIL_TESTS" name="@('build/PInvoke/Release/libForeignCPlusPlusTest-PInvoke.dylib':path)" targetName="@(assemblyDirectory)" />
+</extensions>