Index: Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj
===================================================================
diff -u -rb8f28b43208d1dac612347e750f26cd29ffd50e3 -rc1e511b5e815ddcc0ff7b6f510e8ab7cd5c29531
--- Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision b8f28b43208d1dac612347e750f26cd29ffd50e3)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision c1e511b5e815ddcc0ff7b6f510e8ab7cd5c29531)
@@ -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>{DD7ECAFF-D8A1-4D92-99C0-27498ACB32D4}</ProjectGuid>
-    <RootNamespace>Core.Components.DotSpatial.Test</RootNamespace>
-    <AssemblyName>Core.Components.DotSpatial.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>
@@ -38,14 +29,6 @@
       <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="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.Data" />
@@ -54,82 +37,31 @@
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Converter\MapDataHelperTest.cs" />
-    <Compile Include="Converter\MapLineDataConverterTest.cs" />
-    <Compile Include="Converter\MapPolygonDataConverterTest.cs" />
-    <Compile Include="Converter\FeatureBasedMapDataConverterTest.cs" />
-    <Compile Include="Layer\BruTile\BruTileLayerTest.cs" />
-    <Compile Include="Layer\ImageBasedMapDataLayerFactoryTest.cs" />
-    <Compile Include="Projections\ReprojectExtensionsTest.cs" />
-    <Compile Include="Projections\TileReprojectorTest.cs" />
-    <Compile Include="Projections\WorldFileTest.cs" />
-    <Compile Include="Layer\FeatureBasedMapDataLayerFactoryTest.cs" />
-    <Compile Include="Converter\MapPointDataConverterTest.cs" />
-    <Compile Include="Layer\MapLineDataLayerTest.cs" />
-    <Compile Include="Layer\MapPointDataLayerTest.cs" />
-    <Compile Include="Layer\MapPolygonDataLayerTest.cs" />
-    <Compile Include="MapFunctions\MapFunctionSelectionZoomTest.cs" />
-    <Compile Include="RdNewMouseCoordinatesMapExtensionTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
+    <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\Core.Components.DotSpatial.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>
-    <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\Core.Components.DotSpatial.csproj">
-      <Project>{aa47e858-a2a7-470e-8b2d-c76ae8ed9ccd}</Project>
-      <Name>Core.Components.DotSpatial</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>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="app.config" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
+<ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
@@ -164,4 +96,15 @@
   <ItemGroup>
     <None Include="Resources\BackgroundLayerAfterAddingHalfTransparentTestTiles.png" />
   </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 c1e511b5e815ddcc0ff7b6f510e8ab7cd5c29531 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c1e511b5e815ddcc0ff7b6f510e8ab7cd5c29531 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Test/app.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c1e511b5e815ddcc0ff7b6f510e8ab7cd5c29531 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?