From 82a670361a6fbc2734f89adaf0559ef2048b47f3 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 9 Nov 2015 20:00:38 +0100
Subject: [PATCH] Updated OmniXAML

---
 .../Context/PerspexWiringContext.cs            | 18 ++++++------------
 src/Markup/Perspex.Markup.Xaml/OmniXAML        |  2 +-
 .../Perspex.Markup.Xaml.csproj                 |  4 ++++
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
index e4ca144761..89203022a9 100644
--- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reflection;
 using Glass;
@@ -11,21 +9,17 @@ using OmniXaml;
 using OmniXaml.Builder;
 using OmniXaml.TypeConversion;
 using OmniXaml.Typing;
+using Perspex.Collections;
 using Perspex.Controls;
+using Perspex.Controls.Primitives;
+using Perspex.Controls.Templates;
 using Perspex.Input;
-using Perspex.Markup.Xaml.Templates;
 using Perspex.Markup.Xaml.Converters;
-using Perspex.Markup.Xaml.Data;
-using Perspex.Markup.Xaml.MarkupExtensions;
 using Perspex.Media;
 using Perspex.Media.Imaging;
 using Perspex.Metadata;
 using Perspex.Platform;
 using Perspex.Styling;
-using Perspex.Controls.Primitives;
-using Perspex.Controls.Templates;
-using System.Collections;
-using Perspex.Collections;
 
 namespace Perspex.Markup.Xaml.Context
 {
@@ -48,10 +42,10 @@ namespace Perspex.Markup.Xaml.Context
             var xamlNamespaceRegistry = CreateXamlNamespaceRegistry();
             var typeRepository = new PerspexTypeRepository(xamlNamespaceRegistry, typeFactory, featureProvider);
 
-            typeRepository.RegisterMetadata(new Metadata<Visual>().WithRuntimeNameProperty(d => d.Name));
-            typeRepository.RegisterMetadata(new Metadata<Setter>().WithMemberDependency(x => x.Value, x => x.Property));
+            typeRepository.RegisterMetadata(new GenericMetadata<Visual>().WithRuntimeNameProperty(d => d.Name));
+            typeRepository.RegisterMetadata(new GenericMetadata<Setter>().WithMemberDependency(x => x.Value, x => x.Property));
             typeRepository.RegisterMetadata(
-                new Metadata<SelectingItemsControl>()
+                new GenericMetadata<SelectingItemsControl>()
                 .WithMemberDependency(x => x.SelectedIndex, x => x.Items)
                 .WithMemberDependency(x => x.SelectedItem, x => x.Items));
 
diff --git a/src/Markup/Perspex.Markup.Xaml/OmniXAML b/src/Markup/Perspex.Markup.Xaml/OmniXAML
index 7a7c5fbe40..3582fa46d3 160000
--- a/src/Markup/Perspex.Markup.Xaml/OmniXAML
+++ b/src/Markup/Perspex.Markup.Xaml/OmniXAML
@@ -1 +1 @@
-Subproject commit 7a7c5fbe40181a4c304aab5a8998984e69ec56a6
+Subproject commit 3582fa46d30fd5f747390c3c7296c4c7c9e5be3e
diff --git a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
index de0e4f9c82..9ed83085bb 100644
--- a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
+++ b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
@@ -204,11 +204,15 @@
     <Compile Include="OmniXAML\Source\OmniXaml\Typing\AttachableXamlMember.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Typing\ClrNamespace.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Typing\CoreTypes.cs" />
+    <Compile Include="OmniXAML\Source\OmniXaml\Typing\DependencyRegistration.cs" />
+    <Compile Include="OmniXAML\Source\OmniXaml\Typing\DependencyRegistrations.cs" />
+    <Compile Include="OmniXAML\Source\OmniXaml\Typing\GenericMetadata.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Typing\IXamlMemberValuePlugin.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Typing\IXamlNamespaceRegistry.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Typing\IXamlTypeRepository.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Typing\MemberValuePlugin.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Typing\Metadata.cs" />
+    <Compile Include="OmniXAML\Source\OmniXaml\Typing\MetadataProvider.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Typing\MutableXamlMember.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Typing\Namespace.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Typing\PrefixRegistration.cs" />