Index: src/Deltares.Geotechnics.IO.Tests/Deltares.Geotechnics.IO.Tests.csproj
===================================================================
diff -u -r39 -r45
--- src/Deltares.Geotechnics.IO.Tests/Deltares.Geotechnics.IO.Tests.csproj	(.../Deltares.Geotechnics.IO.Tests.csproj)	(revision 39)
+++ src/Deltares.Geotechnics.IO.Tests/Deltares.Geotechnics.IO.Tests.csproj	(.../Deltares.Geotechnics.IO.Tests.csproj)	(revision 45)
@@ -23,16 +23,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWithSources|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -48,10 +38,32 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Deltares\Deltares.DeltaModel.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
+    <Reference Include="Deltares.Geographic">
+      <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Geometry, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Deltares\DslGeographic\Deltares.Geographic.dll</HintPath>
+      <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
     </Reference>
+    <Reference Include="Deltares.Geotechnics, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Mathematics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=582f89ef4e0ea16b, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Probabilistic">
+      <HintPath>..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Standard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31fe100197c68040, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\Deltares\DslCore\Deltares.Standard.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Standard.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.dll</HintPath>
+    </Reference>
     <Reference Include="Deltares.Standard.TestUtils">
       <HintPath>..\..\lib\Deltares\DslCore\Deltares.Standard.TestUtils.dll</HintPath>
     </Reference>
@@ -157,65 +169,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <Choose>
-    <When Condition="'$(Configuration)' == 'DebugWithSources'">
-      <ItemGroup>
-        <ProjectReference Include="..\..\extern\DslCore\sources\Deltares.Standard\Deltares.Standard.csproj">
-          <Project>{2DAF66C9-7919-4997-9DE3-20FFCF015AAF}</Project>
-          <Name>Deltares.Standard</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslFormsStandard\sources\Deltares.Standard.Forms\Deltares.Standard.Forms.csproj">
-          <Project>{09FF663B-6789-4CA6-910E-5C8AB0DE243E}</Project>
-          <Name>Deltares.Standard.Forms</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslGeo\sources\Deltares.Geometry\Deltares.Geometry.csproj">
-          <Project>{968BF7AA-4DE0-4F33-8663-BDD3C3CC87C6}</Project>
-          <Name>Deltares.Geometry</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslGeo\sources\Deltares.Geotechnics\Deltares.Geotechnics.csproj">
-          <Project>{03031080-1B65-496D-B28C-47EFB176A203}</Project>
-          <Name>Deltares.Geotechnics</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslCore\sources\Deltares.Mathematics\Deltares.Mathematics.csproj">
-          <Project>{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}</Project>
-          <Name>Deltares.Mathematics</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslGeographic\sources\Deltares.Geographic\Deltares.Geographic.csproj">
-          <Project>{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}</Project>
-          <Name>Deltares.Geographic</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslProbabilistic\sources\Deltares.Probabilistic\Deltares.Probabilistic.csproj">
-          <Project>{A9598E77-68A1-429B-B3CD-90AC9A28002D}</Project>
-          <Name>Deltares.Probabilistic</Name>
-        </ProjectReference>
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Deltares.Standard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31fe100197c68040, processorArchitecture=x86">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\..\lib\Deltares\DslCore\Deltares.Standard.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Standard.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geometry, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geotechnics, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Mathematics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=582f89ef4e0ea16b, processorArchitecture=x86">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Probabilistic">
-          <HintPath>..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
 </Project>
\ No newline at end of file