Fix build issues with .NET 6

10 files changed, 61 insertions, 211 deletions

diff --git a/BuildHelpers.targets b/BuildHelpers.targets
index 2c904d52..ba7b5c5d 100644
--- a/BuildHelpers.targets
+++ b/BuildHelpers.targets
@@ -1,3 +1,3 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
 	<!-- This file contains all the build helpers we require to build our projects in different contexts -->
 </Project>
diff --git a/Directory.Build.props b/Directory.Build.props
index 938c2baf..942f3b97 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,9 +1,21 @@
 <Project>
 
   <PropertyGroup>
-    <InMonoDevelopTree Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\MonoDevelop.AfterCommon.props')">true</InMonoDevelopTree>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <TargetFrameworks>net472</TargetFrameworks>
+    <InMonoDevelopTree>False</InMonoDevelopTree>
+    <Net6>False</Net6>
+    <InMonoDevelopTree Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\MonoDevelop.AfterCommon.props')">True</InMonoDevelopTree>
+    <Net6 Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\enable_net6')">True</Net6>
+
+    <DotNetFrameworkTarget>net461</DotNetFrameworkTarget>
+    <DotNetCoreTarget>netstandard2.0</DotNetCoreTarget>
+
+    <MacTargetFramework Condition="!$(Net6)">$(DotNetFrameworkTarget)</MacTargetFramework>
+    <MacTargetFramework Condition="$(Net6)">net6.0-macos</MacTargetFramework>
+
+    <TargetFramework Condition="!$(Net6)">$(DotNetFrameworkTarget)</TargetFramework>
+    <TargetFramework Condition="$(Net6)">$(DotNetCoreTarget)</TargetFramework>
+
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 4f5ba19f..bc0b5297 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,7 +1,5 @@
 <Project>
   <PropertyGroup>
-    <InMonoDevelopTree Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\MonoDevelop.AfterCommon.props')">true</InMonoDevelopTree>
-    <TargetFrameworks>net472</TargetFrameworks>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>
 
diff --git a/TestApps/Samples/Samples.csproj b/TestApps/Samples/Samples.csproj
index 01e07561..6000fb96 100644
--- a/TestApps/Samples/Samples.csproj
+++ b/TestApps/Samples/Samples.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -37,97 +37,17 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Samples\ChartSample.cs" />
-    <Compile Include="Samples\Mnemonics.cs" />
-    <Compile Include="Samples\Spinners.cs" />
-    <Compile Include="Samples\LinkLabels.cs" />
-    <Compile Include="Samples\NotebookSample.cs" />
-    <Compile Include="Samples\Boxes.cs" />
-    <Compile Include="Samples\ListView1.cs" />
-    <Compile Include="Samples\DragDrop.cs" />
-    <Compile Include="MainWindow.cs">
+    <Compile Update="MainWindow.cs">
       <DeployService-Deploy>True</DeployService-Deploy>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Compile>
-    <Compile Include="App.cs">
+    <Compile Update="App.cs">
       <DeployService-Deploy>True</DeployService-Deploy>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
     </Compile>
-    <Compile Include="MonoDevelop.Components.Chart\Axis.cs" />
-    <Compile Include="MonoDevelop.Components.Chart\AxisDimension.cs" />
-    <Compile Include="MonoDevelop.Components.Chart\AxisPosition.cs" />
-    <Compile Include="MonoDevelop.Components.Chart\BasicChart.cs" />
-    <Compile Include="MonoDevelop.Components.Chart\ChartCursor.cs" />
-    <Compile Include="MonoDevelop.Components.Chart\DateTimeAxis.cs" />
-    <Compile Include="MonoDevelop.Components.Chart\IntegerAxis.cs" />
-    <Compile Include="MonoDevelop.Components.Chart\Serie.cs" />
-    <Compile Include="MonoDevelop.Components.Chart\TickEnumerator.cs" />
-    <Compile Include="Samples\PartialImages.cs" />
-    <Compile Include="Samples\ScrollWindowSample.cs" />
-    <Compile Include="Samples\ButtonSample.cs" />
-    <Compile Include="Samples\DrawingTransforms.cs" />
-    <Compile Include="Samples\ComboBoxes.cs" />
-    <Compile Include="Samples\Designer.cs" />
-    <Compile Include="Samples\TextInput.cs" />
-    <Compile Include="Samples\Windows.cs" />
-    <Compile Include="Samples\TextEntries.cs" />
-    <Compile Include="Samples\Images.cs" />
-    <Compile Include="Samples\ThemedImages.cs" />
-    <Compile Include="Samples\CanvasWithWidget.cs" />
-    <Compile Include="Samples\Tables.cs" />
-    <Compile Include="Samples\Labels.cs" />
-    <Compile Include="Samples\Colors.cs" />
-    <Compile Include="Samples\Frames.cs" />
-    <Compile Include="Samples\Checkboxes.cs" />
-    <Compile Include="Samples\WidgetEvents.cs" />
-    <Compile Include="Samples\ClipboardSample.cs" />
-    <Compile Include="Samples\MenuSamples.cs" />
-    <Compile Include="Samples\Tooltips.cs" />
-    <Compile Include="Samples\TreeViews.cs" />
-    <Compile Include="Samples\PanedViews.cs" />
-    <Compile Include="Samples\DrawingText.cs" />
-    <Compile Include="Samples\DrawingFigures.cs" />
-    <Compile Include="Samples\DrawingPatternsAndImages.cs" />
-    <Compile Include="Samples\ListBoxSample.cs" />
-    <Compile Include="Samples\ColorSelectorSample.cs" />
-    <Compile Include="Samples\ProgressBarSample.cs" />
-    <Compile Include="Samples\ExpanderSample.cs" />
-    <Compile Include="Samples\Markdown.cs" />
-    <Compile Include="Samples\PopoverSample.cs" />
-    <Compile Include="Samples\ScreensSample.cs" />
-    <Compile Include="Samples\ImageScaling.cs" />
-    <Compile Include="Samples\RadioButtonSample.cs" />
-    <Compile Include="Samples\WidgetRendering.cs" />
-    <Compile Include="Samples\ScrollbarSample.cs" />
-    <Compile Include="Samples\DatePickerSample.cs" />
-    <Compile Include="Samples\SliderSample.cs" />
-    <Compile Include="Samples\ListView2.cs" />
-    <Compile Include="Samples\OpacitySample.cs" />
-    <Compile Include="Samples\PasswordEntries.cs" />
-    <Compile Include="Samples\Image9Patch.cs" />
-    <Compile Include="Samples\WebViewSample.cs" />
-    <Compile Include="Samples\SpinButtonSample.cs" />
-    <Compile Include="Samples\MouseCursors.cs" />
-    <Compile Include="Samples\MessageDialogs.cs" />
-    <Compile Include="Samples\MultithreadingSample.cs" />
-    <Compile Include="Samples\WidgetFocus.cs" />
-    <Compile Include="Samples\ListViewCellBounds.cs" />
-    <Compile Include="Samples\TreeViewCellBounds.cs" />
-    <Compile Include="Samples\CalendarSample.cs" />
-    <Compile Include="Samples\FontSelectorSample.cs" />
-    <Compile Include="Samples\ListViewEntries.cs" />
-    <Compile Include="Samples\FileSelectorSample.cs" />
-    <Compile Include="Samples\FolderSelectorSample.cs" />
-    <Compile Include="Samples\ListViewCombos.cs" />
-    <Compile Include="Samples\PopupWindows.cs" />
-    <Compile Include="Samples\TreeViewCustomStore.cs" />
-    <Compile Include="Samples\TreeViewEvents.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <ProjectReference Include="..\..\Xwt\Xwt.csproj">
-      <Project>{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}</Project>
-      <Name>Xwt</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/TestApps/XamMacTest/XamMacTest.csproj b/TestApps/XamMacTest/XamMacTest.csproj
index eb578e3a..a1e2f922 100644
--- a/TestApps/XamMacTest/XamMacTest.csproj
+++ b/TestApps/XamMacTest/XamMacTest.csproj
@@ -29,6 +29,7 @@
     <Profiling>false</Profiling>
     <AOTMode>None</AOTMode>
     <LangVersion>6</LangVersion>
+    <LinkMode>None</LinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -47,6 +48,7 @@
     <DebugSymbols>true</DebugSymbols>
     <AOTMode>None</AOTMode>
     <LangVersion>6</LangVersion>
+    <LinkMode>None</LinkMode>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/Xwt.XamMac/Xwt.Mac/MacEngine.cs b/Xwt.XamMac/Xwt.Mac/MacEngine.cs
index 84985143..3195ed7d 100644
--- a/Xwt.XamMac/Xwt.Mac/MacEngine.cs
+++ b/Xwt.XamMac/Xwt.Mac/MacEngine.cs
@@ -166,14 +166,6 @@ namespace Xwt.Mac
 		static Selector hijackedSel = new Selector ("hijacked_loadNibNamed:owner:");
 		static Selector originalSel = new Selector ("loadNibNamed:owner:");
 		
-		static void Hijack ()
-		{
-			Class c = ObjcHelper.GetMetaClass ("NSBundle");
-			if (!c.AddMethod (hijackedSel.Handle, new Func<IntPtr, IntPtr, IntPtr, IntPtr,bool>(HijackedLoadNibNamed), "B@:@@"))
-				throw new Exception ("Failed to add method");
-			c.MethodExchange (originalSel.Handle, hijackedSel.Handle);
-		}
-		
 		static bool HijackedLoadNibNamed (IntPtr self, IntPtr sel, IntPtr filePath, IntPtr owner)
 		{
 			var str = (NSString) Runtime.GetNSObject (filePath);
diff --git a/Xwt.XamMac/Xwt.Mac/ViewBackend.cs b/Xwt.XamMac/Xwt.Mac/ViewBackend.cs
index a492011e..26175b1e 100644
--- a/Xwt.XamMac/Xwt.Mac/ViewBackend.cs
+++ b/Xwt.XamMac/Xwt.Mac/ViewBackend.cs
@@ -543,23 +543,28 @@ namespace Xwt.Mac
 			lock (typesConfiguredForDragDrop) {
 				if (typesConfiguredForDragDrop.Add (type)) {
 					Class c = new Class (type);
-					c.AddMethod (draggingEnteredSel.Handle, new Func<IntPtr,IntPtr,IntPtr,NSDragOperation> (DraggingEntered), "i@:@");
-					c.AddMethod (draggingUpdatedSel.Handle, new Func<IntPtr,IntPtr,IntPtr,NSDragOperation> (DraggingUpdated), "i@:@");
-					c.AddMethod (draggingExitedSel.Handle, new Action<IntPtr,IntPtr,IntPtr> (DraggingExited), "v@:@");
-					c.AddMethod (prepareForDragOperationSel.Handle, new Func<IntPtr,IntPtr,IntPtr,bool> (PrepareForDragOperation), "B@:@");
-					c.AddMethod (performDragOperationSel.Handle, new Func<IntPtr,IntPtr,IntPtr,bool> (PerformDragOperation), "B@:@");
-					c.AddMethod (concludeDragOperationSel.Handle, new Action<IntPtr,IntPtr,IntPtr> (ConcludeDragOperation), "v@:@");
+					c.AddMethod (draggingEnteredSel.Handle, new DelegateIntPtrIntPtrIntPtrNSDragOperation(DraggingEntered), "i@:@");
+					c.AddMethod (draggingUpdatedSel.Handle, new DelegateIntPtrIntPtrIntPtrNSDragOperation(DraggingUpdated), "i@:@");
+					c.AddMethod (draggingExitedSel.Handle, new DelegateIntPtrIntPtrIntPtrVoid(DraggingExited), "v@:@");
+					c.AddMethod (prepareForDragOperationSel.Handle, new DelegateIntPtrIntPtrIntPtrBool(PrepareForDragOperation), "B@:@");
+					c.AddMethod (performDragOperationSel.Handle, new DelegateIntPtrIntPtrIntPtrBool(PerformDragOperation), "B@:@");
+					c.AddMethod (concludeDragOperationSel.Handle, new DelegateIntPtrIntPtrIntPtrVoid(ConcludeDragOperation), "v@:@");
 				}
 			}
 		}
 
+		delegate bool DelegateIntPtrIntPtrBool(IntPtr p1, IntPtr p2);
+		delegate NSDragOperation DelegateIntPtrIntPtrIntPtrNSDragOperation(IntPtr p1, IntPtr p2, IntPtr p3);
+		delegate void DelegateIntPtrIntPtrIntPtrVoid(IntPtr p1, IntPtr p2, IntPtr p3);
+		delegate bool DelegateIntPtrIntPtrIntPtrBool(IntPtr p1, IntPtr p2, IntPtr p3);
+
 		static void SetupFocusEvents (Type type)
 		{
 			lock (typesConfiguredForFocusEvents) {
 				if (typesConfiguredForFocusEvents.Add (type)) {
 					Class c = new Class (type);
-					c.AddMethod (becomeFirstResponderSel.Handle, new Func<IntPtr,IntPtr,bool> (OnBecomeFirstResponder), "B@:");
-					c.AddMethod (resignFirstResponderSel.Handle, new Func<IntPtr,IntPtr,bool> (OnResignFirstResponder), "B@:");
+					c.AddMethod (becomeFirstResponderSel.Handle, new DelegateIntPtrIntPtrBool(OnBecomeFirstResponder), "B@:");
+					c.AddMethod (resignFirstResponderSel.Handle, new DelegateIntPtrIntPtrBool(OnResignFirstResponder), "B@:");
 				}
 			}
 		}
diff --git a/Xwt.XamMac/Xwt.XamMac.csproj b/Xwt.XamMac/Xwt.XamMac.csproj
index 4857485e..3ff852a2 100644
--- a/Xwt.XamMac/Xwt.XamMac.csproj
+++ b/Xwt.XamMac/Xwt.XamMac.csproj
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -7,11 +6,11 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Xwt.Mac</RootNamespace>
     <AssemblyName>Xwt.XamMac</AssemblyName>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\xwt.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFramework>$(MacTargetFramework)</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <DisableImplicitNamespaceImports>True</DisableImplicitNamespaceImports>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -51,108 +50,9 @@
       <HintPath>$(XamMacPath)</HintPath>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Xwt.Mac\BoxBackend.cs" />
-    <Compile Include="Xwt.Mac\ButtonBackend.cs" />
-    <Compile Include="Xwt.Mac\LabelBackend.cs" />
-    <Compile Include="Xwt.Mac\MacEngine.cs" />
-    <Compile Include="Xwt.Mac\NotebookBackend.cs" />
-    <Compile Include="Xwt.Mac\TreeViewBackend.cs" />
-    <Compile Include="Xwt.Mac\Util.cs" />
-    <Compile Include="Xwt.Mac\ViewBackend.cs" />
-    <Compile Include="Xwt.Mac\WindowBackend.cs" />
-    <Compile Include="Xwt.Mac.CellViews\CompositeCell.cs" />
-    <Compile Include="Xwt.Mac.CellViews\ICellRenderer.cs" />
-    <Compile Include="Xwt.Mac.CellViews\ICellSource.cs" />
-    <Compile Include="Xwt.Mac.CellViews\TextTableCell.cs" />
-    <Compile Include="Xwt.Mac.CellViews\CellUtil.cs" />
-    <Compile Include="Xwt.Mac\ImageHandler.cs" />
-    <Compile Include="Xwt.Mac.CellViews\ImageTableCell.cs" />
-    <Compile Include="Xwt.Mac\ContextBackendHandler.cs" />
-    <Compile Include="Xwt.Mac\CanvasBackend.cs" />
-    <Compile Include="Xwt.Mac\GradientBackendHandler.cs" />
-    <Compile Include="Xwt.Mac\TextLayoutBackendHandler.cs" />
-    <Compile Include="Xwt.Mac\FontBackendHandler.cs" />
-    <Compile Include="Xwt.Mac\ListViewBackend.cs" />
-    <Compile Include="Xwt.Mac\TableViewBackend.cs" />
-    <Compile Include="Xwt.Mac\MenuBackend.cs" />
-    <Compile Include="Xwt.Mac\MenuItemBackend.cs" />
-    <Compile Include="Xwt.Mac\ObjcHelper.cs" />
-    <Compile Include="Xwt.Mac\IViewObject.cs" />
-    <Compile Include="Xwt.Mac\ComboBoxBackend.cs" />
-    <Compile Include="Xwt.Mac\TextEntryBackend.cs" />
-    <Compile Include="Xwt.Mac\ImageViewBackend.cs" />
-    <Compile Include="Xwt.Mac\CheckBoxMenuItemBackend.cs" />
-    <Compile Include="Xwt.Mac\RadioButtonMenuItemBackend.cs" />
-    <Compile Include="Xwt.Mac\SeparatorMenuItemBackend.cs" />
-    <Compile Include="Xwt.Mac\CheckBoxBackend.cs" />
-    <Compile Include="Xwt.Mac\ComboBoxEntryBackend.cs" />
-    <Compile Include="Xwt.Mac\ImageBuilderBackendHandler.cs" />
-    <Compile Include="Xwt.Mac\ImagePatternBackendHandler.cs" />
-    <Compile Include="Xwt.Mac\FrameBackend.cs" />
-    <Compile Include="Xwt.Mac\ToggleButtonBackend.cs" />
-    <Compile Include="Xwt.Mac\ScrollViewBackend.cs" />
-    <Compile Include="Xwt.Mac\SeparatorBackend.cs" />
-    <Compile Include="Xwt.Mac\PanedBackend.cs" />
-    <Compile Include="Xwt.Mac\ScrollAdjustmentBackend.cs" />
-    <Compile Include="Xwt.Mac\AlertDialogBackend.cs" />
-    <Compile Include="Xwt.Mac\StatusIconBackend.cs" />
-    <Compile Include="Xwt.Mac\ProgressBarBackend.cs" />
-    <Compile Include="Xwt.Mac\SpinButtonBackend.cs" />
-    <Compile Include="Xwt.Mac\ExpanderBackend.cs" />
-    <Compile Include="Xwt.Mac\SpinnerBackend.cs" />
-    <Compile Include="Xwt.Mac\PopoverBackend.cs" />
-    <Compile Include="Xwt.Mac\LinkLabelBackend.cs" />
-    <Compile Include="Xwt.Mac\FileDialogBackend.cs" />
-    <Compile Include="Xwt.Mac\SelectFolderDialogBackend.cs" />
-    <Compile Include="Xwt.Mac\OpenFileDialogBackend.cs" />
-    <Compile Include="Xwt.Mac\MacClipboardBackend.cs" />
-    <Compile Include="Xwt.Mac\PathBackendHandler.cs" />
-    <Compile Include="Xwt.Mac\CustomWidgetBackend.cs" />
-    <Compile Include="Xwt.Mac\MacDesktopBackend.cs" />
-    <Compile Include="Xwt.Mac\MenuButtonBackend.cs" />
-    <Compile Include="Xwt.Mac.CellViews\CanvasTableCell.cs" />
-    <Compile Include="Xwt.Mac\ListBoxBackend.cs" />
-    <Compile Include="Xwt.Mac\DialogBackend.cs" />
-    <Compile Include="Xwt.Mac\MacSystemInformation.cs" />
-    <Compile Include="Xwt.Mac\RichTextViewBackend.cs" />
-    <Compile Include="Xwt.Mac\RadioButtonBackend.cs" />
-    <Compile Include="Xwt.Mac\ScrollbarBackend.cs" />
-    <Compile Include="Xwt.Mac\DatePickerBackend.cs" />
-    <Compile Include="Xwt.Mac\SliderBackend.cs" />
-    <Compile Include="Xwt.Mac.CellViews\CheckBoxTableCell.cs" />
-    <Compile Include="Xwt.Mac\EmbedNativeWidgetBackend.cs" />
-    <Compile Include="Xwt.Mac\MacKeyboardHandler.cs" />
-    <Compile Include="Xwt.Mac\PasswordEntryBackend.cs" />
-    <Compile Include="Xwt.Mac\WebViewBackend.cs" />
-    <Compile Include="Xwt.Mac\ScrollControlBackend.cs" />
-    <Compile Include="Xwt.Mac.CellViews\CellViewBackend.cs" />
-    <Compile Include="Xwt.Mac\WidgetView.cs" />
-    <Compile Include="Xwt.Mac\NSTableViewBackend.cs" />
-    <Compile Include="Xwt.Mac\Messaging.cs" />
-    <Compile Include="Xwt.Mac\KeyboardUtil.cs" />
-    <Compile Include="Xwt.Mac\SaveFileDialogBackend.cs" />
-    <Compile Include="Xwt.Mac\ColorPickerBackend.cs" />
-    <Compile Include="Xwt.Mac\OutlineViewBackend.cs" />
-    <Compile Include="Xwt.Mac\CalendarBackend.cs" />
-    <Compile Include="Xwt.Mac\SelectFontDialogBackend.cs" />
-    <Compile Include="Xwt.Mac\NSApplicationInitializer.cs" />
-    <Compile Include="Xwt.Mac.CellViews\RadioButtonTableCell.cs" />
-    <Compile Include="Xwt.Mac\GtkQuartz.cs" />
-    <Compile Include="Xwt.Mac\AccessibleBackend.cs" />
-    <Compile Include="Xwt.Mac\PopupWindowBackend.cs" />
-    <Compile Include="Xwt.Mac\SearchTextEntryBackend.cs" />
-    <Compile Include="Xwt.Mac\WindowFrameBackend.cs" />
-    <Compile Include="Xwt.Mac\AccessibleBackend.AccessibilityHelper.cs" />
-    <Compile Include="Xwt.Mac\AccerssibilityHelper.cs" />
-  </ItemGroup>
   <Import Project="..\BuildHelpers.targets" />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <ProjectReference Include="..\Xwt\Xwt.csproj">
-      <Project>{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}</Project>
-      <Name>Xwt</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Xwt.sln b/Xwt.sln
index b780052d..94df029a 100644
--- a/Xwt.sln
+++ b/Xwt.sln
@@ -54,6 +54,7 @@ Global
 		Mac-Debug|x86 = Mac-Debug|x86

 		Release|x86 = Release|x86

 		XamMac-Debug|Any CPU = XamMac-Debug|Any CPU

+		XamMac-Net6-Debug|Any CPU = XamMac-Net6-Debug|Any CPU

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

 		{0AF50CE4-E455-4A9D-92AD-711CBD068A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -66,6 +67,7 @@ Global
 		{0AF50CE4-E455-4A9D-92AD-711CBD068A55}.Win-Debug|Any CPU.Build.0 = Debug|x86

 		{0AF50CE4-E455-4A9D-92AD-711CBD068A55}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{0AF50CE4-E455-4A9D-92AD-711CBD068A55}.XamMac-Debug|Any CPU.Build.0 = Debug|Any CPU

+		{0AF50CE4-E455-4A9D-92AD-711CBD068A55}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{14CF6E75-0D08-4BBD-B0F5-742196E5656D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{14CF6E75-0D08-4BBD-B0F5-742196E5656D}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{14CF6E75-0D08-4BBD-B0F5-742196E5656D}.Mac-Debug|Any CPU.Build.0 = Debug|Any CPU

@@ -75,6 +77,7 @@ Global
 		{14CF6E75-0D08-4BBD-B0F5-742196E5656D}.Win-Debug|x86.ActiveCfg = Debug|Any CPU

 		{14CF6E75-0D08-4BBD-B0F5-742196E5656D}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{14CF6E75-0D08-4BBD-B0F5-742196E5656D}.XamMac-Debug|Any CPU.Build.0 = Debug|Any CPU

+		{14CF6E75-0D08-4BBD-B0F5-742196E5656D}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{22524E1F-A94D-4204-AD90-A5FFE73970EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{22524E1F-A94D-4204-AD90-A5FFE73970EC}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{22524E1F-A94D-4204-AD90-A5FFE73970EC}.Debug|x86.ActiveCfg = Debug|x86

@@ -93,6 +96,7 @@ Global
 		{22524E1F-A94D-4204-AD90-A5FFE73970EC}.Win-Debug|Any CPU.ActiveCfg = Debug|x86

 		{22524E1F-A94D-4204-AD90-A5FFE73970EC}.Win-Debug|x86.ActiveCfg = Debug|x86

 		{22524E1F-A94D-4204-AD90-A5FFE73970EC}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{22524E1F-A94D-4204-AD90-A5FFE73970EC}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU

@@ -100,6 +104,7 @@ Global
 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Win-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{2B7FF081-FE53-42F7-9D5D-D4B38E548F94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{2B7FF081-FE53-42F7-9D5D-D4B38E548F94}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{2B7FF081-FE53-42F7-9D5D-D4B38E548F94}.Release|Any CPU.ActiveCfg = Release|Any CPU

@@ -116,6 +121,7 @@ Global
 		{2B7FF081-FE53-42F7-9D5D-D4B38E548F94}.Mac-Debug|x86.Build.0 = Debug|Any CPU

 		{2B7FF081-FE53-42F7-9D5D-D4B38E548F94}.Release|x86.ActiveCfg = Release|Any CPU

 		{2B7FF081-FE53-42F7-9D5D-D4B38E548F94}.Release|x86.Build.0 = Release|Any CPU

+		{2B7FF081-FE53-42F7-9D5D-D4B38E548F94}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.Debug|x86.ActiveCfg = Debug|Any CPU

@@ -133,6 +139,7 @@ Global
 		{3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.Win-Debug|x86.ActiveCfg = Debug|Any CPU

 		{3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{5CFB1ABA-0CD0-45B9-ABC5-8A32096C0687}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{5CFB1ABA-0CD0-45B9-ABC5-8A32096C0687}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{5CFB1ABA-0CD0-45B9-ABC5-8A32096C0687}.Mac-Debug|Any CPU.Build.0 = Debug|Any CPU

@@ -141,6 +148,7 @@ Global
 		{5CFB1ABA-0CD0-45B9-ABC5-8A32096C0687}.Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{5CFB1ABA-0CD0-45B9-ABC5-8A32096C0687}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{5CFB1ABA-0CD0-45B9-ABC5-8A32096C0687}.XamMac-Debug|Any CPU.Build.0 = Debug|Any CPU

+		{5CFB1ABA-0CD0-45B9-ABC5-8A32096C0687}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -151,6 +159,8 @@ Global
 		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.Win-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.XamMac-Debug|Any CPU.Build.0 = Debug|Any CPU

+		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.XamMac-Net6-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -161,6 +171,8 @@ Global
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Win-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.XamMac-Debug|Any CPU.Build.0 = Debug|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.XamMac-Net6-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU

@@ -176,6 +188,8 @@ Global
 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Debug|x86.Build.0 = Debug|Any CPU

 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Release|x86.ActiveCfg = Release|Any CPU

 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Release|x86.Build.0 = Release|Any CPU

+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.XamMac-Net6-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{BC764278-4141-483C-8643-2EA8C40373B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{BC764278-4141-483C-8643-2EA8C40373B2}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{BC764278-4141-483C-8643-2EA8C40373B2}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -186,6 +200,7 @@ Global
 		{BC764278-4141-483C-8643-2EA8C40373B2}.Win-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{BC764278-4141-483C-8643-2EA8C40373B2}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{BC764278-4141-483C-8643-2EA8C40373B2}.XamMac-Debug|Any CPU.Build.0 = Debug|Any CPU

+		{BC764278-4141-483C-8643-2EA8C40373B2}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{C13CB518-B840-4FE7-AF3D-8C517A2FAD1F}.Debug|Any CPU.ActiveCfg = Debug|x86

 		{C13CB518-B840-4FE7-AF3D-8C517A2FAD1F}.Mac-Debug|Any CPU.ActiveCfg = Debug|x86

 		{C13CB518-B840-4FE7-AF3D-8C517A2FAD1F}.Release|Any CPU.ActiveCfg = Release|x86

@@ -193,6 +208,7 @@ Global
 		{C13CB518-B840-4FE7-AF3D-8C517A2FAD1F}.Win-Debug|Any CPU.ActiveCfg = Debug|x86

 		{C13CB518-B840-4FE7-AF3D-8C517A2FAD1F}.Win-Debug|Any CPU.Build.0 = Debug|x86

 		{C13CB518-B840-4FE7-AF3D-8C517A2FAD1F}.XamMac-Debug|Any CPU.ActiveCfg = Debug|x86

+		{C13CB518-B840-4FE7-AF3D-8C517A2FAD1F}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|x86

 		{C1DF0C90-0C4C-4AB5-A45C-A1805587A844}.Debug|Any CPU.ActiveCfg = Debug|x86

 		{C1DF0C90-0C4C-4AB5-A45C-A1805587A844}.Mac-Debug|Any CPU.ActiveCfg = Debug|x86

 		{C1DF0C90-0C4C-4AB5-A45C-A1805587A844}.Mac-Debug|Any CPU.Build.0 = Debug|x86

@@ -205,6 +221,7 @@ Global
 		{C1DF0C90-0C4C-4AB5-A45C-A1805587A844}.Win-Debug|x86.ActiveCfg = Debug|x86

 		{C1DF0C90-0C4C-4AB5-A45C-A1805587A844}.Win-Debug|x86.Build.0 = Debug|x86

 		{C1DF0C90-0C4C-4AB5-A45C-A1805587A844}.XamMac-Debug|Any CPU.ActiveCfg = Debug|x86

+		{C1DF0C90-0C4C-4AB5-A45C-A1805587A844}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|x86

 		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|x86.ActiveCfg = Debug|Any CPU

@@ -225,6 +242,7 @@ Global
 		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Win-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.XamMac-Debug|Any CPU.Build.0 = Debug|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Release|Any CPU.ActiveCfg = Release|Any CPU

@@ -232,6 +250,7 @@ Global
 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Win-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{E41F4448-15C3-4E95-B310-FD333FDF5D2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{E41F4448-15C3-4E95-B310-FD333FDF5D2F}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{E41F4448-15C3-4E95-B310-FD333FDF5D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU

@@ -239,6 +258,7 @@ Global
 		{E41F4448-15C3-4E95-B310-FD333FDF5D2F}.Win-Debug|Any CPU.ActiveCfg = Debug|x86

 		{E41F4448-15C3-4E95-B310-FD333FDF5D2F}.Win-Debug|Any CPU.Build.0 = Debug|x86

 		{E41F4448-15C3-4E95-B310-FD333FDF5D2F}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{E41F4448-15C3-4E95-B310-FD333FDF5D2F}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{E95833C9-90AA-4366-9262-0A1BED148249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{E95833C9-90AA-4366-9262-0A1BED148249}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{E95833C9-90AA-4366-9262-0A1BED148249}.Mac-Debug|Any CPU.Build.0 = Debug|Any CPU

@@ -247,6 +267,7 @@ Global
 		{E95833C9-90AA-4366-9262-0A1BED148249}.Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{E95833C9-90AA-4366-9262-0A1BED148249}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{E95833C9-90AA-4366-9262-0A1BED148249}.XamMac-Debug|Any CPU.Build.0 = Debug|Any CPU

+		{E95833C9-90AA-4366-9262-0A1BED148249}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{F0C03C12-F08A-4378-958D-86DD4CFE966F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{F0C03C12-F08A-4378-958D-86DD4CFE966F}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{F0C03C12-F08A-4378-958D-86DD4CFE966F}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -269,6 +290,7 @@ Global
 		{F0C03C12-F08A-4378-958D-86DD4CFE966F}.Release|x86.Build.0 = Release|Any CPU

 		{F0C03C12-F08A-4378-958D-86DD4CFE966F}.XamMac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{F0C03C12-F08A-4378-958D-86DD4CFE966F}.XamMac-Debug|Any CPU.Build.0 = Debug|Any CPU

+		{F0C03C12-F08A-4378-958D-86DD4CFE966F}.XamMac-Net6-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 	EndGlobalSection

 	GlobalSection(NestedProjects) = preSolution

 		{BC764278-4141-483C-8643-2EA8C40373B2} = {164E1FED-7688-4AE9-B19B-012F8784F9DD}

diff --git a/Xwt/Xwt.csproj b/Xwt/Xwt.csproj
index 6878696b..5744433b 100644
--- a/Xwt/Xwt.csproj
+++ b/Xwt/Xwt.csproj
@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">

-

   <PropertyGroup>

-    <TargetFrameworks>netstandard2.0</TargetFrameworks>

     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

     <SignAssembly>true</SignAssembly>

     <AssemblyOriginatorKeyFile>..\xwt.snk</AssemblyOriginatorKeyFile>

     <RootNamespace>Xwt</RootNamespace>

     <AssemblyName>Xwt</AssemblyName>

+    <DisableImplicitNamespaceImports>True</DisableImplicitNamespaceImports>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugType>full</DebugType>