Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unsupported targets in Device class #4491

Merged
merged 19 commits into from
Mar 3, 2022
Merged

Remove unsupported targets in Device class #4491

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2300011
Remove unsupported targets in Device class
jsuarezruiz Feb 3, 2022
90d38c7
Merge branch 'main' into device-targets
jsuarezruiz Feb 3, 2022
80fceae
Merge branch 'main' into device-targets
jsuarezruiz Feb 18, 2022
bb5c87d
Fixed broken tests
jsuarezruiz Feb 18, 2022
2af5275
Merge branch 'main' into device-targets
jsuarezruiz Feb 23, 2022
297ed09
Deprecate UWP target
jsuarezruiz Feb 24, 2022
0404fea
Merge branch 'main' into device-targets
jsuarezruiz Mar 2, 2022
cb40ae2
Allow to use UWP target on XAML
jsuarezruiz Mar 3, 2022
b60b313
Fix build errors
jsuarezruiz Mar 3, 2022
f8fdfcd
Merge branch 'release/6.0.2xx-preview14' into device-targets
mattleibow Mar 3, 2022
1ba358c
comments
mattleibow Mar 3, 2022
d985331
UWP == WinUI
mattleibow Mar 3, 2022
b3fc708
Fix Build errors
jsuarezruiz Mar 3, 2022
e0ffb5d
Added more tests
mattleibow Mar 3, 2022
5024ace
fix
mattleibow Mar 3, 2022
fcbd630
vbnm
mattleibow Mar 3, 2022
f845459
More fixes
jsuarezruiz Mar 3, 2022
e71a945
things
mattleibow Mar 3, 2022
3b9ef4c
Merge branch 'device-targets' of https://github.com/dotnet/maui into …
mattleibow Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Controls/tests/Xaml.UnitTests/MarkupExpressionParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,8 @@ public void BindingWithStaticConverter()
[TestCase("{OnPlatform Android=20, macOS=25}", "macOS", 25)]
[TestCase("{OnPlatform Android=20, Tizen=25}", "Tizen", 25)]
[TestCase("{OnPlatform Android=20, WinUI=25}", "WinUI", 25)]
[TestCase("{OnPlatform Android=20, UWP=25}", "WinUI", 25)]
[TestCase("{OnPlatform Android=20, WinUI=25, UWP=20}", "WinUI", 25)]
[TestCase("{OnPlatform Android=20, UWP=25}", "UWP", 25)]
[TestCase("{OnPlatform Android=20, WPF=25}", "WPF", 25)]
[TestCase("{OnPlatform 20}", "Android", 20)]
Expand Down
45 changes: 45 additions & 0 deletions src/Controls/tests/Xaml.UnitTests/OnPlatformTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,51 @@ public void TypeConverterAndDerivedTypes()
image = new Image().LoadFromXaml(xaml);
Assert.AreEqual("icon_twitter.png", (image.Source as FileImageSource).File);
}

[Test]
public void UWPisWinUI()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

{
var xaml = @"
<Image xmlns=""http://schemas.microsoft.com/dotnet/2021/maui""
xmlns:x=""http://schemas.microsoft.com/winfx/2009/xaml"">
<Image.Source>
<OnPlatform x:TypeArguments=""ImageSource"">
<On Platform=""iOS"">icon_twitter.png</On>
<On Platform=""Android"">icon_twitter.png</On>
<On Platform=""UWP"">Images/icon_twitter.png</On>
</OnPlatform>
</Image.Source>
</Image>";

Image image;

mockDeviceInfo.Platform = DevicePlatform.WinUI;
image = new Image().LoadFromXaml(xaml);
Assert.AreEqual("Images/icon_twitter.png", (image.Source as FileImageSource).File);
}

[Test]
public void ChecksPreferWinUI()
{
var xaml = @"
<Image xmlns=""http://schemas.microsoft.com/dotnet/2021/maui""
xmlns:x=""http://schemas.microsoft.com/winfx/2009/xaml"">
<Image.Source>
<OnPlatform x:TypeArguments=""ImageSource"">
<On Platform=""iOS"">icon_twitter.png</On>
<On Platform=""Android"">icon_twitter.png</On>
<On Platform=""UWP"">Images/icon_twitter.png</On>
<On Platform=""WinUI"">Images/icon_twitter_preferred.png</On>
</OnPlatform>
</Image.Source>
</Image>";

Image image;

mockDeviceInfo.Platform = DevicePlatform.WinUI;
image = new Image().LoadFromXaml(xaml);
Assert.AreEqual("Images/icon_twitter_preferred.png", (image.Source as FileImageSource).File);
}
}

[TestFixture]
Expand Down