diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.Library/Eto.Library.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.Library/Eto.Library.vstemplate
index 4a827f5dd5..f60bae02df 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.Library/Eto.Library.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.Library/Eto.Library.vstemplate
@@ -26,7 +26,7 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Combined/Eto.Desktop/Eto.Desktop.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Combined/Eto.Desktop/Eto.Desktop.vstemplate
index 09320a0a0f..0c03762d18 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Combined/Eto.Desktop/Eto.Desktop.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Combined/Eto.Desktop/Eto.Desktop.vstemplate
@@ -25,13 +25,13 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.Gtk" version="2.0.5" />
-      <package id="Eto.Platform.Gtk3" version="2.0.5" />
-      <package id="Eto.Platform.Windows" version="2.0.5" />
-      <package id="Eto.Platform.Wpf" version="2.0.5" />
-      <package id="Eto.Platform.Mac" version="2.0.5" />
-      <package id="Eto.Platform.Mac.Template" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.Gtk" version="2.0.6" />
+      <package id="Eto.Platform.Gtk3" version="2.0.6" />
+      <package id="Eto.Platform.Windows" version="2.0.6" />
+      <package id="Eto.Platform.Wpf" version="2.0.6" />
+      <package id="Eto.Platform.Mac" version="2.0.6" />
+      <package id="Eto.Platform.Mac.Template" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Combined/Eto/Eto.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Combined/Eto/Eto.vstemplate
index 3e98995d26..622074c966 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Combined/Eto/Eto.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Combined/Eto/Eto.vstemplate
@@ -26,7 +26,7 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Gtk2/Eto.Gtk2.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Gtk2/Eto.Gtk2.vstemplate
index 1ad9c14bae..03ede4be36 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Gtk2/Eto.Gtk2.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Gtk2/Eto.Gtk2.vstemplate
@@ -25,8 +25,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.Gtk" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.Gtk" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Gtk3/Eto.Gtk3.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Gtk3/Eto.Gtk3.vstemplate
index 7b108e80c8..01f25f00f8 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Gtk3/Eto.Gtk3.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Gtk3/Eto.Gtk3.vstemplate
@@ -25,8 +25,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.Gtk3" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.Gtk3" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Mac/Eto.Mac.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Mac/Eto.Mac.vstemplate
index c09bd23239..db3548eddd 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Mac/Eto.Mac.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Mac/Eto.Mac.vstemplate
@@ -25,9 +25,9 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.Mac" version="2.0.5" />
-      <package id="Eto.Platform.Mac.Template" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.Mac" version="2.0.6" />
+      <package id="Eto.Platform.Mac.Template" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.WinForms/Eto.WinForms.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.WinForms/Eto.WinForms.vstemplate
index 836bcbe5d7..8c4d5be47d 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.WinForms/Eto.WinForms.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.WinForms/Eto.WinForms.vstemplate
@@ -25,8 +25,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.Windows" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.Windows" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Wpf/Eto.Wpf.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Wpf/Eto.Wpf.vstemplate
index d3020c483e..5f6220afd3 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Wpf/Eto.Wpf.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Wpf/Eto.Wpf.vstemplate
@@ -25,8 +25,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.Wpf" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.Wpf" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.XamMac2/Eto.XamMac2.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.XamMac2/Eto.XamMac2.vstemplate
index cab6c6d2ce..8cec5e23d1 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.XamMac2/Eto.XamMac2.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.XamMac2/Eto.XamMac2.vstemplate
@@ -26,8 +26,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.XamMac2" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.XamMac2" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto/Eto.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto/Eto.vstemplate
index 3e98995d26..622074c966 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto/Eto.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto/Eto.vstemplate
@@ -26,7 +26,7 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Combined/Eto.Desktop/Eto.Desktop.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Combined/Eto.Desktop/Eto.Desktop.vstemplate
index 09320a0a0f..0c03762d18 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Combined/Eto.Desktop/Eto.Desktop.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Combined/Eto.Desktop/Eto.Desktop.vstemplate
@@ -25,13 +25,13 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.Gtk" version="2.0.5" />
-      <package id="Eto.Platform.Gtk3" version="2.0.5" />
-      <package id="Eto.Platform.Windows" version="2.0.5" />
-      <package id="Eto.Platform.Wpf" version="2.0.5" />
-      <package id="Eto.Platform.Mac" version="2.0.5" />
-      <package id="Eto.Platform.Mac.Template" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.Gtk" version="2.0.6" />
+      <package id="Eto.Platform.Gtk3" version="2.0.6" />
+      <package id="Eto.Platform.Windows" version="2.0.6" />
+      <package id="Eto.Platform.Wpf" version="2.0.6" />
+      <package id="Eto.Platform.Mac" version="2.0.6" />
+      <package id="Eto.Platform.Mac.Template" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Gtk2/Eto.Gtk2.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Gtk2/Eto.Gtk2.vstemplate
index 1ad9c14bae..03ede4be36 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Gtk2/Eto.Gtk2.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Gtk2/Eto.Gtk2.vstemplate
@@ -25,8 +25,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.Gtk" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.Gtk" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Gtk3/Eto.Gtk3.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Gtk3/Eto.Gtk3.vstemplate
index 7b108e80c8..01f25f00f8 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Gtk3/Eto.Gtk3.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Gtk3/Eto.Gtk3.vstemplate
@@ -25,8 +25,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.Gtk3" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.Gtk3" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Mac/Eto.Mac.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Mac/Eto.Mac.vstemplate
index c09bd23239..db3548eddd 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Mac/Eto.Mac.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Mac/Eto.Mac.vstemplate
@@ -25,9 +25,9 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.Mac" version="2.0.5" />
-      <package id="Eto.Platform.Mac.Template" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.Mac" version="2.0.6" />
+      <package id="Eto.Platform.Mac.Template" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.WinForms/Eto.WinForms.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.WinForms/Eto.WinForms.vstemplate
index 836bcbe5d7..8c4d5be47d 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.WinForms/Eto.WinForms.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.WinForms/Eto.WinForms.vstemplate
@@ -25,8 +25,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.Windows" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.Windows" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Wpf/Eto.Wpf.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Wpf/Eto.Wpf.vstemplate
index d3020c483e..5f6220afd3 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Wpf/Eto.Wpf.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Wpf/Eto.Wpf.vstemplate
@@ -25,8 +25,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.Wpf" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.Wpf" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.XamMac2/Eto.XamMac2.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.XamMac2/Eto.XamMac2.vstemplate
index cab6c6d2ce..8cec5e23d1 100644
--- a/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.XamMac2/Eto.XamMac2.vstemplate
+++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.XamMac2/Eto.XamMac2.vstemplate
@@ -26,8 +26,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
-      <package id="Eto.Forms" version="2.0.5" />
-      <package id="Eto.Platform.XamMac2" version="2.0.5" />
+      <package id="Eto.Forms" version="2.0.6" />
+      <package id="Eto.Platform.XamMac2" version="2.0.6" />
     </packages>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj b/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj
index a7c6c9d826..ce8d2e1578 100644
--- a/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj
+++ b/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj
@@ -112,68 +112,68 @@
     <None Include="Templates\Projects\Eto-SAL-Separate.xpt.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Forms.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Forms.2.0.5.nupkg')">
-      <Link>Packages\Eto.Forms.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Forms.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Forms.2.0.6.nupkg')">
+      <Link>Packages\Eto.Forms.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Forms.Sample.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Forms.Sample.2.0.5.nupkg')">
-      <Link>Packages\Eto.Forms.Sample.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Forms.Sample.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Forms.Sample.2.0.6.nupkg')">
+      <Link>Packages\Eto.Forms.Sample.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Direct2D.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Direct2D.2.0.5.nupkg')">
-      <Link>Packages\Eto.Platform.Direct2D.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Direct2D.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Direct2D.2.0.6.nupkg')">
+      <Link>Packages\Eto.Platform.Direct2D.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk.2.0.5.nupkg')">
-      <Link>Packages\Eto.Platform.Gtk.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk.2.0.6.nupkg')">
+      <Link>Packages\Eto.Platform.Gtk.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk3.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk3.2.0.5.nupkg')">
-      <Link>Packages\Eto.Platform.Gtk3.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk3.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk3.2.0.6.nupkg')">
+      <Link>Packages\Eto.Platform.Gtk3.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.iOS.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.iOS.2.0.5.nupkg')">
-      <Link>Packages\Eto.Platform.iOS.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.iOS.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.iOS.2.0.6.nupkg')">
+      <Link>Packages\Eto.Platform.iOS.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.2.0.5.nupkg')">
-      <Link>Packages\Eto.Platform.Mac.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.2.0.6.nupkg')">
+      <Link>Packages\Eto.Platform.Mac.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.Template.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.Template.2.0.5.nupkg')">
-      <Link>Packages\Eto.Platform.Mac.Template.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.Template.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.Template.2.0.6.nupkg')">
+      <Link>Packages\Eto.Platform.Mac.Template.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac64.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac64.2.0.5.nupkg')">
-      <Link>Packages\Eto.Platform.Mac64.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac64.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac64.2.0.6.nupkg')">
+      <Link>Packages\Eto.Platform.Mac64.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Windows.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Windows.2.0.5.nupkg')">
-      <Link>Packages\Eto.Platform.Windows.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Windows.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Windows.2.0.6.nupkg')">
+      <Link>Packages\Eto.Platform.Windows.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.WinRT.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.WinRT.2.0.5.nupkg')">
-      <Link>Packages\Eto.Platform.WinRT.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.WinRT.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.WinRT.2.0.6.nupkg')">
+      <Link>Packages\Eto.Platform.WinRT.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Wpf.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Wpf.2.0.5.nupkg')">
-      <Link>Packages\Eto.Platform.Wpf.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Wpf.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Wpf.2.0.6.nupkg')">
+      <Link>Packages\Eto.Platform.Wpf.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac.2.0.5.nupkg')">
-      <Link>Packages\Eto.Platform.XamMac.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac.2.0.6.nupkg')">
+      <Link>Packages\Eto.Platform.XamMac.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac2.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac2.2.0.5.nupkg')">
-      <Link>Packages\Eto.Platform.XamMac2.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac2.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac2.2.0.6.nupkg')">
+      <Link>Packages\Eto.Platform.XamMac2.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Json.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Json.2.0.5.nupkg')">
-      <Link>Packages\Eto.Serialization.Json.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Json.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Json.2.0.6.nupkg')">
+      <Link>Packages\Eto.Serialization.Json.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Xaml.2.0.5.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Xaml.2.0.5.nupkg')">
-      <Link>Packages\Eto.Serialization.Xaml.2.0.5.nupkg</Link>
+    <None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Xaml.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Xaml.2.0.6.nupkg')">
+      <Link>Packages\Eto.Serialization.Xaml.2.0.6.nupkg</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="Templates\Projects\Eto-Library.xpt.xml">
diff --git a/Source/Eto.Serialization.Json/EtoContractResolver.cs b/Source/Eto.Serialization.Json/EtoContractResolver.cs
index 42a3b0dfda..9d4a0654cd 100644
--- a/Source/Eto.Serialization.Json/EtoContractResolver.cs
+++ b/Source/Eto.Serialization.Json/EtoContractResolver.cs
@@ -22,7 +22,7 @@ protected override IValueProvider CreateMemberValueProvider(MemberInfo member)
 		protected override IList<JsonProperty> CreateProperties(Type type, MemberSerialization memberSerialization)
 		{
 			var list = base.CreateProperties(type, memberSerialization);
-			foreach (var eventInfo in type.GetRuntimeEvents().Where(r => r.DeclaringType == type && r.GetAddMethod().IsPublic && !r.GetAddMethod().IsStatic && r.EventHandlerType == typeof(EventHandler<EventArgs>)))
+			foreach (var eventInfo in type.GetRuntimeEvents().Where(r => r.GetAddMethod().IsPublic && !r.GetAddMethod().IsStatic && r.EventHandlerType == typeof(EventHandler<EventArgs>)))
 			{
 				var prop = CreateProperty(eventInfo, memberSerialization);
 				prop.Writable = true;
diff --git a/Source/Shared/GlobalAssemblyInfo.cs b/Source/Shared/GlobalAssemblyInfo.cs
index f55cb1805a..1f37fe482a 100644
--- a/Source/Shared/GlobalAssemblyInfo.cs
+++ b/Source/Shared/GlobalAssemblyInfo.cs
@@ -7,5 +7,5 @@
 [assembly: AssemblyCulture("")]
 
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.5.0")]
-[assembly: AssemblyInformationalVersion("2.0.5")]
+[assembly: AssemblyFileVersion("2.0.6.0")]
+[assembly: AssemblyInformationalVersion("2.0.6")]