Skip to content

Commit

Permalink
Merge branch 'hotfix/2.0.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
@cwensley
cwensley committed Nov 22, 2014
2 parents 490ea2a + 5c657d7 commit 9d72815
Show file tree
Hide file tree
Showing 35 changed files with 233 additions and 182 deletions.
2 changes: 1 addition & 1 deletion Source/Addins/Eto.Addin.VisualStudio/Eto.Library/Eto.Library.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Forms" version="2.0.5" />
</packages>
</WizardData>
</VSTemplate>
14 changes: 7 additions & 7 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Combined/Eto.Desktop/Eto.Desktop.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.Gtk" version="2.0.3" />
<package id="Eto.Platform.Gtk3" version="2.0.3" />
<package id="Eto.Platform.Windows" version="2.0.3" />
<package id="Eto.Platform.Wpf" version="2.0.3" />
<package id="Eto.Platform.Mac" version="2.0.3" />
<package id="Eto.Platform.Mac.Template" version="2.0.3" />
<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" />
</packages>
</WizardData>
</VSTemplate>
2 changes: 1 addition & 1 deletion Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Combined/Eto/Eto.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Forms" version="2.0.5" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Gtk2/Eto.Gtk2.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.Gtk" version="2.0.3" />
<package id="Eto.Forms" version="2.0.5" />
<package id="Eto.Platform.Gtk" version="2.0.5" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Gtk3/Eto.Gtk3.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.Gtk3" version="2.0.3" />
<package id="Eto.Forms" version="2.0.5" />
<package id="Eto.Platform.Gtk3" version="2.0.5" />
</packages>
</WizardData>
</VSTemplate>
6 changes: 3 additions & 3 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Mac/Eto.Mac.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.Mac" version="2.0.3" />
<package id="Eto.Platform.Mac.Template" version="2.0.3" />
<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" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.WinForms/Eto.WinForms.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.Windows" version="2.0.3" />
<package id="Eto.Forms" version="2.0.5" />
<package id="Eto.Platform.Windows" version="2.0.5" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Wpf/Eto.Wpf.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.Wpf" version="2.0.3" />
<package id="Eto.Forms" version="2.0.5" />
<package id="Eto.Platform.Wpf" version="2.0.5" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.XamMac2/Eto.XamMac2.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.XamMac2" version="2.0.3" />
<package id="Eto.Forms" version="2.0.5" />
<package id="Eto.Platform.XamMac2" version="2.0.5" />
</packages>
</WizardData>
</VSTemplate>
2 changes: 1 addition & 1 deletion Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto/Eto.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Forms" version="2.0.5" />
</packages>
</WizardData>
</VSTemplate>
14 changes: 7 additions & 7 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Combined/Eto.Desktop/Eto.Desktop.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.Gtk" version="2.0.3" />
<package id="Eto.Platform.Gtk3" version="2.0.3" />
<package id="Eto.Platform.Windows" version="2.0.3" />
<package id="Eto.Platform.Wpf" version="2.0.3" />
<package id="Eto.Platform.Mac" version="2.0.3" />
<package id="Eto.Platform.Mac.Template" version="2.0.3" />
<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" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Gtk2/Eto.Gtk2.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.Gtk" version="2.0.3" />
<package id="Eto.Forms" version="2.0.5" />
<package id="Eto.Platform.Gtk" version="2.0.5" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Gtk3/Eto.Gtk3.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.Gtk3" version="2.0.3" />
<package id="Eto.Forms" version="2.0.5" />
<package id="Eto.Platform.Gtk3" version="2.0.5" />
</packages>
</WizardData>
</VSTemplate>
6 changes: 3 additions & 3 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Mac/Eto.Mac.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.Mac" version="2.0.3" />
<package id="Eto.Platform.Mac.Template" version="2.0.3" />
<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" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.WinForms/Eto.WinForms.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.Windows" version="2.0.3" />
<package id="Eto.Forms" version="2.0.5" />
<package id="Eto.Platform.Windows" version="2.0.5" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Wpf/Eto.Wpf.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.Wpf" version="2.0.3" />
<package id="Eto.Forms" version="2.0.5" />
<package id="Eto.Platform.Wpf" version="2.0.5" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.XamMac2/Eto.XamMac2.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.3" />
<package id="Eto.Platform.XamMac2" version="2.0.3" />
<package id="Eto.Forms" version="2.0.5" />
<package id="Eto.Platform.XamMac2" version="2.0.5" />
</packages>
</WizardData>
</VSTemplate>
64 changes: 32 additions & 32 deletions Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Forms.2.0.3.nupkg')">
<Link>Packages\Eto.Forms.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Forms.Sample.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Forms.Sample.2.0.3.nupkg')">
<Link>Packages\Eto.Forms.Sample.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Direct2D.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Direct2D.2.0.3.nupkg')">
<Link>Packages\Eto.Platform.Direct2D.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk.2.0.3.nupkg')">
<Link>Packages\Eto.Platform.Gtk.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk3.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk3.2.0.3.nupkg')">
<Link>Packages\Eto.Platform.Gtk3.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.iOS.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.iOS.2.0.3.nupkg')">
<Link>Packages\Eto.Platform.iOS.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.2.0.3.nupkg')">
<Link>Packages\Eto.Platform.Mac.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.Template.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.Template.2.0.3.nupkg')">
<Link>Packages\Eto.Platform.Mac.Template.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac64.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac64.2.0.3.nupkg')">
<Link>Packages\Eto.Platform.Mac64.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Windows.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Windows.2.0.3.nupkg')">
<Link>Packages\Eto.Platform.Windows.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.WinRT.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.WinRT.2.0.3.nupkg')">
<Link>Packages\Eto.Platform.WinRT.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Wpf.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Wpf.2.0.3.nupkg')">
<Link>Packages\Eto.Platform.Wpf.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac.2.0.3.nupkg')">
<Link>Packages\Eto.Platform.XamMac.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac2.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac2.2.0.3.nupkg')">
<Link>Packages\Eto.Platform.XamMac2.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Json.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Json.2.0.3.nupkg')">
<Link>Packages\Eto.Serialization.Json.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Xaml.2.0.3.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Xaml.2.0.3.nupkg')">
<Link>Packages\Eto.Serialization.Xaml.2.0.3.nupkg</Link>
<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>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Templates\Projects\Eto-Library.xpt.xml">
Expand Down
1 change: 1 addition & 0 deletions Source/Eto.Gtk/Forms/GtkFileDialog.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public string FileName
{
Control.SetCurrentFolder(Path.GetDirectoryName(value));
Control.SetFilename(value);
Control.CurrentName = Path.GetFileName(value);
}
}

Expand Down
13 changes: 9 additions & 4 deletions Source/Eto.Mac/Forms/Controls/DrawableHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ public class DrawableHandler : MacPanel<DrawableHandler.EtoDrawableView, Drawabl

public class EtoDrawableView : MacEventView
{
Drawable Drawable
DrawableHandler Drawable
{
get { return Widget as Drawable; }
get { return Handler as DrawableHandler; }
}

public override void DrawRect(CGRect dirtyRect)
Expand All @@ -61,7 +61,7 @@ public override void DrawRect(CGRect dirtyRect)
if (dirtyRect.Y % 1.0f > 0f)
dirtyRect.Height += 1;
ApplicationHandler.QueueResizing = true;
drawable.Update(Rectangle.Ceiling(dirtyRect.ToEto()));
drawable.DrawRegion(Rectangle.Ceiling(dirtyRect.ToEto()));
ApplicationHandler.QueueResizing = false;
}

Expand Down Expand Up @@ -128,7 +128,7 @@ public override void Invalidate(Rectangle rect)
base.Invalidate(rect);
}

public void Update(Rectangle rect)
void DrawRegion(Rectangle rect)
{
var context = NSGraphicsContext.CurrentContext;
if (context != null)
Expand All @@ -145,5 +145,10 @@ public void Update(Rectangle rect)
}
}
}

public void Update(Rectangle rect)
{
Control.DisplayRect(rect.ToSDRectangleF());
}
}
}
2 changes: 1 addition & 1 deletion Source/Eto.Test/Eto.Test/Sections/Controls/TabControlSection.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ public class TabControlSection : Panel

protected override void OnPreLoad(EventArgs e)
{
base.OnPreLoad(e);
Content = Create();
base.OnPreLoad(e);
}

public virtual Control Create()
Expand Down
Loading

0 comments on commit 9d72815

Please sign in to comment.