diff options
| author | E.Z. Hart <hartez@users.noreply.github.com> | 2017-02-17 03:43:26 -0700 |
|---|---|---|
| committer | Rui Marinho <me@ruimarinho.net> | 2017-02-17 10:43:26 +0000 |
| commit | caa8882ff2007d93d08e2c1de307117f5c706730 (patch) | |
| tree | 9ce7ed5606ca4e8c32133783997dcbf95d93c2b7 /Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared | |
| parent | de3fdf57c7ee0af98e5d958a1a62595636b885f0 (diff) | |
| download | xamarin-forms-caa8882ff2007d93d08e2c1de307117f5c706730.tar.gz xamarin-forms-caa8882ff2007d93d08e2c1de307117f5c706730.tar.bz2 xamarin-forms-caa8882ff2007d93d08e2c1de307117f5c706730.zip | |
Split Windows RuntimePlatform into UWP and WinRT (#748)
* Split RuntimePlatform Windows into UWP and WinRT
* Update docs
* Backward compatible targetPlatform=Windows for native XAML views on WinRT/UWP
Diffstat (limited to 'Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared')
5 files changed, 8 insertions, 6 deletions
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22229.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22229.xaml.cs index f7d8918c..12e7143f 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22229.xaml.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22229.xaml.cs @@ -26,7 +26,8 @@ namespace Xamarin.Forms.Controls case Device.Android: _prefix = ""; break; - case Device.Windows: + case Device.WinRT: + case Device.UWP: case Device.WinPhone: _prefix = "Assets/"; break; diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34632.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34632.cs index 30cbc5a8..201f0b86 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34632.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34632.cs @@ -16,7 +16,7 @@ namespace Xamarin.Forms.Controls.Issues { protected override void Init () { - if (Device.RuntimePlatform == Device.Windows) + if (Device.RuntimePlatform == Device.UWP || Device.RuntimePlatform == Device.WinRT) MasterBehavior = MasterBehavior.Split; else MasterBehavior = MasterBehavior.SplitOnLandscape; diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069.cs index d4de5aa3..b1622328 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069.cs @@ -25,7 +25,8 @@ namespace Xamarin.Forms.Controls smallImage = "coffee.png"; break; case Device.WinPhone: - case Device.Windows: + case Device.WinRT: + case Device.UWP: smallImage = "bank.png"; break; } diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ImageLoadingErrorHandling.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ImageLoadingErrorHandling.cs index 6abac885..b2607c71 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ImageLoadingErrorHandling.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ImageLoadingErrorHandling.cs @@ -5,7 +5,7 @@ using Xamarin.Forms.Internals; namespace Xamarin.Forms.Controls { [Preserve(AllMembers = true)] - [Issue(IssueTracker.None, 0, "Image Loading Error Handling", PlatformAffected.WinRT)] + [Issue(IssueTracker.None, 0, "Image Loading Error Handling", PlatformAffected.WinRT | PlatformAffected.UWP)] public class ImageLoadingErrorHandling : TestContentPage { protected override void Init() @@ -31,7 +31,7 @@ namespace Xamarin.Forms.Controls Grid fakeUri = CreateTest(() => image.Source = ImageSource.FromUri(new Uri("http://not.real")), "Non-existent URI", - Device.RuntimePlatform == Device.Windows && Device.Idiom == TargetIdiom.Phone + (Device.RuntimePlatform == Device.UWP || Device.RuntimePlatform == Device.WinRT) && Device.Idiom == TargetIdiom.Phone ? "Clicking this button should display an alert dialog. The error message should include the text 'NotFound'." : "Clicking this button should display an alert dialog. The error message should include the text 'the server name or address could not be resolved'."); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue773.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue773.cs index 63d9cbc1..78570518 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue773.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue773.cs @@ -165,7 +165,7 @@ namespace Xamarin.Forms.Controls.Issues layout.Children.Add(new ScrollView { BackgroundColor = Color.Aqua, Orientation = ScrollOrientation.Horizontal, - HeightRequest = Device.RuntimePlatform == Device.Windows || Device.RuntimePlatform == Device.WinPhone ? 80 : 44, + HeightRequest = Device.RuntimePlatform == Device.WinRT || Device.RuntimePlatform == Device.UWP || Device.RuntimePlatform == Device.WinPhone ? 80 : 44, Content = buttonStack }); |