From 6cec01ba42531aa6d8c2d05dbdb130cfed6412ae Mon Sep 17 00:00:00 2001 From: Curtis Wensley Date: Sun, 13 Sep 2015 22:02:11 -0700 Subject: [PATCH 001/155] Update to v2.2 --- Resources/packages.config | 28 ++++---- .../Eto.ItemTemplates/CS/Code.vstemplate | 2 +- .../Eto.ItemTemplates/CS/Json.vstemplate | 4 +- .../Eto.ItemTemplates/CS/Xaml.vstemplate | 4 +- .../Eto.ItemTemplates/FS/Code.vstemplate | 2 +- .../Eto.ItemTemplates/FS/Json.vstemplate | 4 +- .../Eto.ItemTemplates/FS/Xaml.vstemplate | 4 +- .../Eto.ItemTemplates/VB/Code.vstemplate | 2 +- .../Eto.ItemTemplates/VB/Json.vstemplate | 4 +- .../Eto.ItemTemplates/VB/Xaml.vstemplate | 4 +- .../CS/App/Eto/Eto.vstemplate | 2 +- .../CS/App/Platform/Eto.Desktop.vstemplate | 14 ++-- .../CS/App/Platform/Eto.Gtk2.vstemplate | 4 +- .../CS/App/Platform/Eto.Gtk3.vstemplate | 4 +- .../CS/App/Platform/Eto.Mac.vstemplate | 6 +- .../CS/App/Platform/Eto.WinForms.vstemplate | 4 +- .../CS/App/Platform/Eto.Wpf.vstemplate | 4 +- .../CS/Library/Library.vstemplate | 2 +- .../FS/App/Eto/Eto.vstemplate | 2 +- .../FS/App/Platform/Eto.Desktop.vstemplate | 14 ++-- .../FS/App/Platform/Eto.Gtk2.vstemplate | 4 +- .../FS/App/Platform/Eto.Gtk3.vstemplate | 4 +- .../FS/App/Platform/Eto.Mac.vstemplate | 6 +- .../FS/App/Platform/Eto.WinForms.vstemplate | 4 +- .../FS/App/Platform/Eto.Wpf.vstemplate | 4 +- .../FS/Library/Library.vstemplate | 2 +- .../PY/App/App.vstemplate | 14 ++-- .../VB/App/Eto/Eto.vstemplate | 2 +- .../VB/App/Platform/Eto.Desktop.vstemplate | 14 ++-- .../VB/App/Platform/Eto.Gtk2.vstemplate | 4 +- .../VB/App/Platform/Eto.Gtk3.vstemplate | 4 +- .../VB/App/Platform/Eto.Mac.vstemplate | 6 +- .../VB/App/Platform/Eto.WinForms.vstemplate | 4 +- .../VB/App/Platform/Eto.Wpf.vstemplate | 4 +- .../VB/Library/Library.vstemplate | 2 +- .../Eto.Addin.XamarinStudio.csproj | 64 +++++++++---------- Source/Shared/GlobalAssemblyInfo.cs | 6 +- appveyor.yml | 2 +- 38 files changed, 132 insertions(+), 132 deletions(-) diff --git a/Resources/packages.config b/Resources/packages.config index af8ee7f5ef..95b455b97c 100644 --- a/Resources/packages.config +++ b/Resources/packages.config @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Code.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Code.vstemplate index 39e4291d6f..7a59b5e127 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Code.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Code.vstemplate @@ -34,7 +34,7 @@ - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Json.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Json.vstemplate index 2c68b5a848..1e98c497aa 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Json.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Json.vstemplate @@ -34,9 +34,9 @@ - + - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Xaml.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Xaml.vstemplate index 9ff6d08584..b666982e70 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Xaml.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Xaml.vstemplate @@ -34,8 +34,8 @@ - - + + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Code.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Code.vstemplate index 6728f493ed..f1aa3464e9 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Code.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Code.vstemplate @@ -38,7 +38,7 @@ - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Json.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Json.vstemplate index 5d99d7f77e..31fa2919d9 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Json.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Json.vstemplate @@ -34,9 +34,9 @@ - + - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Xaml.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Xaml.vstemplate index 580816cc87..610bdca02a 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Xaml.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Xaml.vstemplate @@ -34,8 +34,8 @@ - - + + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Code.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Code.vstemplate index 1ab10825df..af181baaca 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Code.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Code.vstemplate @@ -34,7 +34,7 @@ - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Json.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Json.vstemplate index 602385472d..245bbba98f 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Json.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Json.vstemplate @@ -34,9 +34,9 @@ - + - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Xaml.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Xaml.vstemplate index 08c320cead..406c877cfc 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Xaml.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Xaml.vstemplate @@ -34,8 +34,8 @@ - - + + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Eto/Eto.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Eto/Eto.vstemplate index 7ccf74e0c8..71a5dfa8cc 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Eto/Eto.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Eto/Eto.vstemplate @@ -30,7 +30,7 @@ - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Desktop.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Desktop.vstemplate index 3871b5ea44..1be0219996 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Desktop.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Desktop.vstemplate @@ -29,13 +29,13 @@ - - - - - - - + + + + + + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk2.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk2.vstemplate index 98727d942c..1ab4dec8c5 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk2.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk2.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk3.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk3.vstemplate index b87cdaf061..138ec4499d 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk3.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk3.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Mac.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Mac.vstemplate index f44bb91257..c9d0a4ec6e 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Mac.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Mac.vstemplate @@ -31,9 +31,9 @@ - - - + + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.WinForms.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.WinForms.vstemplate index 0638d4165f..e8ad3bcda9 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.WinForms.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.WinForms.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Wpf.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Wpf.vstemplate index 1ac474f988..0bd8d99cc7 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Wpf.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Wpf.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/Library/Library.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/Library/Library.vstemplate index 9b40a84eff..63896e99a0 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/Library/Library.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/Library/Library.vstemplate @@ -34,7 +34,7 @@ - + SupportsPCL,IsLibrary diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Eto/Eto.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Eto/Eto.vstemplate index 91062c0084..f5e4d55fc9 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Eto/Eto.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Eto/Eto.vstemplate @@ -30,7 +30,7 @@ - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Desktop.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Desktop.vstemplate index 1c013db0ee..adbab93443 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Desktop.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Desktop.vstemplate @@ -29,13 +29,13 @@ - - - - - - - + + + + + + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk2.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk2.vstemplate index 005dfe39de..6946b92f10 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk2.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk2.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk3.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk3.vstemplate index 731af86230..207e310c23 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk3.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk3.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Mac.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Mac.vstemplate index 7a06f3e985..1e22a13b88 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Mac.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Mac.vstemplate @@ -31,9 +31,9 @@ - - - + + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.WinForms.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.WinForms.vstemplate index bb068b8637..02ead81d53 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.WinForms.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.WinForms.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Wpf.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Wpf.vstemplate index 1d8f0d6857..282f96ae4e 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Wpf.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Wpf.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/Library/Library.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/Library/Library.vstemplate index 4f07953755..6e1796b611 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/Library/Library.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/Library/Library.vstemplate @@ -33,7 +33,7 @@ - + SupportsPCL,IsLibrary diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/PY/App/App.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/PY/App/App.vstemplate index 4af83fbe26..b5cf4c15c2 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/PY/App/App.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/PY/App/App.vstemplate @@ -28,13 +28,13 @@ - - - - - - - + + + + + + + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Eto/Eto.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Eto/Eto.vstemplate index 0ad3ab4872..8ea65e6576 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Eto/Eto.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Eto/Eto.vstemplate @@ -30,7 +30,7 @@ - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Desktop.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Desktop.vstemplate index ac3973646f..16029758cc 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Desktop.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Desktop.vstemplate @@ -30,13 +30,13 @@ - - - - - - - + + + + + + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk2.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk2.vstemplate index bbc3d5a7c4..e72c33efb5 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk2.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk2.vstemplate @@ -30,8 +30,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk3.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk3.vstemplate index 1282d5b7fc..d8dfb8df93 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk3.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk3.vstemplate @@ -30,8 +30,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Mac.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Mac.vstemplate index 007c1bc451..4eb49a5cf4 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Mac.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Mac.vstemplate @@ -30,9 +30,9 @@ - - - + + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.WinForms.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.WinForms.vstemplate index ffba5afac4..c97c3140ec 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.WinForms.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.WinForms.vstemplate @@ -30,8 +30,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Wpf.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Wpf.vstemplate index 38212c874c..f4d21297df 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Wpf.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Wpf.vstemplate @@ -30,8 +30,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/Library/Library.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/Library/Library.vstemplate index 167485f235..e9e9d50ca0 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/Library/Library.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/Library/Library.vstemplate @@ -34,7 +34,7 @@ - + SupportsPCL,IsLibrary diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj b/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj index 0a1800bbf6..d6370e6342 100644 --- a/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj +++ b/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj @@ -67,16 +67,16 @@ - - Packages\Eto.Platform.iOS.2.1.0.nupkg + + Packages\Eto.Platform.iOS.2.2.0.nupkg PreserveNewest - - Packages\Eto.Platform.WinRT.2.1.0.nupkg + + Packages\Eto.Platform.WinRT.2.2.0.nupkg PreserveNewest - - Packages\Eto.Platform.Wpf.2.1.0.nupkg + + Packages\Eto.Platform.Wpf.2.2.0.nupkg PreserveNewest @@ -145,56 +145,56 @@ PreserveNewest - - Packages\Eto.Forms.2.1.0.nupkg + + Packages\Eto.Forms.2.2.0.nupkg PreserveNewest - - Packages\Eto.Forms.Sample.2.1.0.nupkg + + Packages\Eto.Forms.Sample.2.2.0.nupkg PreserveNewest - - Packages\Eto.Platform.Direct2D.2.1.0.nupkg + + Packages\Eto.Platform.Direct2D.2.2.0.nupkg PreserveNewest - - Packages\Eto.Platform.Gtk.2.1.0.nupkg + + Packages\Eto.Platform.Gtk.2.2.0.nupkg PreserveNewest - - Packages\Eto.Platform.Gtk3.2.1.0.nupkg + + Packages\Eto.Platform.Gtk3.2.2.0.nupkg PreserveNewest - - Packages\Eto.Platform.Mac.2.1.0.nupkg + + Packages\Eto.Platform.Mac.2.2.0.nupkg PreserveNewest - - Packages\Eto.Platform.Mac.Template.2.1.0.nupkg + + Packages\Eto.Platform.Mac.Template.2.2.0.nupkg PreserveNewest - - Packages\Eto.Platform.Mac64.2.1.0.nupkg + + Packages\Eto.Platform.Mac64.2.2.0.nupkg PreserveNewest - - Packages\Eto.Platform.Windows.2.1.0.nupkg + + Packages\Eto.Platform.Windows.2.2.0.nupkg PreserveNewest - - Packages\Eto.Platform.XamMac.2.1.0.nupkg + + Packages\Eto.Platform.XamMac.2.2.0.nupkg PreserveNewest - - Packages\Eto.Platform.XamMac2.2.1.0.nupkg + + Packages\Eto.Platform.XamMac2.2.2.0.nupkg PreserveNewest - - Packages\Eto.Serialization.Json.2.1.0.nupkg + + Packages\Eto.Serialization.Json.2.2.0.nupkg PreserveNewest - - Packages\Eto.Serialization.Xaml.2.1.0.nupkg + + Packages\Eto.Serialization.Xaml.2.2.0.nupkg PreserveNewest diff --git a/Source/Shared/GlobalAssemblyInfo.cs b/Source/Shared/GlobalAssemblyInfo.cs index 55afbf1f9c..4ff6277d2e 100644 --- a/Source/Shared/GlobalAssemblyInfo.cs +++ b/Source/Shared/GlobalAssemblyInfo.cs @@ -6,6 +6,6 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("2.1.0.0")] -//[assembly: AssemblyFileVersion("2.1.0")] -[assembly: AssemblyInformationalVersion("2.1.0")] +[assembly: AssemblyVersion("2.1.*")] +//[assembly: AssemblyFileVersion("2.2.0")] +[assembly: AssemblyInformationalVersion("2.2.0-alpha")] diff --git a/appveyor.yml b/appveyor.yml index dadced103e..7a1662441b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ install: build_script: - set BASE=%APPVEYOR_BUILD_FOLDER% - set BUILD_VERSION=000%APPVEYOR_BUILD_NUMBER% -- set BUILD_VERSION=2.1.0-build%BUILD_VERSION:~-4% +- set BUILD_VERSION=2.2.0-build%BUILD_VERSION:~-4% - echo Downloading XamMac.dll for build.. - mkdir %BASE%\BuildOutput\net40\Release - mkdir %BASE%\BuildOutput\net45\Release From 5ed9aca47f9b2cd34539b346e30991f3f741261c Mon Sep 17 00:00:00 2001 From: Curtis Wensley Date: Sun, 13 Sep 2015 22:04:14 -0700 Subject: [PATCH 002/155] Update Appveyor version as well. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7a1662441b..070813f002 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.1.0.{build} +version: 2.2.0.{build} install: - appveyor DownloadFile http://download.xamarin.com/GTKforWindows/Windows/gtk-sharp-2.12.26.msi - msiexec /i gtk-sharp-2.12.26.msi /qn /norestart From ca22860085a7e908b2db22424bdca0bcb901f8c7 Mon Sep 17 00:00:00 2001 From: Curtis Wensley Date: Wed, 16 Sep 2015 00:28:41 -0700 Subject: [PATCH 003/155] Update addins to use 2.2.0-alpha so they can be built in develop without setting version. --- Resources/packages.config | 28 ++++---- .../source.extension.vsixmanifest | 2 +- .../Eto.ItemTemplates/CS/Code.vstemplate | 2 +- .../Eto.ItemTemplates/CS/Json.vstemplate | 4 +- .../Eto.ItemTemplates/CS/Xaml.vstemplate | 4 +- .../Eto.ItemTemplates/FS/Code.vstemplate | 2 +- .../Eto.ItemTemplates/FS/Json.vstemplate | 4 +- .../Eto.ItemTemplates/FS/Xaml.vstemplate | 4 +- .../Eto.ItemTemplates/VB/Code.vstemplate | 2 +- .../Eto.ItemTemplates/VB/Json.vstemplate | 4 +- .../Eto.ItemTemplates/VB/Xaml.vstemplate | 4 +- .../CS/App/App.vstemplate | 2 +- .../CS/App/Eto/Eto.vstemplate | 2 +- .../CS/App/Platform/Eto.Desktop.vstemplate | 14 ++-- .../CS/App/Platform/Eto.Gtk2.vstemplate | 4 +- .../CS/App/Platform/Eto.Gtk3.vstemplate | 4 +- .../CS/App/Platform/Eto.Mac.vstemplate | 6 +- .../CS/App/Platform/Eto.WinForms.vstemplate | 4 +- .../CS/App/Platform/Eto.Wpf.vstemplate | 4 +- .../CS/Library/Library.vstemplate | 2 +- .../FS/App/Eto/Eto.vstemplate | 2 +- .../FS/App/Platform/Eto.Desktop.fsproj | 1 + .../FS/App/Platform/Eto.Desktop.vstemplate | 14 ++-- .../FS/App/Platform/Eto.Gtk2.vstemplate | 4 +- .../FS/App/Platform/Eto.Gtk3.vstemplate | 4 +- .../FS/App/Platform/Eto.Mac.vstemplate | 6 +- .../FS/App/Platform/Eto.WinForms.vstemplate | 4 +- .../FS/App/Platform/Eto.Wpf.vstemplate | 4 +- .../FS/Library/Library.vstemplate | 2 +- .../PY/App/App.vstemplate | 14 ++-- .../VB/App/Eto/Eto.vstemplate | 2 +- .../VB/App/Platform/Eto.Desktop.vstemplate | 14 ++-- .../VB/App/Platform/Eto.Gtk2.vstemplate | 4 +- .../VB/App/Platform/Eto.Gtk3.vstemplate | 4 +- .../VB/App/Platform/Eto.Mac.vstemplate | 6 +- .../VB/App/Platform/Eto.WinForms.vstemplate | 4 +- .../VB/App/Platform/Eto.Wpf.vstemplate | 4 +- .../VB/Library/Library.vstemplate | 2 +- .../Eto.Addin.XamarinStudio.csproj | 64 +++++++++---------- 39 files changed, 131 insertions(+), 130 deletions(-) diff --git a/Resources/packages.config b/Resources/packages.config index 95b455b97c..0a3540c7e7 100644 --- a/Resources/packages.config +++ b/Resources/packages.config @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/source.extension.vsixmanifest b/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/source.extension.vsixmanifest index a1d96e85fa..d864beea54 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/source.extension.vsixmanifest +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + Eto.Forms Visual Studio Addin Eto.Forms Support for Visual Studio. Eto.Forms is a cross platform GUI framework for desktop and mobile applications in .NET that can target Wpf, WinForms, Direct2D, MonoMac, Xamarin.Mac, Gtk2, Gtk3, and iOS with a single codebase. https://github.com/picoe/Eto diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Code.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Code.vstemplate index 7a59b5e127..c7d7764a5c 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Code.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Code.vstemplate @@ -34,7 +34,7 @@ - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Json.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Json.vstemplate index 1e98c497aa..d211ece9e6 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Json.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Json.vstemplate @@ -34,9 +34,9 @@ - + - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Xaml.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Xaml.vstemplate index b666982e70..3836aa5782 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Xaml.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/CS/Xaml.vstemplate @@ -34,8 +34,8 @@ - - + + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Code.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Code.vstemplate index f1aa3464e9..ca35e61ce6 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Code.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Code.vstemplate @@ -38,7 +38,7 @@ - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Json.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Json.vstemplate index 31fa2919d9..66f63c0616 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Json.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Json.vstemplate @@ -34,9 +34,9 @@ - + - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Xaml.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Xaml.vstemplate index 610bdca02a..ec25c3801d 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Xaml.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/FS/Xaml.vstemplate @@ -34,8 +34,8 @@ - - + + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Code.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Code.vstemplate index af181baaca..e3dd5ae89f 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Code.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Code.vstemplate @@ -34,7 +34,7 @@ - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Json.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Json.vstemplate index 245bbba98f..1391474e5f 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Json.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Json.vstemplate @@ -34,9 +34,9 @@ - + - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Xaml.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Xaml.vstemplate index 406c877cfc..ea1c493419 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Xaml.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ItemTemplates/VB/Xaml.vstemplate @@ -34,8 +34,8 @@ - - + + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/App.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/App.vstemplate index dfed2aad81..9a3750e48f 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/App.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/App.vstemplate @@ -12,7 +12,7 @@ true true 1 - + AssemblyInfo.cs Eto\Eto.vstemplate diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Eto/Eto.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Eto/Eto.vstemplate index 71a5dfa8cc..f474fb9494 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Eto/Eto.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Eto/Eto.vstemplate @@ -30,7 +30,7 @@ - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Desktop.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Desktop.vstemplate index 1be0219996..ed0f60390a 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Desktop.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Desktop.vstemplate @@ -29,13 +29,13 @@ - - - - - - - + + + + + + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk2.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk2.vstemplate index 1ab4dec8c5..60ecdb642b 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk2.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk2.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk3.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk3.vstemplate index 138ec4499d..63282ba374 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk3.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Gtk3.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Mac.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Mac.vstemplate index c9d0a4ec6e..d1ef853727 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Mac.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Mac.vstemplate @@ -31,9 +31,9 @@ - - - + + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.WinForms.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.WinForms.vstemplate index e8ad3bcda9..9062e6c9eb 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.WinForms.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.WinForms.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Wpf.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Wpf.vstemplate index 0bd8d99cc7..430b749540 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Wpf.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Wpf.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/Library/Library.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/Library/Library.vstemplate index 63896e99a0..4e171f115f 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/Library/Library.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/Library/Library.vstemplate @@ -34,7 +34,7 @@ - + SupportsPCL,IsLibrary diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Eto/Eto.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Eto/Eto.vstemplate index f5e4d55fc9..9847c556c1 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Eto/Eto.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Eto/Eto.vstemplate @@ -30,7 +30,7 @@ - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Desktop.fsproj b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Desktop.fsproj index 05c71af690..c8dae1d36e 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Desktop.fsproj +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Desktop.fsproj @@ -11,6 +11,7 @@ 4.3.1.0 true $safeprojectname$ + true true diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Desktop.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Desktop.vstemplate index adbab93443..f210d61227 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Desktop.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Desktop.vstemplate @@ -29,13 +29,13 @@ - - - - - - - + + + + + + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk2.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk2.vstemplate index 6946b92f10..cb5639bc27 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk2.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk2.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk3.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk3.vstemplate index 207e310c23..ab6b31a74e 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk3.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Gtk3.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Mac.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Mac.vstemplate index 1e22a13b88..b210f21fe2 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Mac.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Mac.vstemplate @@ -31,9 +31,9 @@ - - - + + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.WinForms.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.WinForms.vstemplate index 02ead81d53..d746b5712c 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.WinForms.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.WinForms.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Wpf.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Wpf.vstemplate index 282f96ae4e..78f23e4c36 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Wpf.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/App/Platform/Eto.Wpf.vstemplate @@ -31,8 +31,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/Library/Library.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/Library/Library.vstemplate index 6e1796b611..2b4e5cf8f7 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/Library/Library.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/Library/Library.vstemplate @@ -33,7 +33,7 @@ - + SupportsPCL,IsLibrary diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/PY/App/App.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/PY/App/App.vstemplate index b5cf4c15c2..d487eb2646 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/PY/App/App.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/PY/App/App.vstemplate @@ -28,13 +28,13 @@ - - - - - - - + + + + + + + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Eto/Eto.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Eto/Eto.vstemplate index 8ea65e6576..70bf4af1d3 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Eto/Eto.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Eto/Eto.vstemplate @@ -30,7 +30,7 @@ - + diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Desktop.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Desktop.vstemplate index 16029758cc..8a7d0ec218 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Desktop.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Desktop.vstemplate @@ -30,13 +30,13 @@ - - - - - - - + + + + + + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk2.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk2.vstemplate index e72c33efb5..e9d9f05b9f 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk2.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk2.vstemplate @@ -30,8 +30,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk3.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk3.vstemplate index d8dfb8df93..1eaa54ddd3 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk3.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Gtk3.vstemplate @@ -30,8 +30,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Mac.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Mac.vstemplate index 4eb49a5cf4..4c74c12dd5 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Mac.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Mac.vstemplate @@ -30,9 +30,9 @@ - - - + + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.WinForms.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.WinForms.vstemplate index c97c3140ec..179fe57a8b 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.WinForms.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.WinForms.vstemplate @@ -30,8 +30,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Wpf.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Wpf.vstemplate index f4d21297df..65d7acdb33 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Wpf.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Wpf.vstemplate @@ -30,8 +30,8 @@ - - + + ..\$root.safeprojectname$\$root.safeprojectname$ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/Library/Library.vstemplate b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/Library/Library.vstemplate index e9e9d50ca0..054238d017 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/Library/Library.vstemplate +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/Library/Library.vstemplate @@ -34,7 +34,7 @@ - + SupportsPCL,IsLibrary diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj b/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj index d6370e6342..825567716d 100644 --- a/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj +++ b/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj @@ -67,16 +67,16 @@ - - Packages\Eto.Platform.iOS.2.2.0.nupkg + + Packages\Eto.Platform.iOS.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Platform.WinRT.2.2.0.nupkg + + Packages\Eto.Platform.WinRT.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Platform.Wpf.2.2.0.nupkg + + Packages\Eto.Platform.Wpf.2.2.0-alpha.nupkg PreserveNewest @@ -145,56 +145,56 @@ PreserveNewest - - Packages\Eto.Forms.2.2.0.nupkg + + Packages\Eto.Forms.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Forms.Sample.2.2.0.nupkg + + Packages\Eto.Forms.Sample.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Platform.Direct2D.2.2.0.nupkg + + Packages\Eto.Platform.Direct2D.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Platform.Gtk.2.2.0.nupkg + + Packages\Eto.Platform.Gtk.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Platform.Gtk3.2.2.0.nupkg + + Packages\Eto.Platform.Gtk3.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Platform.Mac.2.2.0.nupkg + + Packages\Eto.Platform.Mac.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Platform.Mac.Template.2.2.0.nupkg + + Packages\Eto.Platform.Mac.Template.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Platform.Mac64.2.2.0.nupkg + + Packages\Eto.Platform.Mac64.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Platform.Windows.2.2.0.nupkg + + Packages\Eto.Platform.Windows.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Platform.XamMac.2.2.0.nupkg + + Packages\Eto.Platform.XamMac.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Platform.XamMac2.2.2.0.nupkg + + Packages\Eto.Platform.XamMac2.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Serialization.Json.2.2.0.nupkg + + Packages\Eto.Serialization.Json.2.2.0-alpha.nupkg PreserveNewest - - Packages\Eto.Serialization.Xaml.2.2.0.nupkg + + Packages\Eto.Serialization.Xaml.2.2.0-alpha.nupkg PreserveNewest From c0f5cbf0ecfa0aa8b0abd22cbfe5cb26078dff86 Mon Sep 17 00:00:00 2001 From: Curtis Wensley Date: Wed, 16 Sep 2015 00:30:55 -0700 Subject: [PATCH 004/155] Add DoNotCopyLocalIfInGac to on project files so VS2015 doesn't copy Gtk references when building. --- .../Eto.ProjectTemplates/CS/App/Platform/Eto.Desktop.csproj | 3 ++- .../Eto.ProjectTemplates/CS/Library/Library.csproj | 3 ++- .../Eto.ProjectTemplates/FS/Library/Library.fsproj | 1 + .../Eto.ProjectTemplates/VB/App/Platform/Eto.Desktop.vbproj | 3 ++- .../Eto.ProjectTemplates/VB/Library/Library.vbproj | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Desktop.csproj b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Desktop.csproj index 6d0606fc9a..0bfc5c6c19 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Desktop.csproj +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/App/Platform/Eto.Desktop.csproj @@ -8,7 +8,8 @@ $safeprojectname$ $safeprojectname$ v$targetframeworkversion$ - + true + true bin\Debug\ diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/Library/Library.csproj b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/Library/Library.csproj index 8918173e13..8620b28032 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/Library/Library.csproj +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/CS/Library/Library.csproj @@ -9,7 +9,8 @@ $safeprojectname$ $safeprojectname$ v$targetframeworkversion$ - + true + true full diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/Library/Library.fsproj b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/Library/Library.fsproj index 0199550e81..d560eff5b9 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/Library/Library.fsproj +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/FS/Library/Library.fsproj @@ -11,6 +11,7 @@ v$targetframeworkversion$$ProjectProps$ true $safeprojectname$ + true true diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Desktop.vbproj b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Desktop.vbproj index 93d7c0d05d..baa3875ae5 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Desktop.vbproj +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/App/Platform/Eto.Desktop.vbproj @@ -12,7 +12,8 @@ 512 v$targetframeworkversion$ true - + true + AnyCPU true diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/Library/Library.vbproj b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/Library/Library.vbproj index 9f65745fba..249f357e36 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/Library/Library.vbproj +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.ProjectTemplates/VB/Library/Library.vbproj @@ -9,7 +9,8 @@ $safeprojectname$ $safeprojectname$$ProjectProps$ v$targetframeworkversion$ - + true + true full From 3e24139c6df8a217eb55fa020a02a8c031510170 Mon Sep 17 00:00:00 2001 From: Curtis Wensley Date: Thu, 17 Sep 2015 10:56:54 -0700 Subject: [PATCH 005/155] Wpf: Fix DropDown when not initially visible it will not allow the user to change the value. Fixes #368 --- Source/Eto.Wpf/Forms/Controls/DropDownHandler.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Eto.Wpf/Forms/Controls/DropDownHandler.cs b/Source/Eto.Wpf/Forms/Controls/DropDownHandler.cs index f8bcebd357..877363303b 100644 --- a/Source/Eto.Wpf/Forms/Controls/DropDownHandler.cs +++ b/Source/Eto.Wpf/Forms/Controls/DropDownHandler.cs @@ -28,8 +28,11 @@ public override void OnApplyTemplate() { base.OnApplyTemplate(); - selected = SelectedIndex; - SelectedIndex = -1; + if (!IsLoaded) + { + selected = SelectedIndex; + SelectedIndex = -1; + } } public swc.ScrollViewer ContentHost From a428d5155a54649956b55d36d7be3be272079ac3 Mon Sep 17 00:00:00 2001 From: Curtis Wensley Date: Thu, 17 Sep 2015 10:55:06 -0700 Subject: [PATCH 006/155] Update XS addin to add split screen preview for xeto/jeto/eto.cs files. Added rudimentary code completion for xeto files. --- .../Eto.Addin.VisualStudio.csproj | 1 - .../TextViewListener.cs | 1 + .../Editor/Completion.cs | 103 +++++++++ .../Editor/DisplayBinding.cs | 71 ++++++ .../Editor/EditorView.cs | 211 ++++++++++++++++++ .../Editor/XetoTextEditorExtension.cs | 38 ++++ .../Eto.Addin.XamarinStudio.csproj | 13 ++ .../Eto.Addin.XamarinStudio.sln | 18 ++ .../Eto.Addin.XamarinStudio/ProjectWizard.cs | 4 +- .../Properties/Manifest.addin.xml | 21 +- .../BuilderInfo.cs | 5 +- Source/Eto.Designer/Eto.Designer.csproj | 29 ++- 12 files changed, 489 insertions(+), 26 deletions(-) create mode 100644 Source/Addins/Eto.Addin.XamarinStudio/Editor/Completion.cs create mode 100644 Source/Addins/Eto.Addin.XamarinStudio/Editor/DisplayBinding.cs create mode 100644 Source/Addins/Eto.Addin.XamarinStudio/Editor/EditorView.cs create mode 100644 Source/Addins/Eto.Addin.XamarinStudio/Editor/XetoTextEditorExtension.cs rename Source/{Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio => Eto.Designer}/BuilderInfo.cs (97%) diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio.csproj b/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio.csproj index 37fd7c2675..16cfa14056 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio.csproj +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio.csproj @@ -72,7 +72,6 @@ - diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/TextViewListener.cs b/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/TextViewListener.cs index 8f86878b46..41de23f116 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/TextViewListener.cs +++ b/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/TextViewListener.cs @@ -21,6 +21,7 @@ using System.Threading.Tasks; using System.Windows.Threading; using System.IO; +using Eto.Designer; namespace Eto.Addin.VisualStudio { diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Editor/Completion.cs b/Source/Addins/Eto.Addin.XamarinStudio/Editor/Completion.cs new file mode 100644 index 0000000000..da1f42f9a5 --- /dev/null +++ b/Source/Addins/Eto.Addin.XamarinStudio/Editor/Completion.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using MonoDevelop.Xml.Dom; +using MonoDevelop.Ide.CodeCompletion; +using System.Linq; +using MonoDevelop.Xml.Completion; +using System.Reflection; + +namespace Eto.Addin.XamarinStudio.Editor +{ + abstract class Completion + { + public string Prefix { get; set; } + + public abstract void GetElements(List path, CompletionDataList list); + + public abstract void GetAttributes(CompletionDataList list, IAttributedXObject attributedOb, List path, Dictionary existingAtts); + + public const string EtoFormsNamespace = "http://schema.picoe.ca/eto.forms"; + public const string XamlNamespace = "http://schemas.microsoft.com/winfx/2009/xaml"; + + public static IEnumerable GetCompletions(List path) + { + var root = path.FirstOrDefault() as XElement; + if (root == null) + yield break; + + foreach (var attrib in root.Attributes.Where(r => r.Name.Name == "xmlns" || r.Name.Prefix == "xmlns")) + { + var prefix = attrib.Name.Name == "xmlns" ? "" : attrib.Name.Name + ":"; + if (attrib.Value == EtoFormsNamespace) + { + yield return new TypeCompletion + { + Prefix = prefix, + Assembly = typeof(Eto.Widget).Assembly, + Namespace = "Eto.Forms" + }; + } + if (attrib.Value == XamlNamespace) + { + yield return new XamlCompletion { Prefix = prefix }; + } + } + } + } + + class XamlCompletion : Completion + { + public override void GetElements(List path, CompletionDataList list) + { + } + public override void GetAttributes(CompletionDataList list, IAttributedXObject attributedOb, List path, Dictionary existingAtts) + { + var prefix = Prefix ?? ""; + if (path.OfType().Count() == 1) + list.Add(new XmlCompletionData(prefix + "Class")); + list.Add(new XmlCompletionData(prefix + "Name")); + } + } + + class TypeCompletion : Completion + { + public Assembly Assembly { get; set; } + + public string Namespace { get; set; } + + public override void GetElements(List path, CompletionDataList list) + { + var prefix = Prefix ?? ""; + var types = Assembly.ExportedTypes; + var results = types.Where(r => r.Namespace == Namespace && typeof(Eto.Forms.Control).IsAssignableFrom(r)); + results = results.Where(r => !r.IsGenericType && !r.IsAbstract); + + foreach (var result in results) + { + list.Add(new XmlCompletionData(prefix + result.Name, XmlCompletionData.DataType.XmlElement)); + } + } + + public override void GetAttributes(CompletionDataList list, IAttributedXObject attributedOb, List path, Dictionary existingAtts) + { + var fullName = Namespace + "." + attributedOb.Name.Name; + var type = Assembly.GetType(fullName, false); + if (type != null) + { + foreach (var prop in type.GetProperties(BindingFlags.Public | BindingFlags.Instance)) + { + if (existingAtts.ContainsKey(prop.Name)) + continue; + list.Add(new XmlCompletionData(prop.Name, XmlCompletionData.DataType.XmlAttribute)); + } + foreach (var evt in type.GetEvents(BindingFlags.Public | BindingFlags.Instance)) + { + if (existingAtts.ContainsKey(evt.Name)) + continue; + list.Add(new XmlCompletionData(evt.Name, XmlCompletionData.DataType.XmlAttribute)); + } + } + } + } +} + diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Editor/DisplayBinding.cs b/Source/Addins/Eto.Addin.XamarinStudio/Editor/DisplayBinding.cs new file mode 100644 index 0000000000..583a124e7d --- /dev/null +++ b/Source/Addins/Eto.Addin.XamarinStudio/Editor/DisplayBinding.cs @@ -0,0 +1,71 @@ +using System; +using MonoDevelop.Ide.Gui; +using Eto.Forms; +using MonoDevelop.Ide; +using MonoDevelop.Components.Commands; +using System.Reflection; +using System.IO; +using Eto.Designer; +using Mono.TextEditor; + +namespace Eto.Addin.XamarinStudio.Editor +{ + public class DisplayBinding : IViewDisplayBinding, IDisplayBinding + { + bool exclude = false; + + EditorView viewContent = null; + + /*internal EditorView GetViewContent() + { + if (viewContent == null) + { + viewContent = new EditorView(); + viewContent.Control.Destroyed += HandleDestroyed; + } + return viewContent; + }*/ + + void HandleDestroyed(object sender, EventArgs e) + { + ((Gtk.Widget)sender).Destroyed -= HandleDestroyed; + this.viewContent = null; + } + + public IViewContent CreateContent(MonoDevelop.Core.FilePath fileName, string mimeType, MonoDevelop.Projects.Project ownerProject) + { + exclude = true; + var defaultViewBinding = DisplayBindingService.GetDefaultViewBinding(fileName, mimeType, ownerProject); + var content = defaultViewBinding.CreateContent(fileName, mimeType, ownerProject); + var result = new EditorView(content); + exclude = false; + return result; + } + + public string Name + { + get { return "Eto.Forms designer"; } + } + + public bool CanHandle(MonoDevelop.Core.FilePath fileName, string mimeType, MonoDevelop.Projects.Project ownerProject) + { + if (exclude) + return false; + + if (mimeType != null && mimeType == "application/x-xeto") + return true; + + var info = Eto.Designer.BuilderInfo.Find(fileName); + return info != null; + } + + public bool CanUseAsDefault + { + get + { + return true; + } + } + } +} + diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Editor/EditorView.cs b/Source/Addins/Eto.Addin.XamarinStudio/Editor/EditorView.cs new file mode 100644 index 0000000000..d57d3d5798 --- /dev/null +++ b/Source/Addins/Eto.Addin.XamarinStudio/Editor/EditorView.cs @@ -0,0 +1,211 @@ +using System; +using MonoDevelop.Ide.Gui; +using Eto.Forms; +using MonoDevelop.Ide; +using MonoDevelop.Components.Commands; +using System.Reflection; +using System.IO; +using Eto.Designer; +using Mono.TextEditor; +using MonoDevelop.Ide.Gui.Content; +using MonoDevelop.Ide.Navigation; +using System.Linq; +using MonoDevelop.Core; +using System.Collections.Generic; + +namespace Eto.Addin.XamarinStudio.Editor +{ + public class EditorView : AbstractViewContent + { + readonly IViewContent content; + Splitter splitter; + Panel previewPanel; + Gtk.Widget control; + BuilderInfo builder; + IInterfaceBuilder interfaceBuilder; + UITimer timer; + + public EditorView(IViewContent content) + { + this.content = content; + splitter = new Splitter + { + Orientation = Orientation.Vertical, + FixedPanel = SplitterFixedPanel.None, + RelativePosition = 0.4 + }; + + previewPanel = new Panel(); + splitter.Panel1 = previewPanel; + splitter.Panel2 = content.Control.ToEto(); + content.ContentChanged += content_ContentChanged; + content.DirtyChanged += content_DirtyChanged; + var commandRouterContainer = new CommandRouterContainer(splitter.ToNative(true), content, true); + commandRouterContainer.Show(); + control = commandRouterContainer; + IdeApp.Workbench.ActiveDocumentChanged += Workbench_ActiveDocumentChanged; + + timer = new UITimer { Interval = 0.2 }; + timer.Elapsed += Timer_Elapsed; + base.ContentName = content.ContentName; + } + + void Timer_Elapsed(object sender, EventArgs e) + { + if (interfaceBuilder == null || content == null) + return; + timer.Stop(); + var code = content?.WorkbenchWindow?.Document?.Editor?.Text; + if (!string.IsNullOrEmpty(code)) + { + interfaceBuilder.Create(code, + ctl => previewPanel.Content = ctl, + error => previewPanel.Content = error); + } + } + + public override Gtk.Widget Control + { + get { return control; } + } + + public override void Load(string fileName) + { + builder = BuilderInfo.Find(fileName); + interfaceBuilder = builder.CreateBuilder(); + content.Load(fileName); + base.ContentName = fileName; + } + + public override bool CanReuseView(string fileName) + { + return content.CanReuseView(fileName); //content?.WorkbenchWindow?.Document?.FileName.FileName == fileName; + } + + public override string ContentName + { + get { return content.ContentName; } + set + { + base.ContentName = value; + content.ContentName = value; + } + } + + public override void DiscardChanges() + { + content.DiscardChanges(); + } + + public override bool IsDirty + { + get { return content.IsDirty; } + set + { + base.IsDirty = value; + content.IsDirty = value; + } + } + + public override bool IsReadOnly + { + get { return content.IsReadOnly; } + } + + public override void Save(string fileName) + { + content.Save(fileName); + } + + public override MonoDevelop.Projects.Project Project + { + get { return base.Project; } + set + { + base.Project = value; + content.Project = value; + } + } + + protected override void OnWorkbenchWindowChanged(EventArgs e) + { + base.OnWorkbenchWindowChanged(e); + if (content != null) + content.WorkbenchWindow = WorkbenchWindow; + if (WorkbenchWindow != null) + { + //WorkbenchWindow.AttachViewContent(this); + WorkbenchWindow.ActiveViewContent = content; + //WorkbenchWindow.ActiveViewContentChanged += WorkbenchWindow_ActiveViewContentChanged; + WorkbenchWindow.DocumentChanged += WorkbenchWindow_DocumentChanged; + } + } + + IEnumerable GetChildren(Gtk.Widget widget) + { + var container = widget as Gtk.Container; + if (container != null) + { + foreach (var child in container.AllChildren.OfType()) + { + yield return child; + foreach (var cc in GetChildren(child)) + { + yield return cc; + } + } + } + } + + void Workbench_ActiveDocumentChanged(object sender, EventArgs e) + { + if (IdeApp.Workbench.ActiveDocument != null && IdeApp.Workbench.ActiveDocument.GetContent() == this) + { + /*var focus = GetChildren(content.Control).FirstOrDefault(r => r.CanFocus); + if (focus != null) + focus.GrabFocus();*/ + } + } + + void WorkbenchWindow_ActiveViewContentChanged(object o, ActiveViewContentEventArgs e) + { + if (IdeApp.Workbench.ActiveDocument != null && IdeApp.Workbench.ActiveDocument.GetContent() == this) + { + } + } + + void WorkbenchWindow_DocumentChanged(object sender, EventArgs e) + { + var doc = WorkbenchWindow?.Document?.Editor?.Document; + if (doc != null) + { + doc.LineChanged += (senderr, ee) => timer.Start(); + timer.Start(); + } + } + + public override void Dispose() + { + content.ContentChanged -= content_ContentChanged; + content.DirtyChanged -= content_DirtyChanged; + IdeApp.Workbench.ActiveDocumentChanged -= Workbench_ActiveDocumentChanged; + content.Dispose(); + base.Dispose(); + } + + void content_ContentChanged(object s, EventArgs args) + { + OnContentChanged(args); + } + + void content_DirtyChanged(object s, EventArgs args) + { + OnDirtyChanged(args); + } + + public override object GetContent(Type type) + { + return type.IsInstanceOfType(this) ? this : content?.GetContent(type); + } + } +} diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Editor/XetoTextEditorExtension.cs b/Source/Addins/Eto.Addin.XamarinStudio/Editor/XetoTextEditorExtension.cs new file mode 100644 index 0000000000..4775d30b47 --- /dev/null +++ b/Source/Addins/Eto.Addin.XamarinStudio/Editor/XetoTextEditorExtension.cs @@ -0,0 +1,38 @@ +using System; +using MonoDevelop.Xml.Editor; +using System.Linq; +using MonoDevelop.Xml.Completion; +using System.Reflection; +using System.Collections.Generic; +using MonoDevelop.Xml.Dom; +using MonoDevelop.Ide.CodeCompletion; + +namespace Eto.Addin.XamarinStudio.Editor +{ + public class XetoTextEditorExtension : BaseXmlEditorExtension + { + protected override void GetElementCompletions(CompletionDataList list) + { + var path = GetCurrentPath(); + foreach (var completion in Completion.GetCompletions(path)) + { + completion.GetElements(path, list); + } + BaseXmlEditorExtension.AddMiscBeginTags(list); + base.GetElementCompletions(list); + } + + protected override CompletionDataList GetAttributeCompletions(IAttributedXObject attributedOb, Dictionary existingAtts) + { + var list = base.GetAttributeCompletions(attributedOb, existingAtts) ?? new CompletionDataList(); + + var path = GetCurrentPath(); + foreach (var completion in Completion.GetCompletions(path)) + { + completion.GetAttributes(list, attributedOb, path, existingAtts); + } + return list; + } + } +} + diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj b/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj index 825567716d..f6ba1ae053 100644 --- a/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj +++ b/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj @@ -49,6 +49,10 @@ + + + + @@ -65,6 +69,7 @@ + @@ -217,5 +222,13 @@ {EE6AD588-50FE-4C4B-BBFE-AB1C2B120DE0} Eto.Addin.Shared + + {7FAA1841-0869-474C-9D89-87E1B4BAB190} + Eto.Designer + + + + + \ No newline at end of file diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.sln b/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.sln index 30163377f8..ee7d36aad1 100644 --- a/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.sln +++ b/Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.sln @@ -9,12 +9,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Gtk2 - net45", "..\..\E EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Addin.Shared", "..\Shared\Eto.Addin.Shared.csproj", "{EE6AD588-50FE-4C4B-BBFE-AB1C2B120DE0}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Designer", "..\..\Eto.Designer\Eto.Designer.csproj", "{7FAA1841-0869-474C-9D89-87E1B4BAB190}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Serialization.Json - net45", "..\..\Eto.Serialization.Json\Eto.Serialization.Json - net45.csproj", "{FCEFD5C0-8705-11E4-B4A9-0800200C9A66}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Serialization.Xaml - net45", "..\..\Eto.Serialization.Xaml\Eto.Serialization.Xaml - net45.csproj", "{231FB3B0-CB71-11E3-9C1A-0800200C9A66}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {231FB3B0-CB71-11E3-9C1A-0800200C9A66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {231FB3B0-CB71-11E3-9C1A-0800200C9A66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {231FB3B0-CB71-11E3-9C1A-0800200C9A66}.Release|Any CPU.ActiveCfg = Release|Any CPU + {231FB3B0-CB71-11E3-9C1A-0800200C9A66}.Release|Any CPU.Build.0 = Release|Any CPU {35EF0A4E-2A1A-492C-8BED-106774EA09F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {35EF0A4E-2A1A-492C-8BED-106774EA09F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {35EF0A4E-2A1A-492C-8BED-106774EA09F2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -23,6 +33,10 @@ Global {54A88D77-39C6-49E5-971E-05451209F2A9}.Debug|Any CPU.Build.0 = Debug|Any CPU {54A88D77-39C6-49E5-971E-05451209F2A9}.Release|Any CPU.ActiveCfg = Release|Any CPU {54A88D77-39C6-49E5-971E-05451209F2A9}.Release|Any CPU.Build.0 = Release|Any CPU + {7FAA1841-0869-474C-9D89-87E1B4BAB190}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7FAA1841-0869-474C-9D89-87E1B4BAB190}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7FAA1841-0869-474C-9D89-87E1B4BAB190}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7FAA1841-0869-474C-9D89-87E1B4BAB190}.Release|Any CPU.Build.0 = Release|Any CPU {80915A80-CA54-11E3-9C1A-0800200C9A66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {80915A80-CA54-11E3-9C1A-0800200C9A66}.Debug|Any CPU.Build.0 = Debug|Any CPU {80915A80-CA54-11E3-9C1A-0800200C9A66}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -31,6 +45,10 @@ Global {EE6AD588-50FE-4C4B-BBFE-AB1C2B120DE0}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE6AD588-50FE-4C4B-BBFE-AB1C2B120DE0}.Release|Any CPU.ActiveCfg = Release|Any CPU {EE6AD588-50FE-4C4B-BBFE-AB1C2B120DE0}.Release|Any CPU.Build.0 = Release|Any CPU + {FCEFD5C0-8705-11E4-B4A9-0800200C9A66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FCEFD5C0-8705-11E4-B4A9-0800200C9A66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FCEFD5C0-8705-11E4-B4A9-0800200C9A66}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FCEFD5C0-8705-11E4-B4A9-0800200C9A66}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 diff --git a/Source/Addins/Eto.Addin.XamarinStudio/ProjectWizard.cs b/Source/Addins/Eto.Addin.XamarinStudio/ProjectWizard.cs index 566bd3ceef..f48e9f4316 100644 --- a/Source/Addins/Eto.Addin.XamarinStudio/ProjectWizard.cs +++ b/Source/Addins/Eto.Addin.XamarinStudio/ProjectWizard.cs @@ -5,6 +5,7 @@ using System.Text; using System.Linq; using Eto.Addin.Shared; +using MonoDevelop.Ide; namespace Eto.Addin.XamarinStudio { @@ -40,5 +41,4 @@ public override WizardPage GetPage(int pageNumber) return new ProjectWizardPage(this); } } -} - +} \ No newline at end of file diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Properties/Manifest.addin.xml b/Source/Addins/Eto.Addin.XamarinStudio/Properties/Manifest.addin.xml index 15d0864a85..e2fc768487 100644 --- a/Source/Addins/Eto.Addin.XamarinStudio/Properties/Manifest.addin.xml +++ b/Source/Addins/Eto.Addin.XamarinStudio/Properties/Manifest.addin.xml @@ -6,12 +6,10 @@ - - @@ -25,11 +23,9 @@ - - @@ -62,7 +58,22 @@ - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/BuilderInfo.cs b/Source/Eto.Designer/BuilderInfo.cs similarity index 97% rename from Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/BuilderInfo.cs rename to Source/Eto.Designer/BuilderInfo.cs index 9f5d6c66c9..24aa073d17 100644 --- a/Source/Addins/Eto.Addin.VisualStudio/Eto.Addin.VisualStudio/BuilderInfo.cs +++ b/Source/Eto.Designer/BuilderInfo.cs @@ -1,5 +1,4 @@ -using Eto.Designer; -using Eto.Designer.Builders; +using Eto.Designer.Builders; using System; using System.Collections.Generic; using System.Linq; @@ -8,7 +7,7 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; -namespace Eto.Addin.VisualStudio +namespace Eto.Designer { public class BuilderInfo { diff --git a/Source/Eto.Designer/Eto.Designer.csproj b/Source/Eto.Designer/Eto.Designer.csproj index 40a5d1bf7b..e3c8c9f4b0 100644 --- a/Source/Eto.Designer/Eto.Designer.csproj +++ b/Source/Eto.Designer/Eto.Designer.csproj @@ -1,5 +1,5 @@  - + Debug @@ -30,22 +30,21 @@ 4 - - ..\Addins\Eto.Addin.VisualStudio\packages\FSharp.Compiler.CodeDom.0.9.2\lib\net40\FSharp.Compiler.CodeDom.dll - True - - - False - ..\Addins\Eto.Addin.VisualStudio\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll - + + ..\Addins\Eto.Addin.VisualStudio\packages\FSharp.Compiler.CodeDom.0.9.2\lib\net40\FSharp.Compiler.CodeDom.dll + + + ..\Addins\Eto.Addin.VisualStudio\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll + + @@ -64,18 +63,18 @@ + + {35EF0A4E-2A1A-492C-8BED-106774EA09F2} + Eto - pcl + - {fcefd5c0-8705-11e4-b4a9-0800200c9a66} + {FCEFD5C0-8705-11E4-B4A9-0800200C9A66} Eto.Serialization.Json - net45 - {231fb3b0-cb71-11e3-9c1a-0800200c9a66} + {231FB3B0-CB71-11E3-9C1A-0800200C9A66} Eto.Serialization.Xaml - net45 - - {35ef0a4e-2a1a-492c-8bed-106774ea09f2} - Eto - pcl - - + + + @@ -53,6 +60,7 @@ + @@ -63,7 +71,6 @@ - diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Templates/Files/C#/panel.xft.xml b/Source/Addins/Eto.Addin.XamarinStudio/Templates/Files/C#/panel.xft.xml deleted file mode 100644 index 5f2717f06a..0000000000 --- a/Source/Addins/Eto.Addin.XamarinStudio/Templates/Files/C#/panel.xft.xml +++ /dev/null @@ -1,17 +0,0 @@ - - diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Templates/Files/C#/dialog.cs b/Source/Addins/Eto.Addin.XamarinStudio/Templates/Files/CS/code/dialog.cs similarity index 100% rename from Source/Addins/Eto.Addin.XamarinStudio/Templates/Files/C#/dialog.cs rename to Source/Addins/Eto.Addin.XamarinStudio/Templates/Files/CS/code/dialog.cs diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Templates/Files/C#/dialog.xft.xml b/Source/Addins/Eto.Addin.XamarinStudio/Templates/Files/CS/code/dialog.xft.xml similarity index 67% rename from Source/Addins/Eto.Addin.XamarinStudio/Templates/Files/C#/dialog.xft.xml rename to Source/Addins/Eto.Addin.XamarinStudio/Templates/Files/CS/code/dialog.xft.xml index a9b999cc79..71d135cb3d 100644 --- a/Source/Addins/Eto.Addin.XamarinStudio/Templates/Files/C#/dialog.xft.xml +++ b/Source/Addins/Eto.Addin.XamarinStudio/Templates/Files/CS/code/dialog.xft.xml @@ -1,14 +1,14 @@