Add WinUI 2.6 to UnitTests.UWP

Author: michael-hawker

UnitTests/UnitTests.UWP/App.xaml

@@ -5,50 +5,55 @@
              xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
              xmlns:helpers="using:UnitTests.Extensions.Helpers"
              xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+             xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
              xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
              xmlns:unitTestExtensions="using:UnitTests.Extensions"
              RequestedTheme="Light">
     <Application.Resources>
-
-        <!--  Workarounds for .NET Native issue in unit tests  -->
-        <ui:EnumValuesExtension x:Key="DummyExtension" />
-
-        <unitTestExtensions:Animal x:Key="Animal">Cat</unitTestExtensions:Animal>
-
-        <CommandBar x:Key="DummyCommandBar">
-            <AppBarButton Icon="{ui:FontIcon Glyph=&#xE102;}" />
-            <AppBarButton Icon="{ui:SymbolIcon Symbol=Play}" />
-        </CommandBar>
-
-        <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl1"
-                                          IconSource="{ui:FontIconSource Glyph=&#xE10B;}" />
-
-        <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl2"
-                                          IconSource="{ui:SymbolIconSource Symbol=Play}" />
-
-        <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl3"
-                                          IconSource="{ui:BitmapIconSource Source=/Assets/StoreLogo.png}" />
-
-        <Button x:Key="DummyButton">
-            <Button.Flyout>
-                <MenuFlyout>
-                    <MenuFlyoutItem Icon="{ui:BitmapIcon Source=/Assets/StoreLogo.png}" />
-                </MenuFlyout>
-            </Button.Flyout>
-        </Button>
-
-        <TextBox x:Key="DummyTextBox">
-            <interactivity:Interaction.Behaviors>
-                <behaviors:AutoSelectBehavior />
-            </interactivity:Interaction.Behaviors>
-        </TextBox>
-
-        <controls:ConstrainedBox x:Key="TestConstrainedBox" />
-        <controls:UniformGrid x:Key="TestUniformGrid" />
-        <controls:WrapPanel x:Key="TestWrapPanel" />
-        <ui:NullableBoolExtension x:Key="nullableBool" />
-
-        <helpers:ObjectWithNullableBoolProperty x:Key="objectWithNullableBoolProperty" />
-
+        <muxc:XamlControlsResources>
+            <muxc:XamlControlsResources.MergedDictionaries>
+                <ResourceDictionary>
+                    <!--  Workarounds for .NET Native issue in unit tests  -->
+                    <ui:EnumValuesExtension x:Key="DummyExtension" />
+
+                    <unitTestExtensions:Animal x:Key="Animal">Cat</unitTestExtensions:Animal>
+
+                    <CommandBar x:Key="DummyCommandBar">
+                        <AppBarButton Icon="{ui:FontIcon Glyph=&#xE102;}" />
+                        <AppBarButton Icon="{ui:SymbolIcon Symbol=Play}" />
+                    </CommandBar>
+
+                    <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl1"
+                                                      IconSource="{ui:FontIconSource Glyph=&#xE10B;}" />
+
+                    <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl2"
+                                                      IconSource="{ui:SymbolIconSource Symbol=Play}" />
+
+                    <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl3"
+                                                      IconSource="{ui:BitmapIconSource Source=/Assets/StoreLogo.png}" />
+
+                    <Button x:Key="DummyButton">
+                        <Button.Flyout>
+                            <MenuFlyout>
+                                <MenuFlyoutItem Icon="{ui:BitmapIcon Source=/Assets/StoreLogo.png}" />
+                            </MenuFlyout>
+                        </Button.Flyout>
+                    </Button>
+
+                    <TextBox x:Key="DummyTextBox">
+                        <interactivity:Interaction.Behaviors>
+                            <behaviors:AutoSelectBehavior />
+                        </interactivity:Interaction.Behaviors>
+                    </TextBox>
+
+                    <controls:ConstrainedBox x:Key="TestConstrainedBox" />
+                    <controls:UniformGrid x:Key="TestUniformGrid" />
+                    <controls:WrapPanel x:Key="TestWrapPanel" />
+                    <ui:NullableBoolExtension x:Key="nullableBool" />
+
+                    <helpers:ObjectWithNullableBoolProperty x:Key="objectWithNullableBoolProperty" />
+                </ResourceDictionary>
+            </muxc:XamlControlsResources.MergedDictionaries>
+        </muxc:XamlControlsResources>
     </Application.Resources>
-</Application>
+</Application>

UnitTests/UnitTests.UWP/UnitTests.UWP.csproj

@@ -128,6 +128,9 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.12</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.UI.Xaml">
+      <Version>2.6.1</Version>
+    </PackageReference>
     <PackageReference Include="MSTest.TestAdapter">
       <Version>2.1.2</Version>
     </PackageReference>