Index: Core/Plugins/test/Core.Plugins.Chart.Test/Core.Plugins.Chart.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r0caadc28303a1cd2071083b353fe02bee5416470
--- Core/Plugins/test/Core.Plugins.Chart.Test/Core.Plugins.Chart.Test.csproj	(.../Core.Plugins.Chart.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Core.Plugins.Chart.Test.csproj	(.../Core.Plugins.Chart.Test.csproj)	(revision 0caadc28303a1cd2071083b353fe02bee5416470)
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{45EF3071-5C30-40AA-8B99-CE174DCEEE48}</ProjectGuid>
-    <RootNamespace>Core.Plugins.Chart.Test</RootNamespace>
-    <AssemblyName>Core.Plugins.Chart.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net45\Fluent.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="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Rhino.Mocks">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -28,83 +11,33 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Commands\ToggleLegendViewCommandTest.cs" />
-    <Compile Include="Legend\ChartDataCollectionTreeNodeInfoTest.cs" />
-    <Compile Include="Legend\ChartDataContextTreeNodeInfoTest.cs" />
-    <Compile Include="Legend\ChartLegendViewTest.cs" />
-    <Compile Include="Legend\ChartLegendControllerTest.cs" />
-    <Compile Include="ChartPluginTest.cs" />
-    <Compile Include="PresentationObjects\ChartDataContextTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ChartingRibbonTest.cs" />
-    <Compile Include="PropertyClasses\ChartAreaDataPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\ChartDataCollectionPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\ChartDataPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\ChartLineDataPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\ChartMultipleAreaDataPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\ChartMultipleLineDataPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\ChartPointDataPropertiesTest.cs" />
-    <Compile Include="TestChartView.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="TestView.cs">
-      <SubType>Component</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <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.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
-      <Project>{1d27f91f-4e62-4eaf-a0a8-a32708b9a9b1}</Project>
-      <Name>Core.Common.Controls.TreeView</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
-      <Name>Core.Common.Gui</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.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj">
-      <Project>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</Project>
-      <Name>Core.Common.Gui.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="..\..\..\Components\src\Core.Components.Chart.Forms\Core.Components.Chart.Forms.csproj">
-      <Project>{2465cca1-c505-4827-9454-4fd5fd9194cd}</Project>
-      <Name>Core.Components.Chart.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Components\src\Core.Components.Chart\Core.Components.Chart.csproj">
-      <Project>{516ebc95-b8f2-428c-b7f6-733f01bf8fdd}</Project>
-      <Name>Core.Components.Chart</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Components\src\Core.Components.OxyPlot.Forms\Core.Components.OxyPlot.Forms.csproj">
-      <Project>{DADAA0A5-288C-49CB-9F08-337F16832C86}</Project>
-      <Name>Core.Components.OxyPlot.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Components\test\Core.Components.Chart.TestUtil\Core.Components.Chart.TestUtil.csproj">
-      <Project>{E900A014-CA87-4374-87F0-813D653A9698}</Project>
-      <Name>Core.Components.Chart.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Plugins.Chart\Core.Plugins.Chart.csproj">
-      <Project>{4163B996-3455-4324-A38A-9F2F0E6FCB52}</Project>
-      <Name>Core.Plugins.Chart</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\Components\src\Core.Components.Chart.Forms\Core.Components.Chart.Forms.csproj"/>
+    <ProjectReference Include="..\..\..\Components\src\Core.Components.Chart\Core.Components.Chart.csproj"/>
+    <ProjectReference Include="..\..\..\Components\src\Core.Components.OxyPlot.Forms\Core.Components.OxyPlot.Forms.csproj"/>
+    <ProjectReference Include="..\..\..\Components\test\Core.Components.Chart.TestUtil\Core.Components.Chart.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Plugins.Chart\Core.Plugins.Chart.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Fluent.Ribbon">
+      <Version>3.4.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 0caadc28303a1cd2071083b353fe02bee5416470 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.Chart.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0caadc28303a1cd2071083b353fe02bee5416470 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.Chart.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/Core.Plugins.CommonTools.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r0caadc28303a1cd2071083b353fe02bee5416470
--- Core/Plugins/test/Core.Plugins.CommonTools.Test/Core.Plugins.CommonTools.Test.csproj	(.../Core.Plugins.CommonTools.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Plugins/test/Core.Plugins.CommonTools.Test/Core.Plugins.CommonTools.Test.csproj	(.../Core.Plugins.CommonTools.Test.csproj)	(revision 0caadc28303a1cd2071083b353fe02bee5416470)
@@ -1,47 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{8BD31773-6F6D-42EE-810D-0A5DAD809F9D}</ProjectGuid>
-    <RootNamespace>Core.Plugins.CommonTools.Test</RootNamespace>
-    <AssemblyName>Core.Plugins.CommonTools.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <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="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="CommonToolsPluginTest.cs" />
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Plugins.CommonTools\Core.Plugins.CommonTools.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <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.Plugins.CommonTools\Core.Plugins.CommonTools.csproj">
-      <Project>{93E73FAB-FAE8-49C6-9ABB-27D24DF761F6}</Project>
-      <Name>Core.Plugins.CommonTools</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
-      <Name>Core.Common.Gui</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>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 0caadc28303a1cd2071083b353fe02bee5416470 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.CommonTools.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0caadc28303a1cd2071083b353fe02bee5416470 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.CommonTools.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.Map.Test/Core.Plugins.Map.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r0caadc28303a1cd2071083b353fe02bee5416470
--- Core/Plugins/test/Core.Plugins.Map.Test/Core.Plugins.Map.Test.csproj	(.../Core.Plugins.Map.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Core.Plugins.Map.Test.csproj	(.../Core.Plugins.Map.Test.csproj)	(revision 0caadc28303a1cd2071083b353fe02bee5416470)
@@ -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>{93AB5AFB-F58E-4EC4-A25E-FF439B1895E7}</ProjectGuid>
-    <RootNamespace>Core.Plugins.Map.Test</RootNamespace>
-    <AssemblyName>Core.Plugins.Map.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.Controls, Version=1.8.0.0, Culture=neutral, PublicKeyToken=4d9e49339a7d240c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -23,22 +17,11 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\DotSpatial.1.8\DotSpatial.Topology.dll</HintPath>
     </Reference>
-    <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net45\Fluent.dll</HintPath>
-      <Private>True</Private>
-    </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="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Rhino.Mocks">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -47,114 +30,35 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Commands\ToggleMapLegendViewCommandTest.cs" />
-    <Compile Include="Helpers\MapDataContextHelperTest.cs" />
-    <Compile Include="ImportInfos\MapDataCollectionImportInfoTest.cs" />
-    <Compile Include="Legend\FeatureBasedMapDataContextTreeNodeInfoTest.cs" />
-    <Compile Include="MapPluginTest.cs" />
-    <Compile Include="Legend\MapDataCollectionContextTreeNodeInfoTest.cs" />
-    <Compile Include="Legend\MapLegendControllerTest.cs" />
-    <Compile Include="Legend\MapLegendViewTest.cs" />
-    <Compile Include="MapRibbonTest.cs" />
-    <Compile Include="PresentationObjects\FeatureBasedMapDataContextTest.cs" />
-    <Compile Include="PresentationObjects\MapDataCollectionContextTest.cs" />
-    <Compile Include="PresentationObjects\MapDataContextTest.cs" />
-    <Compile Include="PresentationObjects\MapLineDataContextTest.cs" />
-    <Compile Include="PresentationObjects\MapPointDataContextTest.cs" />
-    <Compile Include="PresentationObjects\MapPolygonDataContextTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyClasses\CategoryThemePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\FeatureBasedMapDataPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\LineCategoryThemePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\MapDataCollectionPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\MapLineDataPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\MapPointDataPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\MapPolygonDataPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\PointCategoryThemePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\PolygonCategoryThemePropertiesTest.cs" />
-    <Compile Include="PropertyInfos\MapDataCollectionContextPropertyInfoTest.cs" />
-    <Compile Include="PropertyInfos\MapLineDataContextPropertyInfoTest.cs" />
-    <Compile Include="PropertyInfos\MapPointDataContextPropertyInfoTest.cs" />
-    <Compile Include="PropertyInfos\MapPolygonDataContextPropertyInfoTest.cs" />
-    <Compile Include="TestMapView.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="TestView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="TestView.Designer.cs">
-      <DependentUpon>TestView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UITypeEditors\MetaDataAttributeEditorTest.cs" />
-    <Compile Include="UITypeEditors\SelectableMetaDataAttributeTest.cs" />
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\Components\src\Core.Components.DotSpatial.Forms\Core.Components.DotSpatial.Forms.csproj"/>
+    <ProjectReference Include="..\..\..\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj"/>
+    <ProjectReference Include="..\..\..\Components\src\Core.Components.Gis.IO\Core.Components.Gis.IO.csproj"/>
+    <ProjectReference Include="..\..\..\Components\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
+    <ProjectReference Include="..\..\..\Components\test\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Plugins.Map\Core.Plugins.Map.csproj"/>
+    <ProjectReference Include="..\Core.Plugins.Map.TestUtil\Core.Plugins.Map.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.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
-      <Project>{1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1}</Project>
-      <Name>Core.Common.Controls.TreeView</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
-      <Name>Core.Common.Gui</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.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj">
-      <Project>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</Project>
-      <Name>Core.Common.Gui.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="..\..\..\Components\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="..\..\..\Components\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="..\..\..\Components\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="..\..\..\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318ba582-88c9-4816-a54a-a7e431461de3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Components\test\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="..\..\src\Core.Plugins.Map\Core.Plugins.Map.csproj">
-      <Project>{610e0a9c-1997-4c43-a10e-39d4c66ada93}</Project>
-      <Name>Core.Plugins.Map</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Core.Plugins.Map.TestUtil\Core.Plugins.Map.TestUtil.csproj">
-      <Project>{430C588F-004A-4E19-91FB-F31E35174DF5}</Project>
-      <Name>Core.Plugins.Map.TestUtil</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="TestView.resx">
-      <DependentUpon>TestView.cs</DependentUpon>
-    </EmbeddedResource>
+    <PackageReference Include="Fluent.Ribbon">
+      <Version>3.4.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 0caadc28303a1cd2071083b353fe02bee5416470 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.Map.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0caadc28303a1cd2071083b353fe02bee5416470 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.Map.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.Map.TestUtil/Core.Plugins.Map.TestUtil.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r0caadc28303a1cd2071083b353fe02bee5416470
--- Core/Plugins/test/Core.Plugins.Map.TestUtil/Core.Plugins.Map.TestUtil.csproj	(.../Core.Plugins.Map.TestUtil.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Plugins/test/Core.Plugins.Map.TestUtil/Core.Plugins.Map.TestUtil.csproj	(.../Core.Plugins.Map.TestUtil.csproj)	(revision 0caadc28303a1cd2071083b353fe02bee5416470)
@@ -1,32 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <RootNamespace>Core.Plugins.Map.TestUtil</RootNamespace>
-    <AssemblyName>Core.Plugins.Map.TestUtil</AssemblyName>
-    <ProjectGuid>{430C588F-004A-4E19-91FB-F31E35174DF5}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
-    <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>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ValueCriterionTestHelper.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\Components\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 0caadc28303a1cd2071083b353fe02bee5416470 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.Map.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0caadc28303a1cd2071083b353fe02bee5416470 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.Map.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Core.Plugins.ProjectExplorer.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r0caadc28303a1cd2071083b353fe02bee5416470
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Core.Plugins.ProjectExplorer.Test.csproj	(.../Core.Plugins.ProjectExplorer.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Core.Plugins.ProjectExplorer.Test.csproj	(.../Core.Plugins.ProjectExplorer.Test.csproj)	(revision 0caadc28303a1cd2071083b353fe02bee5416470)
@@ -1,29 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{07206938-9671-4DC7-BDE4-35B0F6E20DBC}</ProjectGuid>
-    <RootNamespace>Core.Plugins.ProjectExplorer.Test</RootNamespace>
-    <AssemblyName>Core.Plugins.ProjectExplorer.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net45\Fluent.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="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <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.Drawing" />
@@ -32,48 +14,28 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Commands\ToggleProjectExplorerCommandTest.cs" />
-    <Compile Include="Exceptions\PluginActivationExceptionTest.cs" />
-    <Compile Include="ProjectExplorerTest.cs" />
-    <Compile Include="ProjectExplorerViewControllerTest.cs" />
-    <Compile Include="RibbonTest.cs" />
-    <Compile Include="ProjectExplorerPluginTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.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="..\..\src\Core.Plugins.ProjectExplorer\Core.Plugins.ProjectExplorer.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.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
-      <Project>{1d27f91f-4e62-4eaf-a0a8-a32708b9a9b1}</Project>
-      <Name>Core.Common.Controls.TreeView</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
-      <Name>Core.Common.Gui</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="..\..\src\Core.Plugins.ProjectExplorer\Core.Plugins.ProjectExplorer.csproj">
-      <Project>{ED20DBA9-D577-423F-A68D-A0A8130FB10B}</Project>
-      <Name>Core.Plugins.ProjectExplorer</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Fluent.Ribbon">
+      <Version>3.4.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 0caadc28303a1cd2071083b353fe02bee5416470 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0caadc28303a1cd2071083b353fe02bee5416470 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?