Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Uwp retarget to 17763 / 1809 #942

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
30981b2
Uwp Fixes
inforithmics Feb 19, 2021
edbff81
added missing using
inforithmics Feb 19, 2021
d58b9c3
reduce changes (remove uwp platform analyzer)
inforithmics Feb 19, 2021
508784e
Merge branch 'develop' into UWPFix2
TheCodeTraveler Mar 15, 2021
c10949e
Merge branch 'develop' into UWPFix2
jsuarezruiz Mar 17, 2021
297e564
Merge branch 'develop' into UWPFix2
AndreiMisiukevich Mar 18, 2021
6d477f7
Merge branch 'develop' into UWPFix2
TheCodeTraveler Mar 18, 2021
677b58f
Merge branch 'develop' into UWPFix2
jsuarezruiz Mar 19, 2021
49c48c2
Merge branch 'develop' into UWPFix2
inforithmics Mar 24, 2021
5c21732
Merge branch 'develop' into UWPFix2
jsuarezruiz Mar 28, 2021
0d1f731
Merge branch 'develop' into UWPFix2
TheCodeTraveler Apr 5, 2021
a2f8ed0
Merge branch 'develop' into UWPFix2
TheCodeTraveler Apr 6, 2021
88f7ebd
Merge branch 'develop' into UWPFix2
TheCodeTraveler Apr 8, 2021
c14280c
Merge branch 'develop' into UWPFix2
inforithmics Apr 13, 2021
667855b
Merge branch 'develop' into UWPFix2
pictos Apr 13, 2021
e4646bd
Merge branch 'develop' into UWPFix2
jfversluis Apr 15, 2021
f13b87e
Ask first for color than if api is present.
inforithmics Apr 22, 2021
1637554
Merge branch 'develop' into UWPFix2
inforithmics Apr 22, 2021
837b782
Merge branch 'develop' into UWPFix2
jsuarezruiz May 3, 2021
3b1a18c
Merge branch 'develop' into UWPFix2
jsuarezruiz May 10, 2021
c1437d3
Merge branch 'develop' into UWPFix2
pictos Jun 16, 2021
d35cc5b
Merge branch 'develop' into UWPFix2
inforithmics Aug 13, 2021
9970224
Merge branch 'develop' into UWPFix2
inforithmics Aug 17, 2021
42ba256
Merge branch 'develop' into UWPFix2
inforithmics Sep 18, 2021
81fd70b
Merge branch 'develop' into UWPFix2
inforithmics Oct 14, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Xamarin.Forms;
using Xamarin.Forms.Internals;
using Xamarin.Forms.Platform.UWP;
using ApiInformation = Windows.Foundation.Metadata.ApiInformation;
using Specific = Xamarin.CommunityToolkit.PlatformConfiguration.WindowsSpecific.PopUp;
using UWPThickness = Windows.UI.Xaml.Thickness;
using XamlStyle = Windows.UI.Xaml.Style;
Expand Down Expand Up @@ -176,10 +177,11 @@ void SetColor()

flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.BackgroundProperty, Element.Color.ToWindowsColor()));

#if UWP_18362
if (Element.Color == Color.Transparent)
flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.IsDefaultShadowEnabledProperty, false));
#endif
{
if (ApiInformation.IsPropertyPresent(typeof(FlyoutPresenter).FullName, nameof(FlyoutPresenter.IsDefaultShadowEnabledProperty)))
flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.IsDefaultShadowEnabledProperty, false));
}
}

void ApplyStyles()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<PropertyGroup>
<TargetFrameworks>netstandard1.0;netstandard2.0;netstandard2.1;Xamarin.iOS10;MonoAndroid10.0;Xamarin.TVOS10;Xamarin.WatchOS10;Xamarin.Mac20;tizen40</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.19041;netcoreapp3.1;net472;net471</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.17763;netcoreapp3.1;net472;net471</TargetFrameworks>
<TargetPlatformVersion Condition="'$(TargetFramework)' == 'uap10.0.17763'">10.0.19041.0</TargetPlatformVersion>
<AssemblyName>Xamarin.CommunityToolkit</AssemblyName>
<RootNamespace>Xamarin.CommunityToolkit</RootNamespace>
<PackageId>Xamarin.CommunityToolkit</PackageId>
Expand Down