From c840727742a51952391144b92b8f1b0ab03156ac Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 22 Dec 2022 16:08:19 -0500 Subject: [PATCH 1/3] fix(XamlReader): Fix invalid Windows.UI lookups --- src/Uno.UI/UI/Xaml/Markup/Reader/XamlConstants.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Uno.UI/UI/Xaml/Markup/Reader/XamlConstants.cs b/src/Uno.UI/UI/Xaml/Markup/Reader/XamlConstants.cs index e2bbbf080a55..3cf9eb62c3c9 100644 --- a/src/Uno.UI/UI/Xaml/Markup/Reader/XamlConstants.cs +++ b/src/Uno.UI/UI/Xaml/Markup/Reader/XamlConstants.cs @@ -12,7 +12,7 @@ internal static class XamlConstants public const string BundleResourcePrefix = "ms-appx:///"; public const string RootFoundationNamespace = "Windows.Foundation"; - public const string RootWUINamespace = "Windows.UI"; + public const string RootWUINamespace = "Windows" + ".UI"; // Keep split for the WinUI conversion tool public const string RootMUINamespace = "Windows.UI"; public const string BaseXamlNamespace = "Windows.UI.Xaml"; public const string UnoXamlNamespace = "Windows.UI.Xaml"; From 7ddd31afff989cbca0663eb43ac72cb6a55fbc85 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 22 Dec 2022 16:09:57 -0500 Subject: [PATCH 2/3] ci: Run unit tests for WinUI API set --- build/ci/.azure-devops-unit-tests.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build/ci/.azure-devops-unit-tests.yml b/build/ci/.azure-devops-unit-tests.yml index 148ddfe2bd56..ba73b2bfc4c9 100644 --- a/build/ci/.azure-devops-unit-tests.yml +++ b/build/ci/.azure-devops-unit-tests.yml @@ -13,7 +13,14 @@ jobs: strategy: matrix: - Default_Compiler: + UWP: + UNO_UWP_BUILD: true + XAML_FLAVOR_BUILD: UWP + ADDITIONAL_FLAGS: '' + + WinUI: + UNO_UWP_BUILD: false + XAML_FLAVOR_BUILD: WinUI ADDITIONAL_FLAGS: '' # Keep for future previews @@ -35,6 +42,8 @@ jobs: - checkout: self clean: true + - template: templates/download-winui-converted-tree.yml + - template: templates/nuget-cache.yml parameters: nugetPackages: $(NUGET_PACKAGES) From 7aa2f33f607fb71d2937ad65d104301c6ea62a9b Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 22 Dec 2022 16:50:32 -0500 Subject: [PATCH 3/3] ci: Adjust unit tests job dependencies --- build/ci/.azure-devops-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/.azure-devops-unit-tests.yml b/build/ci/.azure-devops-unit-tests.yml index ba73b2bfc4c9..943938ccb592 100644 --- a/build/ci/.azure-devops-unit-tests.yml +++ b/build/ci/.azure-devops-unit-tests.yml @@ -9,7 +9,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} - dependsOn: Pipeline_Validations + dependsOn: winui_convert_tree strategy: matrix: