fixes

Author: StephaneDelcroix

src/Controls/src/SourceGen/InitializeComponentCodeWriter.cs

@@ -118,8 +118,8 @@ static void Visit(RootNode rootnode, SourceGenContext visitorContext, bool useDe
 		if (useDesignProperties)
 			rootnode.Accept(new RemoveDuplicateDesignNodes(), null);
 		rootnode.Accept(new SimplifyTypeExtensionVisitor(), null);
-		if (!string.IsNullOrEmpty(visitorContext.TargetFramework))
-			rootnode.Accept(new SimplifyOnPlatformVisitor(visitorContext.TargetFramework), null);
+		if (!string.IsNullOrEmpty(visitorContext.ProjectItem.TargetFramework))
+			rootnode.Accept(new SimplifyOnPlatformVisitor(visitorContext.ProjectItem.TargetFramework), null);
 		rootnode.Accept(new CreateValuesVisitor(visitorContext), null);
 		rootnode.Accept(new SetNamescopesAndRegisterNamesVisitor(visitorContext), null); //set namescopes for {x:Reference} and FindByName
 		rootnode.Accept(new SetFieldsForXNamesVisitor(visitorContext), null);

src/Controls/src/SourceGen/ProjectItem.cs

@@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls.SourceGen;
 record ProjectItem(AdditionalText AdditionalText, AnalyzerConfigOptions Options)
 {
 	public string Configuration
-		=> Options.GetValueOrDefault("build_metadata.additionalfiles.Configuration", "Debug");
+		=> Options.GetValueOrDefault("build_property.Configuration", "Debug");
 
 	public bool EnableLineInfo
 	{
@@ -63,7 +63,7 @@ public string? RelativePath
 		=> Options.GetValueOrNull("build_metadata.additionalfiles.RelativePath");
 
 	public string? TargetFramework
-		=> Options.GetValueOrNull("build_metadata.additionalfiles.targetFramework");
+		=> Options.GetValueOrNull("build_property.targetFramework");
 
 	public string? TargetPath
 		=> Options.GetValueOrDefault("build_metadata.additionalfiles.TargetPath", AdditionalText.Path);

src/Controls/tests/SourceGen.UnitTests/InitializeComponent/SimplifyOnPlatform.cs

@@ -68,6 +68,13 @@ private partial void InitializeComponent()
 		var setter1 = new global::Microsoft.Maui.Controls.Setter();
 		global::Microsoft.Maui.VisualDiagnostics.RegisterSourceInfo(setter1!, new global::System.Uri(@"Test.xaml;assembly=SourceGeneratorDriver.Generated", global::System.UriKind.Relative), 9, 14);
 		var xamlServiceProvider = new global::Microsoft.Maui.Controls.Xaml.Internals.XamlServiceProvider(this);
+		var iProvideValueTarget = new global::Microsoft.Maui.Controls.Xaml.Internals.SimpleValueTargetProvider(
+			new object?[] {null},
+			null,
+			null,
+			this);
+		xamlServiceProvider.Add(typeof(global::Microsoft.Maui.Controls.Xaml.IReferenceProvider), iProvideValueTarget);
+		xamlServiceProvider.Add(typeof(global::Microsoft.Maui.Controls.Xaml.IProvideValueTarget), iProvideValueTarget);
 		var xmlNamespaceResolver = new global::Microsoft.Maui.Controls.Xaml.Internals.XmlNamespaceResolver();
 		xmlNamespaceResolver.Add("__f__", "http://schemas.microsoft.com/dotnet/2021/maui");
 		xmlNamespaceResolver.Add("__g__", "http://schemas.microsoft.com/dotnet/maui/global");
@@ -92,17 +99,17 @@ private partial void InitializeComponent()
 #endif
 #line 8 "Test.xaml"
 		var xamlServiceProvider1 = new global::Microsoft.Maui.Controls.Xaml.Internals.XamlServiceProvider(this);
-		var iProvideValueTarget = new global::Microsoft.Maui.Controls.Xaml.Internals.SimpleValueTargetProvider(
-			new object[] {setter, style1, __root},
+		var iProvideValueTarget1 = new global::Microsoft.Maui.Controls.Xaml.Internals.SimpleValueTargetProvider(
+			new object?[] {setter, style1, __root},
 			typeof(global::Microsoft.Maui.Controls.Setter).GetProperty("Property"),
 #if !_MAUIXAML_SG_NAMESCOPE_DISABLE
 			new [] { iNameScope1 },
 #else
 			null,
 #endif
-			false);
-		xamlServiceProvider1.Add(typeof(global::Microsoft.Maui.Controls.Xaml.IReferenceProvider), iProvideValueTarget);
-		xamlServiceProvider1.Add(typeof(global::Microsoft.Maui.Controls.Xaml.IProvideValueTarget), iProvideValueTarget);
+			this);
+		xamlServiceProvider1.Add(typeof(global::Microsoft.Maui.Controls.Xaml.IReferenceProvider), iProvideValueTarget1);
+		xamlServiceProvider1.Add(typeof(global::Microsoft.Maui.Controls.Xaml.IProvideValueTarget), iProvideValueTarget1);
 		var xmlNamespaceResolver1 = new global::Microsoft.Maui.Controls.Xaml.Internals.XmlNamespaceResolver();
 		xmlNamespaceResolver1.Add("__f__", "http://schemas.microsoft.com/dotnet/2021/maui");
 		xmlNamespaceResolver1.Add("__g__", "http://schemas.microsoft.com/dotnet/maui/global");
@@ -122,17 +129,17 @@ private partial void InitializeComponent()
 #line default
 #line 9 "Test.xaml"
 		var xamlServiceProvider2 = new global::Microsoft.Maui.Controls.Xaml.Internals.XamlServiceProvider(this);
-		var iProvideValueTarget1 = new global::Microsoft.Maui.Controls.Xaml.Internals.SimpleValueTargetProvider(
-			new object[] {setter1, style1, __root},
+		var iProvideValueTarget2 = new global::Microsoft.Maui.Controls.Xaml.Internals.SimpleValueTargetProvider(
+			new object?[] {setter1, style1, __root},
 			typeof(global::Microsoft.Maui.Controls.Setter).GetProperty("Property"),
 #if !_MAUIXAML_SG_NAMESCOPE_DISABLE
 			new [] { iNameScope2 },
 #else
 			null,
 #endif
-			false);
-		xamlServiceProvider2.Add(typeof(global::Microsoft.Maui.Controls.Xaml.IReferenceProvider), iProvideValueTarget1);
-		xamlServiceProvider2.Add(typeof(global::Microsoft.Maui.Controls.Xaml.IProvideValueTarget), iProvideValueTarget1);
+			this);
+		xamlServiceProvider2.Add(typeof(global::Microsoft.Maui.Controls.Xaml.IReferenceProvider), iProvideValueTarget2);
+		xamlServiceProvider2.Add(typeof(global::Microsoft.Maui.Controls.Xaml.IProvideValueTarget), iProvideValueTarget2);
 		var xmlNamespaceResolver2 = new global::Microsoft.Maui.Controls.Xaml.Internals.XmlNamespaceResolver();
 		xmlNamespaceResolver2.Add("__f__", "http://schemas.microsoft.com/dotnet/2021/maui");
 		xmlNamespaceResolver2.Add("__g__", "http://schemas.microsoft.com/dotnet/maui/global");

src/Controls/tests/SourceGen.UnitTests/SourceGeneratorDriver.cs

@@ -152,7 +152,7 @@ public override bool TryGetValue(string key, [NotNullWhen(true)] out string? val
 					"build_metadata.additionalfiles.ManifestResourceName" => _additionalFile.ManifestResourceName,
 					"build_metadata.additionalfiles.RelativePath" => _additionalFile.RelativePath,
 					"build_metadata.additionalfiles.Inflator" => "SourceGen",
-					"build_property.targetframework" => _additionalFile.TargetFramework,
+					"build_property.targetFramework" => _additionalFile.TargetFramework,
 					"build_property.EnableMauiXamlDiagnostics" => "true",
 					"build_property.MauiXamlLineInfo" => "enable",
 					"build_property.MauiXamlNoWarn" => _additionalFile.NoWarn,

src/Controls/tests/Xaml.UnitTests/MockSourceGenerator.cs

@@ -188,7 +188,7 @@ public override bool TryGetValue(string key, [NotNullWhen(true)] out string? val
 					"build_metadata.additionalfiles.ManifestResourceName" => _additionalFile.ManifestResourceName,
 					"build_metadata.additionalfiles.RelativePath" => _additionalFile.RelativePath,
 					"build_metadata.additionalfiles.Inflator" => "SourceGen",
-					"build_property.targetframework" => _additionalFile.TargetFramework,
+					"build_property.targetFramework" => _additionalFile.TargetFramework,
 					_ => null
 				};