From 9a2dbef228ab282ef928d29609ef14e5f59b9ff2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 2 Sep 2015 00:44:27 +0200
Subject: [PATCH] Updated OmniXAML.

Well, downgraded in terms of version number, as OmniXAML has moved to a
proper semantic versioning scheme and restarted at 0.1.0.
---
 .../XamlTestApplication.csproj                |  8 +++----
 samples/XamlTestApplication/packages.config   | 23 +++++++++----------
 .../Context/PerspexParserFactory.cs           |  2 +-
 .../Perspex.Markup.Xaml.csproj                |  8 +++----
 .../Perspex.Markup.Xaml/packages.config       | 23 +++++++++----------
 5 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/samples/XamlTestApplication/XamlTestApplication.csproj b/samples/XamlTestApplication/XamlTestApplication.csproj
index 688562123d..be738676d1 100644
--- a/samples/XamlTestApplication/XamlTestApplication.csproj
+++ b/samples/XamlTestApplication/XamlTestApplication.csproj
@@ -36,12 +36,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Glass, Version=1.4.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.1.4.8.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\Glass.dll</HintPath>
+    <Reference Include="Glass, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.0.1.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\Glass.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="OmniXaml, Version=1.4.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OmniXaml.1.4.8.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\OmniXaml.dll</HintPath>
+    <Reference Include="OmniXaml, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OmniXaml.0.1.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\OmniXaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
diff --git a/samples/XamlTestApplication/packages.config b/samples/XamlTestApplication/packages.config
index b25bd1d2ef..601727ed56 100644
--- a/samples/XamlTestApplication/packages.config
+++ b/samples/XamlTestApplication/packages.config
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Glass" version="1.4.8.0" targetFramework="net46" userInstalled="true" />
-  <package id="OmniXaml" version="1.4.8.0" targetFramework="net46" userInstalled="true" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="net46" userInstalled="true" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net46" userInstalled="true" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net46" userInstalled="true" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="net46" userInstalled="true" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net46" userInstalled="true" />
-  <package id="Rx-XAML" version="2.2.5" targetFramework="net46" userInstalled="true" />
-  <package id="Serilog" version="1.5.9" targetFramework="net46" userInstalled="true" />
-  <package id="Splat" version="1.6.2" targetFramework="net46" userInstalled="true" />
-  <package id="Sprache" version="2.0.0.46" targetFramework="net46" userInstalled="true" />
-  <package id="Sprache.SuperJMN" version="2.0.0.50" targetFramework="net46" userInstalled="true" />
+  <package id="Glass" version="0.1.0" targetFramework="net451" />
+  <package id="OmniXaml" version="0.1.0" targetFramework="net451" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="net46" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net46" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="net46" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="net46" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net46" />
+  <package id="Rx-XAML" version="2.2.5" targetFramework="net46" />
+  <package id="Serilog" version="1.5.9" targetFramework="net46" />
+  <package id="Splat" version="1.6.2" targetFramework="net46" />
+  <package id="Sprache.SuperJMN" version="2.0.0.50" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexParserFactory.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexParserFactory.cs
index 3312ab7487..b55d2cd279 100644
--- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexParserFactory.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexParserFactory.cs
@@ -9,7 +9,7 @@ namespace Perspex.Markup.Xaml.Context
     using OmniXaml;
     using OmniXaml.ObjectAssembler;
     using OmniXaml.Parsers.ProtoParser;
-    using OmniXaml.Parsers.XamlNodes;
+    using OmniXaml.Parsers.XamlInstructions;
 
     public class PerspexParserFactory : IXamlParserFactory
     {
diff --git a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
index 8a8d3345f8..814427175f 100644
--- a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
+++ b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
@@ -113,12 +113,12 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Glass, Version=1.4.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Glass.1.4.8.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\Glass.dll</HintPath>
+    <Reference Include="Glass, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Glass.0.1.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\Glass.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="OmniXaml, Version=1.4.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\OmniXaml.1.4.8.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\OmniXaml.dll</HintPath>
+    <Reference Include="OmniXaml, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\OmniXaml.0.1.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\OmniXaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
diff --git a/src/Markup/Perspex.Markup.Xaml/packages.config b/src/Markup/Perspex.Markup.Xaml/packages.config
index 8249a6d950..47e6e097df 100644
--- a/src/Markup/Perspex.Markup.Xaml/packages.config
+++ b/src/Markup/Perspex.Markup.Xaml/packages.config
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Glass" version="1.4.8.0" targetFramework="portable46-net451+win81" userInstalled="true" />
-  <package id="OmniXaml" version="1.4.8.0" targetFramework="portable46-net451+win81" userInstalled="true" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="portable46-net451+win81" userInstalled="true" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable46-net451+win81" userInstalled="true" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="portable46-net451+win81" userInstalled="true" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="portable46-net451+win81" userInstalled="true" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable46-net451+win81" userInstalled="true" />
-  <package id="Serilog" version="1.5.9" targetFramework="portable46-net451+win81" userInstalled="true" />
-  <package id="Splat" version="1.6.2" targetFramework="portable46-net451+win81" userInstalled="true" />
-  <package id="Sprache" version="2.0.0.46" targetFramework="portable46-net451+win81" userInstalled="true" />
-  <package id="Sprache.SuperJMN" version="2.0.0.50" targetFramework="portable46-net451+win81" userInstalled="true" />
-  <package id="StyleCop.Analyzers" version="1.0.0-beta008" targetFramework="portable46-net451+win81" developmentDependency="true" userInstalled="true" />
+  <package id="Glass" version="0.1.0" targetFramework="portable46-net451+win81" />
+  <package id="OmniXaml" version="0.1.0" targetFramework="portable46-net451+win81" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="portable46-net451+win81" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable46-net451+win81" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="portable46-net451+win81" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="portable46-net451+win81" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable46-net451+win81" />
+  <package id="Serilog" version="1.5.9" targetFramework="portable46-net451+win81" />
+  <package id="Splat" version="1.6.2" targetFramework="portable46-net451+win81" />
+  <package id="Sprache.SuperJMN" version="2.0.0.50" targetFramework="portable46-net451+win81" />
+  <package id="StyleCop.Analyzers" version="1.0.0-beta008" targetFramework="portable46-net451+win81" developmentDependency="true" />
 </packages>
\ No newline at end of file