diff --git a/.nuspec/Xamarin.Forms.Pages.Azure.nuspec b/.nuspec/Xamarin.Forms.Pages.Azure.nuspec
index 86c77b56f7e..22165f5d508 100644
--- a/.nuspec/Xamarin.Forms.Pages.Azure.nuspec
+++ b/.nuspec/Xamarin.Forms.Pages.Azure.nuspec
@@ -20,6 +20,7 @@
+
diff --git a/.nuspec/Xamarin.Forms.Pages.nuspec b/.nuspec/Xamarin.Forms.Pages.nuspec
index d98cc09c831..c06bb3ea073 100644
--- a/.nuspec/Xamarin.Forms.Pages.nuspec
+++ b/.nuspec/Xamarin.Forms.Pages.nuspec
@@ -19,6 +19,7 @@
+
diff --git a/.nuspec/Xamarin.Forms.nuspec b/.nuspec/Xamarin.Forms.nuspec
index 8d96dde7e58..19374415a16 100644
--- a/.nuspec/Xamarin.Forms.nuspec
+++ b/.nuspec/Xamarin.Forms.nuspec
@@ -25,6 +25,7 @@
+
@@ -206,8 +207,8 @@
-
-
+
+
@@ -227,6 +228,7 @@
+
@@ -234,11 +236,11 @@
-
-
+
+
-
-
+
+
diff --git a/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj b/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj
index ae62293b4ff..1215c7d705e 100644
--- a/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj
+++ b/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj
@@ -12,8 +12,8 @@
en-US
UAP
10.0.16299.0
- 10.0.16299.0
- true
+ 10.0.14393.0
+ true
14
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
@@ -167,4 +167,4 @@
-->
-
\ No newline at end of file
+
diff --git a/EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj b/EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj
index 6b4979ce111..25a314889ad 100644
--- a/EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj
+++ b/EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj
@@ -1,7 +1,7 @@
- netstandard2.0
+ netstandard1.4
True
diff --git a/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj b/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj
index 9ec8eb5a2fc..38cf6621dae 100644
--- a/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj
+++ b/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj
@@ -12,8 +12,8 @@
en-US
UAP
10.0.16299.0
- 10.0.16299.0
- true
+ 10.0.14393.0
+ true
14
true
512
@@ -156,6 +156,9 @@
6.0.6
+
+ 2.1.190606001
+
2.0.1
@@ -164,4 +167,4 @@
14.0
-
\ No newline at end of file
+
diff --git a/PagesGallery/PagesGallery/App.xaml.cs b/PagesGallery/PagesGallery/App.xaml.cs
index 5cad242d3a6..4d348e32a5d 100644
--- a/PagesGallery/PagesGallery/App.xaml.cs
+++ b/PagesGallery/PagesGallery/App.xaml.cs
@@ -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,
@@ -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
}
diff --git a/PagesGallery/PagesGallery/PagesGallery.csproj b/PagesGallery/PagesGallery/PagesGallery.csproj
index c247be84643..4092b10d82b 100644
--- a/PagesGallery/PagesGallery/PagesGallery.csproj
+++ b/PagesGallery/PagesGallery/PagesGallery.csproj
@@ -1,6 +1,6 @@
-
+
- netstandard2.0
+ netstandard1.4
True
diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj b/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
index 2eb1a0bd42b..488f88022c6 100644
--- a/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
+++ b/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
@@ -13,8 +13,8 @@
en-US
UAP
10.0.16299.0
- 10.0.16299.0
- true
+ 10.0.14393.0
+ true
14
true
512
@@ -271,4 +271,4 @@
-->
-
\ No newline at end of file
+
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56771.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56771.cs
index 411dc9e3ea8..7ad38bad06a 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56771.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56771.cs
@@ -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." };
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59718.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59718.cs
index c3050479106..a6ea78d1d16 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59718.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59718.cs
@@ -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
@@ -70,7 +72,7 @@ protected override void Init()
})
};
- _list.On().SetSelectionMode(Xamarin.Forms.PlatformConfiguration.WindowsSpecific.ListViewSelectionMode.Inaccessible);
+ _list.On().SetSelectionMode(Xamarin.Forms.PlatformConfiguration.WindowsSpecific.ListViewSelectionMode.Inaccessible);
_list.ItemTapped += ListView_ItemTapped;
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs
index 32d21ffce81..1bcfcb5b73f 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs
@@ -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; }
@@ -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;
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1396.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1396.cs
index c63f6c603f2..38721ea3d6a 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1396.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1396.cs
@@ -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
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1691_2.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1691_2.cs
index f0866fd9095..7a822a6c7f3 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1691_2.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1691_2.cs
@@ -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;
@@ -29,25 +31,25 @@ protected override void Init()
{
var searchBarWithSpellCheckLabel = new Label { Text = "SearchBar with SpellCheck Enabled:" };
_searchBarWithSpellCheck = new SearchBar();
- _searchBarWithSpellCheck.On().SetIsSpellCheckEnabled(true);
+ _searchBarWithSpellCheck.On().SetIsSpellCheckEnabled(true);
var searchBarWithoutSpellCheckLabel = new Label { Text = "SearchBar with SpellCheck Disabled:" };
_searchBarWithoutSpellCheck = new SearchBar();
- _searchBarWithoutSpellCheck.On().SetIsSpellCheckEnabled(false);
+ _searchBarWithoutSpellCheck.On().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().IsSpellCheckEnabled())
+ if(_searchBarToggleSpellCheck.On().IsSpellCheckEnabled())
{
- _searchBarToggleSpellCheck.On().DisableSpellCheck();
+ _searchBarToggleSpellCheck.On().DisableSpellCheck();
_toggleSpellCheckButton.Text = "Enable SpellCheck";
}
else
{
- _searchBarToggleSpellCheck.On().EnableSpellCheck();
+ _searchBarToggleSpellCheck.On().EnableSpellCheck();
_toggleSpellCheckButton.Text = "Disable SpellCheck";
}
};
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1705_2.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1705_2.cs
index 6407ce2c21f..26ba453ca3d 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1705_2.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1705_2.cs
@@ -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;
@@ -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().IsHeaderIconsEnabled())
+ if (_target.On().IsHeaderIconsEnabled())
{
- _target.On().DisableHeaderIcons();
+ _target.On().DisableHeaderIcons();
_toggleIconsButton.Text = "Show Header Icons";
}
else
{
- _target.On().EnableHeaderIcons();
+ _target.On().EnableHeaderIcons();
_toggleIconsButton.Text = "Hide Header Icons";
}
};
@@ -88,16 +90,16 @@ public HeaderIconsControlPage(TabbedPage target)
if (!Int32.TryParse(_iconHeightEntry.Text, out height))
height = 16;
- var currentSize = _target.On().GetHeaderIconsSize();
+ var currentSize = _target.On().GetHeaderIconsSize();
if (currentSize.Width != width || currentSize.Height != height)
- _target.On().SetHeaderIconsSize(new Size(width, height));
+ _target.On().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().GetHeaderIconsSize();
+ var currentSize = _target.On().GetHeaderIconsSize();
_iconWidthEntry.Text = currentSize.Width.ToString();
_iconHeightEntry.Text = currentSize.Height.ToString();
};
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1717.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1717.cs
index 91ee00147e2..61abf53c852 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1717.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1717.cs
@@ -3,6 +3,7 @@
using Xamarin.Forms.PlatformConfiguration;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;
+using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;
namespace Xamarin.Forms.Controls.Issues
{
@@ -24,21 +25,21 @@ public class Issue1717 : TestContentPage // or TestMasterDetailPage, etc ...
private void DetectFromContent(bool detect)
{
- _entry1.On().SetDetectReadingOrderFromContent(detect);
- _entry2.On().SetDetectReadingOrderFromContent(detect);
- _editor1.On().SetDetectReadingOrderFromContent(detect);
- _editor2.On().SetDetectReadingOrderFromContent(detect);
- _label5.On().SetDetectReadingOrderFromContent(detect);
+ _entry1.On().SetDetectReadingOrderFromContent(detect);
+ _entry2.On().SetDetectReadingOrderFromContent(detect);
+ _editor1.On().SetDetectReadingOrderFromContent(detect);
+ _editor2.On().SetDetectReadingOrderFromContent(detect);
+ _label5.On().SetDetectReadingOrderFromContent(detect);
UpdateLabels();
}
void UpdateLabels()
{
- _label1.Text = $"FlowDirection: {_entry1.FlowDirection}, DetectReadingOrderFromContent: {_entry1.On().GetDetectReadingOrderFromContent()}";
- _label2.Text = $"FlowDirection: {_entry2.FlowDirection}, DetectReadingOrderFromContent: {_entry2.On().GetDetectReadingOrderFromContent()}";
- _label3.Text = $"FlowDirection: {_editor1.FlowDirection}, DetectReadingOrderFromContent: {_editor1.On().GetDetectReadingOrderFromContent()}";
- _label4.Text = $"FlowDirection: {_editor2.FlowDirection}, DetectReadingOrderFromContent: {_editor2.On().GetDetectReadingOrderFromContent()}";
- _label6.Text = $"FlowDirection: {_label5.FlowDirection}, DetectReadingOrderFromContent: {_label5.On().GetDetectReadingOrderFromContent()}";
+ _label1.Text = $"FlowDirection: {_entry1.FlowDirection}, DetectReadingOrderFromContent: {_entry1.On().GetDetectReadingOrderFromContent()}";
+ _label2.Text = $"FlowDirection: {_entry2.FlowDirection}, DetectReadingOrderFromContent: {_entry2.On().GetDetectReadingOrderFromContent()}";
+ _label3.Text = $"FlowDirection: {_editor1.FlowDirection}, DetectReadingOrderFromContent: {_editor1.On().GetDetectReadingOrderFromContent()}";
+ _label4.Text = $"FlowDirection: {_editor2.FlowDirection}, DetectReadingOrderFromContent: {_editor2.On().GetDetectReadingOrderFromContent()}";
+ _label6.Text = $"FlowDirection: {_label5.FlowDirection}, DetectReadingOrderFromContent: {_label5.On().GetDetectReadingOrderFromContent()}";
}
protected override void Init()
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1898.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1898.cs
index 82967568f18..879d3fd100f 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1898.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1898.cs
@@ -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;
@@ -117,7 +119,7 @@ internal static void SetupTabbedPage(TabbedPage tabbedPage, AToolbarPlacement pl
tabbedPage.On().SetBarSelectedItemColor(Color.Green);
#pragma warning restore CS0618 // Type or member is obsolete
tabbedPage.On().SetToolbarPlacement(placement);
- tabbedPage.On().SetHeaderIconsEnabled(true);
+ tabbedPage.On().SetHeaderIconsEnabled(true);
}
}
}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2595.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2595.cs
index 4d7b0376818..5e63d981013 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2595.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2595.cs
@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
-using System.Timers;
+using System.Threading;
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
@@ -48,7 +48,6 @@ void OnMenuClicked(object sender, SelectedItemChangedEventArgs e)
[Preserve(AllMembers = true)]
public class _2595ScrollPage : ContentPage
{
- readonly Timer _timer = new Timer(1000);
protected Label Label;
public _2595ScrollPage() {
@@ -76,9 +75,8 @@ protected StackLayout ScrollContent {
protected override void OnAppearing() {
base.OnAppearing();
- _timer.Elapsed += (s, e) => Device.BeginInvokeOnMainThread(OnTimerElapsed);
- _timer.Start();
+ Timer timer = new Timer((o) => Device.BeginInvokeOnMainThread(OnTimerElapsed), new AutoResetEvent(true), 0, 1000);
}
void OnTimerElapsed() {
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3273.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3273.cs
index cbeed934fc6..6019ba2a12d 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3273.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3273.cs
@@ -39,7 +39,7 @@ protected override void Init ()
Items.CollectionChanged += (_, e) =>
{
statusLabel.Text = "Success";
- var log = $"<{DateTime.Now.ToLongTimeString()}> {e.Action} action fired.";
+ var log = $"<{DateTime.Now.ToString("T")}> {e.Action} action fired.";
actionLabel.Text += $"{log}{Environment.NewLine}";
System.Diagnostics.Debug.WriteLine(log);
};
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3988.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3988.cs
index ea730d7dc93..b898dc8114b 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3988.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3988.cs
@@ -3,6 +3,8 @@
using Xamarin.Forms.PlatformConfiguration;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;
+using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;
+
#if UITEST
using Xamarin.Forms.Core.UITests;
using Xamarin.UITest;
@@ -83,8 +85,8 @@ public static ContentPage CreateTogglePage(Page parent)
var button = new Button() { Text = "Toggle IsDynamicOverflowEnabled" };
button.Clicked += (s, e) =>
{
- var overflowEnabled = parent.On().GetToolbarDynamicOverflowEnabled();
- parent.On().SetToolbarDynamicOverflowEnabled(!overflowEnabled);
+ var overflowEnabled = parent.On().GetToolbarDynamicOverflowEnabled();
+ parent.On().SetToolbarDynamicOverflowEnabled(!overflowEnabled);
};
var text = new Label()
{
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceGallery.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceGallery.cs
index 060890decfc..3ec6f088a66 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceGallery.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceGallery.cs
@@ -125,7 +125,7 @@ private static string GetBuildNumber()
static IEnumerable FindPerformanceScenarios()
{
return typeof(PerformanceGallery).GetTypeInfo().Assembly.DefinedTypes.Select(o => o.AsType())
- .Where(typeInfo => typeof(PerformanceScenario).IsAssignableFrom(typeInfo));
+ .Where(type => typeof(PerformanceScenario).GetTypeInfo().IsAssignableFrom(type.GetTypeInfo()));
}
static IEnumerable InflatePerformanceScenarios()
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ImageScenarios.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ImageScenarios.cs
index 2e433297e33..599c5a4ceca 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ImageScenarios.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ImageScenarios.cs
@@ -1,6 +1,7 @@
using System;
using System.IO;
using System.Linq;
+using System.Reflection;
using Xamarin.Forms.Internals;
namespace Xamarin.Forms.Controls.GalleryPages.PerformanceGallery.Scenarios
@@ -53,7 +54,7 @@ static ImageScenario4()
{
//NOTE: copy image to disk in static ctor, so not to interfere with timing
tempFile = Path.Combine(Path.GetTempPath(), $"{nameof(ImageScenario4)}.png");
- using (var embeddedStream = typeof(ImageScenario4).Assembly.GetManifestResourceStream("Xamarin.Forms.Controls.GalleryPages.crimson.jpg"))
+ using (var embeddedStream = typeof(ImageScenario4).GetTypeInfo().Assembly.GetManifestResourceStream("Xamarin.Forms.Controls.GalleryPages.crimson.jpg"))
using (var fileStream = File.Create(tempFile))
embeddedStream.CopyTo(fileStream);
}
diff --git a/Xamarin.Forms.Controls/CoreGallery.cs b/Xamarin.Forms.Controls/CoreGallery.cs
index 96ea02ecc33..e4a8d0706d1 100644
--- a/Xamarin.Forms.Controls/CoreGallery.cs
+++ b/Xamarin.Forms.Controls/CoreGallery.cs
@@ -516,7 +516,7 @@ public void FilterPages(string filter)
if (string.IsNullOrWhiteSpace(filter))
ItemsSource = _pages;
else
- ItemsSource = _pages.Where(p => p.Title.IndexOf(filter, StringComparison.InvariantCultureIgnoreCase) != -1);
+ ItemsSource = _pages.Where(p => p.Title.IndexOf(filter, StringComparison.OrdinalIgnoreCase) != -1);
}
}
[Preserve(AllMembers = true)]
diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/CarouselViewCoreGalleryPage.cs b/Xamarin.Forms.Controls/CoreGalleryPages/CarouselViewCoreGalleryPage.cs
index f895efb3fbc..f9dfed6daba 100644
--- a/Xamarin.Forms.Controls/CoreGalleryPages/CarouselViewCoreGalleryPage.cs
+++ b/Xamarin.Forms.Controls/CoreGalleryPages/CarouselViewCoreGalleryPage.cs
@@ -53,7 +53,7 @@ internal List GetCarouselItems()
items.Add(new CarouselData
{
Color = Color.FromRgb(random.Next(0, 255), random.Next(0, 255), random.Next(0, 255)),
- Name = DateTime.Now.AddDays(n).ToLongDateString()
+ Name = DateTime.Now.AddDays(n).ToString("D")
});
}
diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/CollectionViewCoreGalleryPage.cs b/Xamarin.Forms.Controls/CoreGalleryPages/CollectionViewCoreGalleryPage.cs
index f09f098cb05..68efc32efc2 100644
--- a/Xamarin.Forms.Controls/CoreGalleryPages/CollectionViewCoreGalleryPage.cs
+++ b/Xamarin.Forms.Controls/CoreGalleryPages/CollectionViewCoreGalleryPage.cs
@@ -13,7 +13,7 @@ protected override void InitializeElement(CollectionView element)
for (int n = 0; n < 1000; n++)
{
- items.Add(DateTime.Now.AddDays(n).ToLongDateString());
+ items.Add(DateTime.Now.AddDays(n).ToString("D"));
}
element.ItemsSource = items;
diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/WebViewCoreGalleryPage.cs b/Xamarin.Forms.Controls/CoreGalleryPages/WebViewCoreGalleryPage.cs
index 10b70d920b4..5c7714acb45 100644
--- a/Xamarin.Forms.Controls/CoreGalleryPages/WebViewCoreGalleryPage.cs
+++ b/Xamarin.Forms.Controls/CoreGalleryPages/WebViewCoreGalleryPage.cs
@@ -3,6 +3,8 @@
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;
+using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;
+
namespace Xamarin.Forms.Controls
{
internal class WebViewCoreGalleryPage : CoreGalleryPage
@@ -132,7 +134,7 @@ protected override void Build (StackLayout stackLayout)
HeightRequest = 200
};
- jsAlertWebView.On().SetIsJavaScriptAlertEnabled(true);
+ jsAlertWebView.On().SetIsJavaScriptAlertEnabled(true);
var javascriptAlertWebSourceContainer = new ViewContainer(Test.WebView.JavaScriptAlert,
jsAlertWebView
diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/WkWebViewCoreGalleryPage.cs b/Xamarin.Forms.Controls/CoreGalleryPages/WkWebViewCoreGalleryPage.cs
index 46bfd0bf48f..38cd0451702 100644
--- a/Xamarin.Forms.Controls/CoreGalleryPages/WkWebViewCoreGalleryPage.cs
+++ b/Xamarin.Forms.Controls/CoreGalleryPages/WkWebViewCoreGalleryPage.cs
@@ -3,6 +3,8 @@
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;
+using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;
+
namespace Xamarin.Forms.Controls
{
internal class WkWebViewCoreGalleryPage : CoreGalleryPage
@@ -107,7 +109,7 @@ protected override void Build (StackLayout stackLayout)
HeightRequest = 200
};
- jsAlertWebView.On().SetIsJavaScriptAlertEnabled(true);
+ jsAlertWebView.On().SetIsJavaScriptAlertEnabled(true);
var javascriptAlertWebSourceContainer = new ViewContainer(Test.WebView.JavaScriptAlert,
jsAlertWebView
diff --git a/Xamarin.Forms.Controls/GalleryPages/DynamicViewGallery.cs b/Xamarin.Forms.Controls/GalleryPages/DynamicViewGallery.cs
index 81e5ae5f8c8..71a09c95f31 100644
--- a/Xamarin.Forms.Controls/GalleryPages/DynamicViewGallery.cs
+++ b/Xamarin.Forms.Controls/GalleryPages/DynamicViewGallery.cs
@@ -130,7 +130,7 @@ internal static void GetProperties(BindableObject element, Type elementType, Sta
// BindableProperty used to clean property values
var bindableProperties = elementType
.GetFields(BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy)
- .Where(p => p.FieldType.IsAssignableFrom(typeof(BindableProperty)))
+ .Where(p => p.FieldType.GetTypeInfo().IsAssignableFrom(typeof(BindableProperty).GetTypeInfo()))
.Select(p => (BindableProperty)p.GetValue(element));
foreach (var property in publicProperties)
@@ -166,7 +166,7 @@ internal static void GetProperties(BindableObject element, Type elementType, Sta
{
propertyLayout.Children.Add(CreateThicknessPicker(property, element));
}
- else if (property.PropertyType.IsEnum)
+ else if (property.PropertyType.GetTypeInfo().IsEnum)
{
propertyLayout.Children.Add(CreateEnumPicker(property, element));
}
diff --git a/Xamarin.Forms.Controls/GalleryPages/ImageSourcesGallery.cs b/Xamarin.Forms.Controls/GalleryPages/ImageSourcesGallery.cs
index 9f404bc02f7..8f904c4d140 100644
--- a/Xamarin.Forms.Controls/GalleryPages/ImageSourcesGallery.cs
+++ b/Xamarin.Forms.Controls/GalleryPages/ImageSourcesGallery.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Reflection;
namespace Xamarin.Forms.Controls
{
@@ -33,7 +34,7 @@ static Picker CreateImageSourcePicker(string title, Action> on
new ImageSourcePickerItem
{
Text = "Stream",
- Getter = () => ImageSource.FromStream(() => typeof(App).Assembly.GetManifestResourceStream("Xamarin.Forms.Controls.coffee.png"))
+ Getter = () => ImageSource.FromStream(() => typeof(App).GetTypeInfo().Assembly.GetManifestResourceStream("Xamarin.Forms.Controls.coffee.png"))
},
new ImageSourcePickerItem
{
diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/MasterDetailPageWindows.cs b/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/MasterDetailPageWindows.cs
index d862c16750f..fd520548de4 100644
--- a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/MasterDetailPageWindows.cs
+++ b/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/MasterDetailPageWindows.cs
@@ -6,13 +6,15 @@
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;
using static Xamarin.Forms.Controls.GalleryPages.PlatformSpecificsGalleries.WindowsPlatformSpecificsGalleryHelpers;
+using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;
+
namespace Xamarin.Forms.Controls.GalleryPages.PlatformSpecificsGalleries
{
public class MasterDetailPageWindows : MasterDetailPage
{
public MasterDetailPageWindows(ICommand restore)
{
- On()
+ On()
.SetCollapseStyle(CollapseStyle.Partial);
MasterBehavior = MasterBehavior.Popover;
@@ -65,10 +67,10 @@ static Layout CreateCollapseStyleChanger(MasterDetailPage page)
Type enumType = typeof(CollapseStyle);
return CreateChanger(enumType,
- Enum.GetName(enumType, page.On().GetCollapseStyle()),
+ Enum.GetName(enumType, page.On().GetCollapseStyle()),
picker =>
{
- page.On().SetCollapseStyle((CollapseStyle)Enum.Parse(enumType, picker.Items[picker.SelectedIndex]));
+ page.On().SetCollapseStyle((CollapseStyle)Enum.Parse(enumType, picker.Items[picker.SelectedIndex]));
},
"Select Collapse Style");
}
@@ -81,14 +83,14 @@ static Layout CreateCollapseWidthAdjuster(MasterDetailPage page)
VerticalTextAlignment = TextAlignment.Center,
VerticalOptions = LayoutOptions.Center
};
- var adjustCollapseWidthEntry = new Entry { Text = page.On().CollapsedPaneWidth().ToString() };
+ var adjustCollapseWidthEntry = new Entry { Text = page.On().CollapsedPaneWidth().ToString() };
var adjustCollapseWidthButton = new Button { Text = "Change", BackgroundColor = Color.Gray };
adjustCollapseWidthButton.Clicked += (sender, args) =>
{
double newWidth;
if (double.TryParse(adjustCollapseWidthEntry.Text, out newWidth))
{
- page.On().CollapsedPaneWidth(newWidth);
+ page.On().CollapsedPaneWidth(newWidth);
}
};
diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/RefreshViewWindows.cs b/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/RefreshViewWindows.cs
index 1aa51ffda97..6e9df243087 100644
--- a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/RefreshViewWindows.cs
+++ b/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/RefreshViewWindows.cs
@@ -3,6 +3,7 @@
using Xamarin.Forms.PlatformConfiguration;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;
using static Xamarin.Forms.PlatformConfiguration.WindowsSpecific.RefreshView;
+using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;
namespace Xamarin.Forms.Controls.GalleryPages.PlatformSpecificsGalleries
{
@@ -29,7 +30,7 @@ void Construct()
refreshView.SetBinding(RefreshView.CommandProperty, "RefreshCommand");
refreshView.SetBinding(RefreshView.IsRefreshingProperty, "IsRefreshing");
- refreshView.On().SetRefreshPullDirection(RefreshPullDirection.BottomToTop);
+ refreshView.On().SetRefreshPullDirection(RefreshPullDirection.BottomToTop);
var listView = new ListView
{
diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/WindowsPlatformSpecificsGalleryHelpers.cs b/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/WindowsPlatformSpecificsGalleryHelpers.cs
index 9b3fbd85144..97bcc6dc526 100644
--- a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/WindowsPlatformSpecificsGalleryHelpers.cs
+++ b/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/WindowsPlatformSpecificsGalleryHelpers.cs
@@ -4,6 +4,8 @@
using Xamarin.Forms.PlatformConfiguration;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;
+using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;
+
namespace Xamarin.Forms.Controls.GalleryPages.PlatformSpecificsGalleries
{
internal static class WindowsPlatformSpecificsGalleryHelpers
@@ -86,10 +88,10 @@ public static Layout CreateToolbarPlacementChanger(Page page)
Type enumType = typeof(ToolbarPlacement);
return CreateChanger(enumType,
- Enum.GetName(enumType, page.On().GetToolbarPlacement()),
+ Enum.GetName(enumType, page.On().GetToolbarPlacement()),
picker =>
{
- page.On().SetToolbarPlacement((ToolbarPlacement)Enum.Parse(enumType, picker.Items[picker.SelectedIndex]));
+ page.On().SetToolbarPlacement((ToolbarPlacement)Enum.Parse(enumType, picker.Items[picker.SelectedIndex]));
}, "Select Toolbar Placement");
}
diff --git a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
index 5e81105b853..e979e9e527d 100644
--- a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
+++ b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
@@ -1,6 +1,10 @@
-
+
+
+ netstandard2.0
+ netstandard2.0;uap10.0.14393
+ 10.0.16299.0
+
- netstandard2.0
True
@@ -31,6 +35,7 @@
+
BindableLayoutGalleryPage.xaml
diff --git a/Xamarin.Forms.Core.UnitTests/WebViewUnitTests.cs b/Xamarin.Forms.Core.UnitTests/WebViewUnitTests.cs
index 8e107a7ef30..5565ec31018 100644
--- a/Xamarin.Forms.Core.UnitTests/WebViewUnitTests.cs
+++ b/Xamarin.Forms.Core.UnitTests/WebViewUnitTests.cs
@@ -7,6 +7,8 @@
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;
+using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;
+
namespace Xamarin.Forms.Core.UnitTests
{
[TestFixture]
@@ -135,10 +137,10 @@ public void TestWindowsSetAllowJavaScriptAlertsFlag()
var defaultWebView = new WebView();
var jsAlertsAllowedWebView = new WebView();
- jsAlertsAllowedWebView.On().SetIsJavaScriptAlertEnabled(true);
+ jsAlertsAllowedWebView.On().SetIsJavaScriptAlertEnabled(true);
- Assert.AreEqual(defaultWebView.On().IsJavaScriptAlertEnabled(), false);
- Assert.AreEqual(jsAlertsAllowedWebView.On().IsJavaScriptAlertEnabled(), true);
+ Assert.AreEqual(defaultWebView.On().IsJavaScriptAlertEnabled(), false);
+ Assert.AreEqual(jsAlertsAllowedWebView.On().IsJavaScriptAlertEnabled(), true);
}
}
}
diff --git a/Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj b/Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj
index 7e783f6a734..1f69a67ef99 100644
--- a/Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj
+++ b/Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj
@@ -1,7 +1,7 @@
- netstandard2.0
+ netstandard2.0;netstandard1.0
diff --git a/Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj b/Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj
index 0f7ee2b4e6a..d701440f604 100644
--- a/Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj
+++ b/Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj
@@ -12,8 +12,8 @@
en-US
UAP
10.0.16299.0
- 10.0.16299.0
- true
+ 10.0.14393.0
+ true
14
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
@@ -84,4 +84,4 @@
-->
-
\ No newline at end of file
+
diff --git a/Xamarin.Forms.Pages.Azure/Xamarin.Forms.Pages.Azure.csproj b/Xamarin.Forms.Pages.Azure/Xamarin.Forms.Pages.Azure.csproj
index 71fafc092d8..839f47ff3b3 100644
--- a/Xamarin.Forms.Pages.Azure/Xamarin.Forms.Pages.Azure.csproj
+++ b/Xamarin.Forms.Pages.Azure/Xamarin.Forms.Pages.Azure.csproj
@@ -1,6 +1,6 @@
- netstandard2.0
+ netstandard2.0;netstandard1.4
diff --git a/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj b/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj
index 7b68fa0f280..65cd36df617 100644
--- a/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj
+++ b/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj
@@ -1,6 +1,6 @@
- netstandard2.0
+ netstandard2.0;netstandard1.4
diff --git a/Xamarin.Forms.Platform.GTK/Controls/DatePicker.cs b/Xamarin.Forms.Platform.GTK/Controls/DatePicker.cs
index 86699b3db8f..b93f15a424a 100644
--- a/Xamarin.Forms.Platform.GTK/Controls/DatePicker.cs
+++ b/Xamarin.Forms.Platform.GTK/Controls/DatePicker.cs
@@ -388,9 +388,7 @@ private void BuildDatePicker()
private void UpdateEntryText()
{
- _comboBox.Entry.Text = string.IsNullOrEmpty(_dateFormat)
- ? _currentDate.ToLongDateString()
- : _currentDate.ToString(_dateFormat);
+ _comboBox.Entry.Text = _currentDate.ToString(string.IsNullOrEmpty(_dateFormat)? "D" : _dateFormat);
}
private void OnBtnShowCalendarClicked(object sender, EventArgs e)
diff --git a/Xamarin.Forms.Platform.UAP/ListViewRenderer.cs b/Xamarin.Forms.Platform.UAP/ListViewRenderer.cs
index ce98c7f872f..f291726c989 100644
--- a/Xamarin.Forms.Platform.UAP/ListViewRenderer.cs
+++ b/Xamarin.Forms.Platform.UAP/ListViewRenderer.cs
@@ -4,6 +4,7 @@
using System.Collections.Specialized;
using System.ComponentModel;
using System.Linq;
+using System.Reflection;
using System.Threading.Tasks;
using Windows.Foundation;
using Windows.UI.Xaml;
@@ -117,8 +118,8 @@ void ControlOnLoaded(object sender, RoutedEventArgs e)
bool IsObservableCollection(object source)
{
var type = source.GetType();
- return type.IsGenericType &&
- type.GetGenericTypeDefinition() == typeof(ObservableCollection<>);
+ return type.GetTypeInfo().IsGenericType &&
+ type.GetGenericTypeDefinition() == typeof(ObservableCollection<>);
}
void ReloadData()
diff --git a/Xamarin.Forms.Platform.UAP/WindowsIsolatedStorage.cs b/Xamarin.Forms.Platform.UAP/WindowsIsolatedStorage.cs
index 38854ce2df9..9fae9940a1f 100644
--- a/Xamarin.Forms.Platform.UAP/WindowsIsolatedStorage.cs
+++ b/Xamarin.Forms.Platform.UAP/WindowsIsolatedStorage.cs
@@ -4,9 +4,9 @@
using Windows.Storage;
using Windows.Storage.FileProperties;
using Windows.Storage.Streams;
-//using FileMode = Xamarin.Forms.Internals.FileMode;
-//using FileAccess = Xamarin.Forms.Internals.FileAccess;
-//using FileShare = Xamarin.Forms.Internals.FileShare;
+using FileMode = Xamarin.Forms.Internals.FileMode;
+using FileAccess = Xamarin.Forms.Internals.FileAccess;
+using FileShare = Xamarin.Forms.Internals.FileShare;
namespace Xamarin.Forms.Platform.UWP
{
diff --git a/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj b/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
index 5054cdf48f4..1f707692f77 100644
--- a/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
+++ b/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
@@ -12,7 +12,7 @@
en-US
UAP
10.0.16299.0
- 10.0.16299.0
+ 10.0.14393.0
true
14
512
@@ -324,4 +324,4 @@
-->
-
\ No newline at end of file
+
diff --git a/Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj b/Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj
index f6edbfaca7c..b8ba18aa653 100644
--- a/Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj
+++ b/Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj
@@ -1,7 +1,7 @@
-
+
Provides the design-time metadata for the XAML language service.
Xamarin.Forms.Xaml.Design
@@ -62,4 +62,4 @@
-
+
\ No newline at end of file
diff --git a/Xamarin.Forms.Xaml.UnitTests/PlatformSpecifics.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/PlatformSpecifics.xaml.cs
index bcd98942483..66f564fc11f 100644
--- a/Xamarin.Forms.Xaml.UnitTests/PlatformSpecifics.xaml.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/PlatformSpecifics.xaml.cs
@@ -6,6 +6,8 @@
using Xamarin.Forms.PlatformConfiguration;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;
+using WindowsOS = Xamarin.Forms.PlatformConfiguration.Windows;
+
namespace Xamarin.Forms.Xaml.UnitTests
{
public partial class PlatformSpecific : MasterDetailPage
@@ -28,8 +30,8 @@ class Tests
public void PlatformSpecificPropertyIsSet(bool useCompiledXaml)
{
var layout = new PlatformSpecific(useCompiledXaml);
- Assert.AreEqual(layout.On().GetCollapseStyle(), CollapseStyle.Partial);
- Assert.AreEqual(layout.On().CollapsedPaneWidth(), 96d);
+ Assert.AreEqual(layout.On().GetCollapseStyle(), CollapseStyle.Partial);
+ Assert.AreEqual(layout.On().CollapsedPaneWidth(), 96d);
}
}
}