Index: src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj
===================================================================
diff -u -r30 -r31
--- src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj	(.../Deltares.DSoilModel.Forms.csproj)	(revision 30)
+++ src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj	(.../Deltares.DSoilModel.Forms.csproj)	(revision 31)
@@ -71,6 +71,58 @@
     <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>
@@ -81,16 +133,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>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="BruTile">
       <HintPath>..\..\lib\DotSpatial.BrutileLayer\BruTile.dll</HintPath>
@@ -106,42 +148,16 @@
       <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 Include="BruTile.Desktop">
+      <HintPath>..\..\lib\DotSpatial.BrutileLayer\BruTile.Desktop.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">
+    <Reference Include="Deltares.DeltaModel, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Deltares\DslCore\Deltares.Mathematics.dll</HintPath>
+      <HintPath>..\..\lib\Deltares\Deltares.DeltaModel.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" />
@@ -409,4 +425,95 @@
   <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\DslCore\sources\Deltares.Mathematics\Deltares.Mathematics.csproj">
+          <Project>{1BBC78C4-9901-4771-A4FF-DD3CB5CD601F}</Project>
+          <Name>Deltares.Mathematics</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\..\extern\DslFormsMap\sources\Deltares.Geographic\Deltares.Geographic.csproj">
+          <Project>{07BF5E50-5E70-4B34-A6CA-EF93C8AD3A72}</Project>
+          <Name>Deltares.Geographic</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\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\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.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.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.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.Standard.Forms.DExpress">
+          <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.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