-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add WinUI 2.6 Dependency to UnitTests.UWP App (#4156)
## Related to #3650 Splitting out the upgrade to WinUI 2.6 in the Unit Tests project to help try and isolate what might be going on. Noticed some our other NuGet dependencies have updates as well, so if this works as-is, will try and update those as well. Then we can check this in, and rebase #3650 to try and determine what else might be going on or pull in others to help investigate. FYI @huynhsontung @azchohfi ## PR Type What kind of change does this PR introduce? <!-- Please uncomment one or more options below that apply to this PR. --> <!-- - Bugfix --> <!-- - Feature --> <!-- - Code style update (formatting) --> - Refactoring (no functional changes, no api changes) <!-- - Build or CI related changes --> <!-- - Documentation content changes --> <!-- - Sample app changes --> <!-- - Other... Please describe: --> ## What is the current behavior? WinUI 2.6 not included when we run unit tests ## What is the new behavior? WinUI 2.6 is now included when we run unit tests. ## PR Checklist Please check if your PR fulfills the following requirements: - [ ] Tested code with current [supported SDKs](../readme.md#supported) - [ ] Pull Request has been submitted to the documentation repository [instructions](..\contributing.md#docs). Link: <!-- docs PR link --> - [ ] Sample in sample app has been added / updated (for bug fixes / features) - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/CommunityToolkit/WindowsCommunityToolkit-design-assets) - [ ] New major technical changes in the toolkit have or will be added to the [Wiki](https://github.com/CommunityToolkit/WindowsCommunityToolkit/wiki) e.g. build changes, source generators, testing infrastructure, sample creation changes, etc... - [ ] Tests for the changes have been added (for bug fixes / features) (if applicable) - [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*) - [ ] Contains **NO** breaking changes <!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. Please note that breaking changes are likely to be rejected within minor release cycles or held until major versions. --> ## Other information
- Loading branch information
Showing
12 changed files
with
94 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| <Application x:Class="UnitTests.App" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors" | ||
| 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> | ||
| <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=}" /> | ||
| <AppBarButton Icon="{ui:SymbolIcon Symbol=Play}" /> | ||
| </CommandBar> | ||
|
|
||
| <unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl1" | ||
| IconSource="{ui:FontIconSource Glyph=}" /> | ||
|
|
||
| <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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters