Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj
===================================================================
diff -u -rb8f28b43208d1dac612347e750f26cd29ffd50e3 -rbfb956191b2e88be47fa35fa20b2fcee13d91846
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj	(.../Core.Components.DotSpatial.Forms.Test.csproj)	(revision b8f28b43208d1dac612347e750f26cd29ffd50e3)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj	(.../Core.Components.DotSpatial.Forms.Test.csproj)	(revision bfb956191b2e88be47fa35fa20b2fcee13d91846)
@@ -1,15 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{73AB8619-65A0-4CC7-9024-A8D08C76FBF5}</ProjectGuid>
-    <RootNamespace>Core.Components.DotSpatial.Forms.Test</RootNamespace>
-    <AssemblyName>Core.Components.DotSpatial.Forms.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="BruTile, Version=0.20.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\BruTile.0.20.0\lib\portable-net45+win+WindowsPhoneApp81+Xamarin.iOS10+MonoAndroid10+MonoTouch10\BruTile.dll</HintPath>
-    </Reference>
     <Reference Include="DotSpatial.Controls, Version=1.8.0.0, Culture=neutral, PublicKeyToken=4d9e49339a7d240c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\DotSpatial.1.8\DotSpatial.Controls.dll</HintPath>
@@ -30,86 +21,41 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\DotSpatial.1.8\DotSpatial.Topology.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BackgroundLayerStatusFactoryTest.cs" />
-    <Compile Include="BackgroundLayerStatusTest.cs" />
-    <Compile Include="DotSpatialMapTest.cs" />
-    <Compile Include="MapControlBackgroundLayerStatusTest.cs" />
-    <Compile Include="MapControlTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WellKnownBackgroundLayerStatusTest.cs" />
-    <Compile Include="WmtsBackgroundLayerStatusTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="app.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Util</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\test\Core.Common.Util.TestUtil\Core.Common.Util.TestUtil.csproj">
-      <Project>{45193749-ECE8-40C4-8C4B-0C783AFFACB5}</Project>
-      <Name>Core.Common.Util.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Components.BruTile.IO\Core.Components.BruTile.IO.csproj">
-      <Project>{6B280C25-DB18-4F80-86D3-1CBA65208F9D}</Project>
-      <Name>Core.Components.BruTile.IO</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Components.BruTile\Core.Components.BruTile.csproj">
-      <Project>{e02482c7-f12b-42f0-bb2b-c7ec17503a72}</Project>
-      <Name>Core.Components.BruTile</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Components.DotSpatial.Forms\Core.Components.DotSpatial.Forms.csproj">
-      <Project>{5a91174a-fb95-4c9d-9ca5-81c0b8d4361a}</Project>
-      <Name>Core.Components.DotSpatial.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Components.DotSpatial\Core.Components.DotSpatial.csproj">
-      <Project>{AA47E858-A2A7-470E-8B2D-C76AE8ED9CCD}</Project>
-      <Name>Core.Components.DotSpatial</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj">
-      <Project>{4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}</Project>
-      <Name>Core.Components.Gis.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318ba582-88c9-4816-a54a-a7e431461de3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj">
-      <Project>{1081336C-D919-4249-AB33-9AF15F4D19EC}</Project>
-      <Name>Core.Components.BruTile.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj">
-      <Project>{f0fb401a-3494-4237-9e6d-02cdf77912a8}</Project>
-      <Name>Core.Components.Gis.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.Util.TestUtil\Core.Common.Util.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.BruTile.IO\Core.Components.BruTile.IO.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.BruTile\Core.Components.BruTile.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.DotSpatial.Forms\Core.Components.DotSpatial.Forms.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.DotSpatial\Core.Components.DotSpatial.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
+    <ProjectReference Include="..\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj"/>
+    <ProjectReference Include="..\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BruTile">
+      <Version>0.20.0</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag bfb956191b2e88be47fa35fa20b2fcee13d91846 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Forms.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag bfb956191b2e88be47fa35fa20b2fcee13d91846 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Forms.Test/app.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag bfb956191b2e88be47fa35fa20b2fcee13d91846 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Forms.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?