summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Core
diff options
context:
space:
mode:
authorkingces95 <kingces95@users.noreply.github.com>2017-03-16 09:19:35 -0700
committerRui Marinho <me@ruimarinho.net>2017-03-16 16:19:35 +0000
commiteb8b4d19450e3264fdd20e964f48facca6521070 (patch)
tree7a6d5453a551d92236b056e2df558c710b34ef2d /Xamarin.Forms.Core
parent6c8b45d5b675817c71c6025bc7010dc5b73aaaa2 (diff)
downloadxamarin-forms-eb8b4d19450e3264fdd20e964f48facca6521070.tar.gz
xamarin-forms-eb8b4d19450e3264fdd20e964f48facca6521070.tar.bz2
xamarin-forms-eb8b4d19450e3264fdd20e964f48facca6521070.zip
Add internal XF.Registrar.RegisterAll b/c previewer needs it (#816)
Diffstat (limited to 'Xamarin.Forms.Core')
-rw-r--r--Xamarin.Forms.Core/DependencyService.cs4
-rw-r--r--Xamarin.Forms.Core/Effect.cs2
-rw-r--r--Xamarin.Forms.Core/Registrar.cs9
3 files changed, 11 insertions, 4 deletions
diff --git a/Xamarin.Forms.Core/DependencyService.cs b/Xamarin.Forms.Core/DependencyService.cs
index 803a951a..2e3c1665 100644
--- a/Xamarin.Forms.Core/DependencyService.cs
+++ b/Xamarin.Forms.Core/DependencyService.cs
@@ -70,9 +70,9 @@ namespace Xamarin.Forms
}
Assembly[] assemblies = Device.GetAssemblies();
- if (Registrar.ExtraAssemblies != null)
+ if (Internals.Registrar.ExtraAssemblies != null)
{
- assemblies = assemblies.Union(Registrar.ExtraAssemblies).ToArray();
+ assemblies = assemblies.Union(Internals.Registrar.ExtraAssemblies).ToArray();
}
Initialize(assemblies);
diff --git a/Xamarin.Forms.Core/Effect.cs b/Xamarin.Forms.Core/Effect.cs
index 89528446..61b62c0b 100644
--- a/Xamarin.Forms.Core/Effect.cs
+++ b/Xamarin.Forms.Core/Effect.cs
@@ -22,7 +22,7 @@ namespace Xamarin.Forms
{
Type effectType;
Effect result = null;
- if (Registrar.Effects.TryGetValue(name, out effectType))
+ if (Internals.Registrar.Effects.TryGetValue(name, out effectType))
{
result = (Effect)Activator.CreateInstance(effectType);
}
diff --git a/Xamarin.Forms.Core/Registrar.cs b/Xamarin.Forms.Core/Registrar.cs
index fc80b2fd..5f0819e8 100644
--- a/Xamarin.Forms.Core/Registrar.cs
+++ b/Xamarin.Forms.Core/Registrar.cs
@@ -4,7 +4,14 @@ using System.ComponentModel;
using System.Linq;
using System.Reflection;
-
+namespace Xamarin.Forms
+{
+ // Previewer uses reflection to bind to this method; Removal or modification of visibility will break previewer.
+ internal static class Registrar
+ {
+ internal static void RegisterAll(Type[] attrTypes) => Internals.Registrar.RegisterAll(attrTypes);
+ }
+}
namespace Xamarin.Forms.Internals
{
[EditorBrowsable(EditorBrowsableState.Never)]