summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Platform.WinRT
diff options
context:
space:
mode:
authorRui Marinho <me@ruimarinho.net>2017-06-28 21:25:23 +0100
committerRui Marinho <me@ruimarinho.net>2017-06-28 22:36:54 +0100
commita31bb1f0960e22cbf11b2207d83bbde1fc392e2a (patch)
tree779930a6fa5e5775a0ace4eb671eb9095bc25f2e /Xamarin.Forms.Platform.WinRT
parente94c04a9493896c02925ae658b8c39a82c44a9ee (diff)
downloadxamarin-forms-a31bb1f0960e22cbf11b2207d83bbde1fc392e2a.tar.gz
xamarin-forms-a31bb1f0960e22cbf11b2207d83bbde1fc392e2a.tar.bz2
xamarin-forms-a31bb1f0960e22cbf11b2207d83bbde1fc392e2a.zip
[UWP] Fixes for usage of XF with .net native toolchain (#1024)
* [UWP]Add required info for .net native when using AccessibilityView on UWP * [UWP] Add reference to xaml assembly * [UWP] Change rd.xml to be a embeded resource * [UWP] Move code to the right place * [UW]Only specify namespace we need
Diffstat (limited to 'Xamarin.Forms.Platform.WinRT')
-rw-r--r--Xamarin.Forms.Platform.WinRT/WindowsBasePlatformServices.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/Xamarin.Forms.Platform.WinRT/WindowsBasePlatformServices.cs b/Xamarin.Forms.Platform.WinRT/WindowsBasePlatformServices.cs
index ced37977..44840f6e 100644
--- a/Xamarin.Forms.Platform.WinRT/WindowsBasePlatformServices.cs
+++ b/Xamarin.Forms.Platform.WinRT/WindowsBasePlatformServices.cs
@@ -78,6 +78,10 @@ namespace Xamarin.Forms.Platform.WinRT
if (!assemblies.Contains(thisAssembly))
assemblies.Add(thisAssembly);
+ Assembly xamlAssembly = typeof(Xamarin.Forms.Xaml.IMarkupExtension).GetTypeInfo().Assembly;
+ if (!assemblies.Contains(xamlAssembly))
+ assemblies.Add(xamlAssembly);
+
return assemblies.ToArray();
}