Index: Core/Common/src/Core.Common.Geometry/Core.Common.Geometry.csproj
===================================================================
diff -u -r4b9bb58c473d9c3652aaa5436eabfadb195423b6 -r82e1844a5a158b0ea922648474dd3efbb7fd4eb7
--- Core/Common/src/Core.Common.Geometry/Core.Common.Geometry.csproj	(.../Core.Common.Geometry.csproj)	(revision 4b9bb58c473d9c3652aaa5436eabfadb195423b6)
+++ Core/Common/src/Core.Common.Geometry/Core.Common.Geometry.csproj	(.../Core.Common.Geometry.csproj)	(revision 82e1844a5a158b0ea922648474dd3efbb7fd4eb7)
@@ -1,48 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{88665510-CE20-4EF5-BE4A-39800720AA2C}</ProjectGuid>
-    <RootNamespace>Core.Common.Geometry</RootNamespace>
-    <AssemblyName>Core.Common.Geometry</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
-    <Reference Include="GeoAPI, Version=1.7.4.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\GeoAPI.1.7.4\lib\net40-client\GeoAPI.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="MathNet.Numerics, Version=3.19.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\MathNet.Numerics.3.19.0\lib\net40\MathNet.Numerics.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="MathNet.Spatial, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\MathNet.Spatial.0.3.0\lib\net40\MathNet.Spatial.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NetTopologySuite, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NetTopologySuite.1.14\lib\net40-client\NetTopologySuite.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AdvancedMath2D.cs" />
-    <Compile Include="InvalidPolygonException.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="MathNet.Numerics">
+      <Version>3.19.0</Version>
+    </PackageReference>
+    <PackageReference Include="MathNet.Spatial">
+      <Version>0.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="NetTopologySuite">
+      <Version>1.14.0</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 82e1844a5a158b0ea922648474dd3efbb7fd4eb7 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Geometry/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 82e1844a5a158b0ea922648474dd3efbb7fd4eb7 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Geometry/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer.sln
===================================================================
diff -u -r164b8be7a3baa8b5fa3b27c35f35887aac3051b4 -r82e1844a5a158b0ea922648474dd3efbb7fd4eb7
--- Riskeer.sln	(.../Riskeer.sln)	(revision 164b8be7a3baa8b5fa3b27c35f35887aac3051b4)
+++ Riskeer.sln	(.../Riskeer.sln)	(revision 82e1844a5a158b0ea922648474dd3efbb7fd4eb7)
@@ -128,9 +128,9 @@
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Common.Gui", "Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj", "{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Base", "Core\Common\src\Core.Common.Base\Core.Common.Base.csproj", "{3BBFD65B-B277-4E50-AE6D-BD24C3434609}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Common.Base", "Core\Common\src\Core.Common.Base\Core.Common.Base.csproj", "{3BBFD65B-B277-4E50-AE6D-BD24C3434609}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Controls", "Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj", "{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Common.Controls", "Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj", "{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0D9858E1-CF2D-4DE5-AC0E-64401900D531}"
 EndProject
@@ -348,7 +348,7 @@
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Controls.TreeView", "Core\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj", "{1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Common.Controls.TreeView", "Core\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj", "{1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
@@ -677,9 +677,6 @@
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Geometry", "Core\Common\src\Core.Common.Geometry\Core.Common.Geometry.csproj", "{88665510-CE20-4EF5-BE4A-39800720AA2C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
-	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Geometry.Test", "Core\Common\test\Core.Common.Geometry.Test\Core.Common.Geometry.Test.csproj", "{E23513DE-B7D0-4415-BCDF-5A33CD084388}"
 	ProjectSection(ProjectDependencies) = postProject