Merge remote-tracking branch 'origin/master' into merge-xammac

30 files changed, 453 insertions, 33 deletions

diff --git a/Testing/GtkTestRunner.csproj b/Testing/GtkTestRunner.csproj
index c9434051..ed8ef7b9 100644
--- a/Testing/GtkTestRunner.csproj
+++ b/Testing/GtkTestRunner.csproj
@@ -30,22 +30,22 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="nunit.core">
-      <HintPath>libs\nunit.core.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll</HintPath>
     </Reference>
     <Reference Include="nunit.core.interfaces">
-      <HintPath>libs\nunit.core.interfaces.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-      <HintPath>libs\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="nunit-console-runner">
-      <HintPath>libs\nunit-console-runner.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit-console-runner.dll</HintPath>
     </Reference>
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="nunit.util">
-      <HintPath>libs\nunit.util.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.util.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
@@ -107,6 +107,7 @@
     <Compile Include="Tests\NinePatchTests.cs" />
     <Compile Include="Tests\DialogTests.cs" />
     <Compile Include="Tests\ScrollableWidgetTests.cs" />
+    <Compile Include="GtkTestRunner\GtkInit.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -148,4 +149,7 @@
       <LogicalName>ninep-tt.9@2x.png</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Testing/GtkTestRunner/GtkInit.cs b/Testing/GtkTestRunner/GtkInit.cs
new file mode 100644
index 00000000..186ab86a
--- /dev/null
+++ b/Testing/GtkTestRunner/GtkInit.cs
@@ -0,0 +1,47 @@
+//
+// GtkInit.cs
+//
+// Author:
+//       Vsevolod Kukol <sevo@sevo.org>
+//
+// Copyright (c) 2015 Vsevolod Kukol
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+                // THE SOFTWARE.
+using NUnit.Framework;
+
+namespace Xwt
+{
+	[SetUpFixture]
+	public class GtkInit
+	{
+		[SetUp]
+		public void Init ()
+		{
+			Application.Initialize (Xwt.ToolkitType.Gtk);
+			ReferenceImageManager.Init ("GtkTestRunner");
+		}
+
+		[TearDown]
+		public void Exit ()
+		{
+			Application.Dispose ();
+		}
+	}
+}
+
diff --git a/Testing/GtkTestRunner/Main.cs b/Testing/GtkTestRunner/Main.cs
index d17a48d0..6dc4b09c 100644
--- a/Testing/GtkTestRunner/Main.cs
+++ b/Testing/GtkTestRunner/Main.cs
@@ -35,9 +35,6 @@ namespace GtkTestRunner
 	{
 		public static void Main (string[] args)
 		{
-			Xwt.Application.Initialize (Xwt.ToolkitType.Gtk);
-			ReferenceImageManager.Init ("GtkTestRunner");
-
 			var list = new List<string> (args);
 			list.Add ("-domain=None");
 			list.Add ("-noshadow");
diff --git a/Testing/MacTestRunner.csproj b/Testing/MacTestRunner.csproj
index d45371f0..a5c366b3 100644
--- a/Testing/MacTestRunner.csproj
+++ b/Testing/MacTestRunner.csproj
@@ -52,19 +52,19 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Drawing" />
     <Reference Include="nunit.core">
-      <HintPath>libs\nunit.core.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll</HintPath>
     </Reference>
     <Reference Include="nunit.core.interfaces">
-      <HintPath>libs\nunit.core.interfaces.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-      <HintPath>libs\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="nunit.util">
-      <HintPath>libs\nunit.util.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.util.dll</HintPath>
     </Reference>
     <Reference Include="nunit-console-runner">
-      <HintPath>libs\nunit-console-runner.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit-console-runner.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Mac">
       <HintPath>\Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\i386\full\Xamarin.Mac.dll</HintPath>
@@ -76,10 +76,12 @@
     <Compile Include="Tests\DrawingTestsBase.cs" />
     <Compile Include="Tests\NinePatchTests.cs" />
     <Compile Include="Tests\ScrollableWidgetTests.cs" />
+    <Compile Include="MacTestRunner\MacInit.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="MacTestRunner\Info.plist" />
     <None Include="Info.plist" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
diff --git a/Testing/MacTestRunner/MacInit.cs b/Testing/MacTestRunner/MacInit.cs
new file mode 100644
index 00000000..a809c701
--- /dev/null
+++ b/Testing/MacTestRunner/MacInit.cs
@@ -0,0 +1,46 @@
+//
+// MacInit.cs
+//
+// Author:
+//       Vsevolod Kukol <sevo@sevo.org>
+//
+// Copyright (c) 2015 Vsevolod Kukol
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+                // THE SOFTWARE.
+using NUnit.Framework;
+
+namespace Xwt
+{
+	[SetUpFixture]
+	public class MacInit
+	{
+		[SetUp]
+		public void Init ()
+		{
+			Application.Initialize (Xwt.ToolkitType.Cocoa);
+			ReferenceImageManager.Init ("MacTestRunner");
+		}
+
+		[TearDown]
+		public void Exit ()
+		{
+			Application.Dispose ();
+		}
+	}
+}
diff --git a/Testing/MacTestRunner/Main.cs b/Testing/MacTestRunner/Main.cs
index f7fbdf03..5553e793 100644
--- a/Testing/MacTestRunner/Main.cs
+++ b/Testing/MacTestRunner/Main.cs
@@ -10,9 +10,6 @@ namespace MacTest
 			//FIXME: remove this once mmp summorts xammac
 			ObjCRuntime.Dlfcn.dlopen ("/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/libxammac.dylib", 0);
 
-			Application.Initialize (ToolkitType.Cocoa);
-			ReferenceImageManager.Init ("MacTestRunner");
-
 			var list = new List<string> (args);
 			list.Add ("-domain=None");
 			list.Add ("-noshadow");
diff --git a/Testing/WpfTestRunner.csproj b/Testing/WpfTestRunner.csproj
index 191dfd74..f61a2df7 100644
--- a/Testing/WpfTestRunner.csproj
+++ b/Testing/WpfTestRunner.csproj
@@ -33,16 +33,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit-console-runner">
-      <HintPath>libs\nunit-console-runner.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit-console-runner.dll</HintPath>
     </Reference>
     <Reference Include="nunit.core">
-      <HintPath>libs\nunit.core.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll</HintPath>
     </Reference>
     <Reference Include="nunit.core.interfaces">
-      <HintPath>libs\nunit.core.interfaces.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll</HintPath>
     </Reference>
     <Reference Include="nunit.util">
-      <HintPath>libs\nunit.util.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.util.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -52,7 +52,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="nunit.framework">
-      <HintPath>libs\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -110,6 +110,7 @@
     <Compile Include="Tests\WidgetTests.cs" />
     <Compile Include="Tests\WindowTests.cs" />
     <Compile Include="Tests\XwtTest.cs" />
+    <Compile Include="WpfTestRunner\WpfInit.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xwt.WPF\Xwt.WPF.csproj">
@@ -155,4 +156,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Testing/WpfTestRunner/Program.cs b/Testing/WpfTestRunner/Program.cs
index 32a71f66..9128e2dc 100644
--- a/Testing/WpfTestRunner/Program.cs
+++ b/Testing/WpfTestRunner/Program.cs
@@ -11,9 +11,6 @@ namespace WpfTestRunner
 		[STAThread]
 		static void Main (string[] args)
 		{
-			Xwt.Application.Initialize (Xwt.ToolkitType.Wpf);
-			ReferenceImageManager.Init ("WpfTestRunner");
-
 			var list = new List<string> (args);
 			list.Add ("-domain=None");
 			list.Add ("-noshadow");
diff --git a/Testing/WpfTestRunner/WpfInit.cs b/Testing/WpfTestRunner/WpfInit.cs
new file mode 100644
index 00000000..88d20476
--- /dev/null
+++ b/Testing/WpfTestRunner/WpfInit.cs
@@ -0,0 +1,48 @@
+//
+// WpfInit.cs
+//
+// Author:
+//       Vsevolod Kukol <sevo@sevo.org>
+//
+// Copyright (c) 2015 Vsevolod Kukol
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+
+[assembly:RequiresSTA]
+
+namespace Xwt
+{
+	[SetUpFixture]
+	public class WpfInit
+	{
+		[SetUp]
+		public void Init ()
+		{
+			Application.Initialize (Xwt.ToolkitType.Wpf);
+			ReferenceImageManager.Init ("WpfTestRunner");
+		}
+
+		[TearDown]
+		public void Exit ()
+		{
+			Application.Dispose ();
+		}
+	}
+}
diff --git a/Testing/libs/nunit-console-runner.dll b/Testing/libs/nunit-console-runner.dll
deleted file mode 100755
index b0e611af..00000000
--- a/Testing/libs/nunit-console-runner.dll
+++ /dev/null
diff --git a/Testing/libs/nunit.core.dll b/Testing/libs/nunit.core.dll
deleted file mode 100755
index 5f748bec..00000000
--- a/Testing/libs/nunit.core.dll
+++ /dev/null
diff --git a/Testing/libs/nunit.core.interfaces.dll b/Testing/libs/nunit.core.interfaces.dll
deleted file mode 100755
index 72b9486d..00000000
--- a/Testing/libs/nunit.core.interfaces.dll
+++ /dev/null
diff --git a/Testing/libs/nunit.framework.dll b/Testing/libs/nunit.framework.dll
deleted file mode 100755
index eaea9eed..00000000
--- a/Testing/libs/nunit.framework.dll
+++ /dev/null
diff --git a/Testing/libs/nunit.util.dll b/Testing/libs/nunit.util.dll
deleted file mode 100755
index 28d603c6..00000000
--- a/Testing/libs/nunit.util.dll
+++ /dev/null
diff --git a/Testing/packages.config b/Testing/packages.config
new file mode 100644
index 00000000..e463457b
--- /dev/null
+++ b/Testing/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="NUnit" version="2.6.4" targetFramework="net40" />

+  <package id="NUnit.Runners" version="2.6.4" />

+</packages>
\ No newline at end of file
diff --git a/Xwt.Gtk/AssemblyInfo.Gtk3.cs b/Xwt.Gtk/AssemblyInfo.Gtk3.cs
new file mode 100644
index 00000000..d29393d5
--- /dev/null
+++ b/Xwt.Gtk/AssemblyInfo.Gtk3.cs
@@ -0,0 +1,45 @@
+//
+// AssemblyInfo.Gtk3.cs
+//
+// Author:
+//       Vsevolod Kukol <sevo@sevo.org>
+//
+// Copyright (c) 2015 Vsevolod Kukol
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Reflection;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("Xwt.Gtk3")]
+[assembly: AssemblyDescription("Gtk3 Toolkit for the Xwt UI Framework")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Xwt UI Framework")]
+[assembly: AssemblyCopyright("Xamarin, Inc (http://www.xamarin.com)")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyInformationalVersion("0.1.0.0-prerelease")]
diff --git a/Xwt.Gtk/AssemblyInfo.cs b/Xwt.Gtk/AssemblyInfo.cs
index d2c4d261..dfacf2d7 100755
--- a/Xwt.Gtk/AssemblyInfo.cs
+++ b/Xwt.Gtk/AssemblyInfo.cs
@@ -5,10 +5,10 @@ using System.Runtime.CompilerServices;
 // Change them to the values specific to your project.
 
 [assembly: AssemblyTitle("Xwt.Gtk")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Gtk Toolkit for the Xwt UI Framework")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyProduct("Xwt UI Framework")]
 [assembly: AssemblyCopyright("Xamarin, Inc (http://www.xamarin.com)")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -18,6 +18,7 @@ using System.Runtime.CompilerServices;
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyInformationalVersion("0.1.0.0-prerelease")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Xwt.Gtk/Xwt.Gtk.nuget.props b/Xwt.Gtk/Xwt.Gtk.nuget.props
new file mode 100644
index 00000000..f66dc3a3
--- /dev/null
+++ b/Xwt.Gtk/Xwt.Gtk.nuget.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup>
+		<None Include="$(MSBuildThisFileDirectory)Xwt.Gtk.dll.config">
+			<Link>Xwt.Gtk.dll.config</Link>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<Visible>False</Visible>
+		</None>
+	</ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Xwt.Gtk/Xwt.Gtk.nuspec b/Xwt.Gtk/Xwt.Gtk.nuspec
new file mode 100644
index 00000000..187d8ff0
--- /dev/null
+++ b/Xwt.Gtk/Xwt.Gtk.nuspec
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<package>
+	<metadata>
+		<id>$id$</id>
+		<title>Xwt.Gtk2</title>
+		<version>$version$</version>
+		<authors>Lluis Sanchez</authors>
+		<summary>$description$</summary>
+		<description>
+Xwt is a cross-platform UI toolkit for creating desktop applications with .NET and Mono.
+
+This package contains the GTK toolkit backend for Xwt based applications targeting GTK2.
+
+Xwt.Gtk requires gtk-sharp (https://github.com/mono/gtk-sharp/). The Windows installation package can be obtained from http://www.monodevelop.com/download/#win.
+		</description>
+		<releaseNotes></releaseNotes>
+		<licenseUrl>https://raw.githubusercontent.com/mono/xwt/master/LICENSE.txt</licenseUrl>
+		<projectUrl>https://github.com/mono/xwt/</projectUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<copyright>$copyright$</copyright>
+		<tags>xwt cross platform gui ui toolkit framework desktop gtk gtk2</tags>
+		<dependencies>
+			<dependency id="Xwt" version="[$version$]"/>
+		</dependencies>
+	</metadata>
+	<files>
+		<file src="Xwt.Gtk.dll.config" target="build" />
+		<file src="Xwt.Gtk.nuget.props" target="build\Xwt.Gtk.props" />
+		<file src="..\LICENSE.txt" />
+		<file src="..\README.markdown" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/Xwt.Gtk/Xwt.Gtk3.csproj b/Xwt.Gtk/Xwt.Gtk3.csproj
index 96f177d6..20f39721 100644
--- a/Xwt.Gtk/Xwt.Gtk3.csproj
+++ b/Xwt.Gtk/Xwt.Gtk3.csproj
@@ -44,7 +44,7 @@
     <Reference Include="gio-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="AssemblyInfo.Gtk3.cs" />
     <Compile Include="Xwt.GtkBackend\LabelBackend.cs" />
     <Compile Include="Xwt.GtkBackend\PasswordEntryBackend.cs" />
     <Compile Include="Xwt.GtkBackend\WidgetBackend.cs" />
diff --git a/Xwt.Gtk/Xwt.Gtk3.nuget.props b/Xwt.Gtk/Xwt.Gtk3.nuget.props
new file mode 100644
index 00000000..1c69613a
--- /dev/null
+++ b/Xwt.Gtk/Xwt.Gtk3.nuget.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup>
+		<None Include="$(MSBuildThisFileDirectory)Xwt.Gtk3.dll.config">
+			<Link>Xwt.Gtk3.dll.config</Link>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<Visible>False</Visible>
+		</None>
+	</ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Xwt.Gtk/Xwt.Gtk3.nuspec b/Xwt.Gtk/Xwt.Gtk3.nuspec
new file mode 100644
index 00000000..7584cff4
--- /dev/null
+++ b/Xwt.Gtk/Xwt.Gtk3.nuspec
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<package>
+	<metadata>
+		<id>$id$</id>
+		<title>$title$</title>
+		<version>$version$</version>
+		<authors>Lluis Sanchez</authors>
+		<summary>$description$</summary>
+		<description>
+Xwt is a cross-platform UI toolkit for creating desktop applications with .NET and Mono.
+
+This package contains the GTK3 toolkit backend for Xwt based applications targeting GTK3.
+
+Xwt.Gtk3 requires gtk-sharp3 (https://github.com/mono/gtk-sharp/). The Windows installation package can be obtained from https://download.gnome.org/binaries/win32/gtk-sharp/.
+		</description>
+		<releaseNotes></releaseNotes>
+		<licenseUrl>https://raw.githubusercontent.com/mono/xwt/master/LICENSE.txt</licenseUrl>
+		<projectUrl>https://github.com/mono/xwt/</projectUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<copyright>$copyright$</copyright>
+		<tags>xwt cross platform gui ui toolkit framework desktop gtk gtk3</tags>
+		<dependencies>
+			<dependency id="Xwt" version="[$version$]"/>
+		</dependencies>
+	</metadata>
+	<files>
+		<file src="Xwt.Gtk3.dll.config" target="build" />
+		<file src="Xwt.Gtk3.nuget.props" target="build\Xwt.Gtk3.props" />
+		<file src="..\LICENSE.txt" />
+		<file src="..\README.markdown" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/Xwt.Mac/Xwt.Mac.nuspec b/Xwt.Mac/Xwt.Mac.nuspec
new file mode 100644
index 00000000..8d7b7197
--- /dev/null
+++ b/Xwt.Mac/Xwt.Mac.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<package>
+	<metadata>
+		<id>$id$</id>
+		<title>$title$</title>
+		<version>$version$</version>
+		<authors>Lluis Sanchez</authors>
+		<summary>$description$</summary>
+		<description>
+Xwt is a cross-platform UI toolkit for creating desktop applications with .NET and Mono.
+
+This package contains the Mac/Cocoa toolkit backend for Xwt based applications targeting OS X.
+
+Xwt.Mac requires Xamarin Studio to be installed.
+		</description>
+		<releaseNotes></releaseNotes>
+		<licenseUrl>https://raw.githubusercontent.com/mono/xwt/master/LICENSE.txt</licenseUrl>
+		<projectUrl>https://github.com/mono/xwt/</projectUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<copyright>$copyright$</copyright>
+		<tags>xwt cross platform gui ui toolkit framework desktop mac osx monomac cocoa</tags>
+		<dependencies>
+			<dependency id="Xwt" version="[$version$]"/>
+		</dependencies>
+	</metadata>
+	<files>
+		<file src="..\LICENSE.txt" />
+		<file src="..\README.markdown" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/Xwt.WPF/AssemblyInfo.cs b/Xwt.WPF/AssemblyInfo.cs
index 4e2961de..1d029da5 100644
--- a/Xwt.WPF/AssemblyInfo.cs
+++ b/Xwt.WPF/AssemblyInfo.cs
@@ -5,10 +5,10 @@ using System.Runtime.CompilerServices;
 // Change them to the values specific to your project.

 

 [assembly: AssemblyTitle("Xwt.WPF")]

-[assembly: AssemblyDescription("")]

+[assembly: AssemblyDescription("Wpf Toolkit for the Xwt UI Framework")]

 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("")]

+[assembly: AssemblyProduct("Xwt UI Framework")]

 [assembly: AssemblyCopyright("Copyright (c) XWT Contributors, 2011-2012")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

@@ -18,6 +18,7 @@ using System.Runtime.CompilerServices;
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.

 

 [assembly: AssemblyVersion("0.1.0.0")]

+[assembly: AssemblyInformationalVersion("0.1.0.0-prerelease")]

 

 // The following attributes are used to specify the signing key for the assembly, 

 // if desired. See the Mono documentation for more information about signing.

diff --git a/Xwt.WPF/Xwt.WPF.nuspec b/Xwt.WPF/Xwt.WPF.nuspec
new file mode 100644
index 00000000..a60104dc
--- /dev/null
+++ b/Xwt.WPF/Xwt.WPF.nuspec
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<package>
+	<metadata>
+		<id>$id$</id>
+		<title>$title$</title>
+		<version>$version$</version>
+		<authors>Lluis Sanchez</authors>
+		<summary>$description$</summary>
+		<description>
+Xwt is a cross-platform UI toolkit for creating desktop applications with .NET and Mono.
+		
+This package contains the WPF toolkit backend for Xwt based applications targeting WPF (Windows Presentation Foundation).
+		</description>
+		<releaseNotes></releaseNotes>
+		<licenseUrl>https://raw.githubusercontent.com/mono/xwt/master/LICENSE.txt</licenseUrl>
+		<projectUrl>https://github.com/mono/xwt/</projectUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<copyright>$copyright$</copyright>
+		<tags>xwt cross platform gui ui toolkit framework desktop wpf</tags>
+		<dependencies>
+			<dependency id="Xwt" version="[$version$]"/>
+		</dependencies>
+	</metadata>
+	<files>
+		<file src="..\LICENSE.txt" />
+		<file src="..\README.markdown" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/Xwt.XamMac/AssemblyInfo.cs b/Xwt.XamMac/AssemblyInfo.cs
index 0589d073..05020307 100755
--- a/Xwt.XamMac/AssemblyInfo.cs
+++ b/Xwt.XamMac/AssemblyInfo.cs
@@ -5,10 +5,10 @@ using System.Runtime.CompilerServices;
 // Change them to the values specific to your project.
 
 [assembly: AssemblyTitle("Xwt.Mac")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Mac Toolkit for the Xwt UI Framework")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyProduct("Xwt UI Framework")]
 [assembly: AssemblyCopyright("Xamarin, Inc (http://www.xamarin.com)")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -18,6 +18,7 @@ using System.Runtime.CompilerServices;
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyInformationalVersion("0.1.0.0-prerelease")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Xwt/AssemblyInfo.cs b/Xwt/AssemblyInfo.cs
index cfe46539..b27d7df9 100755
--- a/Xwt/AssemblyInfo.cs
+++ b/Xwt/AssemblyInfo.cs
@@ -5,10 +5,10 @@ using System.Runtime.CompilerServices;
 // Change them to the values specific to your project.
 
 [assembly: AssemblyTitle("Xwt")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Xwt UI Framework")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyProduct("Xwt UI Framework")]
 [assembly: AssemblyCopyright("Xamarin, Inc (http://www.xamarin.com)")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -18,6 +18,7 @@ using System.Runtime.CompilerServices;
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyInformationalVersion("0.1.0.0-prerelease")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Xwt/Xwt.Drawing/TextLayout.cs b/Xwt/Xwt.Drawing/TextLayout.cs
index 30e89bc5..3c488b1b 100644
--- a/Xwt/Xwt.Drawing/TextLayout.cs
+++ b/Xwt/Xwt.Drawing/TextLayout.cs
@@ -62,6 +62,7 @@ namespace Xwt.Drawing
 
 		internal TextLayout (Toolkit tk)
 		{
+			ToolkitEngine = null;
 			InitForToolkit (tk);
 		}
 
diff --git a/Xwt/Xwt.nuspec b/Xwt/Xwt.nuspec
new file mode 100644
index 00000000..dc3a9a3e
--- /dev/null
+++ b/Xwt/Xwt.nuspec
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<package>
+	<metadata>
+		<id>$id$</id>
+		<title>$title$</title>
+		<version>$version$</version>
+		<authors>Lluis Sanchez</authors>
+		<summary>$description$</summary>
+		<description>
+Xwt is a cross-platform UI toolkit for creating desktop applications with .NET and Mono that run on multiple platforms from the same codebase.
+
+Xwt works by exposing one unified API across all environments that is mapped to a set of native controls on each platform.
+
+The framework consists of the frontend (Xwt core) and platform specific backends. Additionally to this core Xwt package you need to add an Xwt toolkit package (Xwt.*) for every platform you want your application to target.
+		</description>
+		<releaseNotes></releaseNotes>
+		<licenseUrl>https://raw.githubusercontent.com/mono/xwt/master/LICENSE.txt</licenseUrl>
+		<projectUrl>https://github.com/mono/xwt/</projectUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<copyright>$copyright$</copyright>
+		<tags>xwt cross platform gui ui toolkit framework desktop wpf mac osx monomac cocoa gtk</tags>
+	</metadata>
+	<files>
+		<file src="..\LICENSE.txt" />
+		<file src="..\README.markdown" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000..2dfcca20
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,54 @@
+version: 0.2.{build}

+skip_tags: true

+platform: Any CPU

+assembly_info:

+  patch: true

+  file: '**\AssemblyInfo.*'

+  assembly_version: '{version}'

+  assembly_file_version: '{version}'

+  assembly_informational_version: '{version}-{branch}'

+install:

+- if not exist gtk-sharp-2.12.25.msi appveyor DownloadFile http://download.xamarin.com/GTKforWindows/Windows/gtk-sharp-2.12.25.msi

+- msiexec /i gtk-sharp-2.12.25.msi /qn /norestart

+- if not exist gtk-sharp-2.99.3.msi appveyor DownloadFile https://download.gnome.org/binaries/win32/gtk-sharp/2.99/gtk-sharp-2.99.3.msi

+- msiexec /i gtk-sharp-2.99.3.msi /qn /norestart

+cache:

+- gtk-sharp-2.12.25.msi

+- gtk-sharp-2.99.3.msi

+- packages

+nuget:

+  account_feed: true

+  project_feed: true

+  disable_publish_on_pr: true

+build_script:

+- nuget restore

+- msbuild Xwt\Xwt.csproj /target:Build /property:Configuration=Release;Platform=AnyCPU /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

+- msbuild Xwt.Gtk\Xwt.Gtk.csproj /target:Build /property:Configuration=Release;Platform=AnyCPU /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

+- msbuild Xwt.Gtk\Xwt.Gtk3.csproj /target:Build /property:Configuration=Release;Platform=AnyCPU /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

+- msbuild Xwt.WPF\Xwt.WPF.csproj /target:Build /property:Configuration=Release;Platform=AnyCPU /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

+- mkdir nuget

+- NuGet pack Xwt\Xwt.csproj -Properties "Configuration=Release;Platform=AnyCPU" -Symbols -OutputDirectory nuget

+- NuGet pack Xwt.Gtk\Xwt.Gtk.csproj -Properties "Configuration=Release;Platform=AnyCPU" -Symbols -OutputDirectory nuget

+- NuGet pack Xwt.Gtk\Xwt.Gtk3.csproj -Properties "Configuration=Release;Platform=AnyCPU" -Symbols -OutputDirectory nuget

+- NuGet pack Xwt.WPF\Xwt.WPF.csproj -Properties "Configuration=Release;Platform=AnyCPU" -Symbols -OutputDirectory nuget

+- dir nuget

+test_script:

+- ps: >-

+    msbuild Xwt.sln /p:Configuration="Win-Debug" /p:Platform="Any Cpu" /verbosity:quiet

+

+    nunit-console-x86.exe --framework=4.0 -domain=None -noshadow -nothread Testing\bin\WpfTestRunner.exe

+

+    $wc = New-Object 'System.Net.WebClient'

+

+    $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\TestResult.xml))

+

+    $env:Path += ";C:\Program Files (x86)\GtkSharp\2.12\bin"

+

+    $env:GTK_BASEPATH = "C:\Program Files (x86)\GtkSharp\2.12\"

+

+    nunit-console-x86.exe --framework=4.0 -domain=None -noshadow -nothread Testing\bin\GtkTestRunner.exe

+

+    $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\TestResult.xml))

+artifacts:

+- path: nuget\*.nupkg

+  name: Xwt-$(APPVEYOR_BUILD_VERSION)
\ No newline at end of file