Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/FeatureImporterTest.cs
===================================================================
diff -u -r4012 -r4017
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/FeatureImporterTest.cs	(.../FeatureImporterTest.cs)	(revision 4012)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/FeatureImporterTest.cs	(.../FeatureImporterTest.cs)	(revision 4017)
@@ -55,7 +55,7 @@
         [Test]
         public void Import_ReadShapeFile_RepositoryContainsGeometries()
         {
-            var testFile = new ShapeFileLocation(@"..\..\..\Data\ShapeFiles\Gemeenten.shp");
+            var testFile = new ShapeFileLocation(@"TestData\Gemeenten.shp");
             IReader<IFeature> reader = new ShapeFileReader(testFile);
             IFeatureRepository repository = new FeatureRepository();
 
Fisheye: Tag 4017 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4017 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj
===================================================================
diff -u -r4006 -r4017
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 4006)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 4017)
@@ -1,172 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.Maps</RootNamespace>
-    <AssemblyName>Deltares.Maps</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <CodeContractsAssemblyMode>0</CodeContractsAssemblyMode>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
-    <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
-    <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
-    <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>
-    <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
-    <CodeContractsRuntimeSkipQuantifiers>False</CodeContractsRuntimeSkipQuantifiers>
-    <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>
-    <CodeContractsNonNullObligations>True</CodeContractsNonNullObligations>
-    <CodeContractsBoundsObligations>True</CodeContractsBoundsObligations>
-    <CodeContractsArithmeticObligations>False</CodeContractsArithmeticObligations>
-    <CodeContractsEnumObligations>False</CodeContractsEnumObligations>
-    <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>
-    <CodeContractsMissingPublicRequiresAsWarnings>True</CodeContractsMissingPublicRequiresAsWarnings>
-    <CodeContractsInferRequires>True</CodeContractsInferRequires>
-    <CodeContractsInferEnsures>False</CodeContractsInferEnsures>
-    <CodeContractsInferObjectInvariants>False</CodeContractsInferObjectInvariants>
-    <CodeContractsSuggestAssumptions>False</CodeContractsSuggestAssumptions>
-    <CodeContractsSuggestRequires>True</CodeContractsSuggestRequires>
-    <CodeContractsSuggestObjectInvariants>False</CodeContractsSuggestObjectInvariants>
-    <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
-    <CodeContractsShowSquigglies>True</CodeContractsShowSquigglies>
-    <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
-    <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
-    <CodeContractsCustomRewriterAssembly />
-    <CodeContractsCustomRewriterClass />
-    <CodeContractsLibPaths />
-    <CodeContractsExtraRewriteOptions />
-    <CodeContractsExtraAnalysisOptions />
-    <CodeContractsSQLServerOption />
-    <CodeContractsBaseLineFile />
-    <CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
-    <CodeContractsFailBuildOnWarnings>False</CodeContractsFailBuildOnWarnings>
-    <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
-    <CodeContractsReferenceAssembly>DoNotBuild</CodeContractsReferenceAssembly>
-    <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)build\Source.targets" />
   <ItemGroup>
-    <Reference Include="Deltares.Standard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31fe100197c68040, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Folder Include="Properties" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Deltares.Standard">
       <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
     </Reference>
-    <Reference Include="GeoAPI, Version=1.7.4.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\GeoAPI.1.7.4\lib\net45\GeoAPI.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.1.14\lib\net45\NetTopologySuite.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite.IO, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite.IO.GeoTools, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.GeoTools.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite.IO.MsSqlSpatial, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.MsSqlSpatial.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite.IO.PostGis, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.PostGis.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite.IO.ShapeFile, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.ShapeFile.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite.IO.ShapeFile.Extended, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.ShapeFile.Extended.dll</HintPath>
-    </Reference>
-    <Reference Include="PowerCollections, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2573bf8a1bdddcd5, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.1.14\lib\net45\PowerCollections.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AttributeWrongValueException.cs" />
-    <Compile Include="CultureHelper.cs" />
-    <Compile Include="AttributeMissingException.cs" />
-    <Compile Include="AttributesDictionary.cs" />
-    <Compile Include="FeatureCoverageException.cs" />
-    <Compile Include="FeatureRepository.cs" />
-    <Compile Include="Feature.cs" />
-    <Compile Include="FileLocation.cs" />
-    <Compile Include="IFeature.cs" />
-    <Compile Include="IFeatureCollection.cs" />
-    <Compile Include="IFeatureRepository.cs" />
-    <Compile Include="NtsFeature.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="AttributeMapping.cs" />
-    <Compile Include="FeatureImportException.cs" />
-    <Compile Include="IAttributeImporter.cs" />
-    <Compile Include="IntersectionResult.cs" />
-    <Compile Include="GeometryRepositoryExtensions.cs" />
-    <Compile Include="FeatureImporter.cs" />
-    <Compile Include="IFeatureImporter.cs" />
-    <Compile Include="CoverageFunction.cs" />
-    <Compile Include="IFileReader.cs" />
-    <Compile Include="PolygonAttributeImporter.cs" />
-    <Compile Include="IFeatureReader.cs" />
-    <Compile Include="ShapeFileCreator.cs" />
-    <Compile Include="ShapeFileReader.cs" />
+    <PackageReference Include="GeoAPI" Version="1.7.4" />
+    <PackageReference Include="NetTopologySuite" Version="1.14.0" />
+    <PackageReference Include="NetTopologySuite.IO" Version="1.14.0.1" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Copying.GPL.licenseheader">
-      <Link>Copying.GPL.licenseheader</Link>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Translations.xml" />
-  </ItemGroup>
-  <Import Project="$(ProjectDir)..\build\Deltares.DamClientsLibrary.Version.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/Dam.sln
===================================================================
diff -u -r4006 -r4017
--- DamClients/DamUI/trunk/src/Dam.sln	(.../Dam.sln)	(revision 4006)
+++ DamClients/DamUI/trunk/src/Dam.sln	(.../Dam.sln)	(revision 4017)
@@ -78,12 +78,12 @@
 		{48691761-637B-4EFF-A04C-2047E5FA9843} = {48691761-637B-4EFF-A04C-2047E5FA9843}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps.Tests", "DamClientsLibrary\Deltares.Maps\Test\Deltares.Maps.Tests.csproj", "{E0820F33-3929-493D-821D-95E755F87D0B}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DamClientsLibrary", "DamClientsLibrary", "{F6A85256-50BA-4E97-8E3C-D8D488DFAF44}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.DamClientsLibrary.Version", "DamClientsLibrary\Deltares.DamClientsLibrary.Version\Deltares.DamClientsLibrary.Version.csproj", "{48691761-637B-4EFF-A04C-2047E5FA9843}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps.Tests", "DamClientsLibrary\Deltares.Maps.Tests\Deltares.Maps.Tests.csproj", "{E0820F33-3929-493D-821D-95E755F87D0B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -144,14 +144,14 @@
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Debug|x86.Build.0 = Debug|x86
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.ActiveCfg = Release|x86
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.Build.0 = Release|x86
-		{E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.ActiveCfg = Debug|x86
-		{E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.Build.0 = Debug|x86
-		{E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.ActiveCfg = Release|x86
-		{E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.Build.0 = Release|x86
 		{48691761-637B-4EFF-A04C-2047E5FA9843}.Debug|x86.ActiveCfg = Debug|x86
 		{48691761-637B-4EFF-A04C-2047E5FA9843}.Debug|x86.Build.0 = Debug|x86
 		{48691761-637B-4EFF-A04C-2047E5FA9843}.Release|x86.ActiveCfg = Release|x86
 		{48691761-637B-4EFF-A04C-2047E5FA9843}.Release|x86.Build.0 = Release|x86
+		{E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.ActiveCfg = Debug|x86
+		{E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.Build.0 = Debug|x86
+		{E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.ActiveCfg = Release|x86
+		{E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -172,9 +172,9 @@
 		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {31A32A36-649A-41A8-9F43-6A6193C04770}
 		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665} = {F6A85256-50BA-4E97-8E3C-D8D488DFAF44}
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60} = {F6A85256-50BA-4E97-8E3C-D8D488DFAF44}
-		{E0820F33-3929-493D-821D-95E755F87D0B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{F6A85256-50BA-4E97-8E3C-D8D488DFAF44} = {31A32A36-649A-41A8-9F43-6A6193C04770}
 		{48691761-637B-4EFF-A04C-2047E5FA9843} = {F6A85256-50BA-4E97-8E3C-D8D488DFAF44}
+		{E0820F33-3929-493D-821D-95E755F87D0B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B7622D89-F347-4835-A5C0-2E126540024A}
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Deltares.Maps.Tests.csproj
===================================================================
diff -u -r4012 -r4017
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Deltares.Maps.Tests.csproj	(.../Deltares.Maps.Tests.csproj)	(revision 4012)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Deltares.Maps.Tests.csproj	(.../Deltares.Maps.Tests.csproj)	(revision 4017)
@@ -1,154 +1,61 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\NUnit.3.13.3\build\NUnit.props" Condition="Exists('..\..\..\packages\NUnit.3.13.3\build\NUnit.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E0820F33-3929-493D-821D-95E755F87D0B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.Maps.Tests</RootNamespace>
-    <AssemblyName>Deltares.Maps.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)build\Test.targets" />
   <ItemGroup>
-    <Reference Include="Deltares.Standard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31fe100197c68040, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Folder Include="Properties" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Deltares.Standard">
       <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
     </Reference>
-    <Reference Include="GeoAPI, Version=1.7.4.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\GeoAPI.1.7.4\lib\net45\GeoAPI.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\NetTopologySuite.1.14\lib\net45\NetTopologySuite.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite.IO, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite.IO.GeoTools, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.GeoTools.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite.IO.MsSqlSpatial, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.MsSqlSpatial.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite.IO.PostGis, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.PostGis.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite.IO.ShapeFile, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.ShapeFile.dll</HintPath>
-    </Reference>
-    <Reference Include="NetTopologySuite.IO.ShapeFile.Extended, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.ShapeFile.Extended.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="PowerCollections, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2573bf8a1bdddcd5, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\NetTopologySuite.1.14\lib\net45\PowerCollections.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks">
-      <HintPath>..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Domain\FeatureRepositoryTest.cs" />
-    <Compile Include="Domain\FeatureTest.cs" />
-    <Compile Include="FeatureRepositoryTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\FeatueRepositoryExtensionsTest.cs" />
-    <Compile Include="Services\PolygonAttributeImporterTest.cs" />
-    <Compile Include="Services\FeatureImporterTest.cs" />
-    <Compile Include="Domain\CoverageFunctionTest.cs" />
-    <Compile Include="Services\ShapeFileCreatorTest.cs" />
-    <Compile Include="Services\ShapeFileReaderTest.cs" />
+    <ProjectReference Include="..\Deltares.Maps\Deltares.Maps.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Deltares.Maps.csproj">
-      <Project>{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}</Project>
-      <Name>Deltares.Maps</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Copying.GPL.licenseheader">
-      <Link>Copying.GPL.licenseheader</Link>
+    <PackageReference Include="GeoAPI">
+      <Version>1.7.4</Version>
+    </PackageReference>
+    <PackageReference Include="NetTopologySuite">
+      <Version>1.14.0</Version>
+    </PackageReference>
+    <PackageReference Include="NetTopologySuite.IO">
+      <Version>1.14.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="TestData\Gemeenten.dbf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
-    <None Include="TestData\Gemeenten.dbf">
+    <None Update="TestData\Gemeenten.fix">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="TestData\Gemeenten.fix">
+    <None Update="TestData\Gemeenten.prj">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="TestData\Gemeenten.prj">
+    <None Update="TestData\Gemeenten.qix">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="TestData\Gemeenten.qix">
+    <None Update="TestData\Gemeenten.sbn">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="TestData\Gemeenten.sbn">
+    <None Update="TestData\Gemeenten.sbx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="TestData\Gemeenten.sbx">
+    <None Update="TestData\Gemeenten.shp">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="TestData\Gemeenten.shp">
+    <None Update="TestData\Gemeenten.shx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="TestData\Gemeenten.shx">
+    <None Update="TestData\Gemeenten.shp.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="TestData\Gemeenten.shp.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\..\..\packages\NUnit.3.13.3\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\NUnit.3.13.3\build\NUnit.props'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+</Project>