Index: src/Deltares.Soilbase/Deltares.Soilbase.csproj
===================================================================
diff -u -r39 -r45
--- src/Deltares.Soilbase/Deltares.Soilbase.csproj	(.../Deltares.Soilbase.csproj)	(revision 39)
+++ src/Deltares.Soilbase/Deltares.Soilbase.csproj	(.../Deltares.Soilbase.csproj)	(revision 45)
@@ -65,52 +65,6 @@
     <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
     <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>
-    <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>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -127,9 +81,24 @@
     <Reference Include="Deltares.DeltaModel">
       <HintPath>..\..\lib\Deltares\Deltares.DeltaModel.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Geographic">
-      <HintPath>..\..\lib\Deltares\DslGeographic\Deltares.Geographic.dll</HintPath>
+    <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <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\DslGeo\Deltares.Geometry.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Geotechnics">
+      <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.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="FirebirdSql.Data.FirebirdClient, Version=4.1.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\FireBird .NET ADO\FirebirdSql.Data.FirebirdClient.dll</HintPath>
@@ -169,8 +138,8 @@
     <EmbeddedResource Include="Translations.xml" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Properties\AssemblyInfo.cs.svn" />
     <None Include="packages.config" />
+    <None Include="Properties\AssemblyInfo.cs.svn" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Deltares.Geotechnics.IO\Deltares.Geotechnics.IO.csproj">
@@ -193,48 +162,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\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\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.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">
-          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.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
Index: src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj
===================================================================
diff -u -r39 -r45
--- src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj	(.../Deltares.DSoilModel.Forms.csproj)	(revision 39)
+++ src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj	(.../Deltares.DSoilModel.Forms.csproj)	(revision 45)
@@ -71,58 +71,6 @@
     <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
     <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>
-    <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>True</CodeContractsArithmeticObligations>
-    <CodeContractsEnumObligations>True</CodeContractsEnumObligations>
-    <CodeContractsRedundantAssumptions>True</CodeContractsRedundantAssumptions>
-    <CodeContractsAssertsToContractsCheckBox>True</CodeContractsAssertsToContractsCheckBox>
-    <CodeContractsRedundantTests>True</CodeContractsRedundantTests>
-    <CodeContractsMissingPublicRequiresAsWarnings>True</CodeContractsMissingPublicRequiresAsWarnings>
-    <CodeContractsMissingPublicEnsuresAsWarnings>False</CodeContractsMissingPublicEnsuresAsWarnings>
-    <CodeContractsInferRequires>True</CodeContractsInferRequires>
-    <CodeContractsInferEnsures>False</CodeContractsInferEnsures>
-    <CodeContractsInferObjectInvariants>False</CodeContractsInferObjectInvariants>
-    <CodeContractsSuggestAssumptions>False</CodeContractsSuggestAssumptions>
-    <CodeContractsSuggestAssumptionsForCallees>False</CodeContractsSuggestAssumptionsForCallees>
-    <CodeContractsSuggestRequires>False</CodeContractsSuggestRequires>
-    <CodeContractsNecessaryEnsures>True</CodeContractsNecessaryEnsures>
-    <CodeContractsSuggestObjectInvariants>False</CodeContractsSuggestObjectInvariants>
-    <CodeContractsSuggestReadonly>True</CodeContractsSuggestReadonly>
-    <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
-    <CodeContractsShowSquigglies>True</CodeContractsShowSquigglies>
-    <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
-    <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
-    <CodeContractsCustomRewriterAssembly />
-    <CodeContractsCustomRewriterClass />
-    <CodeContractsLibPaths />
-    <CodeContractsExtraRewriteOptions />
-    <CodeContractsExtraAnalysisOptions />
-    <CodeContractsSQLServerOption />
-    <CodeContractsBaseLineFile />
-    <CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
-    <CodeContractsSkipAnalysisIfCannotConnectToCache>False</CodeContractsSkipAnalysisIfCannotConnectToCache>
-    <CodeContractsFailBuildOnWarnings>False</CodeContractsFailBuildOnWarnings>
-    <CodeContractsBeingOptimisticOnExternal>True</CodeContractsBeingOptimisticOnExternal>
-    <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
-    <CodeContractsReferenceAssembly>DoNotBuild</CodeContractsReferenceAssembly>
-    <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -144,9 +92,46 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Deltares\Deltares.DeltaModel.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Geographic">
-      <HintPath>..\..\lib\Deltares\DslGeographic\Deltares.Geographic.dll</HintPath>
+    <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll</HintPath>
     </Reference>
+    <Reference Include="Deltares.Geometry">
+      <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Geometry.Forms">
+      <HintPath>..\..\lib\Deltares\DslFormsGeo\Deltares.Geometry.Forms.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Geotechnics">
+      <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Geotechnics.Forms">
+      <HintPath>..\..\lib\Deltares\DslFormsGeo\Deltares.Geotechnics.Forms.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.Forms.DExpress">
+      <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Standard.Forms.Maps">
+      <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Forms.Maps.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Standard.Maps">
+      <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Maps.dll</HintPath>
+    </Reference>
     <Reference Include="DevExpress.Printing.v12.2.Core, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Data.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Utils.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -184,7 +169,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+      <Link>GlobalAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="BoringControl.cs">
       <SubType>UserControl</SubType>
@@ -411,108 +396,14 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>"$(ProjectDir)..\..\utils\svn_insert_version.cmd" "$(ProjectDir)Properties"</PreBuildEvent>
+  </PropertyGroup>
   <!-- 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>
   -->
-  <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\DslFormsMap\sources\Deltares.Standard.Maps\Deltares.Standard.Maps.csproj">
-          <Project>{C3BC92C5-49D2-41BB-91B2-F0516A48F5DB}</Project>
-          <Name>Deltares.Standard.Maps</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslFormsStandard\sources\Deltares.Standard.Forms.DExpress\Deltares.Standard.Forms.DExpress.csproj">
-          <Project>{8AA0B08A-B23F-495D-8496-F715451B2978}</Project>
-          <Name>Deltares.Standard.Forms.DExpress</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslFormsMap\sources\Deltares.Standard.Forms.Maps\Deltares.Standard.Forms.Maps.csproj">
-          <Project>{581488C1-6C5C-4744-99EC-72EA23010E02}</Project>
-          <Name>Deltares.Standard.Forms.Maps</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\DslFormsGeo\sources\Deltares.Geometry.Forms\Deltares.Geometry.Forms.csproj">
-          <Project>{10F88AE9-B67C-4E2F-92A5-AE5BCF4E4B21}</Project>
-          <Name>Deltares.Geometry.Forms</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\DslFormsGeo\sources\Deltares.Geotechnics.Forms\Deltares.Geotechnics.Forms.csproj">
-          <Project>{C05D6847-29B0-40DB-A0C6-6328368A6E78}</Project>
-          <Name>Deltares.Geotechnics.Forms</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.Standard.Maps">
-          <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Maps.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Standard.Forms.DExpress">
-          <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Standard.Forms.Maps">
-          <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Forms.Maps.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geometry">
-          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geometry.Forms">
-          <HintPath>..\..\lib\Deltares\DslFormsGeo\Deltares.Geometry.Forms.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geotechnics">
-          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geotechnics.Forms">
-          <HintPath>..\..\lib\Deltares\DslFormsGeo\Deltares.Geotechnics.Forms.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>
-  <PropertyGroup>
-    <PreBuildEvent>"$(ProjectDir)..\..\utils\svn_insert_version.cmd" "$(ProjectDir)Properties"</PreBuildEvent>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
Index: src/Deltares.DSoilModel.Data/Deltares.DSoilModel.Data.csproj
===================================================================
diff -u -r39 -r45
--- src/Deltares.DSoilModel.Data/Deltares.DSoilModel.Data.csproj	(.../Deltares.DSoilModel.Data.csproj)	(revision 39)
+++ src/Deltares.DSoilModel.Data/Deltares.DSoilModel.Data.csproj	(.../Deltares.DSoilModel.Data.csproj)	(revision 45)
@@ -72,58 +72,6 @@
     <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
     <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>
-    <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>True</CodeContractsArithmeticObligations>
-    <CodeContractsEnumObligations>True</CodeContractsEnumObligations>
-    <CodeContractsRedundantAssumptions>True</CodeContractsRedundantAssumptions>
-    <CodeContractsAssertsToContractsCheckBox>True</CodeContractsAssertsToContractsCheckBox>
-    <CodeContractsRedundantTests>True</CodeContractsRedundantTests>
-    <CodeContractsMissingPublicRequiresAsWarnings>True</CodeContractsMissingPublicRequiresAsWarnings>
-    <CodeContractsMissingPublicEnsuresAsWarnings>False</CodeContractsMissingPublicEnsuresAsWarnings>
-    <CodeContractsInferRequires>True</CodeContractsInferRequires>
-    <CodeContractsInferEnsures>False</CodeContractsInferEnsures>
-    <CodeContractsInferObjectInvariants>False</CodeContractsInferObjectInvariants>
-    <CodeContractsSuggestAssumptions>False</CodeContractsSuggestAssumptions>
-    <CodeContractsSuggestAssumptionsForCallees>False</CodeContractsSuggestAssumptionsForCallees>
-    <CodeContractsSuggestRequires>False</CodeContractsSuggestRequires>
-    <CodeContractsNecessaryEnsures>True</CodeContractsNecessaryEnsures>
-    <CodeContractsSuggestObjectInvariants>False</CodeContractsSuggestObjectInvariants>
-    <CodeContractsSuggestReadonly>True</CodeContractsSuggestReadonly>
-    <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
-    <CodeContractsShowSquigglies>True</CodeContractsShowSquigglies>
-    <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
-    <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
-    <CodeContractsCustomRewriterAssembly />
-    <CodeContractsCustomRewriterClass />
-    <CodeContractsLibPaths />
-    <CodeContractsExtraRewriteOptions />
-    <CodeContractsExtraAnalysisOptions />
-    <CodeContractsSQLServerOption />
-    <CodeContractsBaseLineFile />
-    <CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
-    <CodeContractsSkipAnalysisIfCannotConnectToCache>False</CodeContractsSkipAnalysisIfCannotConnectToCache>
-    <CodeContractsFailBuildOnWarnings>False</CodeContractsFailBuildOnWarnings>
-    <CodeContractsBeingOptimisticOnExternal>True</CodeContractsBeingOptimisticOnExternal>
-    <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
-    <CodeContractsReferenceAssembly>DoNotBuild</CodeContractsReferenceAssembly>
-    <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -140,17 +88,41 @@
       <HintPath>..\..\lib\Deltares\Deltares.DeltaModel.dll</HintPath>
     </Reference>
     <Reference Include="Deltares.Geographic">
-      <HintPath>..\..\lib\Deltares\DslGeographic\Deltares.Geographic.dll</HintPath>
+      <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll</HintPath>
     </Reference>
+    <Reference Include="Deltares.Geometry">
+      <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Geotechnics">
+      <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
+    </Reference>
     <Reference Include="Deltares.Geotechnics.WaternetCreator">
       <HintPath>..\..\lib\Deltares\Deltares.Geotechnics.WaternetCreator.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.MStab.IO.Classic">
       <HintPath>..\..\lib\Deltares\Deltares.MStab.IO.Classic.dll</HintPath>
     </Reference>
+    <Reference Include="Deltares.Probabilistic">
+      <HintPath>..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll</HintPath>
+    </Reference>
     <Reference Include="Deltares.Stability">
       <HintPath>..\..\lib\Deltares\Deltares.Stability.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.Maps">
+      <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Maps.dll</HintPath>
+    </Reference>
     <Reference Include="LumenWorks.Framework.IO, Version=3.8.0.0, Culture=neutral, PublicKeyToken=5ad3ea2f85776344, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\LumenWorks.Framework.IO.3.8.0\lib\net20\LumenWorks.Framework.IO.dll</HintPath>
@@ -211,80 +183,14 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>"$(ProjectDir)..\..\utils\svn_insert_version.cmd" "$(ProjectDir)Properties"</PreBuildEvent>
+  </PropertyGroup>
   <!-- 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>
   -->
-  <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\DslFormsMap\sources\Deltares.Standard.Maps\Deltares.Standard.Maps.csproj">
-          <Project>{C3BC92C5-49D2-41BB-91B2-F0516A48F5DB}</Project>
-          <Name>Deltares.Standard.Maps</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.Standard.Maps">
-          <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Maps.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geometry">
-          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geotechnics">
-          <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>
-  <PropertyGroup>
-    <PreBuildEvent>"$(ProjectDir)..\..\utils\svn_insert_version.cmd" "$(ProjectDir)Properties"</PreBuildEvent>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
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
Index: src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj
===================================================================
diff -u -r35 -r45
--- src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj	(.../Deltares.DSoilModel.Application.csproj)	(revision 35)
+++ src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj	(.../Deltares.DSoilModel.Application.csproj)	(revision 45)
@@ -28,16 +28,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>
@@ -52,6 +42,23 @@
     <ApplicationIcon>D-SoilModel.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Deltares.Geometry.Forms">
+      <HintPath>..\..\lib\Deltares\DslFormsGeo\Deltares.Geometry.Forms.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Geotechnics.Forms">
+      <HintPath>..\..\lib\Deltares\DslFormsGeo\Deltares.Geotechnics.Forms.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.Forms.DExpress">
+      <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.dll</HintPath>
+    </Reference>
     <Reference Include="DevExpress.BonusSkins.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=95fc6c5621878f0a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Utils.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="System" />
@@ -70,14 +77,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <None Include="..\..\lib\Deltares\GEF\GefBoreNL.dat">
-      <Link>GefBoreNL.dat</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\lib\Deltares\GEF\GefBoreUK.dat">
-      <Link>GefBoreUK.dat</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="packages.config" />
     <None Include="Properties\AssemblyInfo.cs.svn" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -175,51 +174,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\DslFormsStandard\sources\Deltares.Standard.Forms.DExpress\Deltares.Standard.Forms.DExpress.csproj">
-          <Project>{8AA0B08A-B23F-495D-8496-F715451B2978}</Project>
-          <Name>Deltares.Standard.Forms.DExpress</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslFormsGeo\sources\Deltares.Geometry.Forms\Deltares.Geometry.Forms.csproj">
-          <Project>{10F88AE9-B67C-4E2F-92A5-AE5BCF4E4B21}</Project>
-          <Name>Deltares.Geometry.Forms</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslFormsGeo\sources\Deltares.Geotechnics.Forms\Deltares.Geotechnics.Forms.csproj">
-          <Project>{C05D6847-29B0-40DB-A0C6-6328368A6E78}</Project>
-          <Name>Deltares.Geotechnics.Forms</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.Standard.Forms.DExpress">
-          <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geometry.Forms">
-          <HintPath>..\..\lib\Deltares\DslFormsGeo\Deltares.Geometry.Forms.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geotechnics.Forms">
-          <HintPath>..\..\lib\Deltares\DslFormsGeo\Deltares.Geotechnics.Forms.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
 </Project>
\ No newline at end of file
Index: src/DSoilModel.sln
===================================================================
diff -u -r36 -r45
--- src/DSoilModel.sln	(.../DSoilModel.sln)	(revision 36)
+++ src/DSoilModel.sln	(.../DSoilModel.sln)	(revision 45)
@@ -51,8 +51,8 @@
 		{99BF886D-E4BD-4298-960D-25F31C324395}.Debug|x86.Build.0 = Debug|x86
 		{99BF886D-E4BD-4298-960D-25F31C324395}.Release|x86.ActiveCfg = Release|x86
 		{99BF886D-E4BD-4298-960D-25F31C324395}.Release|x86.Build.0 = Release|x86
-		{61D69903-F728-40DF-9B6B-19E45C0621D6}.Debug|x86.ActiveCfg = Debug|x86
-		{61D69903-F728-40DF-9B6B-19E45C0621D6}.Debug|x86.Build.0 = Debug|x86
+		{61D69903-F728-40DF-9B6B-19E45C0621D6}.Debug|x86.ActiveCfg = Release|x86
+		{61D69903-F728-40DF-9B6B-19E45C0621D6}.Debug|x86.Build.0 = Release|x86
 		{61D69903-F728-40DF-9B6B-19E45C0621D6}.Release|x86.ActiveCfg = Release|x86
 		{61D69903-F728-40DF-9B6B-19E45C0621D6}.Release|x86.Build.0 = Release|x86
 		{7F3A1524-E28B-47BF-94BB-4571D304BE16}.Debug|x86.ActiveCfg = Debug|x86
Index: src/Deltares.Soilbase.Test/Deltares.Soilbase.Tests.csproj
===================================================================
diff -u -r31 -r45
--- src/Deltares.Soilbase.Test/Deltares.Soilbase.Tests.csproj	(.../Deltares.Soilbase.Tests.csproj)	(revision 31)
+++ src/Deltares.Soilbase.Test/Deltares.Soilbase.Tests.csproj	(.../Deltares.Soilbase.Tests.csproj)	(revision 45)
@@ -27,15 +27,6 @@
     <ErrorReport>prompt</ErrorReport>
     <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>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -52,6 +43,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Deltares\Deltares.DeltaModel.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.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="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
@@ -101,37 +103,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\DslGeo\sources\Deltares.Geotechnics\Deltares.Geotechnics.csproj">
-          <Project>{03031080-1B65-496D-B28C-47EFB176A203}</Project>
-          <Name>Deltares.Geotechnics</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.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.Probabilistic">
-          <HintPath>..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
 </Project>
\ No newline at end of file
Index: src/Deltares.Geotechnics.IO/Deltares.Geotechnics.IO.csproj
===================================================================
diff -u -r39 -r45
--- src/Deltares.Geotechnics.IO/Deltares.Geotechnics.IO.csproj	(.../Deltares.Geotechnics.IO.csproj)	(revision 39)
+++ src/Deltares.Geotechnics.IO/Deltares.Geotechnics.IO.csproj	(.../Deltares.Geotechnics.IO.csproj)	(revision 45)
@@ -57,50 +57,6 @@
     <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
     <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>
-    <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>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -117,8 +73,26 @@
       <HintPath>..\..\lib\Deltares\Deltares.DeltaModel.dll</HintPath>
     </Reference>
     <Reference Include="Deltares.Geographic">
-      <HintPath>..\..\lib\Deltares\DslGeographic\Deltares.Geographic.dll</HintPath>
+      <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll</HintPath>
     </Reference>
+    <Reference Include="Deltares.Geometry">
+      <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Geotechnics">
+      <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Mathematics, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Probabilistic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1ad0f6a98dfa90ad, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <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="LumenWorks.Framework.IO">
       <HintPath>..\packages\LumenWorks.Framework.IO.3.8.0\lib\net20\LumenWorks.Framework.IO.dll</HintPath>
     </Reference>
@@ -192,56 +166,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\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.Geometry">
-          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geometry.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geotechnics">
-          <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Mathematics, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Probabilistic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1ad0f6a98dfa90ad, processorArchitecture=x86">
-          <SpecificVersion>False</SpecificVersion>
-          <HintPath>..\..\lib\Deltares\DslProbabilistic\Deltares.Probabilistic.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
 </Project>
\ No newline at end of file
Fisheye: Tag 45 refers to a dead (removed) revision in file `src/DSoilModel_Full.sln'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: src/Deltares.DSoilModel.Tests/Deltares.DSoilModel.Tests.csproj
===================================================================
diff -u -r39 -r45
--- src/Deltares.DSoilModel.Tests/Deltares.DSoilModel.Tests.csproj	(.../Deltares.DSoilModel.Tests.csproj)	(revision 39)
+++ src/Deltares.DSoilModel.Tests/Deltares.DSoilModel.Tests.csproj	(.../Deltares.DSoilModel.Tests.csproj)	(revision 45)
@@ -24,17 +24,6 @@
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
     <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>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -50,11 +39,39 @@
   <ItemGroup>
     <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Deltares\DslGeographic\Deltares.Geographic.dll</HintPath>
+      <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\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.Geotechnics.TestUtils">
       <HintPath>..\..\lib\Deltares\DslGeo\Deltares.Geotechnics.TestUtils.dll</HintPath>
     </Reference>
+    <Reference Include="Deltares.Mathematics">
+      <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.Forms.DExpress">
+      <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Standard.Maps">
+      <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Maps.dll</HintPath>
+    </Reference>
     <Reference Include="Deltares.Standard.TestUtils">
       <HintPath>..\..\lib\Deltares\DslCore\Deltares.Standard.TestUtils.dll</HintPath>
     </Reference>
@@ -165,78 +182,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\DslFormsMap\sources\Deltares.Standard.Maps\Deltares.Standard.Maps.csproj">
-          <Project>{C3BC92C5-49D2-41BB-91B2-F0516A48F5DB}</Project>
-          <Name>Deltares.Standard.Maps</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\extern\DslFormsStandard\sources\Deltares.Standard.Forms.DExpress\Deltares.Standard.Forms.DExpress.csproj">
-          <Project>{8AA0B08A-B23F-495D-8496-F715451B2978}</Project>
-          <Name>Deltares.Standard.Forms.DExpress</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.Standard.Maps">
-          <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Standard.Maps.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Standard.Forms.DExpress">
-          <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.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">
-          <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
Fisheye: Tag 45 refers to a dead (removed) revision in file `src/external/utils/svn_insert_version.cmd'.
Fisheye: No comparison available.  Pass `N' to diff?