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.Xaml | |
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.Xaml')
-rw-r--r-- | Xamarin.Forms.Xaml/XamlParser.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Xamarin.Forms.Xaml/XamlParser.cs b/Xamarin.Forms.Xaml/XamlParser.cs index 456aad6a..eb078597 100644 --- a/Xamarin.Forms.Xaml/XamlParser.cs +++ b/Xamarin.Forms.Xaml/XamlParser.cs @@ -269,7 +269,14 @@ namespace Xamarin.Forms.Xaml continue; try { if (targetPlatform != Device.RuntimePlatform) + { + // Special case for Windows backward compatibility + if (targetPlatform == "Windows" && + (Device.RuntimePlatform == Device.UWP || Device.RuntimePlatform == Device.WinRT)) + continue; + prefixes.Add(prefix); + } } catch (InvalidOperationException) { prefixes.Add(prefix); } |