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

#3533 Bring back uap10.0/netstandard1.4 support #7079

Merged
merged 18 commits into from
Nov 22, 2019
Merged

#3533 Bring back uap10.0/netstandard1.4 support #7079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
61d9c54
target netstandard 1.4 for supporting rs2
jrjrguo Aug 6, 2019
0419017
multi targeting
jrjrguo Aug 13, 2019
563df53
initial tests
PureWeen Sep 5, 2019
e8da720
- set a couple libraries to NS1.0
PureWeen Sep 5, 2019
edf93de
- ns1.4
PureWeen Sep 6, 2019
0c08fc3
- fix gallery project
PureWeen Sep 12, 2019
f0829d3
- fix min targets
PureWeen Sep 12, 2019
b6d2124
- fix target
PureWeen Sep 12, 2019
27f8af0
- remove sdk
PureWeen Sep 12, 2019
443bee3
- buildControlsPath
PureWeen Sep 12, 2019
97a0700
- nuget restore
PureWeen Sep 12, 2019
301a6b3
- controls path
PureWeen Sep 12, 2019
f9ebe31
- uwp version
PureWeen Sep 12, 2019
93bd337
- add generic
PureWeen Sep 12, 2019
d23f0a1
- fix xbf
PureWeen Sep 12, 2019
f51e805
- add tuple nuget
PureWeen Sep 12, 2019
56653eb
- set max target to 16299
PureWeen Nov 19, 2019
8b42df8
- proj fixes
PureWeen Nov 19, 2019
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
1 change: 1 addition & 0 deletions .nuspec/Xamarin.Forms.Pages.Azure.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
</dependencies>
</metadata>
<files>
<file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\netstandard1.4\Xamarin.Forms.Pages.Azure.dll" target="lib\netstandard1.4" />
<file src="..\Xamarin.Forms.Pages.Azure\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Pages.Azure.dll" target="lib\netstandard2.0" />
</files>
</package>
1 change: 1 addition & 0 deletions .nuspec/Xamarin.Forms.Pages.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
</dependencies>
</metadata>
<files>
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\netstandard1.4\Xamarin.Forms.Pages.dll" target="lib\netstandard1.4" />
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Pages.dll" target="lib\netstandard2.0" />
</files>
</package>
14 changes: 8 additions & 6 deletions .nuspec/Xamarin.Forms.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.0.12" />
<dependency id="Win2D.uwp" version="1.20.0" />
<dependency id="Microsoft.UI.Xaml" version="2.1.190606001" />
<dependency id="System.ValueTuple" version="4.5.0" />
Copy link
Contributor

Choose a reason for hiding this comment

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

When I run this project with the min sdk support set to 14393 then I have to include the System.ValueTuple nuget otherwise it crashes

</group>
<group targetFramework="tizen40">
<dependency id="Tizen.NET" version="4.0.0"/>
Expand Down Expand Up @@ -206,8 +207,8 @@
<file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\Xamarin.Forms.Platform.UAP.*pdb" target="lib\uap10.0" />
<file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\Xamarin.Forms.Platform.UAP.pri" target="lib\uap10.0" />
<file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\Xamarin.Forms.Platform.UAP.xr.xml" target="lib\uap10.0\Xamarin.Forms.Platform.UAP" />
<file src="..\Xamarin.Forms.Platform\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Platform.dll" target="lib\uap10.0" />
<file src="..\Xamarin.Forms.Platform\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Platform.*pdb" target="lib\uap10.0" />
<file src="..\Xamarin.Forms.Platform\bin\$Configuration$\netstandard1.0\Xamarin.Forms.Platform.dll" target="lib\uap10.0" />
<file src="..\Xamarin.Forms.Platform\bin\$Configuration$\netstandard1.0\Xamarin.Forms.Platform.*pdb" target="lib\uap10.0" />
<file src="..\Xamarin.Forms.Platform.UAP\Properties\Xamarin.Forms.Platform.UAP.rd.xml" target="lib\uap10.0\Xamarin.Forms.Platform.UAP\Properties" />

<file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\FormsFlyout.xbf" target="lib\uap10.0\Xamarin.Forms.Platform.UAP" />
Expand All @@ -227,18 +228,19 @@
<file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\Microsoft.UI.Xaml\DensityStyles\Compact.xbf" target="lib\uap10.0\Xamarin.Forms.Platform.UAP\Microsoft.UI.Xaml\DensityStyles\" />
<file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\Shell\ShellStyles.xbf" target="lib\uap10.0\Xamarin.Forms.Platform.UAP\Shell" />
<file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\PickerStyle.xbf" target="lib\uap10.0\Xamarin.Forms.Platform.UAP" />
<file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\Microsoft.UI.Xaml\Themes\generic.xbf" target="lib\uap10.0\Xamarin.Forms.Platform.UAP\Microsoft.UI.Xaml\Themes\" />

<!--Mac-->
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\Xamarin.Mac" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\Xamarin.Mac" />
<file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\Xamarin.Forms.Platform.macOS.dll" target="lib\Xamarin.Mac" />
<file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\Xamarin.Mac" />

<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\uap10.0" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\uap10.0" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard1.0\Xamarin.Forms.Core.dll" target="lib\uap10.0" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard1.0\Xamarin.Forms.Core.*pdb" target="lib\uap10.0" />
<file src="..\docs\Xamarin.Forms.Core.xml" target="lib\uap10.0" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\uap10.0" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*pdb" target="lib\uap10.0" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard1.0\Xamarin.Forms.Xaml.dll" target="lib\uap10.0" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard1.0\Xamarin.Forms.Xaml.*pdb" target="lib\uap10.0" />
<file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\uap10.0" />

<!-- iOS Localized String Resource Assemblies -->
Expand Down
6 changes: 3 additions & 3 deletions EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<SkipMicrosoftUIXamlCheckTargetPlatformVersion>true</SkipMicrosoftUIXamlCheckTargetPlatformVersion>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<SkipMicrosoftUIXamlCheckTargetPlatformVersion>true</SkipMicrosoftUIXamlCheckTargetPlatformVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
Expand Down Expand Up @@ -167,4 +167,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard1.4</TargetFramework>
<XFDisableTargetsValidation>True</XFDisableTargetsValidation>
</PropertyGroup>
<ItemGroup>
Expand Down
9 changes: 6 additions & 3 deletions PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<SkipMicrosoftUIXamlCheckTargetPlatformVersion>true</SkipMicrosoftUIXamlCheckTargetPlatformVersion>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<SkipMicrosoftUIXamlCheckTargetPlatformVersion>true</SkipMicrosoftUIXamlCheckTargetPlatformVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -156,6 +156,9 @@
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.0.6</Version>
</PackageReference>
<PackageReference Include="Microsoft.UI.Xaml">
<Version>2.1.190606001</Version>
</PackageReference>
<PackageReference Include="NETStandard.Library">
<Version>2.0.1</Version>
</PackageReference>
Expand All @@ -164,4 +167,4 @@
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
</Project>
</Project>
23 changes: 10 additions & 13 deletions PagesGallery/PagesGallery/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;


using Xamarin.Forms;

namespace PagesGallery
{
public partial class App : Application
{
public App ()
public App()
{
InitializeComponent ();
InitializeComponent();

var eventsPage = new EventsPage ();
var speakersPage = new SpeakersPage ();
MainPage = new NavigationPage (new TabbedPage {
var eventsPage = new EventsPage();
var speakersPage = new SpeakersPage();
MainPage = new NavigationPage(new TabbedPage
{
Title = "Xamarin Evolve 2016",
Children = {
eventsPage,
Expand All @@ -24,17 +21,17 @@ public App ()
});
}

protected override void OnStart ()
protected override void OnStart()
{
// Handle when your app starts
}

protected override void OnSleep ()
protected override void OnSleep()
{
// Handle when your app sleeps
}

protected override void OnResume ()
protected override void OnResume()
{
// Handle when your app resumes
}
Expand Down
4 changes: 2 additions & 2 deletions PagesGallery/PagesGallery/PagesGallery.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard1.4</TargetFramework>
<XFDisableTargetsValidation>True</XFDisableTargetsValidation>
</PropertyGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions ...orms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<SkipMicrosoftUIXamlCheckTargetPlatformVersion>true</SkipMicrosoftUIXamlCheckTargetPlatformVersion>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<SkipMicrosoftUIXamlCheckTargetPlatformVersion>true</SkipMicrosoftUIXamlCheckTargetPlatformVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -271,4 +271,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56771.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ protected override void Init()
{
data.CollectionChanged += (_, e) =>
{
var log = $"<{DateTime.Now.ToLongTimeString()}> {e.Action} action fired.";
var log = $"<{DateTime.Now.ToString("T")}> {e.Action} action fired.";
System.Diagnostics.Debug.WriteLine(log);
};
var label = new Label { Text = "Click the Add 2 button." };
Expand Down
4 changes: 3 additions & 1 deletion Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59718.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
using Xamarin.Forms.PlatformConfiguration;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;

using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;

#if UITEST
using NUnit.Framework;
#endif
Expand Down Expand Up @@ -70,7 +72,7 @@ protected override void Init()
})
};

_list.On<Windows>().SetSelectionMode(Xamarin.Forms.PlatformConfiguration.WindowsSpecific.ListViewSelectionMode.Inaccessible);
_list.On<WindowsOS>().SetSelectionMode(Xamarin.Forms.PlatformConfiguration.WindowsSpecific.ListViewSelectionMode.Inaccessible);

_list.ItemTapped += ListView_ItemTapped;

Expand Down
4 changes: 2 additions & 2 deletions Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public ViewModel5623()
[Preserve(AllMembers = true)]
public class Model5623
{
RNGCryptoServiceProvider provider = new RNGCryptoServiceProvider();
Random random = new Random();

public string Text { get; set; }

Expand All @@ -183,7 +183,7 @@ public class Model5623
public Model5623(bool isUneven)
{
var byteArray = new byte[4];
provider.GetBytes(byteArray);
random.NextBytes(byteArray);

if (isUneven)
Height = 100 + (BitConverter.ToInt32(byteArray, 0) % 300 + 300) % 300;
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1396.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ protected override void Init()
var button = new Button { Text = "Change Text" };
button.Clicked += (sender, args) =>
{
_label.Text = DateTime.Now.ToLongDateString() + " " + DateTime.Now.ToLongTimeString();
_label.Text = DateTime.Now.ToString("F");
};

_label = new Label
Expand Down
12 changes: 7 additions & 5 deletions Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1691_2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
using Xamarin.Forms.PlatformConfiguration;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;

using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;

#if UITEST
using Xamarin.UITest;
using NUnit.Framework;
Expand All @@ -29,25 +31,25 @@ protected override void Init()
{
var searchBarWithSpellCheckLabel = new Label { Text = "SearchBar with SpellCheck Enabled:" };
_searchBarWithSpellCheck = new SearchBar();
_searchBarWithSpellCheck.On<Windows>().SetIsSpellCheckEnabled(true);
_searchBarWithSpellCheck.On<WindowsOS>().SetIsSpellCheckEnabled(true);

var searchBarWithoutSpellCheckLabel = new Label { Text = "SearchBar with SpellCheck Disabled:" };
_searchBarWithoutSpellCheck = new SearchBar();
_searchBarWithoutSpellCheck.On<Windows>().SetIsSpellCheckEnabled(false);
_searchBarWithoutSpellCheck.On<WindowsOS>().SetIsSpellCheckEnabled(false);

var searchBarToggleSpellCheck = new Label { Text = "SearchBar with Toggled SpellCheck:" };
_searchBarToggleSpellCheck = new SearchBar();

_toggleSpellCheckButton = new Button { Text = "Enable SpellCheck" };
_toggleSpellCheckButton.Clicked += (object sender, EventArgs e) => {
if(_searchBarToggleSpellCheck.On<Windows>().IsSpellCheckEnabled())
if(_searchBarToggleSpellCheck.On<WindowsOS>().IsSpellCheckEnabled())
{
_searchBarToggleSpellCheck.On<Windows>().DisableSpellCheck();
_searchBarToggleSpellCheck.On<WindowsOS>().DisableSpellCheck();
_toggleSpellCheckButton.Text = "Enable SpellCheck";
}
else
{
_searchBarToggleSpellCheck.On<Windows>().EnableSpellCheck();
_searchBarToggleSpellCheck.On<WindowsOS>().EnableSpellCheck();
_toggleSpellCheckButton.Text = "Disable SpellCheck";
}
};
Expand Down
14 changes: 8 additions & 6 deletions Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1705_2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
using Xamarin.Forms.PlatformConfiguration;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;

using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;

#if UITEST
using Xamarin.UITest;
using NUnit.Framework;
Expand Down Expand Up @@ -59,14 +61,14 @@ public HeaderIconsControlPage(TabbedPage target)
_toggleIconsButton = new Button();
_toggleIconsButton.Text = "Show Header Icons";
_toggleIconsButton.Clicked += (object sender, EventArgs e) => {
if (_target.On<Windows>().IsHeaderIconsEnabled())
if (_target.On<WindowsOS>().IsHeaderIconsEnabled())
{
_target.On<Windows>().DisableHeaderIcons();
_target.On<WindowsOS>().DisableHeaderIcons();
_toggleIconsButton.Text = "Show Header Icons";
}
else
{
_target.On<Windows>().EnableHeaderIcons();
_target.On<WindowsOS>().EnableHeaderIcons();
_toggleIconsButton.Text = "Hide Header Icons";
}
};
Expand All @@ -88,16 +90,16 @@ public HeaderIconsControlPage(TabbedPage target)
if (!Int32.TryParse(_iconHeightEntry.Text, out height))
height = 16;

var currentSize = _target.On<Windows>().GetHeaderIconsSize();
var currentSize = _target.On<WindowsOS>().GetHeaderIconsSize();
if (currentSize.Width != width || currentSize.Height != height)
_target.On<Windows>().SetHeaderIconsSize(new Size(width, height));
_target.On<WindowsOS>().SetHeaderIconsSize(new Size(width, height));
};

_getCurrentIconsSizeButton = new Button();
_getCurrentIconsSizeButton.Text = "Load Current Header Icons Size";
_getCurrentIconsSizeButton.Clicked += (object sender, EventArgs e) => {

var currentSize = _target.On<Windows>().GetHeaderIconsSize();
var currentSize = _target.On<WindowsOS>().GetHeaderIconsSize();
_iconWidthEntry.Text = currentSize.Width.ToString();
_iconHeightEntry.Text = currentSize.Height.ToString();
};
Expand Down
21 changes: 11 additions & 10 deletions Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1717.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Xamarin.Forms.PlatformConfiguration;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;

using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;

namespace Xamarin.Forms.Controls.Issues
{
Expand All @@ -24,21 +25,21 @@ public class Issue1717 : TestContentPage // or TestMasterDetailPage, etc ...

private void DetectFromContent(bool detect)
{
_entry1.On<Windows>().SetDetectReadingOrderFromContent(detect);
_entry2.On<Windows>().SetDetectReadingOrderFromContent(detect);
_editor1.On<Windows>().SetDetectReadingOrderFromContent(detect);
_editor2.On<Windows>().SetDetectReadingOrderFromContent(detect);
_label5.On<Windows>().SetDetectReadingOrderFromContent(detect);
_entry1.On<WindowsOS>().SetDetectReadingOrderFromContent(detect);
_entry2.On<WindowsOS>().SetDetectReadingOrderFromContent(detect);
_editor1.On<WindowsOS>().SetDetectReadingOrderFromContent(detect);
_editor2.On<WindowsOS>().SetDetectReadingOrderFromContent(detect);
_label5.On<WindowsOS>().SetDetectReadingOrderFromContent(detect);
UpdateLabels();
}

void UpdateLabels()
{
_label1.Text = $"FlowDirection: {_entry1.FlowDirection}, DetectReadingOrderFromContent: {_entry1.On<Windows>().GetDetectReadingOrderFromContent()}";
_label2.Text = $"FlowDirection: {_entry2.FlowDirection}, DetectReadingOrderFromContent: {_entry2.On<Windows>().GetDetectReadingOrderFromContent()}";
_label3.Text = $"FlowDirection: {_editor1.FlowDirection}, DetectReadingOrderFromContent: {_editor1.On<Windows>().GetDetectReadingOrderFromContent()}";
_label4.Text = $"FlowDirection: {_editor2.FlowDirection}, DetectReadingOrderFromContent: {_editor2.On<Windows>().GetDetectReadingOrderFromContent()}";
_label6.Text = $"FlowDirection: {_label5.FlowDirection}, DetectReadingOrderFromContent: {_label5.On<Windows>().GetDetectReadingOrderFromContent()}";
_label1.Text = $"FlowDirection: {_entry1.FlowDirection}, DetectReadingOrderFromContent: {_entry1.On<WindowsOS>().GetDetectReadingOrderFromContent()}";
_label2.Text = $"FlowDirection: {_entry2.FlowDirection}, DetectReadingOrderFromContent: {_entry2.On<WindowsOS>().GetDetectReadingOrderFromContent()}";
_label3.Text = $"FlowDirection: {_editor1.FlowDirection}, DetectReadingOrderFromContent: {_editor1.On<WindowsOS>().GetDetectReadingOrderFromContent()}";
_label4.Text = $"FlowDirection: {_editor2.FlowDirection}, DetectReadingOrderFromContent: {_editor2.On<WindowsOS>().GetDetectReadingOrderFromContent()}";
_label6.Text = $"FlowDirection: {_label5.FlowDirection}, DetectReadingOrderFromContent: {_label5.On<WindowsOS>().GetDetectReadingOrderFromContent()}";
}

protected override void Init()
Expand Down
4 changes: 3 additions & 1 deletion Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1898.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
using AToolbarPlacement = Xamarin.Forms.PlatformConfiguration.AndroidSpecific.ToolbarPlacement;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;

using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;

#if UITEST
using Xamarin.UITest;
using NUnit.Framework;
Expand Down Expand Up @@ -117,7 +119,7 @@ internal static void SetupTabbedPage(TabbedPage tabbedPage, AToolbarPlacement pl
tabbedPage.On<Android>().SetBarSelectedItemColor(Color.Green);
#pragma warning restore CS0618 // Type or member is obsolete
tabbedPage.On<Android>().SetToolbarPlacement(placement);
tabbedPage.On<Windows>().SetHeaderIconsEnabled(true);
tabbedPage.On<WindowsOS>().SetHeaderIconsEnabled(true);
}
}
}
Loading