From d5041bc1b08c10fac7ebb57f6ae38d389e5a280e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 24 May 2018 10:33:36 +0200
Subject: [PATCH 1/2] Update Portable.Xaml to develop branch.

As far as I can tell, all of the changes we need have been merged into Portable.Xaml, so we should be able to use the `develop` branch without any of our own patches.
---
 src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj | 6 ++++--
 .../Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 2d3a43a909..544892bcfd 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <DefineConstants>PCL;NETSTANDARD;NETSTANDARD2_0;HAS_TYPE_CONVERTER;HAS_CUSTOM_ATTRIBUTE_PROVIDER</DefineConstants>
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
@@ -9,7 +10,6 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETSTANDARD1_3;PCL;NETSTANDARD</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>CS1591</NoWarn>
@@ -18,7 +18,6 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>NETSTANDARD1_3;PCL;NETSTANDARD</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\Avalonia.Markup.Xaml.xml</DocumentationFile>
@@ -91,6 +90,9 @@
         <Compile Include="PortableXaml\portable.xaml.github\src\Portable.Xaml\**\*.cs" Exclude="PortableXaml\portable.xaml.github\src\Portable.Xaml\Assembly\**\*.cs" />
         <Compile Remove="**\UriTypeConverter.cs" />
     </ItemGroup>
+    <ItemGroup>
+      <Compile Include="PortableXaml\portable.xaml.github\src\Portable.Xaml\Portable.Xaml.ComponentModel\UriTypeConverter.cs" />
+    </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
index cdf46d7892..8abbe09592 160000
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
@@ -1 +1 @@
-Subproject commit cdf46d7892def8a6ba29f12a9339147377f7cf5c
+Subproject commit 8abbe09592668efb573ac4d5548ba2d7e464ba78

From 92f26f8139cb564a93058f8b62c679ff4365aeb1 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 29 May 2018 00:39:20 +0200
Subject: [PATCH 2/2] Fix inclusion of UriTypeConverter.

---
 src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 6c028a7b23..9260a0c9a2 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -65,10 +65,6 @@
         <Compile Include="Templates\TreeDataTemplate.cs" />
         <Compile Include="XamlLoadException.cs" />
         <Compile Include="PortableXaml\portable.xaml.github\src\Portable.Xaml\**\*.cs" Exclude="PortableXaml\portable.xaml.github\src\Portable.Xaml\Assembly\**\*.cs" />
-        <Compile Remove="**\UriTypeConverter.cs" />
-    </ItemGroup>
-    <ItemGroup>
-      <Compile Include="PortableXaml\portable.xaml.github\src\Portable.Xaml\Portable.Xaml.ComponentModel\UriTypeConverter.cs" />
     </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />