Skip to content

Commit 5172f61

Browse files
fixing default assembly
1 parent 8b3ab89 commit 5172f61

File tree

6 files changed

+5
-8
lines changed

6 files changed

+5
-8
lines changed

src/Controls/src/Build.Tasks/XamlTask.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ internal static ILRootNode ParseXaml(Stream stream, ModuleDefinition module, Typ
4848
&& (a.ConstructorArguments.Count == 0 || a.ConstructorArguments[0].Value is bool b && b));
4949

5050
var nsmgr = new XmlNamespaceManager(new NameTable());
51-
nsmgr.AddNamespace("__f__", XamlParser.MauiUri);
5251
if (allowImplicitXmlns)
5352
{
5453
nsmgr.AddNamespace("", XamlParser.DefaultImplicitUri);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static void GatherXmlnsDefinitionAttributes(List<XmlnsDefinitionAttribute> xmlns
7272
{
7373
var attr = GetXmlnsDefinition(ca, asmDef);
7474
//only add globalxmlns definition from the current assembly
75-
if (attr.XmlNamespace == XamlParser.MauiGlobal
75+
if (attr.XmlNamespace == XamlParser.MauiGlobalUri
7676
&& asmDef != currentAssembly)
7777
continue;
7878
ValidateProtectedXmlns(attr.XmlNamespace, attr.AssemblyName);

src/Controls/src/SourceGen/CodeBehindGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ static AssemblyCaches GetAssemblyAttributes(Compilation compilation, Cancellatio
293293
}
294294

295295
//only add globalxmlns definition from the current assembly
296-
if (xmlnsDef.XmlNamespace == XamlParser.MauiGlobal
296+
if (xmlnsDef.XmlNamespace == XamlParser.MauiGlobalUri
297297
&& !SymbolEqualityComparer.Default.Equals(assembly, compilation.Assembly))
298298
{
299299
continue;
@@ -318,7 +318,7 @@ static AssemblyCaches GetAssemblyAttributes(Compilation compilation, Cancellatio
318318
}
319319
}
320320

321-
var globalXmlns = xmlnsDefinitions.Where(x => x.XmlNamespace == XamlParser.MauiGlobal).ToList();
321+
var globalXmlns = xmlnsDefinitions.Where(x => x.XmlNamespace == XamlParser.MauiGlobalUri).ToList();
322322
var globalGeneratedXmlnsDefinitions = new List<XmlnsDefinitionAttribute>();
323323
foreach (var global in globalXmlns)
324324
{

src/Controls/src/Xaml/XamlLoader.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public static void Load(object view, string xaml, Assembly rootAssembly, bool us
6666
&& (a.ConstructorArguments.Count == 0 || a.ConstructorArguments[0].Value is bool b && b));
6767

6868
var nsmgr = new XmlNamespaceManager(new NameTable());
69-
nsmgr.AddNamespace("__f__", XamlParser.MauiUri);
7069
if (allowImplicitXmlns)
7170
{
7271
nsmgr.AddNamespace("", XamlParser.DefaultImplicitUri);

src/Controls/src/Xaml/XamlParser.Namespaces.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ static partial class XamlParser
66
{
77
[Obsolete("Should not be used except for migration/error message purposes")]
88
public const string FormsUri = "http://xamarin.com/schemas/2014/forms";
9-
public const string DefaultImplicitUri = MauiUri;
9+
public const string DefaultImplicitUri = MauiGlobalUri;
1010
public const string MauiGlobalUri = "http://schemas.microsoft.com/dotnet/maui/global";
1111
public const string MauiUri = "http://schemas.microsoft.com/dotnet/2021/maui";
1212
public const string MauiDesignUri = "http://schemas.microsoft.com/dotnet/2021/maui/design";
1313
public const string X2006Uri = "http://schemas.microsoft.com/winfx/2006/xaml";
1414
public const string X2009Uri = "http://schemas.microsoft.com/winfx/2009/xaml";
1515
public const string McUri = "http://schemas.openxmlformats.org/markup-compatibility/2006";
16-
public const string MauiGlobal = "http://schemas.microsoft.com/dotnet/maui/global";
1716
}
1817
}

src/Controls/src/Xaml/XamlParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ static void GatherXmlnsDefinitionAttributes(Assembly currentAssembly)
360360
foreach (XmlnsDefinitionAttribute attribute in assembly.GetCustomAttributes(typeof(XmlnsDefinitionAttribute)))
361361
{
362362
// Only add global xmlns definition from the current assembly
363-
if (attribute.XmlNamespace == XamlParser.MauiGlobal
363+
if (attribute.XmlNamespace == XamlParser.MauiGlobalUri
364364
&& assembly != currentAssembly)
365365
continue;
366366

0 commit comments

Comments
 (0)