Merge pull request #2508 from cwensley/curtis/global-usings

Use global usings

build/Common.Build.props

@@ -22,13 +22,42 @@
 
     <!-- Ignore errors/warnings about semver 2.0 when packing CI builds -->
     <NoWarn>$(NoWarn);NU5105</NoWarn>
+    <LangVersion Condition="$(MSBuildProjectExtension) == '.csproj'">10</LangVersion>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <!-- support t4 templates in projects -->
   <ItemGroup>
     <TextTemplate Include="**\*.tt" />
     <AvailableItemName Include="TextTemplate" />
   </ItemGroup>
+
+  <ItemGroup Condition="$(UseGlobalUsings) == 'true'">
+    <Using Include="System" />
+    <Using Include="System.Collections" />
+    <Using Include="System.Collections.Generic" />
+    <Using Include="System.Collections.ObjectModel" />
+    <Using Include="System.Collections.Specialized" />
+    <Using Include="System.ComponentModel" />
+    <Using Include="System.Diagnostics" />
+    <Using Include="System.Globalization" />
+    <Using Include="System.IO" />
+    <Using Include="System.Linq" />
+    <Using Include="System.Linq.Expressions" />
+    <Using Include="System.Reflection" />
+    <Using Include="System.Runtime.InteropServices" />
+    <Using Include="System.Runtime.Serialization" />
+    <Using Include="System.Text" />
+    <Using Include="System.Text.RegularExpressions" />
+    <Using Include="System.Threading" />
+    <Using Include="System.Threading.Tasks" />
+    <Using Include="Eto.Forms" />
+    <Using Include="Eto.Drawing" />
+    <Using Include="Eto.Forms.Container" Alias="Container" />
+    <Using Include="Eto.Forms.Calendar" Alias="Calendar" />
+    <Using Include="System.ComponentModel" Alias="sc" />
+    <Using Include="System.Windows.Input.ICommand" Alias="ICommand" />
+  </ItemGroup>
 
   <Import Condition="Exists('$(BasePath)..\Eto.Common.props')" Project="$(BasePath)..\Eto.Common.props" />
 </Project>

build/Common.props

@@ -16,7 +16,7 @@
     <HasXamarinMac Condition="$(HasXamarinMac) == ''">True</HasXamarinMac> <!-- VS for Mac needs this, Exists isn't evaluated -->
 
     <ArtifactsDir Condition="$(BuildOutoutDir) == ''">$(BasePath)artifacts\</ArtifactsDir>
-    <BaseIntermediateOutputPath Condition="$(BaseIntermediateOutputPath) == ''">$(BasePath)artifacts\obj\$(OSPlatform)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="$(BaseIntermediateOutputPath) == ''">$(ArtifactsDir)obj\$(OSPlatform)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
     <SourceDir Condition="$(SourceDir) == ''">$(BasePath)src\</SourceDir>
     <NugetDir Condition="$(NugetDir) == ''">$(SourceDir)</NugetDir>
     <PackageOutputPath>$(ArtifactsDir)nuget\$(Configuration)\</PackageOutputPath>

src/Directory.Build.props

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <UseGlobalUsings>true</UseGlobalUsings>
+  </PropertyGroup>
+
   <Import Project="..\build\Common.Build.props" />
   <PropertyGroup>
-    <BaseOutputPath Condition="$(BaseOutputPath) == ''">$(BasePath)artifacts\core\$(MSBuildProjectName)\</BaseOutputPath>
+    <BaseOutputPath Condition="$(BaseOutputPath) == ''">$(ArtifactsDir)core\$(MSBuildProjectName)\</BaseOutputPath>
   </PropertyGroup>
 </Project>

src/Eto.Android/AndroidHelpers.cs

@@ -1,9 +1,5 @@
-using System;
 using Android.Widget;
 using Eto.Android.Forms;
-using Eto.Drawing;
-using Eto.Forms;
-
 using av = Android.Views;
 using ag = Android.Graphics;
 using Android.Views;

src/Eto.Android/ContextMenuHandler.cs

@@ -1,17 +1,10 @@
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
 using ar = Android.Runtime;
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using System.Collections.Generic;
-using System;
-using System.Linq;
-using Eto.Drawing;
-
 namespace Eto.Android
 {
 	internal class ContextMenuHandler : WidgetHandler<aw.PopupMenu, ContextMenu, ContextMenu.ICallback>, ContextMenu.IHandler

src/Eto.Android/Conversions.cs

@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Drawing/BitmapHandler.cs

@@ -1,18 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
 using ar = Android.Runtime;
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using System.IO;
-
 namespace Eto.Android.Drawing
 {
 	/// <summary>

src/Eto.Android/Drawing/BrushHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Drawing/FontFamilyHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Drawing/FontHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Drawing/FontTypefaceHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Drawing/FontsHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -12,8 +6,6 @@
 using aw = Android.Widget;
 using ag = Android.Graphics;
 using System.Xml.Linq;
-using System.IO;
-
 namespace Eto.Android.Drawing
 {
 	public class FontsHandler : WidgetHandler<Widget>, Fonts.IHandler

src/Eto.Android/Drawing/FormattedTextHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Drawing/GraphicsHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Drawing/GraphicsPathHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Drawing/IconHandler.cs

@@ -1,18 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
 using ar = Android.Runtime;
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using Eto.Forms;
-
 namespace Eto.Android.Drawing
 {
 	class IconFrameHandler : IconFrame.IHandler

src/Eto.Android/Drawing/IndexedBitmapHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Drawing/LinearGradientBrushHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Drawing/MatrixHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Drawing/PenHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Drawing/SolidBrushHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Drawing/SystemColorsHandler.cs

@@ -1,5 +1,3 @@
-using Eto.Drawing;
-
 namespace Eto.Android
 	{
 	public class SystemColorsHandler : SystemColors.IHandler

src/Eto.Android/Drawing/TextureBrushHandler.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;

src/Eto.Android/Forms/AndroidContainer.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
-using Eto.Drawing;
 using a = Android;
 using av = Android.Views;
 using aw = Android.Widget;

src/Eto.Android/Forms/AndroidControl.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Forms;
-using Eto.Drawing;
-
 using a = Android;
 using av = Android.Views;
 

src/Eto.Android/Forms/AndroidExtensions.cs

@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using a = Android;
 using av = Android.Views;
 using aw = Android.Widget;

src/Eto.Android/Forms/AndroidPanel.cs

@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using a = Android;
 using av = Android.Views;
 using aw = Android.Widget;

src/Eto.Android/Forms/AndroidTextControl.cs

@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 using aw = Android.Widget;
 using at = Android.Text;
 using av = Android.Views;

src/Eto.Android/Forms/AndroidWindow.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Threading.Tasks;
-using Eto.Forms;
-using Eto.Drawing;
 using a = Android;
 using av = Android.Views;
 using aw = Android.Widget;

src/Eto.Android/Forms/ApplicationHandler.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Eto.Forms;
-
 using a = Android;
 using ao = Android.OS;
 

src/Eto.Android/Forms/Cells/CheckBoxCellHandler.cs

@@ -1,17 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
 using ar = Android.Runtime;
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using Eto.Forms;
-
 namespace Eto.Android.Forms.Cells
 {
 	public class CheckBoxCellHandler : CellHandler<CheckBoxCell>, CheckBoxCell.IHandler

src/Eto.Android/Forms/Cells/ComboBoxCellHandler.cs

@@ -1,17 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
 using ar = Android.Runtime;
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using Eto.Forms;
-
 namespace Eto.Android.Forms.Cells
 {
 	public class ComboBoxCellHandler : CellHandler<ComboBoxCell>, ComboBoxCell.IHandler

src/Eto.Android/Forms/Cells/ICellHandler.cs

@@ -1,4 +1,3 @@
-using Eto.Forms;
 using av = Android.Views;
 
 namespace Eto.Android.Forms.Cells