Merge branch 'master' into tokenizer

samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs

@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using Avalonia.Input.DragDrop;
+using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using System;
 using System.Collections.Generic;

src/Avalonia.Controls/Application.cs

@@ -2,20 +2,17 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using System.Reactive.Concurrency;
 using System.Threading;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
+using Avalonia.Input.Raw;
 using Avalonia.Layout;
-using Avalonia.Rendering;
+using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.Threading;
-using System.Reactive.Concurrency;
-using Avalonia.Input.DragDrop.Raw;
-using Avalonia.Controls.Platform;
-using Avalonia.Platform;
-using Avalonia.Input.DragDrop;
 
 namespace Avalonia
 {

src/Avalonia.Controls/Platform/InProcessDragSource.cs

@@ -5,8 +5,6 @@ using System.Reactive.Subjects;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Input;
-using Avalonia.Input.DragDrop;
-using Avalonia.Input.DragDrop.Raw;
 using Avalonia.Input.Platform;
 using Avalonia.Input.Raw;
 using Avalonia.Threading;

src/Avalonia.Input/DragDrop/DataFormats.cs → src/Avalonia.Input/DataFormats.cs

@@ -1,4 +1,4 @@
-namespace Avalonia.Input.DragDrop
+namespace Avalonia.Input
 {
     public static class DataFormats
     {

src/Avalonia.Input/DragDrop/DataObject.cs → src/Avalonia.Input/DataObject.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Avalonia.Input.DragDrop
+namespace Avalonia.Input
 {
     public class DataObject : IDataObject
     {

src/Avalonia.Input/DragDrop/DragDrop.cs → src/Avalonia.Input/DragDrop.cs

@@ -2,7 +2,7 @@
 using Avalonia.Interactivity;
 using Avalonia.Input.Platform;
 
-namespace Avalonia.Input.DragDrop
+namespace Avalonia.Input
 {
     public static class DragDrop
     {

src/Avalonia.Input/DragDrop/DragDropDevice.cs → src/Avalonia.Input/DragDropDevice.cs

@@ -1,10 +1,9 @@
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 using System.Linq;
-using Avalonia.Input.DragDrop.Raw;
 using Avalonia.Input.Raw;
 
-namespace Avalonia.Input.DragDrop
+namespace Avalonia.Input
 {
     public class DragDropDevice : IDragDropDevice
     {

src/Avalonia.Input/DragDrop/DragDropEffects.cs → src/Avalonia.Input/DragDropEffects.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Avalonia.Input.DragDrop
+namespace Avalonia.Input
 {
     [Flags]
     public enum DragDropEffects

src/Avalonia.Input/DragDrop/DragEventArgs.cs → src/Avalonia.Input/DragEventArgs.cs

@@ -1,6 +1,6 @@
 using Avalonia.Interactivity;
 
-namespace Avalonia.Input.DragDrop
+namespace Avalonia.Input
 {
     public class DragEventArgs : RoutedEventArgs
     {

src/Avalonia.Input/DragDrop/IDataObject.cs → src/Avalonia.Input/IDataObject.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Avalonia.Input.DragDrop
+namespace Avalonia.Input
 {
     /// <summary>
     /// Interface to access information about the data of a drag-and-drop operation.

src/Avalonia.Input/Platform/IPlatformDragSource.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
-using Avalonia.Input.DragDrop;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace Avalonia.Input.Platform

src/Avalonia.Input/DragDrop/Raw/IDragDropDevice.cs → src/Avalonia.Input/Raw/IDragDropDevice.cs

@@ -1,6 +1,6 @@
 using Avalonia.Input;
 
-namespace Avalonia.Input.DragDrop.Raw
+namespace Avalonia.Input.Raw
 {
     public interface IDragDropDevice : IInputDevice
     {

src/Avalonia.Input/DragDrop/Raw/RawDragEvent.cs → src/Avalonia.Input/Raw/RawDragEvent.cs

@@ -2,7 +2,7 @@
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 
-namespace Avalonia.Input.DragDrop.Raw
+namespace Avalonia.Input.Raw
 {
     public class RawDragEvent : RawInputEventArgs
     {

src/Avalonia.Input/DragDrop/Raw/RawDragEventType.cs → src/Avalonia.Input/Raw/RawDragEventType.cs

@@ -1,4 +1,4 @@
-namespace Avalonia.Input.DragDrop.Raw
+namespace Avalonia.Input.Raw
 {
     public enum RawDragEventType
     {

src/OSX/Avalonia.MonoMac/DragSource.cs

@@ -10,9 +10,8 @@ using System.Runtime.InteropServices;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Input.DragDrop;
-using Avalonia.Input.Platform;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Input.Raw;
 using MonoMac;
 using MonoMac.AppKit;

src/OSX/Avalonia.MonoMac/DraggingInfo.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Avalonia.Input.DragDrop;
+using Avalonia.Input;
 using MonoMac.AppKit;
 using MonoMac.Foundation;
 

src/OSX/Avalonia.MonoMac/TopLevelImpl.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Avalonia.Input.DragDrop;
-using Avalonia.Input.DragDrop.Raw;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;

src/Windows/Avalonia.Win32/ClipboardFormats.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Text;
-using Avalonia.Input.DragDrop;
+using Avalonia.Input;
 using Avalonia.Win32.Interop;
 
 namespace Avalonia.Win32

src/Windows/Avalonia.Win32/DataObject.cs

@@ -4,9 +4,9 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Text;
-using Avalonia.Input.DragDrop;
+using Avalonia.Input;
 using Avalonia.Win32.Interop;
-using IDataObject = Avalonia.Input.DragDrop.IDataObject;
+using IDataObject = Avalonia.Input.IDataObject;
 using IOleDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;

src/Windows/Avalonia.Win32/DragSource.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
-using Avalonia.Input.DragDrop;
+using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Threading;
 using Avalonia.Win32.Interop;

src/Windows/Avalonia.Win32/OleDataObject.cs

@@ -6,13 +6,13 @@ using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
-using Avalonia.Input.DragDrop;
+using Avalonia.Input;
 using Avalonia.Win32.Interop;
 using IDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
 
 namespace Avalonia.Win32
 {
-    class OleDataObject : Avalonia.Input.DragDrop.IDataObject
+    class OleDataObject : Avalonia.Input.IDataObject
     {
         private IDataObject _wrapped;
 

src/Windows/Avalonia.Win32/OleDropTarget.cs

@@ -1,9 +1,8 @@
-using Avalonia.Input.DragDrop;
-using Avalonia.Input.DragDrop.Raw;
-using Avalonia.Input;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
 using Avalonia.Platform;
 using Avalonia.Win32.Interop;
-using IDataObject = Avalonia.Input.DragDrop.IDataObject;
+using IDataObject = Avalonia.Input.IDataObject;
 using IOleDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
 
 namespace Avalonia.Win32