Merge pull request #2 from orion75/gtk-sharp-3-14-branch

Gtk sharp 3 14 branch
2024-07-09 22:01:43 +02:00 · 2015-10-30 08:23:19 +01:00 · 2015-10-30 08:23:19 +01:00 · 62b9345c7f
commit 62b9345c7f
parent 542be14153 c099ec1fac
24 changed files with 954 additions and 536 deletions
--- a/atk/atk.csproj
+++ b/atk/atk.csproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -9,7 +9,8 @@
    <OutputType>Library</OutputType>
    <RootNamespace>atk</RootNamespace>
    <AssemblyName>atk-sharp</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
@ -127,6 +128,21 @@
    <Compile Include="generated\Atk\TextRectangle.cs" />
    <Compile Include="generated\Atk\Util.cs" />
    <Compile Include="generated\Atk\ValueAdapter.cs" />
+    <Compile Include="generated\Atk\ITableCell.cs" />
+    <Compile Include="generated\Atk\IWindow.cs" />
+    <Compile Include="generated\Atk\PageChangedHandler.cs" />
+    <Compile Include="generated\Atk\Range.cs" />
+    <Compile Include="generated\Atk\TableCellAdapter.cs" />
+    <Compile Include="generated\Atk\TextGranularity.cs" />
+    <Compile Include="generated\Atk\TextInsertHandler.cs" />
+    <Compile Include="generated\Atk\TextRemoveHandler.cs" />
+    <Compile Include="generated\Atk\UtilListenerInfo.cs" />
+    <Compile Include="generated\Atk\ValueChangedHandler.cs" />
+    <Compile Include="generated\Atk\ValueType.cs" />
+    <Compile Include="generated\Atk\WindowAdapter.cs" />
+    <Compile Include="..\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\glib\glib.csproj">
@ -134,12 +150,10 @@
      <Name>glib</Name>
    </ProjectReference>
  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="generated\" />
-  </ItemGroup>
+  <ItemGroup />
  <ItemGroup>
    <None Include="atk-sharp.dll.config">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
  </ItemGroup>
-</Project>
+</Project>
--- a/audit/audit.csproj
+++ b/audit/audit.csproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -9,7 +9,8 @@
    <OutputType>Exe</OutputType>
    <RootNamespace>audit</RootNamespace>
    <AssemblyName>audit</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
--- a/cairo/cairo.csproj
+++ b/cairo/cairo.csproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -9,7 +9,8 @@
    <OutputType>Library</OutputType>
    <RootNamespace>cairo</RootNamespace>
    <AssemblyName>cairo-sharp</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@

-AC_INIT(gtk-sharp, 2.99.4)
+AC_INIT(gtk-sharp, 3.14.0)

 AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 tar-ustar foreign])
 AC_CANONICAL_HOST
@ -7,17 +7,14 @@ AC_CONFIG_HEADERS(config.h)
 AM_MAINTAINER_MODE
 AC_CONFIG_MACRO_DIR([m4])

-API_VERSION=3.0.0.0
+API_VERSION=3.14.0.0
 AC_SUBST(API_VERSION)
 CAIRO_API_VERSION=1.12.0.0
 AC_SUBST(CAIRO_API_VERSION)
 POLICY_VERSIONS=""
 AC_SUBST(POLICY_VERSIONS)

-PKG_VERSION=3.12.0
-AC_SUBST(PKG_VERSION)
-
-PACKAGE_VERSION=gtk-sharp-3.0
+PACKAGE_VERSION=gtk-sharp-3.14
 AC_SUBST(PACKAGE_VERSION)

 WIN64DEFINES=
--- a/gdk/gdk-sharp-3.0.pc.in
+++ b/gdk/gdk-sharp-3.0.pc.in
@ -6,7 +6,7 @@ gapidir=${prefix}/share/gapi-3.0

 Name: Gdk#
 Description: Gdk# - GDK .NET Binding
-Version: @PKG_VERSION@
+Version: @VERSION@
 Cflags: -I:${gapidir}/gdk-api.xml
 Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gdk-sharp.dll
 Requires: glib-sharp-3.0
--- a/gdk/gdk.csproj
+++ b/gdk/gdk.csproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -9,7 +9,8 @@
    <OutputType>Library</OutputType>
    <RootNamespace>gdk</RootNamespace>
    <AssemblyName>gdk-sharp</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
@ -75,6 +76,8 @@
    <Compile Include="TextProperty.cs" />
    <Compile Include="Window.cs" />
    <Compile Include="WindowAttr.cs" />
+    <Compile Include="generated\GLib\GLibSharp.GSourceFuncNative.cs" />
+    <Compile Include="generated\GLib\GLibSharp.AsyncReadyCallbackNative.cs" />
    <Compile Include="generated\Gdk\AppLaunchContext.cs" />
    <Compile Include="generated\Gdk\AreaUpdatedHandler.cs" />
    <Compile Include="generated\Gdk\ArgContext.cs" />
@ -82,6 +85,7 @@
    <Compile Include="generated\Gdk\Atom.cs" />
    <Compile Include="generated\Gdk\AxisInfo.cs" />
    <Compile Include="generated\Gdk\AxisUse.cs" />
+    <Compile Include="generated\Gdk\Backend.cs" />
    <Compile Include="generated\Gdk\ByteOrder.cs" />
    <Compile Include="generated\Gdk\CairoHelper.cs" />
    <Compile Include="generated\Gdk\ClientFilter.cs" />
@ -111,18 +115,25 @@
    <Compile Include="generated\Gdk\EventFunc.cs" />
    <Compile Include="generated\Gdk\EventHelper.cs" />
    <Compile Include="generated\Gdk\EventMask.cs" />
-    <Compile Include="generated\Gdk\Events.cs" />
+    <Compile Include="generated\Gdk\EventSequence.cs" />
+    <Compile Include="generated\Gdk\EventTouch.cs" />
    <Compile Include="generated\Gdk\EventType.cs" />
-    <Compile Include="generated\Gdk\ExtensionMode.cs" />
+    <Compile Include="generated\Gdk\Events.cs" />
    <Compile Include="generated\Gdk\FilterFunc.cs" />
    <Compile Include="generated\Gdk\FilterReturn.cs" />
+    <Compile Include="generated\Gdk\FrameClock.cs" />
+    <Compile Include="generated\Gdk\FrameClockIdle.cs" />
+    <Compile Include="generated\Gdk\FrameClockPhase.cs" />
+    <Compile Include="generated\Gdk\FrameTimings.cs" />
    <Compile Include="generated\Gdk\FromEmbedderHandler.cs" />
+    <Compile Include="generated\Gdk\FullscreenMode.cs" />
    <Compile Include="generated\Gdk\GdipContext.cs" />
    <Compile Include="generated\Gdk\GdkSharp.EventFuncNative.cs" />
    <Compile Include="generated\Gdk\GdkSharp.FilterFuncNative.cs" />
    <Compile Include="generated\Gdk\GdkSharp.PixbufDestroyNotifyNative.cs" />
    <Compile Include="generated\Gdk\GdkSharp.PixbufSaveFuncNative.cs" />
    <Compile Include="generated\Gdk\GdkSharp.WindowChildFuncNative.cs" />
+    <Compile Include="generated\Gdk\GdkSharp.WindowInvalidateHandlerFuncNative.cs" />
    <Compile Include="generated\Gdk\Geometry.cs" />
    <Compile Include="generated\Gdk\Gif89.cs" />
    <Compile Include="generated\Gdk\GifContext.cs" />
@ -131,25 +142,24 @@
    <Compile Include="generated\Gdk\GrabOwnership.cs" />
    <Compile Include="generated\Gdk\GrabStatus.cs" />
    <Compile Include="generated\Gdk\Gravity.cs" />
+    <Compile Include="generated\Gdk\IOBuffer.cs" />
+    <Compile Include="generated\Gdk\IOClosure.cs" />
    <Compile Include="generated\Gdk\IcnsBlockHeader.cs" />
    <Compile Include="generated\Gdk\IconEntry.cs" />
    <Compile Include="generated\Gdk\InputMode.cs" />
    <Compile Include="generated\Gdk\InputSource.cs" />
    <Compile Include="generated\Gdk\InterpType.cs" />
-    <Compile Include="generated\Gdk\IOBuffer.cs" />
-    <Compile Include="generated\Gdk\IOClosure.cs" />
    <Compile Include="generated\Gdk\Keyboard.cs" />
    <Compile Include="generated\Gdk\Keymap.cs" />
    <Compile Include="generated\Gdk\KeymapKey.cs" />
    <Compile Include="generated\Gdk\Keyval.cs" />
    <Compile Include="generated\Gdk\LoadContext.cs" />
+    <Compile Include="generated\Gdk\ModifierIntent.cs" />
    <Compile Include="generated\Gdk\ModifierType.cs" />
    <Compile Include="generated\Gdk\NotifyType.cs" />
    <Compile Include="generated\Gdk\OffscreenWindow.cs" />
    <Compile Include="generated\Gdk\OffscreenWindowClass.cs" />
    <Compile Include="generated\Gdk\OwnerChange.cs" />
-    <Compile Include="generated\Gdk\Paintable.cs" />
-    <Compile Include="generated\Gdk\PaintableIface.cs" />
    <Compile Include="generated\Gdk\PangoHelper.cs" />
    <Compile Include="generated\Gdk\PickEmbeddedChildHandler.cs" />
    <Compile Include="generated\Gdk\Pixbuf.cs" />
@ -183,9 +193,9 @@
    <Compile Include="generated\Gdk\Point.cs" />
    <Compile Include="generated\Gdk\Pointer.cs" />
    <Compile Include="generated\Gdk\Predicate.cs" />
+    <Compile Include="generated\Gdk\PropMode.cs" />
    <Compile Include="generated\Gdk\Property.cs" />
    <Compile Include="generated\Gdk\PropertyState.cs" />
-    <Compile Include="generated\Gdk\PropMode.cs" />
    <Compile Include="generated\Gdk\RGBA.cs" />
    <Compile Include="generated\Gdk\Screen.cs" />
    <Compile Include="generated\Gdk\ScrollDirection.cs" />
@ -206,23 +216,26 @@
    <Compile Include="generated\Gdk\VisibilityState.cs" />
    <Compile Include="generated\Gdk\Visual.cs" />
    <Compile Include="generated\Gdk\VisualType.cs" />
+    <Compile Include="generated\Gdk\WMDecoration.cs" />
+    <Compile Include="generated\Gdk\WMFunction.cs" />
    <Compile Include="generated\Gdk\Window.cs" />
    <Compile Include="generated\Gdk\WindowAttr.cs" />
    <Compile Include="generated\Gdk\WindowAttributesType.cs" />
    <Compile Include="generated\Gdk\WindowChildFunc.cs" />
    <Compile Include="generated\Gdk\WindowEdge.cs" />
    <Compile Include="generated\Gdk\WindowHints.cs" />
+    <Compile Include="generated\Gdk\WindowInvalidateHandlerFunc.cs" />
    <Compile Include="generated\Gdk\WindowPaint.cs" />
    <Compile Include="generated\Gdk\WindowRedirect.cs" />
    <Compile Include="generated\Gdk\WindowState.cs" />
    <Compile Include="generated\Gdk\WindowType.cs" />
    <Compile Include="generated\Gdk\WindowTypeHint.cs" />
    <Compile Include="generated\Gdk\WindowWindowClass.cs" />
-    <Compile Include="generated\Gdk\WMDecoration.cs" />
-    <Compile Include="generated\Gdk\WMFunction.cs" />
    <Compile Include="generated\Gdk\XBMData.cs" />
    <Compile Include="generated\Gdk\XPMContext.cs" />
-    <Compile Include="generated\GLib\GLibSharp.GSourceFuncNative.cs" />
+    <Compile Include="..\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\glib\glib.csproj">
@ -242,14 +255,10 @@
      <Name>pango</Name>
    </ProjectReference>
  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="generated\" />
-    <Folder Include="generated\Gdk\" />
-    <Folder Include="generated\GLib\" />
-  </ItemGroup>
+  <ItemGroup />
  <ItemGroup>
    <None Include="gdk-sharp.dll.config">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
  </ItemGroup>
-</Project>
+</Project>
--- a/generator/generator.csproj
+++ b/generator/generator.csproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -9,7 +9,8 @@
    <OutputType>Exe</OutputType>
    <RootNamespace>generator</RootNamespace>
    <AssemblyName>gapi_codegen</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
--- a/gio/gio-sharp-3.0.pc.in
+++ b/gio/gio-sharp-3.0.pc.in
@ -6,7 +6,7 @@ gapidir=${prefix}/share/gapi-3.0

 Name: GIO#
 Description: GIO# - GIO .NET Binding
-Version: @PKG_VERSION@
+Version: @VERSION@
 Cflags: -I:${gapidir}/gio-api.xml
 Libs: -r:${assemblies_dir}/gio-sharp.dll
 Requires: glib-sharp-3.0
--- a/gio/gio.csproj
+++ b/gio/gio.csproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -9,7 +9,8 @@
    <OutputType>Library</OutputType>
    <RootNamespace>gio</RootNamespace>
    <AssemblyName>gio-sharp</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
@ -45,102 +46,95 @@
    <Compile Include="generated\GLib\ActionAdapter.cs" />
    <Compile Include="generated\GLib\ActionAddedHandler.cs" />
    <Compile Include="generated\GLib\ActionEnabledChangedHandler.cs" />
+    <Compile Include="generated\GLib\ActionEntry.cs" />
    <Compile Include="generated\GLib\ActionGroupAdapter.cs" />
+    <Compile Include="generated\GLib\ActionMapAdapter.cs" />
    <Compile Include="generated\GLib\ActionRemovedHandler.cs" />
    <Compile Include="generated\GLib\ActionStateChangedHandler.cs" />
-    <Compile Include="generated\GLib\ActivatedHandler.cs" />
    <Compile Include="generated\GLib\AppInfoAdapter.cs" />
    <Compile Include="generated\GLib\AppInfoCreateFlags.cs" />
+    <Compile Include="generated\GLib\AppInfoMonitor.cs" />
    <Compile Include="generated\GLib\AppLaunchContext.cs" />
    <Compile Include="generated\GLib\Application.cs" />
    <Compile Include="generated\GLib\ApplicationCommandLine.cs" />
    <Compile Include="generated\GLib\ApplicationFlags.cs" />
-    <Compile Include="generated\GLib\ApplicationImpl.cs" />
    <Compile Include="generated\GLib\AskPasswordFlags.cs" />
    <Compile Include="generated\GLib\AskPasswordHandler.cs" />
    <Compile Include="generated\GLib\AskQuestionHandler.cs" />
    <Compile Include="generated\GLib\AsyncInitableAdapter.cs" />
    <Compile Include="generated\GLib\AsyncReadyCallback.cs" />
    <Compile Include="generated\GLib\AsyncResultAdapter.cs" />
-    <Compile Include="generated\GLib\AuthenticatedPeerAuthorizedHandler.cs" />
    <Compile Include="generated\GLib\BufferedInputStream.cs" />
    <Compile Include="generated\GLib\BufferedOutputStream.cs" />
-    <Compile Include="generated\GLib\Bus.cs" />
-    <Compile Include="generated\GLib\BusAcquiredCallback.cs" />
-    <Compile Include="generated\GLib\BusNameAcquiredCallback.cs" />
-    <Compile Include="generated\GLib\BusNameAppearedCallback.cs" />
-    <Compile Include="generated\GLib\BusNameLostCallback.cs" />
    <Compile Include="generated\GLib\BusNameOwnerFlags.cs" />
-    <Compile Include="generated\GLib\BusNameVanishedCallback.cs" />
    <Compile Include="generated\GLib\BusNameWatcherFlags.cs" />
    <Compile Include="generated\GLib\BusType.cs" />
+    <Compile Include="generated\GLib\BytesIcon.cs" />
    <Compile Include="generated\GLib\Cancellable.cs" />
    <Compile Include="generated\GLib\CancellableSourceFunc.cs" />
-    <Compile Include="generated\GLib\ChangedHandler.cs" />
    <Compile Include="generated\GLib\ChangeEventHandler.cs" />
+    <Compile Include="generated\GLib\ChangedHandler.cs" />
    <Compile Include="generated\GLib\CharsetConverter.cs" />
-    <Compile Include="generated\GLib\Chunk.cs" />
-    <Compile Include="generated\GLib\ClosedHandler.cs" />
    <Compile Include="generated\GLib\CommandLineHandler.cs" />
    <Compile Include="generated\GLib\ContentType.cs" />
    <Compile Include="generated\GLib\ConverterAdapter.cs" />
    <Compile Include="generated\GLib\ConverterFlags.cs" />
-    <Compile Include="generated\GLib\ConverterInputStream.cs" />
-    <Compile Include="generated\GLib\ConverterOutputStream.cs" />
    <Compile Include="generated\GLib\ConverterResult.cs" />
    <Compile Include="generated\GLib\Credentials.cs" />
    <Compile Include="generated\GLib\CredentialsType.cs" />
-    <Compile Include="generated\GLib\DataInputStream.cs" />
-    <Compile Include="generated\GLib\DataOutputStream.cs" />
-    <Compile Include="generated\GLib\DataStreamByteOrder.cs" />
-    <Compile Include="generated\GLib\DataStreamNewlineType.cs" />
-    <Compile Include="generated\GLib\DBus.cs" />
+    <Compile Include="generated\GLib\DBusActionGroup.cs" />
    <Compile Include="generated\GLib\DBusAnnotationInfo.cs" />
    <Compile Include="generated\GLib\DBusArgInfo.cs" />
-    <Compile Include="generated\GLib\DBusAuth.cs" />
-    <Compile Include="generated\GLib\DBusAuthMechanism.cs" />
-    <Compile Include="generated\GLib\DBusAuthMechanismAnon.cs" />
-    <Compile Include="generated\GLib\DBusAuthMechanismExternal.cs" />
-    <Compile Include="generated\GLib\DBusAuthMechanismSha1.cs" />
-    <Compile Include="generated\GLib\DBusAuthMechanismState.cs" />
    <Compile Include="generated\GLib\DBusAuthObserver.cs" />
+    <Compile Include="generated\GLib\DBusAuthObserverClass.cs" />
    <Compile Include="generated\GLib\DBusCallFlags.cs" />
    <Compile Include="generated\GLib\DBusCapabilityFlags.cs" />
    <Compile Include="generated\GLib\DBusConnection.cs" />
+    <Compile Include="generated\GLib\DBusConnectionClass.cs" />
    <Compile Include="generated\GLib\DBusConnectionFlags.cs" />
    <Compile Include="generated\GLib\DBusError.cs" />
    <Compile Include="generated\GLib\DBusErrorEntry.cs" />
-    <Compile Include="generated\GLib\DBusInterfaceGetPropertyFunc.cs" />
+    <Compile Include="generated\GLib\DBusInterface.cs" />
    <Compile Include="generated\GLib\DBusInterfaceInfo.cs" />
-    <Compile Include="generated\GLib\DBusInterfaceMethodCallFunc.cs" />
-    <Compile Include="generated\GLib\DBusInterfaceSetPropertyFunc.cs" />
+    <Compile Include="generated\GLib\DBusInterfaceSkeleton.cs" />
+    <Compile Include="generated\GLib\DBusInterfaceSkeletonFlags.cs" />
    <Compile Include="generated\GLib\DBusInterfaceVTable.cs" />
+    <Compile Include="generated\GLib\DBusMenuGroup.cs" />
+    <Compile Include="generated\GLib\DBusMenuPath.cs" />
    <Compile Include="generated\GLib\DBusMessage.cs" />
    <Compile Include="generated\GLib\DBusMessageByteOrder.cs" />
-    <Compile Include="generated\GLib\DBusMessageFilterFunction.cs" />
+    <Compile Include="generated\GLib\DBusMessageClass.cs" />
    <Compile Include="generated\GLib\DBusMessageFlags.cs" />
    <Compile Include="generated\GLib\DBusMessageHeaderField.cs" />
    <Compile Include="generated\GLib\DBusMessageType.cs" />
    <Compile Include="generated\GLib\DBusMethodInfo.cs" />
    <Compile Include="generated\GLib\DBusMethodInvocation.cs" />
+    <Compile Include="generated\GLib\DBusMethodInvocationClass.cs" />
    <Compile Include="generated\GLib\DBusNodeInfo.cs" />
+    <Compile Include="generated\GLib\DBusObject.cs" />
+    <Compile Include="generated\GLib\DBusObjectManager.cs" />
+    <Compile Include="generated\GLib\DBusObjectManagerClient.cs" />
+    <Compile Include="generated\GLib\DBusObjectManagerClientFlags.cs" />
+    <Compile Include="generated\GLib\DBusObjectManagerServer.cs" />
+    <Compile Include="generated\GLib\DBusObjectProxy.cs" />
+    <Compile Include="generated\GLib\DBusObjectSkeleton.cs" />
    <Compile Include="generated\GLib\DBusPropertyInfo.cs" />
    <Compile Include="generated\GLib\DBusPropertyInfoFlags.cs" />
    <Compile Include="generated\GLib\DBusProxy.cs" />
    <Compile Include="generated\GLib\DBusProxyFlags.cs" />
+    <Compile Include="generated\GLib\DBusProxyTypeFunc.cs" />
    <Compile Include="generated\GLib\DBusSendMessageFlags.cs" />
    <Compile Include="generated\GLib\DBusServer.cs" />
+    <Compile Include="generated\GLib\DBusServerClass.cs" />
    <Compile Include="generated\GLib\DBusServerFlags.cs" />
-    <Compile Include="generated\GLib\DBusSignalCallback.cs" />
    <Compile Include="generated\GLib\DBusSignalFlags.cs" />
    <Compile Include="generated\GLib\DBusSignalInfo.cs" />
-    <Compile Include="generated\GLib\DBusSubtreeDispatchFunc.cs" />
-    <Compile Include="generated\GLib\DBusSubtreeEnumerateFunc.cs" />
    <Compile Include="generated\GLib\DBusSubtreeFlags.cs" />
-    <Compile Include="generated\GLib\DBusSubtreeIntrospectFunc.cs" />
    <Compile Include="generated\GLib\DBusSubtreeVTable.cs" />
-    <Compile Include="generated\GLib\DBusWorker.cs" />
-    <Compile Include="generated\GLib\DesktopAppInfo.cs" />
+    <Compile Include="generated\GLib\DataInputStream.cs" />
+    <Compile Include="generated\GLib\DataOutputStream.cs" />
+    <Compile Include="generated\GLib\DataStreamByteOrder.cs" />
+    <Compile Include="generated\GLib\DataStreamNewlineType.cs" />
    <Compile Include="generated\GLib\DriveAdapter.cs" />
    <Compile Include="generated\GLib\DriveChangedHandler.cs" />
    <Compile Include="generated\GLib\DriveConnectedHandler.cs" />
@ -154,11 +148,15 @@
    <Compile Include="generated\GLib\DummyTlsCertificateClass.cs" />
    <Compile Include="generated\GLib\DummyTlsConnection.cs" />
    <Compile Include="generated\GLib\DummyTlsConnectionClass.cs" />
+    <Compile Include="generated\GLib\DummyTlsDatabase.cs" />
+    <Compile Include="generated\GLib\DummyTlsDatabaseClass.cs" />
    <Compile Include="generated\GLib\Emblem.cs" />
-    <Compile Include="generated\GLib\EmblemedIcon.cs" />
    <Compile Include="generated\GLib\EmblemOrigin.cs" />
+    <Compile Include="generated\GLib\EmblemedIcon.cs" />
+    <Compile Include="generated\GLib\EventHandler.cs" />
    <Compile Include="generated\GLib\ExportedObject.cs" />
    <Compile Include="generated\GLib\ExportedSubtree.cs" />
+    <Compile Include="generated\GLib\FdoNotificationBackend.cs" />
    <Compile Include="generated\GLib\FileAdapter.cs" />
    <Compile Include="generated\GLib\FileAttributeInfo.cs" />
    <Compile Include="generated\GLib\FileAttributeInfoFlags.cs" />
@ -171,38 +169,28 @@
    <Compile Include="generated\GLib\FileCreateFlags.cs" />
    <Compile Include="generated\GLib\FileDescriptorBasedAdapter.cs" />
    <Compile Include="generated\GLib\FileEnumerator.cs" />
+    <Compile Include="generated\GLib\FileIOStream.cs" />
    <Compile Include="generated\GLib\FileIcon.cs" />
    <Compile Include="generated\GLib\FileInfo.cs" />
    <Compile Include="generated\GLib\FileInputStream.cs" />
-    <Compile Include="generated\GLib\FileIOStream.cs" />
+    <Compile Include="generated\GLib\FileMeasureFlags.cs" />
+    <Compile Include="generated\GLib\FileMeasureProgressCallback.cs" />
    <Compile Include="generated\GLib\FileMonitor.cs" />
    <Compile Include="generated\GLib\FileMonitorEvent.cs" />
    <Compile Include="generated\GLib\FileMonitorFlags.cs" />
-    <Compile Include="generated\GLib\FilenameCompleter.cs" />
    <Compile Include="generated\GLib\FileOutputStream.cs" />
    <Compile Include="generated\GLib\FileProgressCallback.cs" />
    <Compile Include="generated\GLib\FileQueryInfoFlags.cs" />
    <Compile Include="generated\GLib\FileReadMoreCallback.cs" />
-    <Compile Include="generated\GLib\FilesystemPreviewType.cs" />
    <Compile Include="generated\GLib\FileType.cs" />
+    <Compile Include="generated\GLib\FilenameCompleter.cs" />
+    <Compile Include="generated\GLib\FilesystemPreviewType.cs" />
    <Compile Include="generated\GLib\FilterInputStream.cs" />
    <Compile Include="generated\GLib\FilterOutputStream.cs" />
-    <Compile Include="generated\GLib\GioGlobal.cs" />
    <Compile Include="generated\GLib\GLibSharp.AsyncReadyCallbackNative.cs" />
-    <Compile Include="generated\GLib\GLibSharp.BusAcquiredCallbackNative.cs" />
-    <Compile Include="generated\GLib\GLibSharp.BusNameAcquiredCallbackNative.cs" />
-    <Compile Include="generated\GLib\GLibSharp.BusNameAppearedCallbackNative.cs" />
-    <Compile Include="generated\GLib\GLibSharp.BusNameLostCallbackNative.cs" />
-    <Compile Include="generated\GLib\GLibSharp.BusNameVanishedCallbackNative.cs" />
    <Compile Include="generated\GLib\GLibSharp.CancellableSourceFuncNative.cs" />
-    <Compile Include="generated\GLib\GLibSharp.DBusInterfaceGetPropertyFuncNative.cs" />
-    <Compile Include="generated\GLib\GLibSharp.DBusInterfaceMethodCallFuncNative.cs" />
-    <Compile Include="generated\GLib\GLibSharp.DBusInterfaceSetPropertyFuncNative.cs" />
-    <Compile Include="generated\GLib\GLibSharp.DBusMessageFilterFunctionNative.cs" />
-    <Compile Include="generated\GLib\GLibSharp.DBusSignalCallbackNative.cs" />
-    <Compile Include="generated\GLib\GLibSharp.DBusSubtreeDispatchFuncNative.cs" />
-    <Compile Include="generated\GLib\GLibSharp.DBusSubtreeEnumerateFuncNative.cs" />
-    <Compile Include="generated\GLib\GLibSharp.DBusSubtreeIntrospectFuncNative.cs" />
+    <Compile Include="generated\GLib\GLibSharp.DBusProxyTypeFuncNative.cs" />
+    <Compile Include="generated\GLib\GLibSharp.FileMeasureProgressCallbackNative.cs" />
    <Compile Include="generated\GLib\GLibSharp.FileProgressCallbackNative.cs" />
    <Compile Include="generated\GLib\GLibSharp.FileReadMoreCallbackNative.cs" />
    <Compile Include="generated\GLib\GLibSharp.GSourceFuncNative.cs" />
@ -214,14 +202,16 @@
    <Compile Include="generated\GLib\GLibSharp.SettingsGetMappingNative.cs" />
    <Compile Include="generated\GLib\GLibSharp.SimpleAsyncThreadFuncNative.cs" />
    <Compile Include="generated\GLib\GLibSharp.SocketSourceFuncNative.cs" />
-    <Compile Include="generated\GLib\GPropertiesChangedHandler.cs" />
-    <Compile Include="generated\GLib\GSignalHandler.cs" />
+    <Compile Include="generated\GLib\GLibSharp.SpawnChildSetupFuncNative.cs" />
+    <Compile Include="generated\GLib\GLibSharp.TaskThreadFuncNative.cs" />
+    <Compile Include="generated\GLib\GioGlobal.cs" />
+    <Compile Include="generated\GLib\GtkNotificationBackend.cs" />
    <Compile Include="generated\GLib\IAction.cs" />
    <Compile Include="generated\GLib\IActionGroup.cs" />
+    <Compile Include="generated\GLib\IActionMap.cs" />
    <Compile Include="generated\GLib\IAppInfo.cs" />
    <Compile Include="generated\GLib\IAsyncInitable.cs" />
    <Compile Include="generated\GLib\IAsyncResult.cs" />
-    <Compile Include="generated\GLib\IconAdapter.cs" />
    <Compile Include="generated\GLib\IConverter.cs" />
    <Compile Include="generated\GLib\IDrive.cs" />
    <Compile Include="generated\GLib\IFile.cs" />
@ -230,24 +220,18 @@
    <Compile Include="generated\GLib\IInitable.cs" />
    <Compile Include="generated\GLib\ILoadableIcon.cs" />
    <Compile Include="generated\GLib\IMount.cs" />
-    <Compile Include="generated\GLib\IncomingHandler.cs" />
-    <Compile Include="generated\GLib\InetAddress.cs" />
-    <Compile Include="generated\GLib\InetSocketAddress.cs" />
-    <Compile Include="generated\GLib\InitableAdapter.cs" />
-    <Compile Include="generated\GLib\InputStream.cs" />
-    <Compile Include="generated\GLib\InputVector.cs" />
    <Compile Include="generated\GLib\IOError.cs" />
    <Compile Include="generated\GLib\IOErrorEnum.cs" />
    <Compile Include="generated\GLib\IOExtension.cs" />
    <Compile Include="generated\GLib\IOExtensionPoint.cs" />
    <Compile Include="generated\GLib\IOModule.cs" />
+    <Compile Include="generated\GLib\IOModuleScope.cs" />
+    <Compile Include="generated\GLib\IOModuleScopeFlags.cs" />
    <Compile Include="generated\GLib\IOSchedulerJob.cs" />
    <Compile Include="generated\GLib\IOSchedulerJobFunc.cs" />
    <Compile Include="generated\GLib\IOStream.cs" />
    <Compile Include="generated\GLib\IOStreamAdapter.cs" />
    <Compile Include="generated\GLib\IOStreamSpliceFlags.cs" />
-    <Compile Include="generated\GLib\IPollableInputStream.cs" />
-    <Compile Include="generated\GLib\IPollableOutputStream.cs" />
    <Compile Include="generated\GLib\IProxy.cs" />
    <Compile Include="generated\GLib\IProxyResolver.cs" />
    <Compile Include="generated\GLib\ISeekable.cs" />
@ -255,12 +239,33 @@
    <Compile Include="generated\GLib\ITlsClientConnection.cs" />
    <Compile Include="generated\GLib\ITlsServerConnection.cs" />
    <Compile Include="generated\GLib\IVolume.cs" />
+    <Compile Include="generated\GLib\IconAdapter.cs" />
+    <Compile Include="generated\GLib\IncomingHandler.cs" />
+    <Compile Include="generated\GLib\InetAddress.cs" />
+    <Compile Include="generated\GLib\InetAddressMask.cs" />
+    <Compile Include="generated\GLib\InetSocketAddress.cs" />
+    <Compile Include="generated\GLib\InitableAdapter.cs" />
+    <Compile Include="generated\GLib\InputStream.cs" />
+    <Compile Include="generated\GLib\InputVector.cs" />
+    <Compile Include="generated\GLib\ItemsChangedHandler.cs" />
+    <Compile Include="generated\GLib\LaunchedFailedHandler.cs" />
+    <Compile Include="generated\GLib\LaunchedHandler.cs" />
    <Compile Include="generated\GLib\LoadableIconAdapter.cs" />
    <Compile Include="generated\GLib\LocalDirectoryMonitor.cs" />
    <Compile Include="generated\GLib\LocalFileEnumerator.cs" />
    <Compile Include="generated\GLib\LocalFileIOStream.cs" />
-    <Compile Include="generated\GLib\MemoryInputStream.cs" />
-    <Compile Include="generated\GLib\MemoryOutputStream.cs" />
+    <Compile Include="generated\GLib\MemoryBuffer.cs" />
+    <Compile Include="generated\GLib\Menu.cs" />
+    <Compile Include="generated\GLib\MenuAttributeIter.cs" />
+    <Compile Include="generated\GLib\MenuExporter.cs" />
+    <Compile Include="generated\GLib\MenuExporterGroup.cs" />
+    <Compile Include="generated\GLib\MenuExporterLink.cs" />
+    <Compile Include="generated\GLib\MenuExporterMenu.cs" />
+    <Compile Include="generated\GLib\MenuExporterRemote.cs" />
+    <Compile Include="generated\GLib\MenuExporterWatch.cs" />
+    <Compile Include="generated\GLib\MenuItem.cs" />
+    <Compile Include="generated\GLib\MenuLinkIter.cs" />
+    <Compile Include="generated\GLib\MenuModel.cs" />
    <Compile Include="generated\GLib\MessageToWriteData.cs" />
    <Compile Include="generated\GLib\MountAdapter.cs" />
    <Compile Include="generated\GLib\MountAddedHandler.cs" />
@ -273,26 +278,42 @@
    <Compile Include="generated\GLib\MountUnmountFlags.cs" />
    <Compile Include="generated\GLib\NativeVolumeMonitor.cs" />
    <Compile Include="generated\GLib\NetworkAddress.cs" />
+    <Compile Include="generated\GLib\NetworkMonitor.cs" />
    <Compile Include="generated\GLib\NetworkService.cs" />
-    <Compile Include="generated\GLib\NewConnectionHandler.cs" />
+    <Compile Include="generated\GLib\NextstepSettingsBackend.cs" />
+    <Compile Include="generated\GLib\Notification.cs" />
+    <Compile Include="generated\GLib\NotificationBackend.cs" />
+    <Compile Include="generated\GLib\NotificationPriority.cs" />
    <Compile Include="generated\GLib\OpenedHandler.cs" />
    <Compile Include="generated\GLib\OutputStream.cs" />
    <Compile Include="generated\GLib\OutputStreamSpliceFlags.cs" />
    <Compile Include="generated\GLib\OutputVector.cs" />
    <Compile Include="generated\GLib\PasswordSave.cs" />
    <Compile Include="generated\GLib\Permission.cs" />
-    <Compile Include="generated\GLib\PollableInputStreamAdapter.cs" />
-    <Compile Include="generated\GLib\PollableOutputStreamAdapter.cs" />
+    <Compile Include="generated\GLib\Pollable.cs" />
+    <Compile Include="generated\GLib\PollableInputStream.cs" />
+    <Compile Include="generated\GLib\PollableOutputStream.cs" />
    <Compile Include="generated\GLib\PollableSourceFunc.cs" />
+    <Compile Include="generated\GLib\PropertyAction.cs" />
    <Compile Include="generated\GLib\ProxyAdapter.cs" />
    <Compile Include="generated\GLib\ProxyAddress.cs" />
    <Compile Include="generated\GLib\ProxyAddressEnumerator.cs" />
    <Compile Include="generated\GLib\ProxyResolverAdapter.cs" />
    <Compile Include="generated\GLib\ReallocFunc.cs" />
-    <Compile Include="generated\GLib\RemoteActionInfo.cs" />
+    <Compile Include="generated\GLib\RemoteActionGroup.cs" />
    <Compile Include="generated\GLib\ReplyHandler.cs" />
    <Compile Include="generated\GLib\Resolver.cs" />
    <Compile Include="generated\GLib\ResolverError.cs" />
+    <Compile Include="generated\GLib\ResolverRecordType.cs" />
+    <Compile Include="generated\GLib\Resource.cs" />
+    <Compile Include="generated\GLib\ResourceError.cs" />
+    <Compile Include="generated\GLib\ResourceFileEnumerator.cs" />
+    <Compile Include="generated\GLib\ResourceFileEnumeratorClass.cs" />
+    <Compile Include="generated\GLib\ResourceFileInputStream.cs" />
+    <Compile Include="generated\GLib\ResourceFileInputStreamClass.cs" />
+    <Compile Include="generated\GLib\ResourceFlags.cs" />
+    <Compile Include="generated\GLib\ResourceLookupFlags.cs" />
+    <Compile Include="generated\GLib\Resources.cs" />
    <Compile Include="generated\GLib\RunHandler.cs" />
    <Compile Include="generated\GLib\SchemaState.cs" />
    <Compile Include="generated\GLib\SeekableAdapter.cs" />
@ -304,56 +325,68 @@
    <Compile Include="generated\GLib\SettingsBindGetMapping.cs" />
    <Compile Include="generated\GLib\SettingsBindSetMapping.cs" />
    <Compile Include="generated\GLib\SettingsGetMapping.cs" />
-    <Compile Include="generated\GLib\SettingsSchema.cs" />
    <Compile Include="generated\GLib\ShowProcessesHandler.cs" />
+    <Compile Include="generated\GLib\ShowUnmountProgressHandler.cs" />
    <Compile Include="generated\GLib\SimpleAction.cs" />
    <Compile Include="generated\GLib\SimpleActionGroup.cs" />
    <Compile Include="generated\GLib\SimpleAsyncResult.cs" />
    <Compile Include="generated\GLib\SimpleAsyncThreadFunc.cs" />
    <Compile Include="generated\GLib\SimplePermission.cs" />
+    <Compile Include="generated\GLib\SimpleProxyResolver.cs" />
    <Compile Include="generated\GLib\Socket.cs" />
    <Compile Include="generated\GLib\SocketAddress.cs" />
    <Compile Include="generated\GLib\SocketAddressEnumerator.cs" />
    <Compile Include="generated\GLib\SocketClient.cs" />
+    <Compile Include="generated\GLib\SocketClientEvent.cs" />
    <Compile Include="generated\GLib\SocketConnectableAdapter.cs" />
    <Compile Include="generated\GLib\SocketConnection.cs" />
    <Compile Include="generated\GLib\SocketControlMessage.cs" />
    <Compile Include="generated\GLib\SocketFamily.cs" />
-    <Compile Include="generated\GLib\SocketInputStream.cs" />
    <Compile Include="generated\GLib\SocketListener.cs" />
    <Compile Include="generated\GLib\SocketMsgFlags.cs" />
-    <Compile Include="generated\GLib\SocketOutputStream.cs" />
    <Compile Include="generated\GLib\SocketProtocol.cs" />
    <Compile Include="generated\GLib\SocketService.cs" />
    <Compile Include="generated\GLib\SocketSourceFunc.cs" />
    <Compile Include="generated\GLib\SocketType.cs" />
-    <Compile Include="generated\GLib\Socks4aProxy.cs" />
    <Compile Include="generated\GLib\Socks4Proxy.cs" />
+    <Compile Include="generated\GLib\Socks4aProxy.cs" />
    <Compile Include="generated\GLib\Socks5Proxy.cs" />
    <Compile Include="generated\GLib\SrvTarget.cs" />
+    <Compile Include="generated\GLib\StaticResource.cs" />
+    <Compile Include="generated\GLib\Subprocess.cs" />
+    <Compile Include="generated\GLib\SubprocessFlags.cs" />
+    <Compile Include="generated\GLib\SubprocessLauncher.cs" />
+    <Compile Include="generated\GLib\Task.cs" />
+    <Compile Include="generated\GLib\TaskThreadFunc.cs" />
    <Compile Include="generated\GLib\TcpConnection.cs" />
    <Compile Include="generated\GLib\TcpWrapperConnection.cs" />
+    <Compile Include="generated\GLib\TestDBus.cs" />
+    <Compile Include="generated\GLib\TestDBusClass.cs" />
+    <Compile Include="generated\GLib\TestDBusFlags.cs" />
    <Compile Include="generated\GLib\ThemedIcon.cs" />
    <Compile Include="generated\GLib\ThreadedResolver.cs" />
-    <Compile Include="generated\GLib\ThreadedResolverRequest.cs" />
    <Compile Include="generated\GLib\ThreadedSocketService.cs" />
    <Compile Include="generated\GLib\TlsAuthenticationMode.cs" />
    <Compile Include="generated\GLib\TlsCertificate.cs" />
    <Compile Include="generated\GLib\TlsCertificateFlags.cs" />
+    <Compile Include="generated\GLib\TlsCertificateRequestFlags.cs" />
    <Compile Include="generated\GLib\TlsClientConnectionAdapter.cs" />
-    <Compile Include="generated\GLib\TlsClientContext.cs" />
    <Compile Include="generated\GLib\TlsConnection.cs" />
-    <Compile Include="generated\GLib\TlsContext.cs" />
+    <Compile Include="generated\GLib\TlsDatabase.cs" />
+    <Compile Include="generated\GLib\TlsDatabaseLookupFlags.cs" />
+    <Compile Include="generated\GLib\TlsDatabaseVerifyFlags.cs" />
    <Compile Include="generated\GLib\TlsError.cs" />
+    <Compile Include="generated\GLib\TlsFileDatabase.cs" />
+    <Compile Include="generated\GLib\TlsInteraction.cs" />
+    <Compile Include="generated\GLib\TlsInteractionResult.cs" />
+    <Compile Include="generated\GLib\TlsPassword.cs" />
+    <Compile Include="generated\GLib\TlsPasswordFlags.cs" />
    <Compile Include="generated\GLib\TlsRehandshakeMode.cs" />
    <Compile Include="generated\GLib\TlsServerConnectionAdapter.cs" />
-    <Compile Include="generated\GLib\TlsServerContext.cs" />
    <Compile Include="generated\GLib\UnixConnection.cs" />
    <Compile Include="generated\GLib\UnixCredentialsMessage.cs" />
    <Compile Include="generated\GLib\UnixFDList.cs" />
    <Compile Include="generated\GLib\UnixFDMessage.cs" />
-    <Compile Include="generated\GLib\UnixResolver.cs" />
-    <Compile Include="generated\GLib\UnixResolverRequest.cs" />
    <Compile Include="generated\GLib\UnixSocketAddress.cs" />
    <Compile Include="generated\GLib\UnixSocketAddressType.cs" />
    <Compile Include="generated\GLib\Vfs.cs" />
@ -362,14 +395,14 @@
    <Compile Include="generated\GLib\VolumeChangedHandler.cs" />
    <Compile Include="generated\GLib\VolumeMonitor.cs" />
    <Compile Include="generated\GLib\VolumeRemovedHandler.cs" />
-    <Compile Include="generated\GLib\Win32ResolverRequest.cs" />
-    <Compile Include="generated\GLib\WritableChangedHandler.cs" />
    <Compile Include="generated\GLib\WritableChangeEventHandler.cs" />
+    <Compile Include="generated\GLib\WritableChangedHandler.cs" />
    <Compile Include="generated\GLib\ZlibCompressor.cs" />
    <Compile Include="generated\GLib\ZlibCompressorFormat.cs" />
    <Compile Include="generated\GLib\ZlibDecompressor.cs" />
-    <Compile Include="Application.cs" />
-    <Compile Include="GioGlobal.cs" />
+    <Compile Include="..\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\glib\glib.csproj">
@ -380,13 +413,10 @@
  <ItemGroup>
    <Reference Include="System" />
  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="generated\" />
-    <Folder Include="generated\GLib\" />
-  </ItemGroup>
+  <ItemGroup />
  <ItemGroup>
    <None Include="gio-sharp.dll.config">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
  </ItemGroup>
-</Project>
+</Project>
--- a/glib/GType.cs
+++ b/glib/GType.cs
@ -95,19 +95,32 @@ namespace GLib {
 		public static readonly GType Variant = new GType ((IntPtr) TypeFundamentals.TypeVariant);


+		static HashSet<GType> managedTypes = new HashSet<GType> ();
 		static IDictionary<IntPtr, Type> types = new Dictionary<IntPtr, Type> ();
 		static IDictionary<Type, GType> gtypes = new Dictionary<Type, GType> ();

 		public static void Register (GType native_type, System.Type type)
+		{
+			Register (native_type, type, false);
+		}
+
+		public static void Register (GType native_type, System.Type type, bool managed)
 		{
 			lock (types) {
 				if (native_type != GType.Pointer && native_type != GType.Boxed && native_type != ManagedValue.GType)
 					types[native_type.Val] = type;
 				if (type != null)
 					gtypes[type] = native_type;
+				if (managed)
+					managedTypes.Add(native_type);
 			}
 		}

+		public static bool IsManaged (GType gtype)
+		{
+			return managedTypes.Contains(gtype);
+		}
+
 		static GType ()
 		{
 			g_type_init ();
@ -318,7 +331,7 @@ namespace GLib {
 		public GType GetThresholdType ()
 		{
 			GType curr_type = this;
-			while (curr_type.ToString ().StartsWith ("__gtksharp_"))
+			while (IsManaged (curr_type))
 				curr_type = curr_type.GetBaseType ();
 			return curr_type;
 		}
@ -364,7 +377,9 @@ namespace GLib {
 		internal static GType RegisterGObjectType (Object.ClassInitializer gobject_class_initializer)
 		{
 			GType parent_gtype = LookupGObjectType (gobject_class_initializer.Type.BaseType);
-			string name = BuildEscapedName (gobject_class_initializer.Type);
+
+			TypeNameAttribute nattr = (TypeNameAttribute)Attribute.GetCustomAttribute (gobject_class_initializer.Type, typeof (TypeNameAttribute), false);
+			string name = nattr != null ? nattr.Name : BuildEscapedName (gobject_class_initializer.Type);

 			IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name);
 			GTypeQuery query;
@ -376,7 +391,7 @@ namespace GLib {

 			GType gtype = new GType (g_type_register_static (parent_gtype.Val, native_name, ref info, 0));
 			GLib.Marshaller.Free (native_name);
-			Register (gtype, gobject_class_initializer.Type);
+			Register (gtype, gobject_class_initializer.Type, true);

 			return gtype;
 		}
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@ -90,6 +90,7 @@ sources =		 			\
 	ToggleRef.cs				\
 	TypeFundamentals.cs			\
 	TypeInitializerAttribute.cs		\
+	TypeNameAttribute.cs		\
 	ValueArray.cs				\
 	Value.cs				\
 	Variant.cs				\
--- a/glib/Object.cs
+++ b/glib/Object.cs
@ -36,6 +36,7 @@ namespace GLib {
 		bool disposed = false;
 		static uint idx = 1;
 		static Dictionary<IntPtr, ToggleRef> Objects = new Dictionary<IntPtr, ToggleRef>();
+		static Dictionary<IntPtr, Dictionary<IntPtr, GLib.Value>> PropertiesToSet = new Dictionary<IntPtr, Dictionary<IntPtr, GLib.Value>>();

 		~Object ()
 		{
@ -89,7 +90,9 @@ namespace GLib {

 			ToggleRef toggle_ref;
 			lock (Objects) {
-				toggle_ref = (ToggleRef) Objects[o];
+				if (!Objects.TryGetValue (o, out toggle_ref)) {
+					return null;
+				}
 			}

 			if (toggle_ref != null) {
@ -406,7 +409,9 @@ namespace GLib {
 			GType gtype = new GLib.GType (gtypeval);
 			GObjectClass threshold_class = (GObjectClass) Marshal.PtrToStructure (gtype.GetThresholdType ().GetClassPtr (), typeof (GObjectClass));
 			IntPtr raw = threshold_class.constructor_cb (gtypeval, n_construct_properties, construct_properties);
-			bool construct_needed = true;
+			Dictionary<IntPtr, GLib.Value> deferred;
+
+			GLib.Object obj = null;
 			for (int i = 0; i < n_construct_properties; i++) {
 				IntPtr p = new IntPtr (construct_properties.ToInt64 () + i * 2 * IntPtr.Size);

@ -417,16 +422,21 @@ namespace GLib {
 				Value val = (Value) Marshal.PtrToStructure (Marshal.ReadIntPtr (p, IntPtr.Size), typeof (Value));
 				if ((IntPtr) val.Val != IntPtr.Zero) {
 					GCHandle gch = (GCHandle) (IntPtr) val.Val;
-					Object o = (GLib.Object) gch.Target;
-					o.Raw = raw;
-					construct_needed = false;
+					obj = (GLib.Object) gch.Target;
+					obj.Raw = raw;
 					break;
 				}
 			}

-			if (construct_needed)
-				GetObject (raw, false);
+			if (obj == null)
+				obj = GetObject (raw, false);

+			if(PropertiesToSet.TryGetValue(raw, out deferred)) {
+				foreach(var item in deferred) {
+					SetDeferredProperty(obj, item.Value, item.Key);
+				}
+				PropertiesToSet.Remove(raw);
+			}
 			return raw;
 		}

@ -511,17 +521,30 @@ namespace GLib {

 		static void SetPropertyCallback(IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec)
 		{
-			// FIXME: Here is a big quick hack to avoid race condition when trying to set up adjustment with contructor
-			// Because Raw is set too late
-			if (param_spec != IntPtr.Zero) {
-				ParamSpec foo =	new ParamSpec(param_spec);
-				if (foo.Name == "gtk-sharp-managed-instance") {
-					GCHandle gch = (GCHandle) (IntPtr) value.Val;
-					Object o = (GLib.Object) gch.Target;
-					o.Raw = handle;
-				}
+			// There are multiple issues in this place.
+			// We cannot construct an object here as it can be in construction
+			// from ConstructorCallback thus managed object already created.
+			//
+			// We cannot use the "gtk-sharp-managed-instance" property as when
+			// constructed by Gtk.Builder it is set to null.
+			//
+			// We defer setting the properties to later time when
+			// we have unmanaged and managed objects paired.
+			GLib.Object obj = TryGetObject(handle);
+			if(obj != null) {
+				SetDeferredProperty(obj, value, param_spec);
+				return;
 			}
-			GLib.Object obj = GLib.Object.GetObject (handle, false);
+			Dictionary<IntPtr, GLib.Value> deferred;
+			if(!PropertiesToSet.TryGetValue(handle, out deferred)) {
+				deferred = new Dictionary<IntPtr, GLib.Value>();
+				PropertiesToSet.Add(handle, deferred);
+			}
+			deferred[param_spec] = value;
+		}
+
+		static void SetDeferredProperty(GLib.Object obj, GLib.Value value, IntPtr param_spec)
+		{
 			var type = (Type)obj.LookupGType ();

 			Dictionary<IntPtr, PropertyInfo> props;
@ -596,7 +619,7 @@ namespace GLib {
 		protected virtual void CreateNativeObject (string[] names, GLib.Value[] vals)
 		{
 			GType gtype = LookupGType ();
-			bool is_managed_subclass = gtype.ToString ().StartsWith ("__gtksharp");
+			bool is_managed_subclass = GType.IsManaged (gtype);
 			GParameter[] parms = new GParameter [is_managed_subclass ? names.Length + 1 : names.Length];
 			for (int i = 0; i < names.Length; i++) {
 				parms [i].name = GLib.Marshaller.StringToPtrGStrdup (names [i]);
--- a/glib/TypeNameAttribute.cs
+++ b/glib/TypeNameAttribute.cs
@ -0,0 +1,41 @@
+// TypeNameAttribute.cs
+//
+// Copyright (c) 2015 Martin Kupec
+// Copyright (c) 2015 Ales Kurecka
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the Lesser GNU General
+// Public License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GLib {
+
+	using System;
+
+	[AttributeUsage (AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+	public sealed class TypeNameAttribute : Attribute {
+		private readonly string name;
+
+		public TypeNameAttribute (string name)
+		{
+			this.name = name;
+		}
+
+		public string Name
+		{
+			get {
+				return name;
+			}
+		}
+	}
+}
--- a/glib/glib-sharp-3.0.pc.in
+++ b/glib/glib-sharp-3.0.pc.in
@ -6,7 +6,7 @@ gapidir=${prefix}/share/gapi-3.0

 Name: GLib#
 Description: GLib# - .NET Binding for the glib library.
-Version: @PKG_VERSION@
+Version: @VERSION@
 Cflags: -I:${gapidir}/glib-api.xml
 Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/glib-sharp.dll

--- a/glib/glib.csproj
+++ b/glib/glib.csproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -9,7 +9,8 @@
    <OutputType>Library</OutputType>
    <RootNamespace>glib</RootNamespace>
    <AssemblyName>glib-sharp</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
@ -102,6 +103,10 @@
    <Compile Include="SourceFuncs.cs" />
    <Compile Include="GLibSharp.SourceDummyMarshalNative.cs" />
    <Compile Include="GLibSharp.SourceFuncNative.cs" />
+    <Compile Include="TypeNameAttribute.cs" />
+    <Compile Include="..\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
  </ItemGroup>
  <ItemGroup>
    <Reference Include="System.Core" />
--- a/gtk-sharp.sln
+++ b/gtk-sharp.sln
@ -1,256 +1,261 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample", "sample\sample.csproj", "{48234565-8E78-462E-ADEC-9AAA81B641B2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator", "generator\generator.csproj", "{80E73555-2284-40DC-9068-9A40B7359B0C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gtk-sharp", "gtk-sharp", "{E0AD538D-9979-479B-8CBA-ED9143536CE0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "glib", "glib\glib.csproj", "{3BF1D531-8840-4F15-8066-A9788D8C398B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "atk", "atk\atk.csproj", "{42FE871A-D8CF-4B29-9AFF-B02454E6C976}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cairo", "cairo\cairo.csproj", "{364577DB-9728-4951-AC2C-EDF7A6FCC09D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gdk", "gdk\gdk.csproj", "{58346CC6-DE93-45B4-8093-3508BD5DAA12}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gio", "gio\gio.csproj", "{1C3BB17B-336D-432A-8952-4E979BC90867}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gtk", "gtk\gtk.csproj", "{94045F11-4266-40B4-910F-298985AF69D5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pango", "pango\pango.csproj", "{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "audit", "audit\audit.csproj", "{D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1C3BB17B-336D-432A-8952-4E979BC90867}.Debug|x86.ActiveCfg = Debug|x86
-		{1C3BB17B-336D-432A-8952-4E979BC90867}.Debug|x86.Build.0 = Debug|x86
-		{1C3BB17B-336D-432A-8952-4E979BC90867}.Release|x86.ActiveCfg = Release|x86
-		{1C3BB17B-336D-432A-8952-4E979BC90867}.Release|x86.Build.0 = Release|x86
-		{364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Debug|x86.ActiveCfg = Debug|x86
-		{364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Debug|x86.Build.0 = Debug|x86
-		{364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Release|x86.ActiveCfg = Release|x86
-		{364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Release|x86.Build.0 = Release|x86
-		{3BF1D531-8840-4F15-8066-A9788D8C398B}.Debug|x86.ActiveCfg = Debug|x86
-		{3BF1D531-8840-4F15-8066-A9788D8C398B}.Debug|x86.Build.0 = Debug|x86
-		{3BF1D531-8840-4F15-8066-A9788D8C398B}.Release|x86.ActiveCfg = Release|x86
-		{3BF1D531-8840-4F15-8066-A9788D8C398B}.Release|x86.Build.0 = Release|x86
-		{42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Debug|x86.ActiveCfg = Debug|x86
-		{42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Debug|x86.Build.0 = Debug|x86
-		{42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Release|x86.ActiveCfg = Release|x86
-		{42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Release|x86.Build.0 = Release|x86
-		{48234565-8E78-462E-ADEC-9AAA81B641B2}.Debug|x86.ActiveCfg = Debug|x86
-		{48234565-8E78-462E-ADEC-9AAA81B641B2}.Debug|x86.Build.0 = Debug|x86
-		{48234565-8E78-462E-ADEC-9AAA81B641B2}.Release|x86.ActiveCfg = Release|x86
-		{48234565-8E78-462E-ADEC-9AAA81B641B2}.Release|x86.Build.0 = Release|x86
-		{58346CC6-DE93-45B4-8093-3508BD5DAA12}.Debug|x86.ActiveCfg = Debug|x86
-		{58346CC6-DE93-45B4-8093-3508BD5DAA12}.Debug|x86.Build.0 = Debug|x86
-		{58346CC6-DE93-45B4-8093-3508BD5DAA12}.Release|x86.ActiveCfg = Release|x86
-		{58346CC6-DE93-45B4-8093-3508BD5DAA12}.Release|x86.Build.0 = Release|x86
-		{80E73555-2284-40DC-9068-9A40B7359B0C}.Debug|x86.ActiveCfg = Debug|x86
-		{80E73555-2284-40DC-9068-9A40B7359B0C}.Debug|x86.Build.0 = Debug|x86
-		{80E73555-2284-40DC-9068-9A40B7359B0C}.Release|x86.ActiveCfg = Release|x86
-		{80E73555-2284-40DC-9068-9A40B7359B0C}.Release|x86.Build.0 = Release|x86
-		{94045F11-4266-40B4-910F-298985AF69D5}.Debug|x86.ActiveCfg = Debug|x86
-		{94045F11-4266-40B4-910F-298985AF69D5}.Debug|x86.Build.0 = Debug|x86
-		{94045F11-4266-40B4-910F-298985AF69D5}.Release|x86.ActiveCfg = Release|x86
-		{94045F11-4266-40B4-910F-298985AF69D5}.Release|x86.Build.0 = Release|x86
-		{D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Debug|x86.ActiveCfg = Debug|x86
-		{D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Debug|x86.Build.0 = Debug|x86
-		{D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Release|x86.ActiveCfg = Release|x86
-		{D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Release|x86.Build.0 = Release|x86
-		{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Debug|x86.ActiveCfg = Debug|x86
-		{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Debug|x86.Build.0 = Debug|x86
-		{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Release|x86.ActiveCfg = Release|x86
-		{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{3BF1D531-8840-4F15-8066-A9788D8C398B} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
-		{42FE871A-D8CF-4B29-9AFF-B02454E6C976} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
-		{364577DB-9728-4951-AC2C-EDF7A6FCC09D} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
-		{58346CC6-DE93-45B4-8093-3508BD5DAA12} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
-		{1C3BB17B-336D-432A-8952-4E979BC90867} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
-		{94045F11-4266-40B4-910F-298985AF69D5} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
-		{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = sample\sample.csproj
-		Policies = $0
-		$0.TextStylePolicy = $1
-		$1.inheritsSet = null
-		$1.scope = text/x-csharp
-		$0.CSharpFormattingPolicy = $2
-		$2.inheritsSet = Mono
-		$2.inheritsScope = text/x-csharp
-		$2.scope = text/x-csharp
-		$0.TextStylePolicy = $3
-		$3.FileWidth = 120
-		$3.TabsToSpaces = False
-		$3.inheritsSet = VisualStudio
-		$3.inheritsScope = text/plain
-		$3.scope = text/plain
-		$0.DotNetNamingPolicy = $4
-		$4.DirectoryNamespaceAssociation = None
-		$4.ResourceNamePolicy = FileFormatDefault
-		$0.StandardHeader = $5
-		$5.Text = 
-		$5.IncludeInNewFiles = True
-		$0.NameConventionPolicy = $6
-		$6.Rules = $7
-		$7.NamingRule = $8
-		$8.Name = Namespaces
-		$8.AffectedEntity = Namespace
-		$8.VisibilityMask = VisibilityMask
-		$8.NamingStyle = PascalCase
-		$8.IncludeInstanceMembers = True
-		$8.IncludeStaticEntities = True
-		$7.NamingRule = $9
-		$9.Name = Types
-		$9.AffectedEntity = Class, Struct, Enum, Delegate
-		$9.VisibilityMask = VisibilityMask
-		$9.NamingStyle = PascalCase
-		$9.IncludeInstanceMembers = True
-		$9.IncludeStaticEntities = True
-		$7.NamingRule = $10
-		$10.Name = Interfaces
-		$10.RequiredPrefixes = $11
-		$11.String = I
-		$10.AffectedEntity = Interface
-		$10.VisibilityMask = VisibilityMask
-		$10.NamingStyle = PascalCase
-		$10.IncludeInstanceMembers = True
-		$10.IncludeStaticEntities = True
-		$7.NamingRule = $12
-		$12.Name = Attributes
-		$12.RequiredSuffixes = $13
-		$13.String = Attribute
-		$12.AffectedEntity = CustomAttributes
-		$12.VisibilityMask = VisibilityMask
-		$12.NamingStyle = PascalCase
-		$12.IncludeInstanceMembers = True
-		$12.IncludeStaticEntities = True
-		$7.NamingRule = $14
-		$14.Name = Event Arguments
-		$14.RequiredSuffixes = $15
-		$15.String = EventArgs
-		$14.AffectedEntity = CustomEventArgs
-		$14.VisibilityMask = VisibilityMask
-		$14.NamingStyle = PascalCase
-		$14.IncludeInstanceMembers = True
-		$14.IncludeStaticEntities = True
-		$7.NamingRule = $16
-		$16.Name = Exceptions
-		$16.RequiredSuffixes = $17
-		$17.String = Exception
-		$16.AffectedEntity = CustomExceptions
-		$16.VisibilityMask = VisibilityMask
-		$16.NamingStyle = PascalCase
-		$16.IncludeInstanceMembers = True
-		$16.IncludeStaticEntities = True
-		$7.NamingRule = $18
-		$18.Name = Methods
-		$18.AffectedEntity = Methods
-		$18.VisibilityMask = VisibilityMask
-		$18.NamingStyle = PascalCase
-		$18.IncludeInstanceMembers = True
-		$18.IncludeStaticEntities = True
-		$7.NamingRule = $19
-		$19.Name = Static Readonly Fields
-		$19.AffectedEntity = ReadonlyField
-		$19.VisibilityMask = Internal, Protected, Public
-		$19.NamingStyle = PascalCase
-		$19.IncludeInstanceMembers = False
-		$19.IncludeStaticEntities = True
-		$7.NamingRule = $20
-		$20.Name = Fields (Non Private)
-		$20.AffectedEntity = Field
-		$20.VisibilityMask = Internal, Protected, Public
-		$20.NamingStyle = PascalCase
-		$20.IncludeInstanceMembers = True
-		$20.IncludeStaticEntities = True
-		$7.NamingRule = $21
-		$21.Name = ReadOnly Fields (Non Private)
-		$21.AffectedEntity = ReadonlyField
-		$21.VisibilityMask = Internal, Protected, Public
-		$21.NamingStyle = PascalCase
-		$21.IncludeInstanceMembers = True
-		$21.IncludeStaticEntities = False
-		$7.NamingRule = $22
-		$22.Name = Fields (Private)
-		$22.AllowedPrefixes = $23
-		$23.String = _
-		$23.String = m_
-		$22.AffectedEntity = Field, ReadonlyField
-		$22.VisibilityMask = Private
-		$22.NamingStyle = CamelCase
-		$22.IncludeInstanceMembers = True
-		$22.IncludeStaticEntities = False
-		$7.NamingRule = $24
-		$24.Name = Static Fields (Private)
-		$24.AffectedEntity = Field
-		$24.VisibilityMask = Private
-		$24.NamingStyle = CamelCase
-		$24.IncludeInstanceMembers = False
-		$24.IncludeStaticEntities = True
-		$7.NamingRule = $25
-		$25.Name = ReadOnly Fields (Private)
-		$25.AllowedPrefixes = $26
-		$26.String = _
-		$26.String = m_
-		$25.AffectedEntity = ReadonlyField
-		$25.VisibilityMask = Private
-		$25.NamingStyle = CamelCase
-		$25.IncludeInstanceMembers = True
-		$25.IncludeStaticEntities = False
-		$7.NamingRule = $27
-		$27.Name = Constant Fields
-		$27.AffectedEntity = ConstantField
-		$27.VisibilityMask = VisibilityMask
-		$27.NamingStyle = PascalCase
-		$27.IncludeInstanceMembers = True
-		$27.IncludeStaticEntities = True
-		$7.NamingRule = $28
-		$28.Name = Properties
-		$28.AffectedEntity = Property
-		$28.VisibilityMask = VisibilityMask
-		$28.NamingStyle = PascalCase
-		$28.IncludeInstanceMembers = True
-		$28.IncludeStaticEntities = True
-		$7.NamingRule = $29
-		$29.Name = Events
-		$29.AffectedEntity = Event
-		$29.VisibilityMask = VisibilityMask
-		$29.NamingStyle = PascalCase
-		$29.IncludeInstanceMembers = True
-		$29.IncludeStaticEntities = True
-		$7.NamingRule = $30
-		$30.Name = Enum Members
-		$30.AffectedEntity = EnumMember
-		$30.VisibilityMask = VisibilityMask
-		$30.NamingStyle = PascalCase
-		$30.IncludeInstanceMembers = True
-		$30.IncludeStaticEntities = True
-		$7.NamingRule = $31
-		$31.Name = Parameters
-		$31.AffectedEntity = Parameter
-		$31.VisibilityMask = VisibilityMask
-		$31.NamingStyle = CamelCase
-		$31.IncludeInstanceMembers = True
-		$31.IncludeStaticEntities = True
-		$7.NamingRule = $32
-		$32.Name = Type Parameters
-		$32.RequiredPrefixes = $33
-		$33.String = T
-		$32.AffectedEntity = TypeParameter
-		$32.VisibilityMask = VisibilityMask
-		$32.NamingStyle = PascalCase
-		$32.IncludeInstanceMembers = True
-		$32.IncludeStaticEntities = True
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.40629.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample", "sample\sample.csproj", "{48234565-8E78-462E-ADEC-9AAA81B641B2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator", "generator\generator.csproj", "{80E73555-2284-40DC-9068-9A40B7359B0C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gtk-sharp", "gtk-sharp", "{E0AD538D-9979-479B-8CBA-ED9143536CE0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "glib", "glib\glib.csproj", "{3BF1D531-8840-4F15-8066-A9788D8C398B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "atk", "atk\atk.csproj", "{42FE871A-D8CF-4B29-9AFF-B02454E6C976}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cairo", "cairo\cairo.csproj", "{364577DB-9728-4951-AC2C-EDF7A6FCC09D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gdk", "gdk\gdk.csproj", "{58346CC6-DE93-45B4-8093-3508BD5DAA12}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gio", "gio\gio.csproj", "{1C3BB17B-336D-432A-8952-4E979BC90867}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gtk", "gtk\gtk.csproj", "{94045F11-4266-40B4-910F-298985AF69D5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pango", "pango\pango.csproj", "{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "audit", "audit\audit.csproj", "{D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{48234565-8E78-462E-ADEC-9AAA81B641B2}.Debug|x86.ActiveCfg = Debug|x86
+		{48234565-8E78-462E-ADEC-9AAA81B641B2}.Debug|x86.Build.0 = Debug|x86
+		{48234565-8E78-462E-ADEC-9AAA81B641B2}.Release|x86.ActiveCfg = Release|x86
+		{48234565-8E78-462E-ADEC-9AAA81B641B2}.Release|x86.Build.0 = Release|x86
+		{80E73555-2284-40DC-9068-9A40B7359B0C}.Debug|x86.ActiveCfg = Debug|x86
+		{80E73555-2284-40DC-9068-9A40B7359B0C}.Debug|x86.Build.0 = Debug|x86
+		{80E73555-2284-40DC-9068-9A40B7359B0C}.Release|x86.ActiveCfg = Release|x86
+		{80E73555-2284-40DC-9068-9A40B7359B0C}.Release|x86.Build.0 = Release|x86
+		{3BF1D531-8840-4F15-8066-A9788D8C398B}.Debug|x86.ActiveCfg = Debug|x86
+		{3BF1D531-8840-4F15-8066-A9788D8C398B}.Debug|x86.Build.0 = Debug|x86
+		{3BF1D531-8840-4F15-8066-A9788D8C398B}.Release|x86.ActiveCfg = Release|x86
+		{3BF1D531-8840-4F15-8066-A9788D8C398B}.Release|x86.Build.0 = Release|x86
+		{42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Debug|x86.ActiveCfg = Debug|x86
+		{42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Debug|x86.Build.0 = Debug|x86
+		{42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Release|x86.ActiveCfg = Release|x86
+		{42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Release|x86.Build.0 = Release|x86
+		{364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Debug|x86.ActiveCfg = Debug|x86
+		{364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Debug|x86.Build.0 = Debug|x86
+		{364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Release|x86.ActiveCfg = Release|x86
+		{364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Release|x86.Build.0 = Release|x86
+		{58346CC6-DE93-45B4-8093-3508BD5DAA12}.Debug|x86.ActiveCfg = Debug|x86
+		{58346CC6-DE93-45B4-8093-3508BD5DAA12}.Debug|x86.Build.0 = Debug|x86
+		{58346CC6-DE93-45B4-8093-3508BD5DAA12}.Release|x86.ActiveCfg = Release|x86
+		{58346CC6-DE93-45B4-8093-3508BD5DAA12}.Release|x86.Build.0 = Release|x86
+		{1C3BB17B-336D-432A-8952-4E979BC90867}.Debug|x86.ActiveCfg = Debug|x86
+		{1C3BB17B-336D-432A-8952-4E979BC90867}.Debug|x86.Build.0 = Debug|x86
+		{1C3BB17B-336D-432A-8952-4E979BC90867}.Release|x86.ActiveCfg = Release|x86
+		{1C3BB17B-336D-432A-8952-4E979BC90867}.Release|x86.Build.0 = Release|x86
+		{94045F11-4266-40B4-910F-298985AF69D5}.Debug|x86.ActiveCfg = Debug|x86
+		{94045F11-4266-40B4-910F-298985AF69D5}.Debug|x86.Build.0 = Debug|x86
+		{94045F11-4266-40B4-910F-298985AF69D5}.Release|x86.ActiveCfg = Release|x86
+		{94045F11-4266-40B4-910F-298985AF69D5}.Release|x86.Build.0 = Release|x86
+		{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Debug|x86.ActiveCfg = Debug|x86
+		{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Debug|x86.Build.0 = Debug|x86
+		{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Release|x86.ActiveCfg = Release|x86
+		{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Release|x86.Build.0 = Release|x86
+		{D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Debug|x86.ActiveCfg = Debug|x86
+		{D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Debug|x86.Build.0 = Debug|x86
+		{D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Release|x86.ActiveCfg = Release|x86
+		{D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{3BF1D531-8840-4F15-8066-A9788D8C398B} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
+		{42FE871A-D8CF-4B29-9AFF-B02454E6C976} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
+		{364577DB-9728-4951-AC2C-EDF7A6FCC09D} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
+		{58346CC6-DE93-45B4-8093-3508BD5DAA12} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
+		{1C3BB17B-336D-432A-8952-4E979BC90867} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
+		{94045F11-4266-40B4-910F-298985AF69D5} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
+		{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4} = {E0AD538D-9979-479B-8CBA-ED9143536CE0}
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = sample\sample.csproj
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.inheritsSet = null
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+		$0.TextStylePolicy = $3
+		$3.FileWidth = 120
+		$3.TabsToSpaces = False
+		$3.inheritsSet = VisualStudio
+		$3.inheritsScope = text/plain
+		$3.scope = text/plain
+		$0.DotNetNamingPolicy = $4
+		$4.DirectoryNamespaceAssociation = None
+		$4.ResourceNamePolicy = FileFormatDefault
+		$0.StandardHeader = $5
+		$5.Text = 
+		$5.IncludeInNewFiles = True
+		$0.NameConventionPolicy = $6
+		$6.Rules = $7
+		$7.NamingRule = $8
+		$8.Name = Namespaces
+		$8.AffectedEntity = Namespace
+		$8.VisibilityMask = VisibilityMask
+		$8.NamingStyle = PascalCase
+		$8.IncludeInstanceMembers = True
+		$8.IncludeStaticEntities = True
+		$7.NamingRule = $9
+		$9.Name = Types
+		$9.AffectedEntity = Class, Struct, Enum, Delegate
+		$9.VisibilityMask = VisibilityMask
+		$9.NamingStyle = PascalCase
+		$9.IncludeInstanceMembers = True
+		$9.IncludeStaticEntities = True
+		$7.NamingRule = $10
+		$10.Name = Interfaces
+		$10.RequiredPrefixes = $11
+		$11.String = I
+		$10.AffectedEntity = Interface
+		$10.VisibilityMask = VisibilityMask
+		$10.NamingStyle = PascalCase
+		$10.IncludeInstanceMembers = True
+		$10.IncludeStaticEntities = True
+		$7.NamingRule = $12
+		$12.Name = Attributes
+		$12.RequiredSuffixes = $13
+		$13.String = Attribute
+		$12.AffectedEntity = CustomAttributes
+		$12.VisibilityMask = VisibilityMask
+		$12.NamingStyle = PascalCase
+		$12.IncludeInstanceMembers = True
+		$12.IncludeStaticEntities = True
+		$7.NamingRule = $14
+		$14.Name = Event Arguments
+		$14.RequiredSuffixes = $15
+		$15.String = EventArgs
+		$14.AffectedEntity = CustomEventArgs
+		$14.VisibilityMask = VisibilityMask
+		$14.NamingStyle = PascalCase
+		$14.IncludeInstanceMembers = True
+		$14.IncludeStaticEntities = True
+		$7.NamingRule = $16
+		$16.Name = Exceptions
+		$16.RequiredSuffixes = $17
+		$17.String = Exception
+		$16.AffectedEntity = CustomExceptions
+		$16.VisibilityMask = VisibilityMask
+		$16.NamingStyle = PascalCase
+		$16.IncludeInstanceMembers = True
+		$16.IncludeStaticEntities = True
+		$7.NamingRule = $18
+		$18.Name = Methods
+		$18.AffectedEntity = Methods
+		$18.VisibilityMask = VisibilityMask
+		$18.NamingStyle = PascalCase
+		$18.IncludeInstanceMembers = True
+		$18.IncludeStaticEntities = True
+		$7.NamingRule = $19
+		$19.Name = Static Readonly Fields
+		$19.AffectedEntity = ReadonlyField
+		$19.VisibilityMask = Internal, Protected, Public
+		$19.NamingStyle = PascalCase
+		$19.IncludeInstanceMembers = False
+		$19.IncludeStaticEntities = True
+		$7.NamingRule = $20
+		$20.Name = Fields (Non Private)
+		$20.AffectedEntity = Field
+		$20.VisibilityMask = Internal, Protected, Public
+		$20.NamingStyle = PascalCase
+		$20.IncludeInstanceMembers = True
+		$20.IncludeStaticEntities = True
+		$7.NamingRule = $21
+		$21.Name = ReadOnly Fields (Non Private)
+		$21.AffectedEntity = ReadonlyField
+		$21.VisibilityMask = Internal, Protected, Public
+		$21.NamingStyle = PascalCase
+		$21.IncludeInstanceMembers = True
+		$21.IncludeStaticEntities = False
+		$7.NamingRule = $22
+		$22.Name = Fields (Private)
+		$22.AllowedPrefixes = $23
+		$23.String = _
+		$23.String = m_
+		$22.AffectedEntity = Field, ReadonlyField
+		$22.VisibilityMask = Private
+		$22.NamingStyle = CamelCase
+		$22.IncludeInstanceMembers = True
+		$22.IncludeStaticEntities = False
+		$7.NamingRule = $24
+		$24.Name = Static Fields (Private)
+		$24.AffectedEntity = Field
+		$24.VisibilityMask = Private
+		$24.NamingStyle = CamelCase
+		$24.IncludeInstanceMembers = False
+		$24.IncludeStaticEntities = True
+		$7.NamingRule = $25
+		$25.Name = ReadOnly Fields (Private)
+		$25.AllowedPrefixes = $26
+		$26.String = _
+		$26.String = m_
+		$25.AffectedEntity = ReadonlyField
+		$25.VisibilityMask = Private
+		$25.NamingStyle = CamelCase
+		$25.IncludeInstanceMembers = True
+		$25.IncludeStaticEntities = False
+		$7.NamingRule = $27
+		$27.Name = Constant Fields
+		$27.AffectedEntity = ConstantField
+		$27.VisibilityMask = VisibilityMask
+		$27.NamingStyle = PascalCase
+		$27.IncludeInstanceMembers = True
+		$27.IncludeStaticEntities = True
+		$7.NamingRule = $28
+		$28.Name = Properties
+		$28.AffectedEntity = Property
+		$28.VisibilityMask = VisibilityMask
+		$28.NamingStyle = PascalCase
+		$28.IncludeInstanceMembers = True
+		$28.IncludeStaticEntities = True
+		$7.NamingRule = $29
+		$29.Name = Events
+		$29.AffectedEntity = Event
+		$29.VisibilityMask = VisibilityMask
+		$29.NamingStyle = PascalCase
+		$29.IncludeInstanceMembers = True
+		$29.IncludeStaticEntities = True
+		$7.NamingRule = $30
+		$30.Name = Enum Members
+		$30.AffectedEntity = EnumMember
+		$30.VisibilityMask = VisibilityMask
+		$30.NamingStyle = PascalCase
+		$30.IncludeInstanceMembers = True
+		$30.IncludeStaticEntities = True
+		$7.NamingRule = $31
+		$31.Name = Parameters
+		$31.AffectedEntity = Parameter
+		$31.VisibilityMask = VisibilityMask
+		$31.NamingStyle = CamelCase
+		$31.IncludeInstanceMembers = True
+		$31.IncludeStaticEntities = True
+		$7.NamingRule = $32
+		$32.Name = Type Parameters
+		$32.RequiredPrefixes = $33
+		$33.String = T
+		$32.AffectedEntity = TypeParameter
+		$32.VisibilityMask = VisibilityMask
+		$32.NamingStyle = PascalCase
+		$32.IncludeInstanceMembers = True
+		$32.IncludeStaticEntities = True
+	EndGlobalSection
+EndGlobal
--- a/gtk/gtk-api.raw
+++ b/gtk/gtk-api.raw
@ -23309,11 +23309,11 @@
      <field name="Priv" cname="priv" type="GtkTextTagPrivate*" />
      <property name="Name" cname="name" type="gchar*" readable="true" writeable="true" construct-only="true" />
      <property name="Background" cname="background" type="gchar*" writeable="true" />
-      <property name="BackgroundGdk" cname="background-gdk" type="GTypeFromName(&quot;gdkcolor&quot;)" readable="true" writeable="true" />
+      <property name="BackgroundGdk" cname="background-gdk" type="GdkColor" readable="true" writeable="true" />
      <property name="BackgroundRgba" cname="background-rgba" type="GdkRgba" readable="true" writeable="true" />
      <property name="BackgroundFullHeight" cname="background-full-height" type="gboolean" readable="true" writeable="true" />
      <property name="Foreground" cname="foreground" type="gchar*" writeable="true" />
-      <property name="ForegroundGdk" cname="foreground-gdk" type="GTypeFromName(&quot;gdkcolor&quot;)" readable="true" writeable="true" />
+      <property name="ForegroundGdk" cname="foreground-gdk" type="GdkColor" readable="true" writeable="true" />
      <property name="ForegroundRgba" cname="foreground-rgba" type="GdkRgba" readable="true" writeable="true" />
      <property name="Direction" cname="direction" type="GtkTextDirection" readable="true" writeable="true" />
      <property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true" />
@ -23344,7 +23344,7 @@
      <property name="Tabs" cname="tabs" type="PangoTabArray" readable="true" writeable="true" />
      <property name="Invisible" cname="invisible" type="gboolean" readable="true" writeable="true" />
      <property name="ParagraphBackground" cname="paragraph-background" type="gchar*" writeable="true" />
-      <property name="ParagraphBackgroundGdk" cname="paragraph-background-gdk" type="GTypeFromName(&quot;gdkcolor&quot;)" readable="true" writeable="true" />
+      <property name="ParagraphBackgroundGdk" cname="paragraph-background-gdk" type="GdkColor" readable="true" writeable="true" />
      <property name="ParagraphBackgroundRgba" cname="paragraph-background-rgba" type="GdkRgba" readable="true" writeable="true" />
      <property name="Fallback" cname="fallback" type="gboolean" readable="true" writeable="true" />
      <property name="LetterSpacing" cname="letter-spacing" type="gint" readable="true" writeable="true" />
--- a/gtk/gtk-sharp-3.0.pc.in
+++ b/gtk/gtk-sharp-3.0.pc.in
@ -6,7 +6,7 @@ gapidir=${prefix}/share/gapi-3.0

 Name: Gtk#
 Description: Gtk# - GNOME .NET Binding
-Version: @PKG_VERSION@
+Version: @VERSION@
 Cflags: -I:${gapidir}/cairo-api.xml -I:${gapidir}/pango-api.xml -I:${gapidir}/atk-api.xml -I:${gapidir}/gtk-api.xml
 Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/cairo-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/pango-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/atk-sharp.dll  -r:${libdir}/mono/@PACKAGE_VERSION@/gtk-sharp.dll
 Requires: glib-sharp-3.0 gio-sharp-3.0 gdk-sharp-3.0
--- a/gtk/gtk.csproj
+++ b/gtk/gtk.csproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -9,7 +9,8 @@
    <OutputType>Library</OutputType>
    <RootNamespace>gtk</RootNamespace>
    <AssemblyName>gtk-sharp</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
@ -147,7 +148,6 @@
    <Compile Include="generated\Gtk\AccelChangedHandler.cs" />
    <Compile Include="generated\Gtk\AccelClearedHandler.cs" />
    <Compile Include="generated\Gtk\AccelEditedHandler.cs" />
-    <Compile Include="generated\Gtk\Accelerator.cs" />
    <Compile Include="generated\Gtk\AccelFlags.cs" />
    <Compile Include="generated\Gtk\AccelGroup.cs" />
    <Compile Include="generated\Gtk\AccelGroupActivate.cs" />
@ -157,24 +157,29 @@
    <Compile Include="generated\Gtk\AccelLabel.cs" />
    <Compile Include="generated\Gtk\AccelMap.cs" />
    <Compile Include="generated\Gtk\AccelMapForeach.cs" />
+    <Compile Include="generated\Gtk\Accelerator.cs" />
    <Compile Include="generated\Gtk\AcceptPositionHandler.cs" />
    <Compile Include="generated\Gtk\Accessible.cs" />
    <Compile Include="generated\Gtk\Action.cs" />
    <Compile Include="generated\Gtk\ActionActivatedHandler.cs" />
+    <Compile Include="generated\Gtk\ActionBar.cs" />
    <Compile Include="generated\Gtk\ActionGroup.cs" />
+    <Compile Include="generated\Gtk\ActionHelper.cs" />
+    <Compile Include="generated\Gtk\ActionMuxer.cs" />
+    <Compile Include="generated\Gtk\ActionObservableAdapter.cs" />
+    <Compile Include="generated\Gtk\ActionObserverAdapter.cs" />
+    <Compile Include="generated\Gtk\ActionableAdapter.cs" />
    <Compile Include="generated\Gtk\ActivatableAdapter.cs" />
    <Compile Include="generated\Gtk\ActivateCurrentHandler.cs" />
    <Compile Include="generated\Gtk\ActivateCursorItemHandler.cs" />
    <Compile Include="generated\Gtk\ActivateLinkHandler.cs" />
-    <Compile Include="generated\Gtk\AddedHandler.cs" />
-    <Compile Include="generated\Gtk\AddEditableHandler.cs" />
    <Compile Include="generated\Gtk\AddWidgetHandler.cs" />
+    <Compile Include="generated\Gtk\AddedHandler.cs" />
    <Compile Include="generated\Gtk\AdjustBoundsHandler.cs" />
    <Compile Include="generated\Gtk\Adjustment.cs" />
    <Compile Include="generated\Gtk\Align.cs" />
    <Compile Include="generated\Gtk\Alignment.cs" />
-    <Compile Include="generated\Gtk\AnimationDescription.cs" />
-    <Compile Include="generated\Gtk\AnimationInfo.cs" />
+    <Compile Include="generated\Gtk\AngleChangedHandler.cs" />
    <Compile Include="generated\Gtk\AppChooserAdapter.cs" />
    <Compile Include="generated\Gtk\AppChooserButton.cs" />
    <Compile Include="generated\Gtk\AppChooserDialog.cs" />
@ -182,23 +187,30 @@
    <Compile Include="generated\Gtk\AppChooserWidget.cs" />
    <Compile Include="generated\Gtk\Application.cs" />
    <Compile Include="generated\Gtk\ApplicationActivatedHandler.cs" />
+    <Compile Include="generated\Gtk\ApplicationInhibitFlags.cs" />
    <Compile Include="generated\Gtk\ApplicationSelectedHandler.cs" />
+    <Compile Include="generated\Gtk\ApplicationWindow.cs" />
    <Compile Include="generated\Gtk\Arrow.cs" />
    <Compile Include="generated\Gtk\ArrowPlacement.cs" />
    <Compile Include="generated\Gtk\ArrowType.cs" />
    <Compile Include="generated\Gtk\AspectFrame.cs" />
    <Compile Include="generated\Gtk\Assistant.cs" />
-    <Compile Include="generated\Gtk\AssistantAccessible.cs" />
-    <Compile Include="generated\Gtk\AssistantAccessibleClass.cs" />
    <Compile Include="generated\Gtk\AssistantPage.cs" />
    <Compile Include="generated\Gtk\AssistantPageFunc.cs" />
    <Compile Include="generated\Gtk\AssistantPageType.cs" />
    <Compile Include="generated\Gtk\AttachOptions.cs" />
-    <Compile Include="generated\Gtk\AttributesAppliedHandler.cs" />
+    <Compile Include="generated\Gtk\BaselinePosition.cs" />
+    <Compile Include="generated\Gtk\BeginHandler.cs" />
    <Compile Include="generated\Gtk\BeginPrintHandler.cs" />
    <Compile Include="generated\Gtk\Bin.cs" />
    <Compile Include="generated\Gtk\Bindings.cs" />
+    <Compile Include="generated\Gtk\Bitmask.cs" />
+    <Compile Include="generated\Gtk\Bookmark.cs" />
+    <Compile Include="generated\Gtk\BookmarksChangedFunc.cs" />
+    <Compile Include="generated\Gtk\BookmarksManager.cs" />
    <Compile Include="generated\Gtk\Border.cs" />
+    <Compile Include="generated\Gtk\BorderImage.cs" />
+    <Compile Include="generated\Gtk\BorderImageSliceSize.cs" />
    <Compile Include="generated\Gtk\BorderStyle.cs" />
    <Compile Include="generated\Gtk\Box.cs" />
    <Compile Include="generated\Gtk\Builder.cs" />
@ -210,13 +222,14 @@
    <Compile Include="generated\Gtk\ButtonPressEventHandler.cs" />
    <Compile Include="generated\Gtk\ButtonReleaseEventHandler.cs" />
    <Compile Include="generated\Gtk\ButtonsType.cs" />
-    <Compile Include="generated\Gtk\CachedIcon.cs" />
    <Compile Include="generated\Gtk\CacheEntry.cs" />
+    <Compile Include="generated\Gtk\CachedIcon.cs" />
    <Compile Include="generated\Gtk\CairoHelper.cs" />
    <Compile Include="generated\Gtk\Calendar.cs" />
    <Compile Include="generated\Gtk\CalendarDetailFunc.cs" />
    <Compile Include="generated\Gtk\CalendarDisplayOptions.cs" />
    <Compile Include="generated\Gtk\Callback.cs" />
+    <Compile Include="generated\Gtk\CancelHandler.cs" />
    <Compile Include="generated\Gtk\CancelPositionHandler.cs" />
    <Compile Include="generated\Gtk\CellAllocCallback.cs" />
    <Compile Include="generated\Gtk\CellArea.cs" />
@ -243,10 +256,12 @@
    <Compile Include="generated\Gtk\CellRendererToggle.cs" />
    <Compile Include="generated\Gtk\CellView.cs" />
    <Compile Include="generated\Gtk\ChangeCurrentPageHandler.cs" />
-    <Compile Include="generated\Gtk\ChangedHandler.cs" />
    <Compile Include="generated\Gtk\ChangeValueHandler.cs" />
+    <Compile Include="generated\Gtk\ChangedHandler.cs" />
    <Compile Include="generated\Gtk\CheckButton.cs" />
    <Compile Include="generated\Gtk\CheckMenuItem.cs" />
+    <Compile Include="generated\Gtk\Child.cs" />
+    <Compile Include="generated\Gtk\ChildActivatedHandler.cs" />
    <Compile Include="generated\Gtk\ChildAnchorInsertedHandler.cs" />
    <Compile Include="generated\Gtk\ChildAttachedHandler.cs" />
    <Compile Include="generated\Gtk\ChildDetachedHandler.cs" />
@ -260,17 +275,28 @@
    <Compile Include="generated\Gtk\ClipboardTargetsReceivedFunc.cs" />
    <Compile Include="generated\Gtk\ClipboardTextReceivedFunc.cs" />
    <Compile Include="generated\Gtk\ClipboardURIReceivedFunc.cs" />
+    <Compile Include="generated\Gtk\ColorActivatedHandler.cs" />
    <Compile Include="generated\Gtk\ColorButton.cs" />
+    <Compile Include="generated\Gtk\ColorChooserAdapter.cs" />
+    <Compile Include="generated\Gtk\ColorChooserDialog.cs" />
+    <Compile Include="generated\Gtk\ColorChooserWidget.cs" />
+    <Compile Include="generated\Gtk\ColorEditor.cs" />
+    <Compile Include="generated\Gtk\ColorEditorClass.cs" />
+    <Compile Include="generated\Gtk\ColorPlane.cs" />
+    <Compile Include="generated\Gtk\ColorPlaneClass.cs" />
+    <Compile Include="generated\Gtk\ColorScale.cs" />
+    <Compile Include="generated\Gtk\ColorScaleClass.cs" />
    <Compile Include="generated\Gtk\ColorSelection.cs" />
    <Compile Include="generated\Gtk\ColorSelectionChangePaletteFunc.cs" />
    <Compile Include="generated\Gtk\ColorSelectionChangePaletteWithScreenFunc.cs" />
    <Compile Include="generated\Gtk\ColorSelectionDialog.cs" />
    <Compile Include="generated\Gtk\ColorStop.cs" />
+    <Compile Include="generated\Gtk\ColorSwatch.cs" />
+    <Compile Include="generated\Gtk\ColorSwatchClass.cs" />
    <Compile Include="generated\Gtk\ComboBox.cs" />
    <Compile Include="generated\Gtk\ComboBoxText.cs" />
    <Compile Include="generated\Gtk\CommitHandler.cs" />
    <Compile Include="generated\Gtk\CompareInfo.cs" />
-    <Compile Include="generated\Gtk\ComparePathData.cs" />
    <Compile Include="generated\Gtk\ComposeTable.cs" />
    <Compile Include="generated\Gtk\ComposeTableCompact.cs" />
    <Compile Include="generated\Gtk\ConfigureEventHandler.cs" />
@ -278,11 +304,60 @@
    <Compile Include="generated\Gtk\ConnectProxyHandler.cs" />
    <Compile Include="generated\Gtk\Container.cs" />
    <Compile Include="generated\Gtk\CornerType.cs" />
+    <Compile Include="generated\Gtk\CountingData.cs" />
    <Compile Include="generated\Gtk\CreateCustomWidgetHandler.cs" />
    <Compile Include="generated\Gtk\CreateMenuProxyHandler.cs" />
    <Compile Include="generated\Gtk\CreateWindowHandler.cs" />
+    <Compile Include="generated\Gtk\CssAnimation.cs" />
+    <Compile Include="generated\Gtk\CssAnimationClass.cs" />
+    <Compile Include="generated\Gtk\CssChangeTranslation.cs" />
+    <Compile Include="generated\Gtk\CssComputedValues.cs" />
+    <Compile Include="generated\Gtk\CssComputedValuesClass.cs" />
+    <Compile Include="generated\Gtk\CssCustomProperty.cs" />
+    <Compile Include="generated\Gtk\CssCustomPropertyClass.cs" />
+    <Compile Include="generated\Gtk\CssImage.cs" />
+    <Compile Include="generated\Gtk\CssImageClass.cs" />
+    <Compile Include="generated\Gtk\CssImageCrossFade.cs" />
+    <Compile Include="generated\Gtk\CssImageCrossFadeClass.cs" />
+    <Compile Include="generated\Gtk\CssImageGradient.cs" />
+    <Compile Include="generated\Gtk\CssImageGradientClass.cs" />
+    <Compile Include="generated\Gtk\CssImageIconTheme.cs" />
+    <Compile Include="generated\Gtk\CssImageIconThemeClass.cs" />
+    <Compile Include="generated\Gtk\CssImageLinear.cs" />
+    <Compile Include="generated\Gtk\CssImageLinearClass.cs" />
+    <Compile Include="generated\Gtk\CssImageLinearColorStop.cs" />
+    <Compile Include="generated\Gtk\CssImageScaled.cs" />
+    <Compile Include="generated\Gtk\CssImageScaledClass.cs" />
+    <Compile Include="generated\Gtk\CssImageSurface.cs" />
+    <Compile Include="generated\Gtk\CssImageSurfaceClass.cs" />
+    <Compile Include="generated\Gtk\CssImageUrl.cs" />
+    <Compile Include="generated\Gtk\CssImageUrlClass.cs" />
+    <Compile Include="generated\Gtk\CssImageWin32.cs" />
+    <Compile Include="generated\Gtk\CssImageWin32Class.cs" />
+    <Compile Include="generated\Gtk\CssKeyframes.cs" />
+    <Compile Include="generated\Gtk\CssLookup.cs" />
+    <Compile Include="generated\Gtk\CssMatcherClass.cs" />
+    <Compile Include="generated\Gtk\CssMatcherSuperset.cs" />
+    <Compile Include="generated\Gtk\CssMatcherWidgetPath.cs" />
+    <Compile Include="generated\Gtk\CssParser.cs" />
    <Compile Include="generated\Gtk\CssProvider.cs" />
    <Compile Include="generated\Gtk\CssProviderError.cs" />
+    <Compile Include="generated\Gtk\CssRuleset.cs" />
+    <Compile Include="generated\Gtk\CssScanner.cs" />
+    <Compile Include="generated\Gtk\CssSection.cs" />
+    <Compile Include="generated\Gtk\CssSectionType.cs" />
+    <Compile Include="generated\Gtk\CssSelector.cs" />
+    <Compile Include="generated\Gtk\CssSelectorClass.cs" />
+    <Compile Include="generated\Gtk\CssSelectorTree.cs" />
+    <Compile Include="generated\Gtk\CssSelectorTreeBuilder.cs" />
+    <Compile Include="generated\Gtk\CssShorthandProperty.cs" />
+    <Compile Include="generated\Gtk\CssShorthandPropertyClass.cs" />
+    <Compile Include="generated\Gtk\CssStyleProperty.cs" />
+    <Compile Include="generated\Gtk\CssStylePropertyClass.cs" />
+    <Compile Include="generated\Gtk\CssTransition.cs" />
+    <Compile Include="generated\Gtk\CssTransitionClass.cs" />
+    <Compile Include="generated\Gtk\CssValue.cs" />
+    <Compile Include="generated\Gtk\CssValueClass.cs" />
    <Compile Include="generated\Gtk\CursorOnMatchHandler.cs" />
    <Compile Include="generated\Gtk\CustomItemActivatedHandler.cs" />
    <Compile Include="generated\Gtk\CustomPaperUnixDialog.cs" />
@ -291,11 +366,12 @@
    <Compile Include="generated\Gtk\CycleFocusHandler.cs" />
    <Compile Include="generated\Gtk\CycleHandleFocusHandler.cs" />
    <Compile Include="generated\Gtk\DamageEventHandler.cs" />
-    <Compile Include="generated\Gtk\DeletedTextHandler.cs" />
+    <Compile Include="generated\Gtk\DecomposedMatrix.cs" />
    <Compile Include="generated\Gtk\DeleteEventHandler.cs" />
    <Compile Include="generated\Gtk\DeleteFromCursorHandler.cs" />
    <Compile Include="generated\Gtk\DeleteRangeHandler.cs" />
    <Compile Include="generated\Gtk\DeleteType.cs" />
+    <Compile Include="generated\Gtk\DeletedTextHandler.cs" />
    <Compile Include="generated\Gtk\DestDefaults.cs" />
    <Compile Include="generated\Gtk\DestroyEventHandler.cs" />
    <Compile Include="generated\Gtk\DetailsAcquiredHandler.cs" />
@ -308,6 +384,8 @@
    <Compile Include="generated\Gtk\DisconnectProxyHandler.cs" />
    <Compile Include="generated\Gtk\DoneHandler.cs" />
    <Compile Include="generated\Gtk\Drag.cs" />
+    <Compile Include="generated\Gtk\DragActionAskHandler.cs" />
+    <Compile Include="generated\Gtk\DragActionRequestedHandler.cs" />
    <Compile Include="generated\Gtk\DragAnim.cs" />
    <Compile Include="generated\Gtk\DragBeginHandler.cs" />
    <Compile Include="generated\Gtk\DragDataDeleteHandler.cs" />
@ -321,15 +399,19 @@
    <Compile Include="generated\Gtk\DragFindData.cs" />
    <Compile Include="generated\Gtk\DragLeaveHandler.cs" />
    <Compile Include="generated\Gtk\DragMotionHandler.cs" />
+    <Compile Include="generated\Gtk\DragPerformDropHandler.cs" />
    <Compile Include="generated\Gtk\DragResult.cs" />
    <Compile Include="generated\Gtk\DragSourceInfo.cs" />
    <Compile Include="generated\Gtk\DragSourceSite.cs" />
+    <Compile Include="generated\Gtk\DragUpdateHandler.cs" />
+    <Compile Include="generated\Gtk\DrawPageHandler.cs" />
    <Compile Include="generated\Gtk\DrawingArea.cs" />
    <Compile Include="generated\Gtk\DrawnHandler.cs" />
-    <Compile Include="generated\Gtk\DrawPageHandler.cs" />
    <Compile Include="generated\Gtk\EditableAdapter.cs" />
    <Compile Include="generated\Gtk\EditedHandler.cs" />
    <Compile Include="generated\Gtk\EditingStartedHandler.cs" />
+    <Compile Include="generated\Gtk\EnableDebuggingHandler.cs" />
+    <Compile Include="generated\Gtk\EndHandler.cs" />
    <Compile Include="generated\Gtk\EndPrintHandler.cs" />
    <Compile Include="generated\Gtk\EnterNotifyEventHandler.cs" />
    <Compile Include="generated\Gtk\Entry.cs" />
@ -341,6 +423,9 @@
    <Compile Include="generated\Gtk\EntryIconPosition.cs" />
    <Compile Include="generated\Gtk\EntryPasswordHint.cs" />
    <Compile Include="generated\Gtk\EventBox.cs" />
+    <Compile Include="generated\Gtk\EventController.cs" />
+    <Compile Include="generated\Gtk\EventData.cs" />
+    <Compile Include="generated\Gtk\EventSequenceState.cs" />
    <Compile Include="generated\Gtk\ExpandCollapseCursorRowHandler.cs" />
    <Compile Include="generated\Gtk\Expander.cs" />
    <Compile Include="generated\Gtk\ExpanderStyle.cs" />
@ -361,19 +446,39 @@
    <Compile Include="generated\Gtk\FilterLevel.cs" />
    <Compile Include="generated\Gtk\FilterRule.cs" />
    <Compile Include="generated\Gtk\Fixed.cs" />
-    <Compile Include="generated\Gtk\FocusChangedHandler.cs" />
+    <Compile Include="generated\Gtk\FlowBox.cs" />
+    <Compile Include="generated\Gtk\FlowBoxChild.cs" />
+    <Compile Include="generated\Gtk\FlowBoxFilterFunc.cs" />
+    <Compile Include="generated\Gtk\FlowBoxForeachFunc.cs" />
+    <Compile Include="generated\Gtk\FlowBoxSortFunc.cs" />
    <Compile Include="generated\Gtk\FocusChildSetHandler.cs" />
-    <Compile Include="generated\Gtk\FocusedHandler.cs" />
    <Compile Include="generated\Gtk\FocusHomeOrEndHandler.cs" />
    <Compile Include="generated\Gtk\FocusInEventHandler.cs" />
    <Compile Include="generated\Gtk\FocusOutEventHandler.cs" />
    <Compile Include="generated\Gtk\FocusTabHandler.cs" />
+    <Compile Include="generated\Gtk\FocusedHandler.cs" />
+    <Compile Include="generated\Gtk\FontActivatedHandler.cs" />
    <Compile Include="generated\Gtk\FontButton.cs" />
+    <Compile Include="generated\Gtk\FontChooserAdapter.cs" />
+    <Compile Include="generated\Gtk\FontChooserDialog.cs" />
+    <Compile Include="generated\Gtk\FontChooserProp.cs" />
+    <Compile Include="generated\Gtk\FontChooserWidget.cs" />
+    <Compile Include="generated\Gtk\FontFilterFunc.cs" />
    <Compile Include="generated\Gtk\FontSelection.cs" />
    <Compile Include="generated\Gtk\FontSelectionDialog.cs" />
+    <Compile Include="generated\Gtk\FormatEntryTextHandler.cs" />
    <Compile Include="generated\Gtk\FormatValueHandler.cs" />
    <Compile Include="generated\Gtk\Frame.cs" />
-    <Compile Include="generated\Gtk\FrameHandler.cs" />
+    <Compile Include="generated\Gtk\Gesture.cs" />
+    <Compile Include="generated\Gtk\GestureDrag.cs" />
+    <Compile Include="generated\Gtk\GestureLongPress.cs" />
+    <Compile Include="generated\Gtk\GestureMultiPress.cs" />
+    <Compile Include="generated\Gtk\GesturePan.cs" />
+    <Compile Include="generated\Gtk\GestureRotate.cs" />
+    <Compile Include="generated\Gtk\GestureSingle.cs" />
+    <Compile Include="generated\Gtk\GestureSwipe.cs" />
+    <Compile Include="generated\Gtk\GestureZoom.cs" />
+    <Compile Include="generated\Gtk\GetChildPositionHandler.cs" />
    <Compile Include="generated\Gtk\Global.cs" />
    <Compile Include="generated\Gtk\GotPageSizeHandler.cs" />
    <Compile Include="generated\Gtk\Grab.cs" />
@ -387,10 +492,12 @@
    <Compile Include="generated\Gtk\GridLineData.cs" />
    <Compile Include="generated\Gtk\GridLines.cs" />
    <Compile Include="generated\Gtk\GridRequest.cs" />
+    <Compile Include="generated\Gtk\GridRowProperties.cs" />
    <Compile Include="generated\Gtk\GtkSharp.AccelGroupActivateNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.AccelGroupFindFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.AccelMapForeachNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.AssistantPageFuncNative.cs" />
+    <Compile Include="generated\Gtk\GtkSharp.BookmarksChangedFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.BuilderConnectFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.CalendarDetailFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.CallbackNative.cs" />
@ -408,15 +515,25 @@
    <Compile Include="generated\Gtk\GtkSharp.ColorSelectionChangePaletteWithScreenFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.EntryCompletionMatchFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.FileFilterFuncNative.cs" />
+    <Compile Include="generated\Gtk\GtkSharp.FlowBoxFilterFuncNative.cs" />
+    <Compile Include="generated\Gtk\GtkSharp.FlowBoxForeachFuncNative.cs" />
+    <Compile Include="generated\Gtk\GtkSharp.FlowBoxSortFuncNative.cs" />
+    <Compile Include="generated\Gtk\GtkSharp.FontFilterFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.IconViewForeachFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.KeySnoopFuncNative.cs" />
+    <Compile Include="generated\Gtk\GtkSharp.ListBoxFilterFuncNative.cs" />
+    <Compile Include="generated\Gtk\GtkSharp.ListBoxForeachFuncNative.cs" />
+    <Compile Include="generated\Gtk\GtkSharp.ListBoxSortFuncNative.cs" />
+    <Compile Include="generated\Gtk\GtkSharp.ListBoxUpdateHeaderFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.MenuDetachFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.MenuPositionFuncNative.cs" />
+    <Compile Include="generated\Gtk\GtkSharp.MenuTrackerInsertFuncNative.cs" />
+    <Compile Include="generated\Gtk\GtkSharp.MenuTrackerRemoveFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.MnemonicHashForeachNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.PageSetupDoneFuncNative.cs" />
-    <Compile Include="generated\Gtk\GtkSharp.PrinterFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.PrintJobCompleteFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.PrintSettingsFuncNative.cs" />
+    <Compile Include="generated\Gtk\GtkSharp.PrinterFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.RcPropertyParserNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.RecentFilterFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.RecentSortFuncNative.cs" />
@ -425,6 +542,7 @@
    <Compile Include="generated\Gtk\GtkSharp.TextBufferSerializeFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.TextCharPredicateNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.TextTagTableForeachNative.cs" />
+    <Compile Include="generated\Gtk\GtkSharp.TickCallbackNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.TranslateFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.TreeCellDataFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.TreeDestroyCountFuncNative.cs" />
@ -440,24 +558,51 @@
    <Compile Include="generated\Gtk\GtkSharp.TreeViewRowSeparatorFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.TreeViewSearchEqualFuncNative.cs" />
    <Compile Include="generated\Gtk\GtkSharp.TreeViewSearchPositionFuncNative.cs" />
-    <Compile Include="generated\Gtk\HandleBox.cs" />
-    <Compile Include="generated\Gtk\HashNode.cs" />
    <Compile Include="generated\Gtk\HBox.cs" />
    <Compile Include="generated\Gtk\HButtonBox.cs" />
-    <Compile Include="generated\Gtk\HelpShownHandler.cs" />
-    <Compile Include="generated\Gtk\HierarchyChangedHandler.cs" />
    <Compile Include="generated\Gtk\HPaned.cs" />
+    <Compile Include="generated\Gtk\HSLA.cs" />
+    <Compile Include="generated\Gtk\HSV.cs" />
    <Compile Include="generated\Gtk\HScale.cs" />
    <Compile Include="generated\Gtk\HScrollbar.cs" />
    <Compile Include="generated\Gtk\HSeparator.cs" />
-    <Compile Include="generated\Gtk\HSV.cs" />
+    <Compile Include="generated\Gtk\HandleBox.cs" />
+    <Compile Include="generated\Gtk\HandleWindow.cs" />
+    <Compile Include="generated\Gtk\HashNode.cs" />
+    <Compile Include="generated\Gtk\HeaderBar.cs" />
+    <Compile Include="generated\Gtk\HelpShownHandler.cs" />
+    <Compile Include="generated\Gtk\HierarchyChangedHandler.cs" />
+    <Compile Include="generated\Gtk\IActionObservable.cs" />
+    <Compile Include="generated\Gtk\IActionObserver.cs" />
+    <Compile Include="generated\Gtk\IActionable.cs" />
    <Compile Include="generated\Gtk\IActivatable.cs" />
    <Compile Include="generated\Gtk\IAppChooser.cs" />
    <Compile Include="generated\Gtk\ICellEditable.cs" />
    <Compile Include="generated\Gtk\ICellLayout.cs" />
+    <Compile Include="generated\Gtk\IColorChooser.cs" />
+    <Compile Include="generated\Gtk\IEditable.cs" />
+    <Compile Include="generated\Gtk\IFileChooser.cs" />
+    <Compile Include="generated\Gtk\IFontChooser.cs" />
+    <Compile Include="generated\Gtk\IMContext.cs" />
+    <Compile Include="generated\Gtk\IMContextSimple.cs" />
+    <Compile Include="generated\Gtk\IMModule.cs" />
+    <Compile Include="generated\Gtk\IMModuleClass.cs" />
+    <Compile Include="generated\Gtk\IMMulticontext.cs" />
+    <Compile Include="generated\Gtk\IOrientable.cs" />
+    <Compile Include="generated\Gtk\IPrintOperationPreview.cs" />
+    <Compile Include="generated\Gtk\IRecentChooser.cs" />
+    <Compile Include="generated\Gtk\IScrollable.cs" />
+    <Compile Include="generated\Gtk\IStyleProvider.cs" />
+    <Compile Include="generated\Gtk\IToolShell.cs" />
+    <Compile Include="generated\Gtk\ITreeDragDest.cs" />
+    <Compile Include="generated\Gtk\ITreeDragSource.cs" />
+    <Compile Include="generated\Gtk\ITreeModel.cs" />
+    <Compile Include="generated\Gtk\ITreeSortable.cs" />
    <Compile Include="generated\Gtk\Icon.cs" />
    <Compile Include="generated\Gtk\IconAlias.cs" />
    <Compile Include="generated\Gtk\IconFactory.cs" />
+    <Compile Include="generated\Gtk\IconHelper.cs" />
+    <Compile Include="generated\Gtk\IconHelperClass.cs" />
    <Compile Include="generated\Gtk\IconInfo.cs" />
    <Compile Include="generated\Gtk\IconLookupFlags.cs" />
    <Compile Include="generated\Gtk\IconPressHandler.cs" />
@ -472,55 +617,51 @@
    <Compile Include="generated\Gtk\IconViewDropPosition.cs" />
    <Compile Include="generated\Gtk\IconViewForeachFunc.cs" />
    <Compile Include="generated\Gtk\IconViewItem.cs" />
-    <Compile Include="generated\Gtk\IEditable.cs" />
-    <Compile Include="generated\Gtk\IFileChooser.cs" />
    <Compile Include="generated\Gtk\Image.cs" />
    <Compile Include="generated\Gtk\ImageGIconData.cs" />
    <Compile Include="generated\Gtk\ImageIconNameData.cs" />
    <Compile Include="generated\Gtk\ImageMenuItem.cs" />
    <Compile Include="generated\Gtk\ImageType.cs" />
-    <Compile Include="generated\Gtk\IMContext.cs" />
-    <Compile Include="generated\Gtk\IMContextSimple.cs" />
-    <Compile Include="generated\Gtk\IMModule.cs" />
-    <Compile Include="generated\Gtk\IMModuleClass.cs" />
-    <Compile Include="generated\Gtk\IMMulticontext.cs" />
    <Compile Include="generated\Gtk\IncrConversion.cs" />
    <Compile Include="generated\Gtk\IncrInfo.cs" />
    <Compile Include="generated\Gtk\InfoBar.cs" />
    <Compile Include="generated\Gtk\Init.cs" />
    <Compile Include="generated\Gtk\InputHandler.cs" />
+    <Compile Include="generated\Gtk\InputHints.cs" />
+    <Compile Include="generated\Gtk\InputPurpose.cs" />
    <Compile Include="generated\Gtk\InsertAtCursorHandler.cs" />
-    <Compile Include="generated\Gtk\InsertedTextHandler.cs" />
    <Compile Include="generated\Gtk\InsertTextHandler.cs" />
+    <Compile Include="generated\Gtk\InsertedHandler.cs" />
+    <Compile Include="generated\Gtk\InsertedTextHandler.cs" />
    <Compile Include="generated\Gtk\Invisible.cs" />
-    <Compile Include="generated\Gtk\IOrientable.cs" />
-    <Compile Include="generated\Gtk\IPrintOperationPreview.cs" />
-    <Compile Include="generated\Gtk\IRecentChooser.cs" />
-    <Compile Include="generated\Gtk\IScrollable.cs" />
-    <Compile Include="generated\Gtk\IStyleProvider.cs" />
    <Compile Include="generated\Gtk\ItemActivatedHandler.cs" />
-    <Compile Include="generated\Gtk\IToolShell.cs" />
-    <Compile Include="generated\Gtk\ITreeDragDest.cs" />
-    <Compile Include="generated\Gtk\ITreeDragSource.cs" />
-    <Compile Include="generated\Gtk\ITreeModel.cs" />
-    <Compile Include="generated\Gtk\ITreeSortable.cs" />
    <Compile Include="generated\Gtk\JunctionSides.cs" />
    <Compile Include="generated\Gtk\Justification.cs" />
    <Compile Include="generated\Gtk\KeyHashEntry.cs" />
    <Compile Include="generated\Gtk\KeyPressEventHandler.cs" />
    <Compile Include="generated\Gtk\KeyReleaseEventHandler.cs" />
-    <Compile Include="generated\Gtk\KeySnooperData.cs" />
    <Compile Include="generated\Gtk\KeySnoopFunc.cs" />
+    <Compile Include="generated\Gtk\KeySnooperData.cs" />
+    <Compile Include="generated\Gtk\KineticScrolling.cs" />
    <Compile Include="generated\Gtk\Label.cs" />
    <Compile Include="generated\Gtk\Layout.cs" />
    <Compile Include="generated\Gtk\LayoutChild.cs" />
    <Compile Include="generated\Gtk\LeaveNotifyEventHandler.cs" />
+    <Compile Include="generated\Gtk\LevelBar.cs" />
+    <Compile Include="generated\Gtk\LevelBarMode.cs" />
    <Compile Include="generated\Gtk\License.cs" />
    <Compile Include="generated\Gtk\LinesWindow.cs" />
    <Compile Include="generated\Gtk\LinkButton.cs" />
+    <Compile Include="generated\Gtk\ListBox.cs" />
+    <Compile Include="generated\Gtk\ListBoxFilterFunc.cs" />
+    <Compile Include="generated\Gtk\ListBoxForeachFunc.cs" />
+    <Compile Include="generated\Gtk\ListBoxRow.cs" />
+    <Compile Include="generated\Gtk\ListBoxSortFunc.cs" />
+    <Compile Include="generated\Gtk\ListBoxUpdateHeaderFunc.cs" />
    <Compile Include="generated\Gtk\ListStore.cs" />
-    <Compile Include="generated\Gtk\LoadState.cs" />
-    <Compile Include="generated\Gtk\LocationMode.cs" />
+    <Compile Include="generated\Gtk\LocationPopupHandler.cs" />
+    <Compile Include="generated\Gtk\Magnifier.cs" />
+    <Compile Include="generated\Gtk\MagnifierClass.cs" />
    <Compile Include="generated\Gtk\Main.cs" />
    <Compile Include="generated\Gtk\MapChangedHandler.cs" />
    <Compile Include="generated\Gtk\MapEventHandler.cs" />
@ -531,19 +672,29 @@
    <Compile Include="generated\Gtk\MenuActivateHandler.cs" />
    <Compile Include="generated\Gtk\MenuAttachData.cs" />
    <Compile Include="generated\Gtk\MenuBar.cs" />
+    <Compile Include="generated\Gtk\MenuButton.cs" />
    <Compile Include="generated\Gtk\MenuDetachFunc.cs" />
    <Compile Include="generated\Gtk\MenuDirectionType.cs" />
    <Compile Include="generated\Gtk\MenuItem.cs" />
    <Compile Include="generated\Gtk\MenuPopdownData.cs" />
    <Compile Include="generated\Gtk\MenuPositionFunc.cs" />
+    <Compile Include="generated\Gtk\MenuSectionBox.cs" />
    <Compile Include="generated\Gtk\MenuShell.cs" />
    <Compile Include="generated\Gtk\MenuToolButton.cs" />
+    <Compile Include="generated\Gtk\MenuTracker.cs" />
+    <Compile Include="generated\Gtk\MenuTrackerInsertFunc.cs" />
+    <Compile Include="generated\Gtk\MenuTrackerItem.cs" />
+    <Compile Include="generated\Gtk\MenuTrackerItemRole.cs" />
+    <Compile Include="generated\Gtk\MenuTrackerRemoveFunc.cs" />
+    <Compile Include="generated\Gtk\MenuTrackerSection.cs" />
    <Compile Include="generated\Gtk\MessageDialog.cs" />
    <Compile Include="generated\Gtk\MessageType.cs" />
    <Compile Include="generated\Gtk\Misc.cs" />
    <Compile Include="generated\Gtk\MnemonicActivatedHandler.cs" />
    <Compile Include="generated\Gtk\MnemonicHash.cs" />
    <Compile Include="generated\Gtk\MnemonicHashForeach.cs" />
+    <Compile Include="generated\Gtk\ModelButton.cs" />
+    <Compile Include="generated\Gtk\ModelMenuItem.cs" />
    <Compile Include="generated\Gtk\ModifierStyle.cs" />
    <Compile Include="generated\Gtk\ModuleInfo.cs" />
    <Compile Include="generated\Gtk\MotionNotifyEventHandler.cs" />
@ -556,11 +707,11 @@
    <Compile Include="generated\Gtk\MoveFocusOutHandler.cs" />
    <Compile Include="generated\Gtk\MoveHandleHandler.cs" />
    <Compile Include="generated\Gtk\MoveHandler.cs" />
-    <Compile Include="generated\Gtk\MovementStep.cs" />
    <Compile Include="generated\Gtk\MoveScrollHandler.cs" />
    <Compile Include="generated\Gtk\MoveSelectedHandler.cs" />
    <Compile Include="generated\Gtk\MoveSliderHandler.cs" />
    <Compile Include="generated\Gtk\MoveViewportHandler.cs" />
+    <Compile Include="generated\Gtk\MovementStep.cs" />
    <Compile Include="generated\Gtk\Node.cs" />
    <Compile Include="generated\Gtk\NodeUIReference.cs" />
    <Compile Include="generated\Gtk\Notebook.cs" />
@ -569,10 +720,14 @@
    <Compile Include="generated\Gtk\NumberUpLayout.cs" />
    <Compile Include="generated\Gtk\NumerableIcon.cs" />
    <Compile Include="generated\Gtk\OffscreenWindow.cs" />
+    <Compile Include="generated\Gtk\OffsetChangedHandler.cs" />
+    <Compile Include="generated\Gtk\OpenLocationHandler.cs" />
    <Compile Include="generated\Gtk\OrientableAdapter.cs" />
    <Compile Include="generated\Gtk\Orientation.cs" />
    <Compile Include="generated\Gtk\OrientationChangedHandler.cs" />
    <Compile Include="generated\Gtk\OutputHandler.cs" />
+    <Compile Include="generated\Gtk\Overlay.cs" />
+    <Compile Include="generated\Gtk\OverlayChild.cs" />
    <Compile Include="generated\Gtk\OwnerChangeHandler.cs" />
    <Compile Include="generated\Gtk\PackDirection.cs" />
    <Compile Include="generated\Gtk\PackType.cs" />
@ -586,16 +741,24 @@
    <Compile Include="generated\Gtk\PageSetupDoneFunc.cs" />
    <Compile Include="generated\Gtk\PageSetupUnixDialog.cs" />
    <Compile Include="generated\Gtk\PaginateHandler.cs" />
+    <Compile Include="generated\Gtk\PanDirection.cs" />
+    <Compile Include="generated\Gtk\PanHandler.cs" />
    <Compile Include="generated\Gtk\Paned.cs" />
    <Compile Include="generated\Gtk\PaperSize.cs" />
    <Compile Include="generated\Gtk\ParentSetHandler.cs" />
    <Compile Include="generated\Gtk\ParseContext.cs" />
+    <Compile Include="generated\Gtk\ParsingErrorHandler.cs" />
    <Compile Include="generated\Gtk\PasteDoneHandler.cs" />
    <Compile Include="generated\Gtk\PathElement.cs" />
    <Compile Include="generated\Gtk\PixbufInsertedHandler.cs" />
+    <Compile Include="generated\Gtk\PixelCache.cs" />
+    <Compile Include="generated\Gtk\PlacesOpenFlags.cs" />
+    <Compile Include="generated\Gtk\PlacesSidebar.cs" />
    <Compile Include="generated\Gtk\Plug.cs" />
    <Compile Include="generated\Gtk\PlugRemovedHandler.cs" />
+    <Compile Include="generated\Gtk\PointData.cs" />
    <Compile Include="generated\Gtk\PolicyType.cs" />
+    <Compile Include="generated\Gtk\Popover.cs" />
    <Compile Include="generated\Gtk\PoppedDownHandler.cs" />
    <Compile Include="generated\Gtk\PopulatePopupHandler.cs" />
    <Compile Include="generated\Gtk\PopupContextMenuHandler.cs" />
@ -606,7 +769,9 @@
    <Compile Include="generated\Gtk\PreeditChangedHandler.cs" />
    <Compile Include="generated\Gtk\PrefixInsertedHandler.cs" />
    <Compile Include="generated\Gtk\PrepareHandler.cs" />
+    <Compile Include="generated\Gtk\PressedHandler.cs" />
    <Compile Include="generated\Gtk\PreviewHandler.cs" />
+    <Compile Include="generated\Gtk\PrimaryAccelChangedHandler.cs" />
    <Compile Include="generated\Gtk\Print.cs" />
    <Compile Include="generated\Gtk\PrintBackend.cs" />
    <Compile Include="generated\Gtk\PrintBackendModule.cs" />
@ -614,9 +779,6 @@
    <Compile Include="generated\Gtk\PrintCapabilities.cs" />
    <Compile Include="generated\Gtk\PrintContext.cs" />
    <Compile Include="generated\Gtk\PrintDuplex.cs" />
-    <Compile Include="generated\Gtk\Printer.cs" />
-    <Compile Include="generated\Gtk\PrinterFinder.cs" />
-    <Compile Include="generated\Gtk\PrinterFunc.cs" />
    <Compile Include="generated\Gtk\PrintError.cs" />
    <Compile Include="generated\Gtk\PrintJob.cs" />
    <Compile Include="generated\Gtk\PrintJobCompleteFunc.cs" />
@ -632,14 +794,18 @@
    <Compile Include="generated\Gtk\PrintStatus.cs" />
    <Compile Include="generated\Gtk\PrintUnixDialog.cs" />
    <Compile Include="generated\Gtk\PrintWin32Devnames.cs" />
+    <Compile Include="generated\Gtk\Printer.cs" />
+    <Compile Include="generated\Gtk\PrinterFinder.cs" />
+    <Compile Include="generated\Gtk\PrinterFunc.cs" />
    <Compile Include="generated\Gtk\ProgressBar.cs" />
+    <Compile Include="generated\Gtk\PropagationPhase.cs" />
    <Compile Include="generated\Gtk\PropertyData.cs" />
-    <Compile Include="generated\Gtk\PropertyNode.cs" />
    <Compile Include="generated\Gtk\PropertyNotifyEventHandler.cs" />
    <Compile Include="generated\Gtk\PropertyValue.cs" />
    <Compile Include="generated\Gtk\ProximityInEventHandler.cs" />
    <Compile Include="generated\Gtk\ProximityOutEventHandler.cs" />
    <Compile Include="generated\Gtk\QueryTooltipHandler.cs" />
+    <Compile Include="generated\Gtk\QuickBookmarkHandler.cs" />
    <Compile Include="generated\Gtk\RadioAction.cs" />
    <Compile Include="generated\Gtk\RadioButton.cs" />
    <Compile Include="generated\Gtk\RadioMenuItem.cs" />
@ -670,20 +836,19 @@
    <Compile Include="generated\Gtk\RecentSortType.cs" />
    <Compile Include="generated\Gtk\Region.cs" />
    <Compile Include="generated\Gtk\RegionFlags.cs" />
+    <Compile Include="generated\Gtk\ReleasedHandler.cs" />
    <Compile Include="generated\Gtk\ReliefStyle.cs" />
-    <Compile Include="generated\Gtk\ReloadState.cs" />
    <Compile Include="generated\Gtk\RemovedHandler.cs" />
-    <Compile Include="generated\Gtk\RemoveEditableHandler.cs" />
    <Compile Include="generated\Gtk\Render.cs" />
    <Compile Include="generated\Gtk\ReorderTabHandler.cs" />
    <Compile Include="generated\Gtk\RequestContentsInfo.cs" />
-    <Compile Include="generated\Gtk\RequestedSize.cs" />
    <Compile Include="generated\Gtk\RequestImageInfo.cs" />
    <Compile Include="generated\Gtk\RequestPageSetupHandler.cs" />
    <Compile Include="generated\Gtk\RequestRichTextInfo.cs" />
    <Compile Include="generated\Gtk\RequestTargetsInfo.cs" />
    <Compile Include="generated\Gtk\RequestTextInfo.cs" />
    <Compile Include="generated\Gtk\RequestURIInfo.cs" />
+    <Compile Include="generated\Gtk\RequestedSize.cs" />
    <Compile Include="generated\Gtk\Requisition.cs" />
    <Compile Include="generated\Gtk\ResizeMode.cs" />
    <Compile Include="generated\Gtk\RespondHandler.cs" />
@ -692,6 +857,10 @@
    <Compile Include="generated\Gtk\ResponseType.cs" />
    <Compile Include="generated\Gtk\RetrievalInfo.cs" />
    <Compile Include="generated\Gtk\RetrieveSurroundingHandler.cs" />
+    <Compile Include="generated\Gtk\Revealer.cs" />
+    <Compile Include="generated\Gtk\RevealerTransitionType.cs" />
+    <Compile Include="generated\Gtk\RoundedBox.cs" />
+    <Compile Include="generated\Gtk\RoundedBoxCorner.cs" />
    <Compile Include="generated\Gtk\RowActivatedHandler.cs" />
    <Compile Include="generated\Gtk\RowChangedHandler.cs" />
    <Compile Include="generated\Gtk\RowCollapsedHandler.cs" />
@ -699,21 +868,26 @@
    <Compile Include="generated\Gtk\RowExpandedHandler.cs" />
    <Compile Include="generated\Gtk\RowHasChildToggledHandler.cs" />
    <Compile Include="generated\Gtk\RowInsertedHandler.cs" />
+    <Compile Include="generated\Gtk\RowSelectedHandler.cs" />
    <Compile Include="generated\Gtk\Scale.cs" />
    <Compile Include="generated\Gtk\ScaleButton.cs" />
+    <Compile Include="generated\Gtk\ScaleChangedHandler.cs" />
    <Compile Include="generated\Gtk\ScaleMark.cs" />
    <Compile Include="generated\Gtk\ScreenChangedHandler.cs" />
-    <Compile Include="generated\Gtk\ScrollableAdapter.cs" />
-    <Compile Include="generated\Gtk\ScrollablePolicy.cs" />
-    <Compile Include="generated\Gtk\Scrollbar.cs" />
    <Compile Include="generated\Gtk\ScrollChildHandler.cs" />
-    <Compile Include="generated\Gtk\ScrolledWindow.cs" />
    <Compile Include="generated\Gtk\ScrollEventHandler.cs" />
    <Compile Include="generated\Gtk\ScrollStep.cs" />
    <Compile Include="generated\Gtk\ScrollType.cs" />
+    <Compile Include="generated\Gtk\ScrollableAdapter.cs" />
+    <Compile Include="generated\Gtk\ScrollablePolicy.cs" />
+    <Compile Include="generated\Gtk\Scrollbar.cs" />
+    <Compile Include="generated\Gtk\ScrolledWindow.cs" />
+    <Compile Include="generated\Gtk\SearchBar.cs" />
+    <Compile Include="generated\Gtk\SearchEntry.cs" />
    <Compile Include="generated\Gtk\SelectAllHandler.cs" />
    <Compile Include="generated\Gtk\SelectCursorParentHandler.cs" />
    <Compile Include="generated\Gtk\SelectCursorRowHandler.cs" />
+    <Compile Include="generated\Gtk\SelectPageHandler.cs" />
    <Compile Include="generated\Gtk\Selection.cs" />
    <Compile Include="generated\Gtk\SelectionClearEventHandler.cs" />
    <Compile Include="generated\Gtk\SelectionData.cs" />
@ -724,68 +898,72 @@
    <Compile Include="generated\Gtk\SelectionReceivedHandler.cs" />
    <Compile Include="generated\Gtk\SelectionRequestEventHandler.cs" />
    <Compile Include="generated\Gtk\SelectionTargetList.cs" />
-    <Compile Include="generated\Gtk\SelectorElement.cs" />
-    <Compile Include="generated\Gtk\SelectorPath.cs" />
-    <Compile Include="generated\Gtk\SelectorStyleInfo.cs" />
-    <Compile Include="generated\Gtk\SelectPageHandler.cs" />
    <Compile Include="generated\Gtk\SensitivityType.cs" />
    <Compile Include="generated\Gtk\Separator.cs" />
    <Compile Include="generated\Gtk\SeparatorMenuItem.cs" />
    <Compile Include="generated\Gtk\SeparatorToolItem.cs" />
+    <Compile Include="generated\Gtk\SequenceStateChangedHandler.cs" />
    <Compile Include="generated\Gtk\SetFocusHandler.cs" />
    <Compile Include="generated\Gtk\Settings.cs" />
-    <Compile Include="generated\Gtk\SettingsIconSize.cs" />
    <Compile Include="generated\Gtk\SettingsPropertyValue.cs" />
    <Compile Include="generated\Gtk\SettingsValue.cs" />
    <Compile Include="generated\Gtk\ShadowType.cs" />
    <Compile Include="generated\Gtk\SharedData.cs" />
+    <Compile Include="generated\Gtk\ShowErrorMessageHandler.cs" />
    <Compile Include="generated\Gtk\SizeAllocatedHandler.cs" />
    <Compile Include="generated\Gtk\SizeChangedHandler.cs" />
    <Compile Include="generated\Gtk\SizeGroup.cs" />
    <Compile Include="generated\Gtk\SizeGroupMode.cs" />
    <Compile Include="generated\Gtk\SizeRequestMode.cs" />
-    <Compile Include="generated\Gtk\SliceSideModifier.cs" />
    <Compile Include="generated\Gtk\Socket.cs" />
    <Compile Include="generated\Gtk\SortData.cs" />
    <Compile Include="generated\Gtk\SortElt.cs" />
    <Compile Include="generated\Gtk\SortLevel.cs" />
-    <Compile Include="generated\Gtk\SortTuple.cs" />
    <Compile Include="generated\Gtk\SortType.cs" />
    <Compile Include="generated\Gtk\SpinButton.cs" />
    <Compile Include="generated\Gtk\SpinButtonUpdatePolicy.cs" />
-    <Compile Include="generated\Gtk\Spinner.cs" />
-    <Compile Include="generated\Gtk\SpinnerAccessible.cs" />
-    <Compile Include="generated\Gtk\SpinnerAccessibleClass.cs" />
    <Compile Include="generated\Gtk\SpinType.cs" />
+    <Compile Include="generated\Gtk\Spinner.cs" />
+    <Compile Include="generated\Gtk\Stack.cs" />
+    <Compile Include="generated\Gtk\StackChildInfo.cs" />
+    <Compile Include="generated\Gtk\StackSwitcher.cs" />
+    <Compile Include="generated\Gtk\StackTransitionType.cs" />
    <Compile Include="generated\Gtk\StartInteractiveSearchHandler.cs" />
    <Compile Include="generated\Gtk\StateChangedHandler.cs" />
    <Compile Include="generated\Gtk\StateFlags.cs" />
    <Compile Include="generated\Gtk\StateFlagsChangedHandler.cs" />
+    <Compile Include="generated\Gtk\StateSetHandler.cs" />
    <Compile Include="generated\Gtk\StateType.cs" />
+    <Compile Include="generated\Gtk\StatusIcon.cs" />
    <Compile Include="generated\Gtk\Statusbar.cs" />
    <Compile Include="generated\Gtk\StatusbarMsg.cs" />
-    <Compile Include="generated\Gtk\StatusIcon.cs" />
    <Compile Include="generated\Gtk\Stock.cs" />
    <Compile Include="generated\Gtk\StockItem.cs" />
    <Compile Include="generated\Gtk\StockTranslateFunc.cs" />
    <Compile Include="generated\Gtk\Style.cs" />
+    <Compile Include="generated\Gtk\StyleAnimation.cs" />
+    <Compile Include="generated\Gtk\StyleAnimationClass.cs" />
+    <Compile Include="generated\Gtk\StyleCascade.cs" />
+    <Compile Include="generated\Gtk\StyleCascadeClass.cs" />
+    <Compile Include="generated\Gtk\StyleCascadeIter.cs" />
    <Compile Include="generated\Gtk\StyleChangedHandler.cs" />
    <Compile Include="generated\Gtk\StyleContext.cs" />
-    <Compile Include="generated\Gtk\StyleData.cs" />
    <Compile Include="generated\Gtk\StyleInfo.cs" />
-    <Compile Include="generated\Gtk\StylePriorityInfo.cs" />
    <Compile Include="generated\Gtk\StyleProperties.cs" />
+    <Compile Include="generated\Gtk\StyleProperty.cs" />
+    <Compile Include="generated\Gtk\StylePropertyClass.cs" />
    <Compile Include="generated\Gtk\StylePropertyParser.cs" />
    <Compile Include="generated\Gtk\StylePropertyValue.cs" />
    <Compile Include="generated\Gtk\StyleProviderAdapter.cs" />
    <Compile Include="generated\Gtk\StyleProviderData.cs" />
+    <Compile Include="generated\Gtk\StyleProviderPrivateInterface.cs" />
    <Compile Include="generated\Gtk\StyleSetHandler.cs" />
    <Compile Include="generated\Gtk\SurroundingDeletedHandler.cs" />
+    <Compile Include="generated\Gtk\SwipeHandler.cs" />
    <Compile Include="generated\Gtk\Switch.cs" />
-    <Compile Include="generated\Gtk\SwitchAccessible.cs" />
-    <Compile Include="generated\Gtk\SwitchAccessibleClass.cs" />
    <Compile Include="generated\Gtk\SwitchPageHandler.cs" />
    <Compile Include="generated\Gtk\SymbolicColor.cs" />
+    <Compile Include="generated\Gtk\SymbolicPixbufCache.cs" />
    <Compile Include="generated\Gtk\Table.cs" />
    <Compile Include="generated\Gtk\TagAddedHandler.cs" />
    <Compile Include="generated\Gtk\TagAppliedHandler.cs" />
@ -795,6 +973,7 @@
    <Compile Include="generated\Gtk\TargetEntry.cs" />
    <Compile Include="generated\Gtk\TargetFlags.cs" />
    <Compile Include="generated\Gtk\TargetList.cs" />
+    <Compile Include="generated\Gtk\TargetPair.cs" />
    <Compile Include="generated\Gtk\Targets.cs" />
    <Compile Include="generated\Gtk\TearoffMenuItem.cs" />
    <Compile Include="generated\Gtk\TestCollapseRowHandler.cs" />
@ -810,10 +989,11 @@
    <Compile Include="generated\Gtk\TextCharPredicate.cs" />
    <Compile Include="generated\Gtk\TextChildAnchor.cs" />
    <Compile Include="generated\Gtk\TextChildBody.cs" />
-    <Compile Include="generated\Gtk\TextCursorDisplay.cs" />
    <Compile Include="generated\Gtk\TextDeletedHandler.cs" />
    <Compile Include="generated\Gtk\TextDirection.cs" />
    <Compile Include="generated\Gtk\TextEventHandler.cs" />
+    <Compile Include="generated\Gtk\TextHandle.cs" />
+    <Compile Include="generated\Gtk\TextHandleClass.cs" />
    <Compile Include="generated\Gtk\TextInsertedHandler.cs" />
    <Compile Include="generated\Gtk\TextIter.cs" />
    <Compile Include="generated\Gtk\TextLayout.cs" />
@ -835,27 +1015,24 @@
    <Compile Include="generated\Gtk\TextTagTableForeach.cs" />
    <Compile Include="generated\Gtk\TextView.cs" />
    <Compile Include="generated\Gtk\TextViewChild.cs" />
+    <Compile Include="generated\Gtk\TextViewLayer.cs" />
    <Compile Include="generated\Gtk\TextWindow.cs" />
    <Compile Include="generated\Gtk\TextWindowType.cs" />
    <Compile Include="generated\Gtk\ThemeEngine.cs" />
+    <Compile Include="generated\Gtk\ThemingBackground.cs" />
    <Compile Include="generated\Gtk\ThemingEngine.cs" />
    <Compile Include="generated\Gtk\ThemingModule.cs" />
    <Compile Include="generated\Gtk\ThemingModuleClass.cs" />
-    <Compile Include="generated\Gtk\Timeline.cs" />
-    <Compile Include="generated\Gtk\TimelineDirection.cs" />
-    <Compile Include="generated\Gtk\TimelinePriv.cs" />
-    <Compile Include="generated\Gtk\TimelineProgressType.cs" />
+    <Compile Include="generated\Gtk\TickCallback.cs" />
+    <Compile Include="generated\Gtk\TickCallbackInfo.cs" />
    <Compile Include="generated\Gtk\ToggleAction.cs" />
    <Compile Include="generated\Gtk\ToggleButton.cs" />
    <Compile Include="generated\Gtk\ToggleCursorRowHandler.cs" />
-    <Compile Include="generated\Gtk\ToggledHandler.cs" />
    <Compile Include="generated\Gtk\ToggleHandleFocusHandler.cs" />
    <Compile Include="generated\Gtk\ToggleSizeAllocatedHandler.cs" />
    <Compile Include="generated\Gtk\ToggleSizeRequestedHandler.cs" />
    <Compile Include="generated\Gtk\ToggleToolButton.cs" />
-    <Compile Include="generated\Gtk\Toolbar.cs" />
-    <Compile Include="generated\Gtk\ToolbarContent.cs" />
-    <Compile Include="generated\Gtk\ToolbarStyle.cs" />
+    <Compile Include="generated\Gtk\ToggledHandler.cs" />
    <Compile Include="generated\Gtk\ToolButton.cs" />
    <Compile Include="generated\Gtk\ToolItem.cs" />
    <Compile Include="generated\Gtk\ToolItemGroup.cs" />
@ -865,8 +1042,14 @@
    <Compile Include="generated\Gtk\ToolPaletteDragData.cs" />
    <Compile Include="generated\Gtk\ToolPaletteDragTargets.cs" />
    <Compile Include="generated\Gtk\ToolShellAdapter.cs" />
+    <Compile Include="generated\Gtk\Toolbar.cs" />
+    <Compile Include="generated\Gtk\ToolbarContent.cs" />
+    <Compile Include="generated\Gtk\ToolbarStyle.cs" />
    <Compile Include="generated\Gtk\Tooltip.cs" />
+    <Compile Include="generated\Gtk\TouchEventHandler.cs" />
+    <Compile Include="generated\Gtk\TransitionInfo.cs" />
    <Compile Include="generated\Gtk\TranslateFunc.cs" />
+    <Compile Include="generated\Gtk\TrashMonitor.cs" />
    <Compile Include="generated\Gtk\TrayIcon.cs" />
    <Compile Include="generated\Gtk\Tree.cs" />
    <Compile Include="generated\Gtk\TreeCellDataFunc.cs" />
@ -911,31 +1094,40 @@
    <Compile Include="generated\Gtk\UnmapEventHandler.cs" />
    <Compile Include="generated\Gtk\UnselectAllHandler.cs" />
    <Compile Include="generated\Gtk\UpdateCustomWidgetHandler.cs" />
-    <Compile Include="generated\Gtk\ValueChangedHandler.cs" />
-    <Compile Include="generated\Gtk\ValueData.cs" />
+    <Compile Include="generated\Gtk\UpdateHandler.cs" />
    <Compile Include="generated\Gtk\VBox.cs" />
    <Compile Include="generated\Gtk\VButtonBox.cs" />
-    <Compile Include="generated\Gtk\Viewport.cs" />
-    <Compile Include="generated\Gtk\VisibilityNotifyEventHandler.cs" />
-    <Compile Include="generated\Gtk\VolumeButton.cs" />
    <Compile Include="generated\Gtk\VPaned.cs" />
    <Compile Include="generated\Gtk\VScale.cs" />
    <Compile Include="generated\Gtk\VScrollbar.cs" />
    <Compile Include="generated\Gtk\VSeparator.cs" />
+    <Compile Include="generated\Gtk\ValueChangedHandler.cs" />
+    <Compile Include="generated\Gtk\ValueData.cs" />
+    <Compile Include="generated\Gtk\Viewport.cs" />
+    <Compile Include="generated\Gtk\VisibilityNotifyEventHandler.cs" />
+    <Compile Include="generated\Gtk\VolumeButton.cs" />
    <Compile Include="generated\Gtk\Widget.cs" />
    <Compile Include="generated\Gtk\WidgetEventAfterHandler.cs" />
    <Compile Include="generated\Gtk\WidgetEventHandler.cs" />
    <Compile Include="generated\Gtk\WidgetHelpType.cs" />
    <Compile Include="generated\Gtk\WidgetPath.cs" />
+    <Compile Include="generated\Gtk\WidgetPropertyValue.cs" />
    <Compile Include="generated\Gtk\Win32EmbedWidget.cs" />
    <Compile Include="generated\Gtk\Window.cs" />
+    <Compile Include="generated\Gtk\WindowAddedHandler.cs" />
    <Compile Include="generated\Gtk\WindowGroup.cs" />
    <Compile Include="generated\Gtk\WindowKeyEntry.cs" />
+    <Compile Include="generated\Gtk\WindowPopover.cs" />
    <Compile Include="generated\Gtk\WindowPosition.cs" />
+    <Compile Include="generated\Gtk\WindowRemovedHandler.cs" />
    <Compile Include="generated\Gtk\WindowStateEventHandler.cs" />
    <Compile Include="generated\Gtk\WindowType.cs" />
    <Compile Include="generated\Gtk\WrapMode.cs" />
    <Compile Include="generated\Gtk\XEmbedMessage.cs" />
+    <Compile Include="generated\GLib\GLibSharp.AsyncReadyCallbackNative.cs" />
+    <Compile Include="..\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
  </ItemGroup>
  <ItemGroup>
    <Reference Include="System" />
@ -966,10 +1158,7 @@
      <Name>pango</Name>
    </ProjectReference>
  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="generated\" />
-    <Folder Include="generated\Gtk\" />
-  </ItemGroup>
+  <ItemGroup />
  <ItemGroup>
    <None Include="gtk-sharp.dll.config">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
--- a/gtkdotnet/gtk-dotnet-3.0.pc.in
+++ b/gtkdotnet/gtk-dotnet-3.0.pc.in
@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib

 Name: Gtk.DotNet
 Description: .NET Extensions for Gtk
-Version: @PKG_VERSION@
+Version: @VERSION@
 Requires:gtk-sharp-3.0
 Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gtk-dotnet.dll
--- a/gtkdotnet/gtkdotnet.csproj
+++ b/gtkdotnet/gtkdotnet.csproj
@ -0,0 +1,71 @@
+<?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)' == '' ">x86</Platform>
+    <ProjectGuid>{CF2BE08F-9354-4CB6-8D49-05DFE1BBCF1F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Gtk.DotNet</RootNamespace>
+    <AssemblyName>gtk-dotnet</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <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>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Graphics.cs" />
+    <Compile Include="StyleContextExtensions.cs" />
+    <Compile Include="..\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\glib\glib.csproj">
+      <Project>{3BF1D531-8840-4F15-8066-A9788D8C398B}</Project>
+      <Name>glib</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\gio\gio.csproj">
+      <Project>{1C3BB17B-336D-432A-8952-4E979BC90867}</Project>
+      <Name>gio</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\cairo\cairo.csproj">
+      <Project>{364577DB-9728-4951-AC2C-EDF7A6FCC09D}</Project>
+      <Name>cairo</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\pango\pango.csproj">
+      <Project>{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}</Project>
+      <Name>pango</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\gdk\gdk.csproj">
+      <Project>{58346CC6-DE93-45B4-8093-3508BD5DAA12}</Project>
+      <Name>gdk</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\gtk\gtk.csproj">
+      <Project>{94045F11-4266-40B4-910F-298985AF69D5}</Project>
+      <Name>gtk</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/pango/pango.csproj
+++ b/pango/pango.csproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -9,7 +9,8 @@
    <OutputType>Library</OutputType>
    <RootNamespace>pango</RootNamespace>
    <AssemblyName>pango-sharp</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
@ -89,7 +90,6 @@
    <Compile Include="generated\Pango\BidiType.cs" />
    <Compile Include="generated\Pango\BlockInfo.cs" />
    <Compile Include="generated\Pango\CacheEntry.cs" />
-    <Compile Include="generated\Pango\CairoATSUIFontMapClass.cs" />
    <Compile Include="generated\Pango\CairoContextInfo.cs" />
    <Compile Include="generated\Pango\CairoFcFont.cs" />
    <Compile Include="generated\Pango\CairoFcFontClass.cs" />
@ -102,6 +102,17 @@
    <Compile Include="generated\Pango\CairoWin32FontMapClass.cs" />
    <Compile Include="generated\Pango\Color.cs" />
    <Compile Include="generated\Pango\Context.cs" />
+    <Compile Include="generated\Pango\CoreTextFace.cs" />
+    <Compile Include="generated\Pango\CoreTextFaceClass.cs" />
+    <Compile Include="generated\Pango\CoreTextFamily.cs" />
+    <Compile Include="generated\Pango\CoreTextFamilyClass.cs" />
+    <Compile Include="generated\Pango\CoreTextFont.cs" />
+    <Compile Include="generated\Pango\CoreTextFontKey.cs" />
+    <Compile Include="generated\Pango\CoreTextFontMap.cs" />
+    <Compile Include="generated\Pango\CoreTextFontMapClass.cs" />
+    <Compile Include="generated\Pango\CoreTextFontset.cs" />
+    <Compile Include="generated\Pango\CoreTextFontsetClass.cs" />
+    <Compile Include="generated\Pango\CoreTextFontsetKey.cs" />
    <Compile Include="generated\Pango\Coverage.cs" />
    <Compile Include="generated\Pango\CoverageLevel.cs" />
    <Compile Include="generated\Pango\Direction.cs" />
@ -111,6 +122,12 @@
    <Compile Include="generated\Pango\EnginePair.cs" />
    <Compile Include="generated\Pango\EngineShape.cs" />
    <Compile Include="generated\Pango\Extents.cs" />
+    <Compile Include="generated\Pango\FT2Family.cs" />
+    <Compile Include="generated\Pango\FT2Font.cs" />
+    <Compile Include="generated\Pango\FT2FontClass.cs" />
+    <Compile Include="generated\Pango\FT2GlyphInfo.cs" />
+    <Compile Include="generated\Pango\FT2Renderer.cs" />
+    <Compile Include="generated\Pango\FT2RendererClass.cs" />
    <Compile Include="generated\Pango\Font.cs" />
    <Compile Include="generated\Pango\FontDescription.cs" />
    <Compile Include="generated\Pango\FontFace.cs" />
@ -121,12 +138,6 @@
    <Compile Include="generated\Pango\FontMetrics.cs" />
    <Compile Include="generated\Pango\Fontset.cs" />
    <Compile Include="generated\Pango\FontsetForeachFunc.cs" />
-    <Compile Include="generated\Pango\FT2Family.cs" />
-    <Compile Include="generated\Pango\FT2Font.cs" />
-    <Compile Include="generated\Pango\FT2FontClass.cs" />
-    <Compile Include="generated\Pango\FT2GlyphInfo.cs" />
-    <Compile Include="generated\Pango\FT2Renderer.cs" />
-    <Compile Include="generated\Pango\FT2RendererClass.cs" />
    <Compile Include="generated\Pango\Global.cs" />
    <Compile Include="generated\Pango\GlyphGeometry.cs" />
    <Compile Include="generated\Pango\GlyphInfo.cs" />
@ -137,8 +148,8 @@
    <Compile Include="generated\Pango\Gravity.cs" />
    <Compile Include="generated\Pango\GravityHint.cs" />
    <Compile Include="generated\Pango\Item.cs" />
-    <Compile Include="generated\Pango\ItemizeState.cs" />
    <Compile Include="generated\Pango\ItemProperties.cs" />
+    <Compile Include="generated\Pango\ItemizeState.cs" />
    <Compile Include="generated\Pango\Language.cs" />
    <Compile Include="generated\Pango\Layout.cs" />
    <Compile Include="generated\Pango\LayoutIter.cs" />
@ -148,14 +159,14 @@
    <Compile Include="generated\Pango\LineState.cs" />
    <Compile Include="generated\Pango\LogAttr.cs" />
    <Compile Include="generated\Pango\MapInfo.cs" />
+    <Compile Include="generated\Pango\Markup.cs" />
    <Compile Include="generated\Pango\MarkupData.cs" />
    <Compile Include="generated\Pango\Matrix.cs" />
    <Compile Include="generated\Pango\Module.cs" />
    <Compile Include="generated\Pango\ModuleClass.cs" />
-    <Compile Include="generated\Pango\OpenTag.cs" />
    <Compile Include="generated\Pango\OTInfoClass.cs" />
-    <Compile Include="generated\Pango\OTRule.cs" />
    <Compile Include="generated\Pango\OTRulesetClass.cs" />
+    <Compile Include="generated\Pango\OpenTag.cs" />
    <Compile Include="generated\Pango\PangoSharp.AttrDataCopyFuncNative.cs" />
    <Compile Include="generated\Pango\PangoSharp.AttrFilterFuncNative.cs" />
    <Compile Include="generated\Pango\PangoSharp.CairoShapeRendererFuncNative.cs" />
@ -164,8 +175,8 @@
    <Compile Include="generated\Pango\ParenStackEntry.cs" />
    <Compile Include="generated\Pango\Point.cs" />
    <Compile Include="generated\Pango\Rectangle.cs" />
-    <Compile Include="generated\Pango\Renderer.cs" />
    <Compile Include="generated\Pango\RenderPart.cs" />
+    <Compile Include="generated\Pango\Renderer.cs" />
    <Compile Include="generated\Pango\RunInfo.cs" />
    <Compile Include="generated\Pango\Script.cs" />
    <Compile Include="generated\Pango\Stretch.cs" />
@ -188,6 +199,9 @@
    <Compile Include="generated\Pango\Win32GlyphInfo.cs" />
    <Compile Include="generated\Pango\Win32MetricsInfo.cs" />
    <Compile Include="generated\Pango\WrapMode.cs" />
+    <Compile Include="..\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
+    </Compile>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\glib\glib.csproj">
@ -199,13 +213,10 @@
      <Name>cairo</Name>
    </ProjectReference>
  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="generated\" />
-    <Folder Include="generated\Pango\" />
-  </ItemGroup>
+  <ItemGroup />
  <ItemGroup>
    <None Include="pango-sharp.dll.config">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
  </ItemGroup>
-</Project>
+</Project>
--- a/parser/gapi-3.0.pc.in
+++ b/parser/gapi-3.0.pc.in
@ -3,4 +3,4 @@ prefix=${pcfiledir}/../..

 Name: GAPI
 Description: GObject .NET API Wrapping Tool
-Version: @PKG_VERSION@
+Version: @VERSION@
--- a/sample/sample.csproj
+++ b/sample/sample.csproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -9,7 +9,8 @@
    <OutputType>Exe</OutputType>
    <RootNamespace>sample</RootNamespace>
    <AssemblyName>sample</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
@ -50,7 +51,6 @@
    <Compile Include="PolarFixed.cs" />
    <Compile Include="PropertyRegistration.cs" />
    <Compile Include="Scribble.cs" />
-    <Compile Include="ScribbleXInput.cs" />
    <Compile Include="SpawnTests.cs" />
    <Compile Include="Subclass.cs" />
    <Compile Include="TestDnd.cs" />
@ -83,15 +83,6 @@
    <Compile Include="GtkDemo\DemoUIManager.cs" />
    <Compile Include="valtest\Valtest.cs" />
    <Compile Include="opaquetest\OpaqueTest.cs" />
-    <Compile Include="opaquetest\generated\GCFunc.cs" />
-    <Compile Include="opaquetest\generated\GtksharpSharp.GCFuncNative.cs" />
-    <Compile Include="opaquetest\generated\GtksharpSharp.OpaqueReturnFuncNative.cs" />
-    <Compile Include="opaquetest\generated\GtksharpSharp.RefcountedReturnFuncNative.cs" />
-    <Compile Include="opaquetest\generated\Opaque.cs" />
-    <Compile Include="opaquetest\generated\OpaqueReturnFunc.cs" />
-    <Compile Include="opaquetest\generated\Opaquetest.cs" />
-    <Compile Include="opaquetest\generated\Refcounted.cs" />
-    <Compile Include="opaquetest\generated\RefcountedReturnFunc.cs" />
    <Compile Include="test\TestCheckButton.cs" />
    <Compile Include="test\TestColorSelection.cs" />
    <Compile Include="test\TestComboBox.cs" />
@ -108,11 +99,20 @@
    <Compile Include="gio\Volume.cs" />
    <Compile Include="gtk-gio\MountOperation.cs" />
    <Compile Include="CairoPng.cs" />
-    <Compile Include="valtest\Gtksharp\Valobj.cs" />
    <Compile Include="GtkDemo\DemoSpinner.cs" />
    <Compile Include="GtkDemo\DemoCssBasics.cs" />
    <Compile Include="GtkDemo\DemoThemingStyleClasses.cs" />
    <Compile Include="VariantDemo.cs" />
+    <Compile Include="opaquetest\generated\Gtksharp\GCFunc.cs" />
+    <Compile Include="opaquetest\generated\Gtksharp\GtksharpSharp.GCFuncNative.cs" />
+    <Compile Include="opaquetest\generated\Gtksharp\GtksharpSharp.OpaqueReturnFuncNative.cs" />
+    <Compile Include="opaquetest\generated\Gtksharp\GtksharpSharp.RefcountedReturnFuncNative.cs" />
+    <Compile Include="opaquetest\generated\Gtksharp\Opaque.cs" />
+    <Compile Include="opaquetest\generated\Gtksharp\OpaqueReturnFunc.cs" />
+    <Compile Include="opaquetest\generated\Gtksharp\Opaquetest.cs" />
+    <Compile Include="opaquetest\generated\Gtksharp\Refcounted.cs" />
+    <Compile Include="opaquetest\generated\Gtksharp\RefcountedReturnFunc.cs" />
+    <Compile Include="valtest\generated\Gtksharp\Valobj.cs" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <ItemGroup>
@ -123,6 +123,7 @@
  </ItemGroup>
  <ItemGroup>
    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\pango\pango.csproj">
@ -154,4 +155,7 @@
      <Name>gtk</Name>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="valtest\Gtksharp\" />
+  </ItemGroup>
 </Project>