Merge pull request #954 from mono/wpf-sdk-project

Change Xwt and Xwt.WPF project types to multi-targeted SDK
2019-09-26 10:22:38 +02:00 · 2019-09-26 10:22:38 +02:00 · 184d7b7ac5
--- a/Xwt.Gtk.Mac/Xwt.Gtk.Mac.csproj
+++ b/Xwt.Gtk.Mac/Xwt.Gtk.Mac.csproj
@ -36,6 +36,8 @@
  <PropertyGroup>
    <XamMacPath>\Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\x86_64\full\Xamarin.Mac.dll</XamMacPath>
    <XamMacPath Condition="Exists('$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll')">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll</XamMacPath>
+    <XamMacPath Condition="Exists('$(MSBuildProgramFiles32)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll')">$(MSBuildProgramFiles32)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll</XamMacPath>
+    <XamMacPath Condition="Exists('$(MSBuildToolsPath)\..\..\..\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll')">$(MSBuildToolsPath)\..\..\..\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll</XamMacPath>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
--- a/Xwt.WPF/Directory.Build.props
+++ b/Xwt.WPF/Directory.Build.props
@ -0,0 +1,7 @@
+<Project>
+
+  <PropertyGroup>
+    <TargetFrameworks Condition=" '$(InMonoDevelopTree)' == 'true' ">net461;net40;net47</TargetFrameworks>
+  </PropertyGroup>
+
+</Project>
--- a/Xwt.WPF/Xwt.WPF.csproj
+++ b/Xwt.WPF/Xwt.WPF.csproj
@ -1,42 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C93D746E-1586-4D4F-B411-BF5A966E6A08}</ProjectGuid>
-    <OutputType>Library</OutputType>
+    <TargetFrameworks>net40;net47</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\xwt.snk</AssemblyOriginatorKeyFile>
    <RootNamespace>Xwt.WPF</RootNamespace>
    <AssemblyName>Xwt.WPF</AssemblyName>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net40'">
+    <DefineConstants>DEBUG;NETFRAMEWORK;NET40</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net47'">
+    <DefineConstants>DEBUG;NETFRAMEWORK;NET47</DefineConstants>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
    <LangVersion>6</LangVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
    <LangVersion>6</LangVersion>
  </PropertyGroup>
  <PropertyGroup>
-    <SignAssembly>True</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\xwt.snk</AssemblyOriginatorKeyFile>
+    <PackageId>Xwt.WPF</PackageId>
+    <PackageVersion>1.0.0</PackageVersion>
+    <Authors>Lluis Sanchez</Authors>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/mono/xwt/</PackageProjectUrl>
+    <PackageTags>xwt cross platform gui ui toolkit framework desktop wpf</PackageTags>
+    <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>
+    <NoBuild>true</NoBuild>
  </PropertyGroup>
+  <ItemGroup>
+    <Resource Include="Xwt.WPFBackend\TreeView.xaml">
+      <SubType>Designer</SubType>
+    </Resource>
+    <Resource Include="Xwt.WPFBackend\ScrollView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Resource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="icons\add-16.png" />
+    <EmbeddedResource Include="icons\add-16~dark.png" />
+    <EmbeddedResource Include="icons\add-16~disabled.png" />
+    <EmbeddedResource Include="icons\add-16~dark~disabled.png" />
+    <EmbeddedResource Include="icons\remove-16.png" />
+    <EmbeddedResource Include="icons\remove-16~dark.png" />
+    <EmbeddedResource Include="icons\remove-16~disabled.png" />
+    <EmbeddedResource Include="icons\remove-16~dark~disabled.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xwt\Xwt.csproj" />
+  </ItemGroup>
  <ItemGroup>
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
@ -52,149 +72,10 @@
    <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Xwt.WPFBackend.CellViews\CanvasCellViewBackend.cs" />
-    <Compile Include="Xwt.WPFBackend.CellViews\CanvasCellViewPanel.cs" />
-    <Compile Include="Xwt.WPFBackend.CellViews\CheckBoxCellViewBackend.cs" />
-    <Compile Include="Xwt.WPFBackend.CellViews\CellViewBackend.cs" />
-    <Compile Include="Xwt.WPFBackend.CellViews\TextCellViewBackend.cs" />
-    <Compile Include="Xwt.WPFBackend.Interop\NativeStockIcon.cs" />
-    <Compile Include="Xwt.WPFBackend.Utilities\CellUtil.cs" />
-    <Compile Include="Xwt.WPFBackend.Utilities\ImageToImageSourceConverter.cs" />
-    <Compile Include="Xwt.WPFBackend.Utilities\MarkupToPlainTextConverter.cs" />
-    <Compile Include="Xwt.WPFBackend.Utilities\TypeToStringConverter.cs" />
-    <Compile Include="Xwt.WPFBackend\AccessibleBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\AlertDialogBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\Backend.cs" />
-    <Compile Include="Xwt.WPFBackend\BooleanToValueConverter.cs" />
-    <Compile Include="Xwt.WPFBackend\ButtonBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\CheckBoxBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\CheckboxMenuItemBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\ClipboardBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\ComboBoxBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\ComboBoxEntryBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\ComboBoxTextEntryBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\DatePickerBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\EmbedNativeWidgetBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\PasswordEntryBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\PlaceholderTextAdorner.cs" />
-    <Compile Include="Xwt.WPFBackend\ScrollbarBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\SliderBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\SpinButtonBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\RadioButtonBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\ImagePatternBackendHandler.cs" />
-    <Compile Include="Xwt.WPFBackend\GradientBackendHandler.cs" />
-    <Compile Include="Xwt.WPFBackend\SelectColorDialogBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\TextLayoutBackendHandler.cs" />
-    <Compile Include="Xwt.WPFBackend\ImageBuilderBackendHandler.cs" />
-    <Compile Include="Xwt.WPFBackend\DrawingContext.cs" />
-    <Compile Include="Xwt.WPFBackend\ContextBackendHandler.cs" />
-    <Compile Include="Xwt.WPFBackend\ExRichTextBox.cs" />
-    <Compile Include="Xwt.WPFBackend\SaveFileDialogBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\LinkLabelBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\PopoverBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\ProgressBarBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\CustomWidgetBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\DelegatedCommand.cs" />
-    <Compile Include="Xwt.WPFBackend\DialogBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\DropDownButton.cs" />
-    <Compile Include="Xwt.WPFBackend\ExComboBox.cs" />
-    <Compile Include="Xwt.WPFBackend\ExGrid.cs" />
-    <Compile Include="Xwt.WPFBackend\ExListBox.cs" />
-    <Compile Include="Xwt.WPFBackend\ExListBoxItem.cs" />
-    <Compile Include="Xwt.WPFBackend\ExListView.cs" />
-    <Compile Include="Xwt.WPFBackend\ExListViewItem.cs" />
-    <Compile Include="Xwt.WPFBackend\ExpanderBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\ExScrollViewer.cs" />
-    <Compile Include="Xwt.WPFBackend\ExTextBox.cs" />
-    <Compile Include="Xwt.WPFBackend\ExTreeView.cs" />
-    <Compile Include="Xwt.WPFBackend\ExTreeViewItem.cs" />
-    <Compile Include="Xwt.WPFBackend\FileDialogBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\FrameBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\ImageHandler.cs" />
-    <Compile Include="Xwt.WPFBackend.Interop\NativeMethods.cs" />
-    <Compile Include="Xwt.WPFBackend\ImageViewBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\LabelBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\BoxBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\DataConverter.cs" />
-    <Compile Include="Xwt.WPFBackend\FontBackendHandler.cs" />
-    <Compile Include="Xwt.WPFBackend\KeyboardUtil.cs" />
-    <Compile Include="Xwt.WPFBackend\LevelToIndentConverter.cs" />
-    <Compile Include="Xwt.WPFBackend\ListBoxBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\ListDataSource.cs" />
-    <Compile Include="Xwt.WPFBackend\ListSourceNotifyWrapper.cs" />
-    <Compile Include="Xwt.WPFBackend\ListViewBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\MenuBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\MenuButtonBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\MenuItemBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\OpenFileDialogBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\PanedBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\RadioButtonMenuItemBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\ResPool.cs" />
-    <Compile Include="Xwt.WPFBackend\ScrollViewBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\SelectFolderDialogBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\SeparatorBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\SeparatorMenuItemBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\SpinnerBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\TextEntryBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\Timeout.cs" />
-    <Compile Include="Xwt.WPFBackend\ToggleButtonBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\TreeStoreBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\TreeStoreNode.cs" />
-    <Compile Include="Xwt.WPFBackend\TreeViewBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\ImageAdorner.cs" />
-    <Compile Include="Xwt.WPFBackend\TreeViewDropAdorner.cs" />
-    <Compile Include="Xwt.WPFBackend\Util.cs" />
-    <Compile Include="Xwt.WPFBackend\ValuesContainer.cs" />
-    <Compile Include="Xwt.WPFBackend\CanvasBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\WidgetBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\WindowBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\WindowFrameBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\WPFEngine.cs" />
-    <Compile Include="Xwt.WPFBackend\NotebookBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\ScrollAdjustmentBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\CustomScrollViewPort.cs" />
-    <Compile Include="Xwt.WPFBackend\RichTextViewBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\WpfDesktopBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\WindowsSpinButton.xaml.cs" />
-    <Compile Include="Xwt.WPFBackend\WpfKeyboardHandler.cs" />
-    <Compile Include="Xwt.WPFBackend\WebViewBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\ScrollControlBackend.cs" />
-    <Compile Include="Xwt.WPFBackend\CalendarBackend.cs" />
-    <Compile Include="Xwt.WPFBackend.Interop\IDocHostUIHandler.cs" />
-    <Compile Include="Xwt.WPFBackend.CellViews\RadioButtonCellViewBackend.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\Xwt\Xwt.csproj">
-      <Project>{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}</Project>
-      <Name>Xwt</Name>
-    </ProjectReference>
+    <Compile Remove="Xwt.WPFBackend.Utilities\MultiColumnTreeViewItem.cs" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="..\xwt.snk">
-      <Link>xwt.snk</Link>
-    </None>
+    <None Include="..\LICENSE.txt" Pack="true" PackagePath=""/>
+    <None Include="..\README.markdown" Pack="true" PackagePath=""/>
  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Xwt.WPFBackend\TreeView.xaml">
-      <SubType>Designer</SubType>
-    </Resource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="icons\add-16.png" />
-    <EmbeddedResource Include="icons\add-16~dark.png" />
-    <EmbeddedResource Include="icons\add-16~disabled.png" />
-    <EmbeddedResource Include="icons\add-16~dark~disabled.png" />
-    <EmbeddedResource Include="icons\remove-16.png" />
-    <EmbeddedResource Include="icons\remove-16~dark.png" />
-    <EmbeddedResource Include="icons\remove-16~disabled.png" />
-    <EmbeddedResource Include="icons\remove-16~dark~disabled.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Xwt.WPFBackend\ScrollView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Resource>
-  </ItemGroup>
-</Project>
+</Project>
--- a/Xwt.WPF/Xwt.WPF.nuspec
+++ b/Xwt.WPF/Xwt.WPF.nuspec
@ -1,28 +0,0 @@
-<?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>
--- a/Xwt.XamMac/Xwt.XamMac.csproj
+++ b/Xwt.XamMac/Xwt.XamMac.csproj
@ -36,6 +36,8 @@
  <PropertyGroup>
    <XamMacPath>\Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\x86_64\full\Xamarin.Mac.dll</XamMacPath>
    <XamMacPath Condition="Exists('$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll')">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll</XamMacPath>
+    <XamMacPath Condition="Exists('$(MSBuildProgramFiles32)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll')">$(MSBuildProgramFiles32)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll</XamMacPath>
+    <XamMacPath Condition="Exists('$(MSBuildToolsPath)\..\..\..\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll')">$(MSBuildToolsPath)\..\..\..\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\Xamarin.Mac\v2.0\Xamarin.Mac.dll</XamMacPath>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
--- a/Xwt.sln
+++ b/Xwt.sln
@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{164E
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GtkTestRunner", "Testing\GtkTestRunner.csproj", "{BC764278-4141-483C-8643-2EA8C40373B2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacTestRunner", "Testing\MacTestRunner.csproj", "{0017C823-67F6-4DFA-8C2C-E23CD1E33D8F}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfTestRunner", "Testing\WpfTestRunner.csproj", "{C13CB518-B840-4FE7-AF3D-8C517A2FAD1F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestApps", "TestApps", "{83D74DDF-581E-4E2A-AE02-F4047A5B96C7}"
@ -58,14 +56,6 @@ Global
 		XamMac-Debug|Any CPU = XamMac-Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0017C823-67F6-4DFA-8C2C-E23CD1E33D8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0017C823-67F6-4DFA-8C2C-E23CD1E33D8F}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0017C823-67F6-4DFA-8C2C-E23CD1E33D8F}.Mac-Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0017C823-67F6-4DFA-8C2C-E23CD1E33D8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0017C823-67F6-4DFA-8C2C-E23CD1E33D8F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0017C823-67F6-4DFA-8C2C-E23CD1E33D8F}.Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0017C823-67F6-4DFA-8C2C-E23CD1E33D8F}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0017C823-67F6-4DFA-8C2C-E23CD1E33D8F}.XamMac-Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0AF50CE4-E455-4A9D-92AD-711CBD068A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0AF50CE4-E455-4A9D-92AD-711CBD068A55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0AF50CE4-E455-4A9D-92AD-711CBD068A55}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU
@ -282,7 +272,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{BC764278-4141-483C-8643-2EA8C40373B2} = {164E1FED-7688-4AE9-B19B-012F8784F9DD}
-		{0017C823-67F6-4DFA-8C2C-E23CD1E33D8F} = {164E1FED-7688-4AE9-B19B-012F8784F9DD}
 		{C13CB518-B840-4FE7-AF3D-8C517A2FAD1F} = {164E1FED-7688-4AE9-B19B-012F8784F9DD}
 		{0AF50CE4-E455-4A9D-92AD-711CBD068A55} = {83D74DDF-581E-4E2A-AE02-F4047A5B96C7}
 		{2B7FF081-FE53-42F7-9D5D-D4B38E548F94} = {83D74DDF-581E-4E2A-AE02-F4047A5B96C7}
--- a/Xwt/Directory.Build.props
+++ b/Xwt/Directory.Build.props
@ -0,0 +1,7 @@
+<Project>
+
+  <PropertyGroup>
+    <TargetFrameworks Condition=" '$(InMonoDevelopTree)' == 'true' ">net461;net40</TargetFrameworks>
+  </PropertyGroup>
+
+</Project>
--- a/Xwt/Xwt.csproj
+++ b/Xwt/Xwt.csproj
@ -1,381 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xwt</RootNamespace>
-    <AssemblyName>Xwt</AssemblyName>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\xwt.snk</AssemblyOriginatorKeyFile>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <LangVersion>6</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <DebugSymbols>true</DebugSymbols>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <LangVersion>6</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Xwt.Backends\IPasswordEntryBackend.cs" />
-    <Compile Include="Xwt\PasswordEntry.cs" />
-    <Compile Include="Xwt\TextInputEventArgs.cs" />
-    <Compile Include="Xwt\Widget.cs" />
-    <Compile Include="Xwt\Window.cs" />
-    <Compile Include="Xwt\Button.cs" />
-    <Compile Include="Xwt\Label.cs" />
-    <Compile Include="Xwt.Backends\IWidgetBackend.cs" />
-    <Compile Include="Xwt.Backends\ILabelBackend.cs" />
-    <Compile Include="Xwt.Backends\IWindowBackend.cs" />
-    <Compile Include="Xwt\Application.cs" />
-    <Compile Include="Xwt.Backends\IBackend.cs" />
-    <Compile Include="Xwt\XwtComponent.cs" />
-    <Compile Include="Xwt\Box.cs" />
-    <Compile Include="Xwt\WidgetCollection.cs" />
-    <Compile Include="Xwt.Backends\IBoxBackend.cs" />
-    <Compile Include="Xwt\HBox.cs" />
-    <Compile Include="Xwt\VBox.cs" />
-    <Compile Include="Xwt\Table.cs" />
-    <Compile Include="Xwt.Backends\IButtonBackend.cs" />
-    <Compile Include="Xwt\Notebook.cs" />
-    <Compile Include="Xwt.Backends\INotebookBackend.cs" />
-    <Compile Include="Xwt\Paned.cs" />
-    <Compile Include="Xwt\VPaned.cs" />
-    <Compile Include="Xwt\HPaned.cs" />
-    <Compile Include="Xwt.Backends\IPanedBackend.cs" />
-    <Compile Include="Xwt\TreeView.cs" />
-    <Compile Include="Xwt\DataStore.cs" />
-    <Compile Include="Xwt\Rectangle.cs" />
-    <Compile Include="Xwt\Point.cs" />
-    <Compile Include="Xwt\Size.cs" />
-    <Compile Include="Xwt\Alignment.cs" />
-    <Compile Include="Xwt.Drawing\Image.cs" />
-    <Compile Include="Xwt\TreeStore.cs" />
-    <Compile Include="Xwt\DataField.cs" />
-    <Compile Include="Xwt\TreeNavigator.cs" />
-    <Compile Include="Xwt\TreePosition.cs" />
-    <Compile Include="Xwt\CellViewCollection.cs" />
-    <Compile Include="Xwt\CellView.cs" />
-    <Compile Include="Xwt\TextCellView.cs" />
-    <Compile Include="Xwt\ComboBoxCellView.cs" />
-    <Compile Include="Xwt.Backends\ITreeViewBackend.cs" />
-    <Compile Include="Xwt.Backends\ITreeStoreBackend.cs" />
-    <Compile Include="Xwt\XwtObject.cs" />
-    <Compile Include="Xwt.Backends\ImageBackendHandler.cs" />
-    <Compile Include="Xwt\ImageCellView.cs" />
-    <Compile Include="Xwt.Drawing\Context.cs" />
-    <Compile Include="Xwt\Distance.cs" />
-    <Compile Include="Xwt\Canvas.cs" />
-    <Compile Include="Xwt.Backends\ICanvasBackend.cs" />
-    <Compile Include="Xwt.Drawing\Color.cs" />
-    <Compile Include="Xwt.Drawing\HslColor.cs" />
-    <Compile Include="Xwt.Drawing\LinearGradient.cs" />
-    <Compile Include="Xwt.Drawing\Pattern.cs" />
-    <Compile Include="Xwt.Drawing\Gradient.cs" />
-    <Compile Include="Xwt.Drawing\RadialGradient.cs" />
-    <Compile Include="Xwt.Drawing\TextLayout.cs" />
-    <Compile Include="Xwt.Drawing\Font.cs" />
-    <Compile Include="Xwt.Drawing\Matrix.cs" />
-    <Compile Include="Xwt\ButtonEventArgs.cs" />
-    <Compile Include="Xwt\MouseMovedEventArgs.cs" />
-    <Compile Include="Xwt\SelectionMode.cs" />
-    <Compile Include="Xwt\ListViewColumn.cs" />
-    <Compile Include="Xwt\ListViewColumnCollection.cs" />
-    <Compile Include="Xwt\ListView.cs" />
-    <Compile Include="Xwt.Backends\IListViewBackend.cs" />
-    <Compile Include="Xwt.Backends\IColumnContainerBackend.cs" />
-    <Compile Include="Xwt\ListStore.cs" />
-    <Compile Include="Xwt.Backends\IListStoreBackend.cs" />
-    <Compile Include="Xwt.Backends\ITableViewBackend.cs" />
-    <Compile Include="Xwt\CheckBoxCellView.cs" />
-    <Compile Include="Xwt.Design\DesignerSurface.cs" />
-    <Compile Include="Xwt.Backends\IDesignerSurfaceBackend.cs" />
-    <Compile Include="Xwt\Menu.cs" />
-    <Compile Include="Xwt\MenuItem.cs" />
-    <Compile Include="Xwt\MenuItemCollection.cs" />
-    <Compile Include="Xwt.Backends\IMenuBackend.cs" />
-    <Compile Include="Xwt.Backends\IMenuItemBackend.cs" />
-    <Compile Include="Xwt\IWidgetSurface.cs" />
-    <Compile Include="Xwt\ChildrenCollection.cs" />
-    <Compile Include="Xwt\IContainerEventSink.cs" />
-    <Compile Include="Xwt\DragDropAction.cs" />
-    <Compile Include="Xwt\DragOperation.cs" />
-    <Compile Include="Xwt\DragEventArgs.cs" />
-    <Compile Include="Xwt\ScrollView.cs" />
-    <Compile Include="Xwt.Backends\IScrollViewBackend.cs" />
-    <Compile Include="Xwt\ButtonStyle.cs" />
-    <Compile Include="Xwt\StockIcons.cs" />
-    <Compile Include="Xwt\IconSize.cs" />
-    <Compile Include="Xwt\ComboBox.cs" />
-    <Compile Include="Xwt\ItemCollection.cs" />
-    <Compile Include="Xwt.Backends\IComboBoxBackend.cs" />
-    <Compile Include="Xwt\Command.cs" />
-    <Compile Include="Xwt\IListDataSource.cs" />
-    <Compile Include="Xwt\ITreeDataSource.cs" />
-    <Compile Include="Xwt\Dialog.cs" />
-    <Compile Include="Xwt.Backends\ICustomWidgetBackend.cs" />
-    <Compile Include="Xwt\PopupWindow.cs" />
-    <Compile Include="Xwt\MenuButton.cs" />
-    <Compile Include="Xwt.Backends\IMenuButtonBackend.cs" />
-    <Compile Include="Xwt\TextEntry.cs" />
-    <Compile Include="Xwt.Backends\ITextEntryBackend.cs" />
-    <Compile Include="Xwt\ToggleButton.cs" />
-    <Compile Include="Xwt.Backends\IToggleButtonBackend.cs" />
-    <Compile Include="Xwt\ImageView.cs" />
-    <Compile Include="Xwt.Backends\IImageViewBackend.cs" />
-    <Compile Include="Xwt\MessageDialog.cs" />
-    <Compile Include="Xwt.Backends\IAlertDialogBackend.cs" />
-    <Compile Include="Xwt\Key.cs" />
-    <Compile Include="Xwt\ModifierKeys.cs" />
-    <Compile Include="Xwt\KeyEventArgs.cs" />
-    <Compile Include="Xwt\WindowFrame.cs" />
-    <Compile Include="Xwt.Backends\IWindowFrameBackend.cs" />
-    <Compile Include="Xwt\CheckBox.cs" />
-    <Compile Include="Xwt.Backends\ICheckBoxBackend.cs" />
-    <Compile Include="Xwt\ContentPosition.cs" />
-    <Compile Include="Xwt.Backends\IFrameBackend.cs" />
-    <Compile Include="Xwt\Separator.cs" />
-    <Compile Include="Xwt.Backends\ISeparatorBackend.cs" />
-    <Compile Include="Xwt\HSeparator.cs" />
-    <Compile Include="Xwt\VSeparator.cs" />
-    <Compile Include="Xwt\ItemSeparator.cs" />
-    <Compile Include="Xwt.Backends\ICollectionListener.cs" />
-    <Compile Include="Xwt.Backends\IDialogBackend.cs" />
-    <Compile Include="Xwt\DialogButtonCollection.cs" />
-    <Compile Include="Xwt\ComboBoxEntry.cs" />
-    <Compile Include="Xwt.Backends\IComboBoxEntryBackend.cs" />
-    <Compile Include="Xwt\TreeViewStatus.cs" />
-    <Compile Include="Xwt\Clipboard.cs" />
-    <Compile Include="Xwt\PointerButton.cs" />
-    <Compile Include="Xwt.Drawing\ImageBuilder.cs" />
-    <Compile Include="Xwt.Drawing\ImageFormat.cs" />
-    <Compile Include="Xwt.Drawing\ImagePattern.cs" />
-    <Compile Include="Xwt\CheckBoxMenuItem.cs" />
-    <Compile Include="Xwt\RadioButtonMenuItem.cs" />
-    <Compile Include="Xwt\SeparatorMenuItem.cs" />
-    <Compile Include="Xwt.Backends\ICheckBoxMenuItemBackend.cs" />
-    <Compile Include="Xwt.Backends\IRadioButtonMenuItemBackend.cs" />
-    <Compile Include="Xwt.Backends\ISeparatorMenuItemBackend.cs" />
-    <Compile Include="Xwt\EllipsizeMode.cs" />
-    <Compile Include="Xwt\RowDropPosition.cs" />
-    <Compile Include="Xwt\OpenFileDialog.cs" />
-    <Compile Include="Xwt\SaveFileDialog.cs" />
-    <Compile Include="Xwt\FileDialog.cs" />
-    <Compile Include="Xwt.Backends\IFileDialogBackend.cs" />
-    <Compile Include="Xwt.Backends\IOpenFileDialogBackend.cs" />
-    <Compile Include="Xwt.Backends\ISaveFileDialogBackend.cs" />
-    <Compile Include="Xwt\FileDialogFilter.cs" />
-    <Compile Include="Xwt\ObjectCollection.cs" />
-    <Compile Include="Xwt.Backends\ISelectFolderDialogBackend.cs" />
-    <Compile Include="Xwt\SelectFolderDialog.cs" />
-    <Compile Include="Xwt\WidgetSpacing.cs" />
-    <Compile Include="Xwt.Drawing\Colors.cs" />
-    <Compile Include="Xwt\TransferDataSource.cs" />
-    <Compile Include="Xwt\TransferDataType.cs" />
-    <Compile Include="Xwt.Backends\TransferDataStore.cs" />
-    <Compile Include="Xwt\CursorType.cs" />
-    <Compile Include="Xwt\SelectColorDialog.cs" />
-    <Compile Include="Xwt.Backends\ISelectColorDialogBackend.cs" />
-    <Compile Include="Xwt\IScrollableWidget.cs" />
-    <Compile Include="Xwt.Backends\IScrollableWidgetBackend.cs" />
-    <Compile Include="Xwt\ListBox.cs" />
-    <Compile Include="Xwt.Backends\IListBoxBackend.cs" />
-    <Compile Include="Xwt.Backends\BackendHost.cs" />
-    <Compile Include="Xwt.Backends\IFrontend.cs" />
-    <Compile Include="Xwt.Backends\DefaultNaturalSizes.cs" />
-    <Compile Include="Xwt\StatusIcon.cs" />
-    <Compile Include="Xwt.Backends\IStatusIconBackend.cs" />
-    <Compile Include="Xwt\ColorSelector.cs" />
-    <Compile Include="Xwt.Backends\IColorSelectorBackend.cs" />
-    <Compile Include="Xwt.Backends\XwtWidgetBackend.cs" />
-    <Compile Include="Xwt\ProgressBar.cs" />
-    <Compile Include="Xwt.Backends\IProgressBarBackend.cs" />
-    <Compile Include="Xwt\Popover.cs" />
-    <Compile Include="Xwt.Backends\IPopoverBackend.cs" />
-    <Compile Include="Xwt.Backends\ISpinButtonBackend.cs" />
-    <Compile Include="Xwt\SpinButton.cs" />
-    <Compile Include="Xwt\DatePicker.cs" />
-    <Compile Include="Xwt.Backends\IDatePickerBackend.cs" />
-    <Compile Include="Xwt\Frame.cs" />
-    <Compile Include="Xwt\Expander.cs" />
-    <Compile Include="Xwt.Backends\IExpandBackend.cs" />
-    <Compile Include="Xwt.Backends\ToolkitEngineBackend.cs" />
-    <Compile Include="Xwt\MouseScrolledEventArgs.cs" />
-    <Compile Include="Xwt\LinkLabel.cs" />
-    <Compile Include="Xwt.Backends\ILinkLabelBackend.cs" />
-    <Compile Include="Xwt\Placement.cs" />
-    <Compile Include="Xwt\Spinner.cs" />
-    <Compile Include="Xwt.Backends\ISpinnerBackend.cs" />
-    <Compile Include="Xwt\CloseRequestedHandler.cs" />
-    <Compile Include="Xwt\CloseRequestedEventArgs.cs" />
-    <Compile Include="Xwt\WrapMode.cs" />
-    <Compile Include="Xwt\XwtTaskScheduler.cs" />
-    <Compile Include="Xwt\ExceptionEventArgs.cs" />
-    <Compile Include="Xwt\RichTextView.cs" />
-    <Compile Include="Xwt.Backends\IRichTextViewBackend.cs" />
-    <Compile Include="Xwt.Formats\TextFormat.cs" />
-    <Compile Include="Xwt.Formats\MarkdownTextFormat.cs" />
-    <Compile Include="Xwt.Backends\ContextBackendHandler.cs" />
-    <Compile Include="Xwt.Backends\BackendHandler.cs" />
-    <Compile Include="Xwt.Backends\GradientBackendHandler.cs" />
-    <Compile Include="Xwt.Backends\FontBackendHandler.cs" />
-    <Compile Include="Xwt.Backends\ImagePatternBackendHandler.cs" />
-    <Compile Include="Xwt.Backends\ImageBuilderBackendHandler.cs" />
-    <Compile Include="Xwt.Backends\TextLayoutBackendHandler.cs" />
-    <Compile Include="Xwt.Backends\ClipboardBackend.cs" />
-    <Compile Include="Xwt.Backends\ApplicationContext.cs" />
-    <Compile Include="Xwt\Toolkit.cs" />
-    <Compile Include="Xwt.Drawing\DrawingPath.cs" />
-    <Compile Include="Xwt.Backends\DrawingPathBackendHandler.cs" />
-    <Compile Include="Xwt\Desktop.cs" />
-    <Compile Include="Xwt\Screen.cs" />
-    <Compile Include="Xwt.Backends\DesktopBackend.cs" />
-    <Compile Include="Xwt.Backends\BackendTypeAttribute.cs" />
-    <Compile Include="Xwt.Backends\IEmbeddedWidgetBackend.cs" />
-    <Compile Include="Xwt\ListViewRowEventArgs.cs" />
-    <Compile Include="Xwt\TreeViewRowEventArgs.cs" />
-    <Compile Include="Xwt\CanvasCellView.cs" />
-    <Compile Include="Xwt\SegmentedButton.cs" />
-    <Compile Include="Xwt.Backends\ISegmentedButtonBackend.cs" />
-    <Compile Include="Xwt\DesktopType.cs" />
-    <Compile Include="Xwt.Backends\StockIconId.cs" />
-    <Compile Include="Xwt.Drawing\DrawingImage.cs" />
-    <Compile Include="Xwt.Drawing\BitmapImage.cs" />
-    <Compile Include="Xwt.Formats\PlainTextFormat.cs" />
-    <Compile Include="Xwt.Formats\MarkupTextFormat.cs" />
-    <Compile Include="Xwt.Drawing\ImageFileType.cs" />
-    <Compile Include="Xwt\Slider.cs" />
-    <Compile Include="Xwt.Backends\ISliderBackend.cs" />
-    <Compile Include="Xwt.Drawing\VectorImage.cs" />
-    <Compile Include="Xwt\RadioButton.cs" />
-    <Compile Include="Xwt.Backends\IRadioButtonBackend.cs" />
-    <Compile Include="Xwt\FormattedText.cs" />
-    <Compile Include="Xwt.Drawing\BackgroundTextAttribute.cs" />
-    <Compile Include="Xwt.Drawing\FontWeightTextAttribute.cs" />
-    <Compile Include="Xwt.Drawing\FontStyleTextAttribute.cs" />
-    <Compile Include="Xwt.Drawing\UnderlineTextAttribute.cs" />
-    <Compile Include="Xwt.Drawing\StrikethroughTextAttribute.cs" />
-    <Compile Include="Xwt.Drawing\FontTextAttribute.cs" />
-    <Compile Include="Xwt.Drawing\ColorTextAttribute.cs" />
-    <Compile Include="Xwt.Drawing\LinkTextAttribute.cs" />
-    <Compile Include="Xwt.Drawing\TextAttribute.cs" />
-    <Compile Include="Xwt\WidgetEventArgs.cs" />
-    <Compile Include="Xwt.Backends\IImageCellViewFrontend.cs" />
-    <Compile Include="Xwt.Backends\ICellViewFrontend.cs" />
-    <Compile Include="Xwt.Backends\ITextCellViewFrontend.cs" />
-    <Compile Include="Xwt.Backends\ICanvasCellViewFrontend.cs" />
-    <Compile Include="Xwt.Backends\ICheckBoxCellViewFrontend.cs" />
-    <Compile Include="Xwt.Backends\ExtensionMethods.cs" />
-    <Compile Include="Xwt\Scrollbar.cs" />
-    <Compile Include="Xwt\HScrollbar.cs" />
-    <Compile Include="Xwt\VScrollbar.cs" />
-    <Compile Include="Xwt.Backends\IScrollbarBackend.cs" />
-    <Compile Include="Xwt\SizeConstraint.cs" />
-    <Compile Include="Xwt\WidgetAlignment.cs" />
-    <Compile Include="Xwt.Backends\IChildPlacementHandler.cs" />
-    <Compile Include="Xwt\TableCalc.cs" />
-    <Compile Include="Xwt\VSlider.cs" />
-    <Compile Include="Xwt\HSlider.cs" />
-    <Compile Include="Xwt.Backends\ResourceManager.cs" />
-    <Compile Include="Xwt.Backends\DisposableResourceBackendHandler.cs" />
-    <Compile Include="Xwt.Motion\Animation.cs" />
-    <Compile Include="Xwt.Motion\AnimationExtensions.cs" />
-    <Compile Include="Xwt.Motion\Easing.cs" />
-    <Compile Include="Xwt.Motion\Tweener.cs" />
-    <Compile Include="Xwt.Motion\IAnimatable.cs" />
-    <Compile Include="Xwt\WindowLocation.cs" />
-    <Compile Include="Xwt.Motion\ObjectTransforms.cs" />
-    <Compile Include="Xwt\CheckBoxState.cs" />
-    <Compile Include="Xwt\InvalidConstructorInvocation.cs" />
-    <Compile Include="Xwt\Keyboard.cs" />
-    <Compile Include="Xwt.Backends\KeyboardHandler.cs" />
-    <Compile Include="Xwt\FrameBox.cs" />
-    <Compile Include="Xwt\ToolkitNotInitializedException.cs" />
-    <Compile Include="Xwt.Drawing\NinePatchImage.cs" />
-    <Compile Include="Xwt\WebView.cs" />
-    <Compile Include="Xwt.Backends\IWebViewBackend.cs" />
-    <Compile Include="Xwt.Backends\IScrollAdjustmentBackend.cs" />
-    <Compile Include="Xwt\ScrollAdjustment.cs" />
-    <Compile Include="Xwt\ScrollControl.cs" />
-    <Compile Include="Xwt.Backends\IScrollControlBackend.cs" />
-    <Compile Include="Xwt.Backends\ICellViewBackend.cs" />
-    <Compile Include="Xwt.Backends\EventHost.cs" />
-    <Compile Include="Xwt.Backends\ICanvasCellViewBackend.cs" />
-    <Compile Include="Xwt\SearchTextEntry.cs" />
-    <Compile Include="Xwt.Backends\ISearchTextEntryBackend.cs" />
-    <Compile Include="Xwt\GridLines.cs" />
-    <Compile Include="Xwt\ColorPicker.cs" />
-    <Compile Include="Xwt.Backends\IColorPickerBackend.cs" />
-    <Compile Include="Xwt\XwtSynchronizationContext.cs" />
-    <Compile Include="Xwt\Calendar.cs" />
-    <Compile Include="Xwt.Backends\ICalendarBackend.cs" />
-    <Compile Include="Xwt.Drawing\ThemedImage.cs" />
-    <Compile Include="Xwt.Drawing\IImageLoader.cs" />
-    <Compile Include="Xwt\FontSelector.cs" />
-    <Compile Include="Xwt.Backends\IFontSelectorBackend.cs" />
-    <Compile Include="Xwt\SelectFontDialog.cs" />
-    <Compile Include="Xwt.Backends\ISelectFontDialogBackend.cs" />
-    <Compile Include="Xwt.Drawing\StyleSet.cs" />
-    <Compile Include="Xwt\FileSelector.cs" />
-    <Compile Include="Xwt.Backends\IFileSelectorBackend.cs" />
-    <Compile Include="Xwt\FolderSelector.cs" />
-    <Compile Include="Xwt.Backends\IFolderSelectorBackend.cs" />
-    <Compile Include="Xwt\ToolkitDefaults.cs" />
-    <Compile Include="Xwt.Backends\IComboBoxCellViewFrontend.cs" />
-    <Compile Include="Xwt\RadioButtonCellView.cs" />
-    <Compile Include="Xwt.Backends\IRadioButtonCellViewFrontend.cs" />
-    <Compile Include="Xwt.Backends\IToggleCellViewFrontend.cs" />
-    <Compile Include="Xwt.Backends\IDispatcherBackend.cs" />
-    <Compile Include="Xwt\ITranslationCatalog.cs" />
-    <Compile Include="Xwt.Accessibility\Accessible.cs" />
-    <Compile Include="Xwt.Accessibility\IAccessibleBackend.cs" />
-    <Compile Include="Xwt.Accessibility\Role.cs" />
-    <Compile Include="Xwt.Backends\IPopupWindowBackend.cs" />
-    <Compile Include="Xwt\UtilityWindow.cs" />
-    <Compile Include="Xwt.Backends\IUtilityWindowBackend.cs" />
-    <Compile Include="Xwt\TextChangedEventArgs.cs" />
-    <Compile Include="Xwt.Drawing\FontSizeTextAttribute.cs" />
-    <Compile Include="Xwt.Accessibility\AccessibleFields.cs" />
-    <Compile Include="Xwt.Accessibility\XwtAccessibleBackend.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup />
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <Policies>
-          <DotNetNamingPolicy DirectoryNamespaceAssociation="Flat" ResourceNamePolicy="FileFormatDefault" />
-        </Policies>
-      </Properties>
-    </MonoDevelop>
-  </ProjectExtensions>
-  <ItemGroup />
-  <ItemGroup />
-  <ItemGroup />
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net40</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\xwt.snk</AssemblyOriginatorKeyFile>
+    <RootNamespace>Xwt</RootNamespace>
+    <AssemblyName>Xwt</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <LangVersion>6</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <LangVersion>6</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PackageId>Xwt</PackageId>
+    <Authors>Lluis Sanchez</Authors>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/mono/xwt/</PackageProjectUrl>
+    <PackageTags>xwt cross platform gui ui toolkit framework desktop wpf mac osx monomac cocoa gtk</PackageTags>
+    <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>
+    <NoBuild>true</NoBuild>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.Xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\LICENSE.txt" Pack="true" PackagePath=""/>
+    <None Include="..\README.markdown" Pack="true" PackagePath=""/>
+  </ItemGroup>
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties>
+        <Policies>
+          <DotNetNamingPolicy ResourceNamePolicy="FileFormatDefault" DirectoryNamespaceAssociation="Flat" />
+        </Policies>
+      </Properties>
+    </MonoDevelop>
+  </ProjectExtensions>
+</Project>
--- a/Xwt/Xwt.nuspec
+++ b/Xwt/Xwt.nuspec
@ -1,27 +0,0 @@
-<?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>
--- a/appveyor.yml
+++ b/appveyor.yml
@ -6,6 +6,8 @@ branches:
  - master
 skip_tags: true

+image: Visual Studio 2019 Preview
+
 configuration: Release
 platform: Any CPU

@ -41,13 +43,13 @@ build_script:
 - msbuild Xwt.WPF\Xwt.WPF.csproj /target:Build /property:Configuration=Release;Platform=AnyCPU /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 - msbuild Xwt.XamMac\Xwt.XamMac.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
+- msbuild Xwt\Xwt.csproj -t:pack -p:Configuration=Release;Platform=AnyCPU -p:PackageVersion=%APPVEYOR_BUILD_VERSION% -p:IncludeSymbols=true -p:PackageOutputPath=..\nuget
 - NuGet pack Xwt.Gtk\Xwt.Gtk.csproj -Properties "Configuration=Release;Platform=AnyCPU" -Symbols -OutputDirectory nuget
 - NuGet pack Xwt.Gtk.Windows\Xwt.Gtk.Windows.csproj -Properties "Configuration=Release;Platform=AnyCPU" -Symbols -OutputDirectory nuget
 - NuGet pack Xwt.Gtk.Mac\Xwt.Gtk.Mac.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
 - NuGet pack Xwt.XamMac\Xwt.XamMac.csproj -Properties "Configuration=Release;Platform=AnyCPU" -Symbols -OutputDirectory nuget
+- msbuild Xwt.WPF\Xwt.WPF.csproj -t:pack -p:Configuration=Release;Platform=AnyCPU -p:PackageVersion=%APPVEYOR_BUILD_VERSION% -p:IncludeSymbols=true -p:PackageOutputPath=..\nuget
 - dir nuget

 test_script: