Index: Core/Components/test/Core.Components.Gis.IO.Test/Core.Components.Gis.IO.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r1e072dab1de9387271963e5bc9e457a5719c49ea
--- Core/Components/test/Core.Components.Gis.IO.Test/Core.Components.Gis.IO.Test.csproj	(.../Core.Components.Gis.IO.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Components/test/Core.Components.Gis.IO.Test/Core.Components.Gis.IO.Test.csproj	(.../Core.Components.Gis.IO.Test.csproj)	(revision 1e072dab1de9387271963e5bc9e457a5719c49ea)
@@ -1,11 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{2A542599-87A4-4BDE-8BE1-8C77D178E5E4}</ProjectGuid>
-    <RootNamespace>Core.Components.Gis.IO.Test</RootNamespace>
-    <AssemblyName>Core.Components.Gis.IO.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
     <Reference Include="DotSpatial.Data, Version=1.8.0.0, Culture=neutral, PublicKeyToken=c29dbf30e059ca9d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -15,61 +9,29 @@
       <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.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Importers\FeatureBasedMapDataImporterTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Readers\PointShapeFileReaderTest.cs" />
-    <Compile Include="Readers\PolygonShapeFileReaderTest.cs" />
-    <Compile Include="Readers\PolylineShapeFileReaderTest.cs" />
-    <Compile Include="Readers\ShapeFileReaderBaseTest.cs" />
-    <Compile Include="Readers\WmtsConnectionInfoReaderTest.cs" />
-    <Compile Include="Writers\PointShapeFileWriterTest.cs" />
-    <Compile Include="Writers\PolylineShapeFileWriterTest.cs" />
-    <Compile Include="Writers\ShapeFileWriterBaseTest.cs" />
-    <Compile Include="Writers\WmtsConnectionInfoWriterTest.cs" />
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.IO\Core.Common.IO.csproj"/>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.Base.TestUtil\Core.Common.Base.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.Gis.IO\Core.Components.Gis.IO.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.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.IO\Core.Common.IO.csproj">
-      <Project>{e344867e-9ac9-44c8-88a5-8185681679a9}</Project>
-      <Name>Core.Common.IO</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\test\Core.Common.Base.TestUtil\Core.Common.Base.TestUtil.csproj">
-      <Project>{8E2FAB92-51AA-47B0-B18A-9AC0455EF77D}</Project>
-      <Name>Core.Common.Base.TestUtil</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="..\..\src\Core.Components.Gis.IO\Core.Components.Gis.IO.csproj">
-      <Project>{fd264fad-e6f9-47cc-97cd-770199a8e629}</Project>
-      <Name>Core.Components.Gis.IO</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>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <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 1e072dab1de9387271963e5bc9e457a5719c49ea refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.IO.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1e072dab1de9387271963e5bc9e457a5719c49ea refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.IO.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?