From fe07c0e6cf01e8779c8706a28efac174809a83dc Mon Sep 17 00:00:00 2001 From: reunion-maestro-bot Date: Sat, 27 Dec 2025 06:06:40 +0000 Subject: [PATCH 01/12] Syncing content from committish 8355d5e6d13b992f5d6f54183a5f8aa73e214488 --- src/eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/eng/Version.Details.xml b/src/eng/Version.Details.xml index ee244b4f38..773ca3f63c 100644 --- a/src/eng/Version.Details.xml +++ b/src/eng/Version.Details.xml @@ -15,9 +15,9 @@ d064456d97fbf7841c7eafa43f81da65fd52444e - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed - f7c950a2719a1966c60c186500b978dc7e5d3ae7 + 18310de6c57be75de1d05b48b5f4484edf39bbf2 https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator From 0e71a75a46869cd006242497733d3300e83d105a Mon Sep 17 00:00:00 2001 From: reunion-maestro-bot Date: Mon, 29 Dec 2025 05:29:02 +0000 Subject: [PATCH 02/12] Syncing content from committish 1e9018ac05740620c1287c25f283fb875807c9a7 --- src/eng/Version.Details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/eng/Version.Details.xml b/src/eng/Version.Details.xml index 773ca3f63c..301d61103a 100644 --- a/src/eng/Version.Details.xml +++ b/src/eng/Version.Details.xml @@ -6,9 +6,9 @@ https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP d064456d97fbf7841c7eafa43f81da65fd52444e - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK - fd0ddc31a5f2697b5b8093677459dcfa9dcaada5 + 7bafcc2d5e3b80e2e1e0b0d160ec7e09cbe94a88 https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP @@ -23,9 +23,9 @@ https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator eda4bbdc05ddd6d1bc197ff930af59b4e50d891d - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK - fd0ddc31a5f2697b5b8093677459dcfa9dcaada5 + 7bafcc2d5e3b80e2e1e0b0d160ec7e09cbe94a88 https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP From 65638395c6ddbc00b91d74b50ca0fe6a8e879689 Mon Sep 17 00:00:00 2001 From: reunion-maestro-bot Date: Tue, 30 Dec 2025 09:02:38 +0000 Subject: [PATCH 03/12] Syncing content from committish a6625368bd42ef1785800dab0c0106bf02098fea --- src/eng/Version.Details.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/eng/Version.Details.xml b/src/eng/Version.Details.xml index 301d61103a..4d3cbb90d7 100644 --- a/src/eng/Version.Details.xml +++ b/src/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP - d064456d97fbf7841c7eafa43f81da65fd52444e + 547b4bb04a27a7e09e61022dc6ac3595fa1550f7 https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK 7bafcc2d5e3b80e2e1e0b0d160ec7e09cbe94a88 - + https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP - d064456d97fbf7841c7eafa43f81da65fd52444e + 547b4bb04a27a7e09e61022dc6ac3595fa1550f7 @@ -27,9 +27,9 @@ https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK 7bafcc2d5e3b80e2e1e0b0d160ec7e09cbe94a88 - + https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP - d064456d97fbf7841c7eafa43f81da65fd52444e + 547b4bb04a27a7e09e61022dc6ac3595fa1550f7 From d407a92ba4c0f4ba046d1ce745459269d9700401 Mon Sep 17 00:00:00 2001 From: reunion-maestro-bot Date: Tue, 30 Dec 2025 12:07:34 +0000 Subject: [PATCH 04/12] Syncing content from committish 61ed270500566d622741a76839c7b2f02644a655 --- src/eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/eng/Version.Details.xml b/src/eng/Version.Details.xml index 4d3cbb90d7..18ef096c1a 100644 --- a/src/eng/Version.Details.xml +++ b/src/eng/Version.Details.xml @@ -15,9 +15,9 @@ 547b4bb04a27a7e09e61022dc6ac3595fa1550f7 - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed - 18310de6c57be75de1d05b48b5f4484edf39bbf2 + dd37af51755aee08e649a30d320f9570bceb4696 https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator From 0dc57d3b3cc7a90d7e0db34a6033d8315a6ac13a Mon Sep 17 00:00:00 2001 From: reunion-maestro-bot Date: Sun, 4 Jan 2026 18:32:35 +0000 Subject: [PATCH 05/12] Syncing content from committish 42ac060add60abdd41be8acae220f50400292bb7 --- src/eng/Version.Details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/eng/Version.Details.xml b/src/eng/Version.Details.xml index 18ef096c1a..8a8cb4e456 100644 --- a/src/eng/Version.Details.xml +++ b/src/eng/Version.Details.xml @@ -6,9 +6,9 @@ https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP 547b4bb04a27a7e09e61022dc6ac3595fa1550f7 - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK - 7bafcc2d5e3b80e2e1e0b0d160ec7e09cbe94a88 + d472673e85868f5a8fc102196772d28bbdf8d327 https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP @@ -23,9 +23,9 @@ https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator eda4bbdc05ddd6d1bc197ff930af59b4e50d891d - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK - 7bafcc2d5e3b80e2e1e0b0d160ec7e09cbe94a88 + d472673e85868f5a8fc102196772d28bbdf8d327 https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP From 785d87636ad4b79cfbd81ba4af6c352262252f3e Mon Sep 17 00:00:00 2001 From: reunion-maestro-bot Date: Mon, 5 Jan 2026 06:54:20 +0000 Subject: [PATCH 06/12] Syncing content from committish 9105d4a85fee1a83abe81c589c3ecbc4856ec9d3 --- src/eng/Version.Details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/eng/Version.Details.xml b/src/eng/Version.Details.xml index 8a8cb4e456..b5b36e3b36 100644 --- a/src/eng/Version.Details.xml +++ b/src/eng/Version.Details.xml @@ -6,9 +6,9 @@ https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP 547b4bb04a27a7e09e61022dc6ac3595fa1550f7 - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK - d472673e85868f5a8fc102196772d28bbdf8d327 + 7bafcc2d5e3b80e2e1e0b0d160ec7e09cbe94a88 https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP @@ -23,9 +23,9 @@ https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator eda4bbdc05ddd6d1bc197ff930af59b4e50d891d - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK - d472673e85868f5a8fc102196772d28bbdf8d327 + 7bafcc2d5e3b80e2e1e0b0d160ec7e09cbe94a88 https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP From 4c99a2ae4820dcff0ee7868ace13cbef8083c673 Mon Sep 17 00:00:00 2001 From: reunion-maestro-bot Date: Mon, 5 Jan 2026 12:51:00 +0000 Subject: [PATCH 07/12] Merged PR 14476899: Enable warning level 4 Merged PR 14480580: [OSS] Scrubbing unittest code under /dxaml/xcp/components/AccessKeys/* Syncing content from committish 33029ab13d861e9a1641737e1617041789f34778 --- src/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 7d9731be6e..3bd8f1c22c 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -19,6 +19,7 @@ false false + 4 From 309ceeb741e6583a16156746157c709f8b0f6874 Mon Sep 17 00:00:00 2001 From: reunion-maestro-bot Date: Tue, 6 Jan 2026 04:43:05 +0000 Subject: [PATCH 08/12] Merged PR 14493027: XamlPredicate: Allow writing custom predicates without the need of explicit Bindable attribute Syncing content from committish 5f60597c653530fc6d2a36a3cd0e726521755839 --- .../BuildTasks/Microsoft.UI.Xaml.Markup.Compiler.XML | 5 +++++ .../Microsoft/Xaml/XamlCompiler/CompileError.cs | 10 ++++++++++ .../Microsoft/Xaml/XamlCompiler/TypeInfoCollector.cs | 12 ++++++++++++ .../KnownStrings.cs | 1 + .../Properties/XamlCompilerResources.Designer.cs | 9 +++++++++ .../Properties/XamlCompilerResources.resx | 3 +++ 6 files changed, 40 insertions(+) diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft.UI.Xaml.Markup.Compiler.XML b/src/src/XamlCompiler/BuildTasks/Microsoft.UI.Xaml.Markup.Compiler.XML index 732d7d91aa..d223d80b2b 100644 --- a/src/src/XamlCompiler/BuildTasks/Microsoft.UI.Xaml.Markup.Compiler.XML +++ b/src/src/XamlCompiler/BuildTasks/Microsoft.UI.Xaml.Markup.Compiler.XML @@ -786,6 +786,11 @@ Looks up a localized string similar to '[Bindable]' on generic type '{0}' is not supported. + + + Looks up a localized string similar to Implementing IXamlPredicate on generic type '{0}' is not supported. + + Looks up a localized string similar to Type Load Exception reading assembly attributes for '{0}'. diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CompileError.cs b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CompileError.cs index 4da40539fb..53ac68dd7c 100644 --- a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CompileError.cs +++ b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CompileError.cs @@ -92,6 +92,7 @@ internal enum ErrorCode WMC0820 = 0820, WMC0821 = 0821, WMC0822 = 0822, + WMC0823 = 0823, // Validation Errors 900-999 WMC0901 = 0901, @@ -935,6 +936,15 @@ public XamlSchemaError_UnknownTypeError(string typeName) Message = ResourceUtilities.FormatString(XamlCompilerResources.XamlCompiler_UnknownTypeError, typeName); } } + + internal class XamlSchemaError_PredicateNotSupportedOnGeneric : XamlCompileError + { + public XamlSchemaError_PredicateNotSupportedOnGeneric(string typeName) + : base(ErrorCode.WMC0823) + { + Message = ResourceUtilities.FormatString(XamlCompilerResources.DuiSchema_PredicateNotSupportedOnGeneric, typeName); + } + } internal class XamlValidationErrorInvalidFieldModifier : XamlCompileError diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/TypeInfoCollector.cs b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/TypeInfoCollector.cs index 5314af5144..4346e69da1 100644 --- a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/TypeInfoCollector.cs +++ b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/TypeInfoCollector.cs @@ -557,6 +557,18 @@ private void FindAllMetadataAndBindableTypes(IList loadedAssemblies, A bindableTypes.Add(type); } } + else if (HasInterface(type, KnownTypes.IXamlPredicate)) + { + if (type.IsGenericType) + { + _schemaContext.SchemaErrors.Add(new XamlSchemaError_PredicateNotSupportedOnGeneric(type.FullName)); + } + else + { + // Add custom IXamlPredicate types to the bindable types list to be included in the XamlTypeInfo.g.* + bindableTypes.Add(type); + } + } if (asm != localAssembly) { if (HasInterface(type, KnownTypes.IXamlMetadataProvider)) diff --git a/src/src/XamlCompiler/Microsoft.UI.Xaml.Markup.Compiler.Core/KnownStrings.cs b/src/src/XamlCompiler/Microsoft.UI.Xaml.Markup.Compiler.Core/KnownStrings.cs index 514babff57..dd2206fafd 100644 --- a/src/src/XamlCompiler/Microsoft.UI.Xaml.Markup.Compiler.Core/KnownStrings.cs +++ b/src/src/XamlCompiler/Microsoft.UI.Xaml.Markup.Compiler.Core/KnownStrings.cs @@ -146,6 +146,7 @@ internal static class KnownTypes public const string IXamlBindScopeDiagnostics = KnownNamespaces.XamlMarkup + ".IXamlBindScopeDiagnostics"; public const string IXamlMember = KnownNamespaces.XamlMarkup + ".IXamlMember"; public const string IXamlMetadataProvider = KnownNamespaces.XamlMarkup + ".IXamlMetadataProvider"; + public const string IXamlPredicate = KnownNamespaces.XamlMarkup + ".IXamlPredicate"; public const string IXamlType = KnownNamespaces.XamlMarkup + ".IXamlType"; public const string FullXamlMetadataProviderAttribute = KnownNamespaces.XamlMarkup + ".FullXamlMetadataProviderAttribute"; public const string MarkupExtension = KnownNamespaces.XamlMarkup + ".MarkupExtension"; diff --git a/src/src/XamlCompiler/Properties/XamlCompilerResources.Designer.cs b/src/src/XamlCompiler/Properties/XamlCompilerResources.Designer.cs index a75b1b9e6b..222f60ddbf 100644 --- a/src/src/XamlCompiler/Properties/XamlCompilerResources.Designer.cs +++ b/src/src/XamlCompiler/Properties/XamlCompilerResources.Designer.cs @@ -501,6 +501,15 @@ internal static string DuiSchema_GetAllXamlTypeNotImpl { } } + /// + /// Looks up a localized string similar to Implementing IXamlPredicate on generic type '{0}' is not supported. + /// + internal static string DuiSchema_PredicateNotSupportedOnGeneric { + get { + return ResourceManager.GetString("DuiSchema_PredicateNotSupportedOnGeneric", resourceCulture); + } + } + /// /// Looks up a localized string similar to Type Load Exception loading type '{0}' from reference '{1}'. /// diff --git a/src/src/XamlCompiler/Properties/XamlCompilerResources.resx b/src/src/XamlCompiler/Properties/XamlCompilerResources.resx index d952f69813..da1a525859 100644 --- a/src/src/XamlCompiler/Properties/XamlCompilerResources.resx +++ b/src/src/XamlCompiler/Properties/XamlCompilerResources.resx @@ -268,6 +268,9 @@ '[Bindable]' on generic type '{0}' is not supported + + Implementing IXamlPredicate on generic type '{0}' is not supported + Cannot assign text value '{0}' into property '{1}' of type '{2}' From d86c877431f996086ea2305b58de6feb023c597d Mon Sep 17 00:00:00 2001 From: reunion-maestro-bot Date: Tue, 6 Jan 2026 09:56:41 +0000 Subject: [PATCH 09/12] Syncing content from committish 6759699b694700461f46dd1bfebe52b2c63af4d4 --- src/eng/Version.Details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/eng/Version.Details.xml b/src/eng/Version.Details.xml index b5b36e3b36..6d8069969b 100644 --- a/src/eng/Version.Details.xml +++ b/src/eng/Version.Details.xml @@ -6,9 +6,9 @@ https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP 547b4bb04a27a7e09e61022dc6ac3595fa1550f7 - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK - 7bafcc2d5e3b80e2e1e0b0d160ec7e09cbe94a88 + 5aa7009dc7a3075562ea2739341882439c7364e7 https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP @@ -23,9 +23,9 @@ https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator eda4bbdc05ddd6d1bc197ff930af59b4e50d891d - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK - 7bafcc2d5e3b80e2e1e0b0d160ec7e09cbe94a88 + 5aa7009dc7a3075562ea2739341882439c7364e7 https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP From 5892c18ef8fca32ec884ba5e151ed3064cb0b4b5 Mon Sep 17 00:00:00 2001 From: reunion-maestro-bot Date: Tue, 6 Jan 2026 10:15:25 +0000 Subject: [PATCH 10/12] Syncing content from committish baaad7a79453105c924e99eba300f3d21ed11b5d --- src/eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/eng/Version.Details.xml b/src/eng/Version.Details.xml index 6d8069969b..505e59d592 100644 --- a/src/eng/Version.Details.xml +++ b/src/eng/Version.Details.xml @@ -15,9 +15,9 @@ 547b4bb04a27a7e09e61022dc6ac3595fa1550f7 - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed - dd37af51755aee08e649a30d320f9570bceb4696 + 4e60cf8db6fec902aa9c401d56d247426a697270 https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator From 06efaf3d279a524e200fd718f9ebde333059984f Mon Sep 17 00:00:00 2001 From: reunion-maestro-bot Date: Tue, 6 Jan 2026 21:51:56 +0000 Subject: [PATCH 11/12] Syncing content from committish 906855541e7a7d6185a00be925fdae6ea112aaeb --- src/eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/eng/Version.Details.xml b/src/eng/Version.Details.xml index 505e59d592..b24cea93d9 100644 --- a/src/eng/Version.Details.xml +++ b/src/eng/Version.Details.xml @@ -19,9 +19,9 @@ https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed 4e60cf8db6fec902aa9c401d56d247426a697270 - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator - eda4bbdc05ddd6d1bc197ff930af59b4e50d891d + 80c83f790be1302bc55e1df1c845b2d6cc222a0c https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK From 06dcb9af4c182605a7fcc9f7f1e72d770f727477 Mon Sep 17 00:00:00 2001 From: reunion-maestro-bot Date: Wed, 7 Jan 2026 00:19:19 +0000 Subject: [PATCH 12/12] Syncing content from committish 1de7c386c6fc6a4d19101e04f6ff3a8dfa7e6db2 --- src/eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/eng/Version.Details.xml b/src/eng/Version.Details.xml index b24cea93d9..942d53361d 100644 --- a/src/eng/Version.Details.xml +++ b/src/eng/Version.Details.xml @@ -15,9 +15,9 @@ 547b4bb04a27a7e09e61022dc6ac3595fa1550f7 - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed - 4e60cf8db6fec902aa9c401d56d247426a697270 + 16030caa30f240458a14672dfff4077f4219cc0f https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator