Fisheye: Tag eab9e44ec463eca0edfb6281e367ff3fbd69b5f5 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/Riskeer.MacroStabilityInwards.CalculatedInput.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -reab9e44ec463eca0edfb6281e367ff3fbd69b5f5
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/Riskeer.MacroStabilityInwards.CalculatedInput.csproj	(.../Riskeer.MacroStabilityInwards.CalculatedInput.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/Riskeer.MacroStabilityInwards.CalculatedInput.csproj	(.../Riskeer.MacroStabilityInwards.CalculatedInput.csproj)	(revision eab9e44ec463eca0edfb6281e367ff3fbd69b5f5)
@@ -1,48 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{D0887613-858E-4EED-9320-8C5A09170761}</ProjectGuid>
-    <RootNamespace>Riskeer.MacroStabilityInwards.CalculatedInput</RootNamespace>
-    <AssemblyName>Riskeer.MacroStabilityInwards.CalculatedInput</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Converters\DrainageConstructionConverter.cs" />
-    <Compile Include="Converters\MacroStabilityInwardsWaternetConverter.cs" />
-    <Compile Include="Converters\PhreaticLineOffsetsConverter.cs" />
-    <Compile Include="Converters\SoilProfileConverter.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WaternetCalculationService.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
-      <Name>Riskeer.Common.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.KernelWrapper\Riskeer.MacroStabilityInwards.KernelWrapper.csproj">
-      <Project>{3C0D3B38-A9F7-4B22-9705-513DA26AE2CC}</Project>
-      <Name>Riskeer.MacroStabilityInwards.KernelWrapper</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Primitives\Riskeer.MacroStabilityInwards.Primitives.csproj">
-      <Project>{E9B39743-2DC9-4922-9E0F-6BA3E0E54189}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Primitives</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Riskeer.MacroStabilityInwards.CalculatedInput.Test</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag eab9e44ec463eca0edfb6281e367ff3fbd69b5f5 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/Riskeer.MacroStabilityInwards.Data.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -reab9e44ec463eca0edfb6281e367ff3fbd69b5f5
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/Riskeer.MacroStabilityInwards.Data.csproj	(.../Riskeer.MacroStabilityInwards.Data.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/Riskeer.MacroStabilityInwards.Data.csproj	(.../Riskeer.MacroStabilityInwards.Data.csproj)	(revision eab9e44ec463eca0edfb6281e367ff3fbd69b5f5)
@@ -1,119 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{83D6B73E-91D5-46B0-9218-955DA1F75F7C}</ProjectGuid>
-    <RootNamespace>Riskeer.MacroStabilityInwards.Data</RootNamespace>
-    <AssemblyName>Riskeer.MacroStabilityInwards.Data</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DerivedMacroStabilityInwardsInput.cs" />
-    <Compile Include="DerivedMacroStabilityInwardsOutput.cs" />
-    <Compile Include="DerivedMacroStabilityInwardsOutputFactory.cs" />
-    <Compile Include="MacroStabilityInwardsFailureMechanismAssemblyFactory.cs" />
-    <Compile Include="MacroStabilityInwardsGrid.cs" />
-    <Compile Include="GeneralMacroStabilityInwardsInput.cs" />
-    <Compile Include="MacroStabilityInwardsGridDeterminationType.cs" />
-    <Compile Include="MacroStabilityInwardsCalculation.cs" />
-    <Compile Include="MacroStabilityInwardsCalculationScenario.cs" />
-    <Compile Include="MacroStabilityInwardsCalculationScenarioExtensions.cs" />
-    <Compile Include="MacroStabilityInwardsFailureMechanism.cs" />
-    <Compile Include="MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.cs" />
-    <Compile Include="MacroStabilityInwardsFailureMechanismSectionResult.cs" />
-    <Compile Include="MacroStabilityInwardsInput.cs" />
-    <Compile Include="MacroStabilityInwardsLocationInputExtreme.cs" />
-    <Compile Include="MacroStabilityInwardsLocationInputDaily.cs" />
-    <Compile Include="MacroStabilityInwardsOutput.cs" />
-    <Compile Include="MacroStabilityInwardsSlice.cs" />
-    <Compile Include="MacroStabilityInwardsSlidingCircle.cs" />
-    <Compile Include="MacroStabilityInwardsSlidingCurve.cs" />
-    <Compile Include="MacroStabilityInwardsSlipPlaneUpliftVan.cs" />
-    <Compile Include="MacroStabilityInwardsTangentLineDeterminationType.cs" />
-    <Compile Include="MacroStabilityInwardsLocationInputBase.cs" />
-    <Compile Include="MacroStabilityInwardsZoningBoundariesDeterminationType.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="MacroStabilityInwardsProbabilityAssessmentInput.cs" />
-    <Compile Include="MacroStabilityInwardsSurfaceLineCollection.cs" />
-    <Compile Include="SoilProfile\IMacroStabilityInwardsSoilProfile.cs" />
-    <Compile Include="SoilProfile\MacroStabilityInwardsPreconsolidationStress.cs" />
-    <Compile Include="SoilProfile\MacroStabilityInwardsSoilLayer1D.cs" />
-    <Compile Include="SoilProfile\MacroStabilityInwardsSoilProfile1D.cs" />
-    <Compile Include="SoilProfile\MacroStabilityInwardsSoilProfile2D.cs" />
-    <Compile Include="SoilProfile\MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs" />
-    <Compile Include="SoilProfile\MacroStabilityInwardsSoilProfile2DLayersHelper.cs" />
-    <Compile Include="SoilProfile\MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs" />
-    <Compile Include="SoilProfile\MacroStabilityInwardsStochasticSoilModel.cs" />
-    <Compile Include="SoilProfile\MacroStabilityInwardsStochasticSoilModelCollection.cs" />
-    <Compile Include="SoilProfile\MacroStabilityInwardsStochasticSoilModelExtensions.cs" />
-    <Compile Include="SoilProfile\MacroStabilityInwardsStochasticSoilModelProfileDifference.cs" />
-    <Compile Include="SoilProfile\MacroStabilityInwardsStochasticSoilProfile.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Geometry\Core.Common.Geometry.csproj">
-      <Project>{88665510-CE20-4EF5-BE4A-39800720AA2C}</Project>
-      <Name>Core.Common.Geometry</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Util</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj">
-      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
-      <Name>Riskeer.AssemblyTool.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj">
-      <Project>{358b6da2-a1df-477f-b6ac-c30204265cb0}</Project>
-      <Name>Riskeer.AssemblyTool.KernelWrapper</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
-      <Name>Riskeer.Common.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj">
-      <Project>{78AA56F5-431D-465C-AC50-3173D7E90AC1}</Project>
-      <Name>Riskeer.Common.Primitives</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.CalculatedInput\Riskeer.MacroStabilityInwards.CalculatedInput.csproj">
-      <Project>{D0887613-858E-4EED-9320-8C5A09170761}</Project>
-      <Name>Riskeer.MacroStabilityInwards.CalculatedInput</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Primitives\Riskeer.MacroStabilityInwards.Primitives.csproj">
-      <Project>{E9B39743-2DC9-4922-9E0F-6BA3E0E54189}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Primitives</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag eab9e44ec463eca0edfb6281e367ff3fbd69b5f5 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Riskeer.MacroStabilityInwards.Forms.csproj
===================================================================
diff -u -r71cd7f49ce3b31f4989a61a853380c1dfec16344 -reab9e44ec463eca0edfb6281e367ff3fbd69b5f5
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Riskeer.MacroStabilityInwards.Forms.csproj	(.../Riskeer.MacroStabilityInwards.Forms.csproj)	(revision 71cd7f49ce3b31f4989a61a853380c1dfec16344)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Riskeer.MacroStabilityInwards.Forms.csproj	(.../Riskeer.MacroStabilityInwards.Forms.csproj)	(revision eab9e44ec463eca0edfb6281e367ff3fbd69b5f5)
@@ -1,261 +1,97 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{69EBF07F-20E5-4B5A-8620-C2638191AFED}</ProjectGuid>
-    <RootNamespace>Riskeer.MacroStabilityInwards.Forms</RootNamespace>
-    <AssemblyName>Riskeer.MacroStabilityInwards.Forms</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Factories\MacroStabilityInwardsSliceChartDataFactory.cs" />
-    <Compile Include="Factories\MacroStabilityInwardsSliceChartDataPointsFactory.cs" />
-    <Compile Include="Factories\MacroStabilityInwardsAssemblyMapDataFeaturesFactory.cs" />
-    <Compile Include="MacroStabilityInwardsCalculationConfigurationHelper.cs" />
-    <Compile Include="PresentationObjects\MacroStabilityInwardsFailureMechanismSectionsContext.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsLocationInputExtremeProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsLocationInputDailyProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsSoilLayer2DTopLevelProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsWaternetLineProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsPhreaticLineProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsWaternetProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsWaterStressLinesProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsPreconsolidationStressProperties.cs" />
-    <Compile Include="MacroStabilityInwardsSurfaceLineSelectionDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PresentationObjects\MacroStabilityInwardsOutputContext.cs" />
-    <Compile Include="PresentationObjects\MacroStabilityInwardsScenariosContext.cs" />
-    <Compile Include="PresentationObjects\MacroStabilityInwardsCalculationScenarioContext.cs" />
-    <Compile Include="PresentationObjects\MacroStabilityInwardsCalculationGroupContext.cs" />
-    <Compile Include="PresentationObjects\MacroStabilityInwardsContext.cs" />
-    <Compile Include="PresentationObjects\MacroStabilityInwardsFailureMechanismContext.cs" />
-    <Compile Include="PresentationObjects\MacroStabilityInwardsInputContext.cs" />
-    <Compile Include="PresentationObjects\MacroStabilityInwardsSurfaceLinesContext.cs" />
-    <Compile Include="PresentationObjects\MacroStabilityInwardsStochasticSoilModelCollectionContext.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="PropertyClasses\MacroStabilityInwardsDrainageProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsFailureMechanismProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsGridProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsGridSettingsProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsInputContextProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsLocationInputOffsetProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsOutputProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsSlipPlaneSettingsProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsLocationInputBaseProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsSoilLayer2DBaseProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsSurfaceLineCollectionProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsStochasticSoilModelCollectionProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsSoilLayer1DProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsStochasticSoilProfileProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsSurfaceLineProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsStochasticSoilModelProperties.cs" />
-    <Compile Include="PropertyClasses\MacroStabilityInwardsWaterStressesProperties.cs" />
-    <Compile Include="UITypeEditors\MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditor.cs" />
-    <Compile Include="UITypeEditors\MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditor.cs" />
-    <Compile Include="UITypeEditors\MacroStabilityInwardsInputContextSurfaceLineSelectionEditor.cs" />
-    <Compile Include="Factories\MacroStabilityInwardsChartDataPointsFactory.cs" />
-    <Compile Include="Factories\MacroStabilityInwardsMapDataFeaturesFactory.cs" />
-    <Compile Include="Views\MacroStabilityInwardsSliceRow.cs" />
-    <Compile Include="Views\MacroStabilityInwardsFormattedSoilLayerDataRow.cs" />
-    <Compile Include="Views\MacroStabilityInwardsOutputChartControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Views\MacroStabilityInwardsOutputChartControl.Designer.cs">
-      <DependentUpon>MacroStabilityInwardsOutputChartControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MacroStabilityInwardsOutputView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Views\MacroStabilityInwardsOutputView.Designer.cs">
-      <DependentUpon>MacroStabilityInwardsOutputView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MacroStabilityInwardsScenarioRow.cs" />
-    <Compile Include="Views\MacroStabilityInwardsScenariosView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Views\MacroStabilityInwardsScenariosView.Designer.cs">
-      <DependentUpon>MacroStabilityInwardsScenariosView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Factories\MacroStabilityInwardsChartDataFactory.cs" />
-    <Compile Include="Views\MacroStabilityInwardsInputView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Views\MacroStabilityInwardsInputView.Designer.cs">
-      <DependentUpon>MacroStabilityInwardsInputView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MacroStabilityInwardsCalculationRow.cs" />
-    <Compile Include="Views\MacroStabilityInwardsCalculationsView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Views\MacroStabilityInwardsCalculationsView.Designer.cs">
-      <DependentUpon>MacroStabilityInwardsCalculationsView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MacroStabilityInwardsFailureMechanismResultView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Views\MacroStabilityInwardsFailureMechanismSectionResultRow.cs" />
-    <Compile Include="Views\MacroStabilityInwardsFailureMechanismView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Views\MacroStabilityInwardsFailureMechanismView.Designer.cs">
-      <DependentUpon>MacroStabilityInwardsFailureMechanismView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MacroStabilityInwardsSlicesTable.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Views\MacroStabilityInwardsSoilLayerDataTable.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
-      <Name>Core.Common.Controls</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
-      <Name>Core.Common.Gui</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
-      <Name>Core.Common.Util</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Chart.Forms\Core.Components.Chart.Forms.csproj">
-      <Project>{2465cca1-c505-4827-9454-4fd5fd9194cd}</Project>
-      <Name>Core.Components.Chart.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Chart\Core.Components.Chart.csproj">
-      <Project>{516EBC95-B8F2-428C-B7F6-733F01BF8FDD}</Project>
-      <Name>Core.Components.Chart</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj">
-      <Project>{4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}</Project>
-      <Name>Core.Components.Gis.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318ba582-88c9-4816-a54a-a7e431461de3}</Project>
-      <Name>Core.Components.Gis</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.OxyPlot.Forms\Core.Components.OxyPlot.Forms.csproj">
-      <Project>{dadaa0a5-288c-49cb-9f08-337f16832c86}</Project>
-      <Name>Core.Components.OxyPlot.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj">
-      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
-      <Name>Riskeer.AssemblyTool.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
-      <Name>Riskeer.Common.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj">
-      <Project>{4d840673-3812-4338-a352-84854e32b8a0}</Project>
-      <Name>Riskeer.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj">
-      <Project>{78AA56F5-431D-465C-AC50-3173D7E90AC1}</Project>
-      <Name>Riskeer.Common.Primitives</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Util\Riskeer.Common.Util.csproj">
-      <Project>{6a074d65-a81c-4c1c-8e24-f36c916e4ed7}</Project>
-      <Name>Riskeer.Common.Util</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Data\Riskeer.MacroStabilityInwards.Data.csproj">
-      <Project>{83d6b73e-91d5-46b0-9218-955da1f75f7c}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Primitives\Riskeer.MacroStabilityInwards.Primitives.csproj">
-      <Project>{E9B39743-2DC9-4922-9E0F-6BA3E0E54189}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Primitives</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Service\Riskeer.MacroStabilityInwards.Service.csproj">
-      <Project>{55be9a1b-68ab-488f-af20-e037a50063db}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Service</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\MacroStabilityInwardsOutputChartControl.resx">
-      <DependentUpon>MacroStabilityInwardsOutputChartControl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\MacroStabilityInwardsOutputView.resx">
-      <DependentUpon>MacroStabilityInwardsOutputView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\MacroStabilityInwardsScenariosView.resx">
-      <DependentUpon>MacroStabilityInwardsScenariosView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\MacroStabilityInwardsInputView.resx">
-      <DependentUpon>MacroStabilityInwardsInputView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\MacroStabilityInwardsCalculationsView.resx">
-      <DependentUpon>MacroStabilityInwardsCalculationsView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\MacroStabilityInwardsFailureMechanismView.resx">
-      <DependentUpon>MacroStabilityInwardsFailureMechanismView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\u48.png" />
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\table-import.png" />
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\u48.png" />
+    <None Include="Resources\table-import.png" />
     <None Include="Resources\chart_curve.png" />
+    <None Include="Resources\blue-document-list.png" />
+    <None Include="Resources\shovel.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\blue-document-list.png" />
+    <PackageReference Include="log4net">
+      <Version>2.0.8</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\shovel.png" />
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Riskeer.MacroStabilityInwards.Forms.Test</_Parameter1>
+    </AssemblyAttribute>
   </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag eab9e44ec463eca0edfb6281e367ff3fbd69b5f5 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag eab9e44ec463eca0edfb6281e367ff3fbd69b5f5 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Riskeer.MacroStabilityInwards.IO.csproj
===================================================================
diff -u -r71cd7f49ce3b31f4989a61a853380c1dfec16344 -reab9e44ec463eca0edfb6281e367ff3fbd69b5f5
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Riskeer.MacroStabilityInwards.IO.csproj	(.../Riskeer.MacroStabilityInwards.IO.csproj)	(revision 71cd7f49ce3b31f4989a61a853380c1dfec16344)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Riskeer.MacroStabilityInwards.IO.csproj	(.../Riskeer.MacroStabilityInwards.IO.csproj)	(revision eab9e44ec463eca0edfb6281e367ff3fbd69b5f5)
@@ -1,95 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{0943DDA8-8FAB-4D0B-8E9C-8A1A9B3273B4}</ProjectGuid>
-    <RootNamespace>Riskeer.MacroStabilityInwards.IO</RootNamespace>
-    <AssemblyName>Riskeer.MacroStabilityInwards.IO</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
-    <Compile Include="Configurations\ConfigurationDikeSoilScenario.cs" />
-    <Compile Include="Configurations\ConfigurationZoningBoundariesDeterminationType.cs" />
-    <Compile Include="Configurations\ConfigurationGridDeterminationType.cs" />
-    <Compile Include="Configurations\ConfigurationTangentLineDeterminationType.cs" />
-    <Compile Include="Configurations\Helpers\ConfigurationDikeSoilScenarioTypeConverter.cs" />
-    <Compile Include="Configurations\Helpers\ConfigurationZoningBoundariesDeterminationTypeConverter.cs" />
-    <Compile Include="Configurations\Helpers\ConfigurationGridDeterminationTypeConverter.cs" />
-    <Compile Include="Configurations\Helpers\ConfigurationTangentLineDeterminationTypeConverter.cs" />
-    <Compile Include="Configurations\Helpers\MacroStabilityInwardsGridConversionExtensions.cs" />
-    <Compile Include="Configurations\Helpers\MacroStabilityInwardsLocationInputConversionExtensions.cs" />
-    <Compile Include="Configurations\Helpers\MacroStabilityInwardsXElementExtensions.cs" />
-    <Compile Include="Configurations\MacroStabilityInwardsCalculationConfigurationExporter.cs" />
-    <Compile Include="Configurations\MacroStabilityInwardsCalculationConfigurationWriter.cs" />
-    <Compile Include="Configurations\MacroStabilityInwardsCalculationConfigurationImporter.cs" />
-    <Compile Include="Configurations\MacroStabilityInwardsGridConfiguration.cs" />
-    <Compile Include="Configurations\MacroStabilityInwardsLocationInputExtremeConfiguration.cs" />
-    <Compile Include="Configurations\MacroStabilityInwardsLocationInputConfiguration.cs" />
-    <Compile Include="SoilProfiles\MacroStabilityInwardsPreconsolidationStressTransformer.cs" />
-    <Compile Include="SoilProfiles\MacroStabilityInwardsSoilLayerTransformer.cs" />
-    <Compile Include="SoilProfiles\MacroStabilityInwardsSoilProfileTransformer.cs" />
-    <Compile Include="SoilProfiles\MacroStabilityInwardsStochasticSoilModelFilter.cs" />
-    <Compile Include="SoilProfiles\MacroStabilityInwardsStochasticSoilModelTransformer.cs" />
-    <Compile Include="SoilProfiles\MacroStabilityInwardsStochasticSoilProfileTransformer.cs" />
-    <Compile Include="SurfaceLines\MacroStabilityInwardsSurfaceLineTransformer.cs" />
-    <Compile Include="SurfaceLines\MacroStabilityInwardsSurfaceLineExtensions.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Configurations\MacroStabilityInwardsCalculationConfigurationReader.cs" />
-    <Compile Include="Configurations\MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs" />
-    <Compile Include="Configurations\MacroStabilityInwardsCalculationConfiguration.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.XML" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\..\..\..\build\Copying.licenseheader">
+      <Link>Copying.licenseheader</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
-      <Name>Riskeer.Common.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj">
-      <Project>{52ba7627-cbab-4209-be77-3b5f31378277}</Project>
-      <Name>Riskeer.Common.IO</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Data\Riskeer.MacroStabilityInwards.Data.csproj">
-      <Project>{83d6b73e-91d5-46b0-9218-955da1f75f7c}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Primitives\Riskeer.MacroStabilityInwards.Primitives.csproj">
-      <Project>{e9b39743-2dc9-4922-9e0f-6ba3e0e54189}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Primitives</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.XML" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\build\Copying.licenseheader">
-      <Link>Copying.licenseheader</Link>
-    </None>
-    <None Include="packages.config" />
     <None Include="Resources\MacroStabiliteitBinnenwaartsConfiguratieSchema.xsd">
       <SubType>Designer</SubType>
     </None>
@@ -103,4 +55,14 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="log4net">
+      <Version>2.0.8</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Riskeer.MacroStabilityInwards.IO.Test</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag eab9e44ec463eca0edfb6281e367ff3fbd69b5f5 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag eab9e44ec463eca0edfb6281e367ff3fbd69b5f5 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Riskeer.MacroStabilityInwards.KernelWrapper.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -reab9e44ec463eca0edfb6281e367ff3fbd69b5f5
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Riskeer.MacroStabilityInwards.KernelWrapper.csproj	(.../Riskeer.MacroStabilityInwards.KernelWrapper.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Riskeer.MacroStabilityInwards.KernelWrapper.csproj	(.../Riskeer.MacroStabilityInwards.KernelWrapper.csproj)	(revision eab9e44ec463eca0edfb6281e367ff3fbd69b5f5)
@@ -1,12 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{3C0D3B38-A9F7-4B22-9705-513DA26AE2CC}</ProjectGuid>
-    <RootNamespace>Riskeer.MacroStabilityInwards.KernelWrapper</RootNamespace>
-    <AssemblyName>Riskeer.MacroStabilityInwards.KernelWrapper</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
-  
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -15,88 +8,13 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Calculators\Input\DrainageConstruction.cs" />
-    <Compile Include="Calculators\Input\LandwardDirection.cs" />
-    <Compile Include="Calculators\Input\PhreaticLineOffsets.cs" />
-    <Compile Include="Calculators\Input\PlLineCreationMethod.cs" />
-    <Compile Include="Calculators\Input\PreconsolidationStress.cs" />
-    <Compile Include="Calculators\Input\DilatancyType.cs" />
-    <Compile Include="Calculators\Input\WaternetCreationMode.cs" />
-    <Compile Include="Calculators\UpliftVan\Input\UpliftVanSlipPlaneConstraints.cs" />
-    <Compile Include="Calculators\UpliftVan\Input\UpliftVanSlipPlane.cs" />
-    <Compile Include="Calculators\Input\WaterPressureInterpolationModel.cs" />
-    <Compile Include="Calculators\Input\ShearStrengthModel.cs" />
-    <Compile Include="Calculators\Input\SoilLayer.cs" />
-    <Compile Include="Calculators\Input\SoilProfile.cs" />
-    <Compile Include="Calculators\UpliftVan\UpliftVanCalculatorException.cs" />
-    <Compile Include="Calculators\UpliftVan\UpliftVanKernelMessage.cs" />
-    <Compile Include="Calculators\UpliftVan\UpliftVanKernelMessageType.cs" />
-    <Compile Include="Calculators\Waternet\Input\WaternetCalculatorInput.cs" />
-    <Compile Include="Calculators\Waternet\IWaternetCalculator.cs" />
-    <Compile Include="Calculators\Waternet\Output\WaternetCalculatorResult.cs" />
-    <Compile Include="Calculators\Waternet\Output\WaternetLineResult.cs" />
-    <Compile Include="Calculators\Waternet\Output\WaternetPhreaticLineResult.cs" />
-    <Compile Include="Calculators\Waternet\WaternetCalculator.cs" />
-    <Compile Include="Calculators\Waternet\WaternetCalculatorException.cs" />
-    <Compile Include="Calculators\Waternet\WaternetDailyCalculator.cs" />
-    <Compile Include="Calculators\Waternet\WaternetExtremeCalculator.cs" />
-    <Compile Include="Creators\Input\LayerWithSoil.cs" />
-    <Compile Include="Creators\Input\LayerWithSoilCreator.cs" />
-    <Compile Include="Creators\Input\SlipPlaneUpliftVanCreator.cs" />
-    <Compile Include="Creators\Input\SoilProfileCreator.cs" />
-    <Compile Include="Creators\Input\SlipPlaneConstraintsCreator.cs" />
-    <Compile Include="Creators\Input\UpliftVanStabilityLocationCreator.cs" />
-    <Compile Include="Creators\Input\StabilityLocationCreatorHelper.cs" />
-    <Compile Include="Creators\Input\SurfaceLineCreator.cs" />
-    <Compile Include="Calculators\UpliftVan\IUpliftVanCalculator.cs" />
-    <Compile Include="Calculators\IMacroStabilityInwardsCalculatorFactory.cs" />
-    <Compile Include="Calculators\UpliftVan\UpliftVanCalculator.cs" />
-    <Compile Include="Calculators\MacroStabilityInwardsCalculatorFactory.cs" />
-    <Compile Include="Calculators\UpliftVan\Input\UpliftVanCalculatorInput.cs" />
-    <Compile Include="Calculators\UpliftVan\Output\UpliftVanCalculatorResult.cs" />
-    <Compile Include="Creators\Input\SoilModelCreator.cs" />
-    <Compile Include="Calculators\UpliftVan\UpliftVanGrid.cs" />
-    <Compile Include="Calculators\UpliftVan\Output\UpliftVanSliceResult.cs" />
-    <Compile Include="Calculators\UpliftVan\Output\UpliftVanSlidingCircleResult.cs" />
-    <Compile Include="Calculators\UpliftVan\Output\UpliftVanSlidingCurveResult.cs" />
-    <Compile Include="Creators\Input\WaternetStabilityLocationCreator.cs" />
-    <Compile Include="Creators\Output\UpliftVanKernelMessagesCreator.cs" />
-    <Compile Include="Creators\Output\WaternetCalculatorResultCreator.cs" />
-    <Compile Include="Kernels\UpliftVan\UpliftVanKernelWrapperException.cs" />
-    <Compile Include="Kernels\Waternet\IWaternetKernel.cs" />
-    <Compile Include="Kernels\Waternet\WaternetDailyKernelWrapper.cs" />
-    <Compile Include="Kernels\Waternet\WaternetExtremeKernelWrapper.cs" />
-    <Compile Include="Kernels\Waternet\WaternetKernelWrapper.cs" />
-    <Compile Include="Kernels\Waternet\WaternetKernelWrapperException.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Creators\Output\UpliftVanSlidingCurveResultCreator.cs" />
-    <Compile Include="Calculators\UpliftVan\Output\UpliftVanCalculationGridResult.cs" />
-    <Compile Include="Creators\Output\UpliftVanCalculationGridResultCreator.cs" />
-    <Compile Include="Kernels\IMacroStabilityInwardsKernelFactory.cs" />
-    <Compile Include="Kernels\UpliftVan\IUpliftVanKernel.cs" />
-    <Compile Include="Kernels\MacroStabilityInwardsKernelWrapperFactory.cs" />
-    <Compile Include="Kernels\UpliftVan\UpliftVanKernelWrapper.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
-      <Name>Riskeer.Common.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Primitives\Riskeer.MacroStabilityInwards.Primitives.csproj">
-      <Project>{e9b39743-2dc9-4922-9e0f-6ba3e0e54189}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Primitives</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
@@ -106,10 +24,27 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Riskeer.MacroStabilityInwards.KernelWrapper.Test</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Riskeer.MacroStabilityInwards.Service.Test</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag eab9e44ec463eca0edfb6281e367ff3fbd69b5f5 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/Riskeer.MacroStabilityInwards.Plugin.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -reab9e44ec463eca0edfb6281e367ff3fbd69b5f5
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/Riskeer.MacroStabilityInwards.Plugin.csproj	(.../Riskeer.MacroStabilityInwards.Plugin.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/Riskeer.MacroStabilityInwards.Plugin.csproj	(.../Riskeer.MacroStabilityInwards.Plugin.csproj)	(revision eab9e44ec463eca0edfb6281e367ff3fbd69b5f5)
@@ -1,11 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{B6B27968-6B39-48DF-B2E5-CBABF362808C}</ProjectGuid>
-    <RootNamespace>Riskeer.MacroStabilityInwards.Plugin</RootNamespace>
-    <AssemblyName>Riskeer.MacroStabilityInwards.Plugin</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
@@ -16,123 +10,77 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="FileImporter\MacroStabilityInwardsStochasticSoilModelImporterConfigurationFactory.cs" />
-    <Compile Include="FileImporter\MacroStabilityInwardsStochasticSoilModelReplaceDataStrategy.cs" />
-    <Compile Include="FileImporter\MacroStabilityInwardsStochasticSoilModelUpdateDataStrategy.cs" />
-    <Compile Include="FileImporter\MacroStabilityInwardsSurfaceLineReplaceDataStrategy.cs" />
-    <Compile Include="FileImporter\MacroStabilityInwardsSurfaceLineUpdateDataStrategy.cs" />
-    <Compile Include="FileImporter\MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategy.cs" />
-    <Compile Include="FileImporter\SurfaceLinesCsvImporterConfigurationFactory.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="MacroStabilityInwardsPlugin.cs" />
+    <None Include="..\..\..\..\build\Copying.licenseheader">
+      <Link>Copying.licenseheader</Link>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
-      <Project>{1d27f91f-4e62-4eaf-a0a8-a32708b9a9b1}</Project>
-      <Name>Core.Common.Controls.TreeView</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
-      <Name>Core.Common.Controls</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
-      <Name>Core.Common.Gui</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Util</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Chart.Forms\Core.Components.Chart.Forms.csproj">
-      <Project>{2465cca1-c505-4827-9454-4fd5fd9194cd}</Project>
-      <Name>Core.Components.Chart.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj">
-      <Project>{4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}</Project>
-      <Name>Core.Components.Gis.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
-      <Name>Riskeer.Common.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj">
-      <Project>{4d840673-3812-4338-a352-84854e32b8a0}</Project>
-      <Name>Riskeer.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj">
-      <Project>{52ba7627-cbab-4209-be77-3b5f31378277}</Project>
-      <Name>Riskeer.Common.IO</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Plugin\Riskeer.Common.Plugin.csproj">
-      <Project>{8513B8D6-79C8-4173-B663-59C91AC65E5F}</Project>
-      <Name>Riskeer.Common.Plugin</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj">
-      <Project>{78AA56F5-431D-465C-AC50-3173D7E90AC1}</Project>
-      <Name>Riskeer.Common.Primitives</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Service\Riskeer.Common.Service.csproj">
-      <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
-      <Name>Riskeer.Common.Service</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Data\Riskeer.MacroStabilityInwards.Data.csproj">
-      <Project>{83d6b73e-91d5-46b0-9218-955da1f75f7c}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Forms\Riskeer.MacroStabilityInwards.Forms.csproj">
-      <Project>{69ebf07f-20e5-4b5a-8620-c2638191afed}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.IO\Riskeer.MacroStabilityInwards.IO.csproj">
-      <Project>{0943dda8-8fab-4d0b-8e9c-8a1a9b3273b4}</Project>
-      <Name>Riskeer.MacroStabilityInwards.IO</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Primitives\Riskeer.MacroStabilityInwards.Primitives.csproj">
-      <Project>{e9b39743-2dc9-4922-9e0f-6ba3e0e54189}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Primitives</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Service\Riskeer.MacroStabilityInwards.Service.csproj">
-      <Project>{55be9a1b-68ab-488f-af20-e037a50063db}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Service</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\build\Copying.licenseheader">
-      <Link>Copying.licenseheader</Link>
-    </None>
-  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag eab9e44ec463eca0edfb6281e367ff3fbd69b5f5 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Primitives/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Primitives/Riskeer.MacroStabilityInwards.Primitives.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -reab9e44ec463eca0edfb6281e367ff3fbd69b5f5
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Primitives/Riskeer.MacroStabilityInwards.Primitives.csproj	(.../Riskeer.MacroStabilityInwards.Primitives.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Primitives/Riskeer.MacroStabilityInwards.Primitives.csproj	(.../Riskeer.MacroStabilityInwards.Primitives.csproj)	(revision eab9e44ec463eca0edfb6281e367ff3fbd69b5f5)
@@ -1,55 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{E9B39743-2DC9-4922-9E0F-6BA3E0E54189}</ProjectGuid>
-    <RootNamespace>Riskeer.MacroStabilityInwards.Primitives</RootNamespace>
-    <AssemblyName>Riskeer.MacroStabilityInwards.Primitives</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="IMacroStabilityInwardsLocationInput.cs" />
-    <Compile Include="IMacroStabilityInwardsLocationInputDaily.cs" />
-    <Compile Include="IMacroStabilityInwardsLocationInputExtreme.cs" />
-    <Compile Include="IMacroStabilityInwardsSoilLayer.cs" />
-    <Compile Include="IMacroStabilityInwardsWaternetInput.cs" />
-    <Compile Include="IMacroStabilityInwardsPreconsolidationStress.cs" />
-    <Compile Include="IMacroStabilityInwardsSoilProfileUnderSurfaceLine.cs" />
-    <Compile Include="MacroStabilityInwardsDikeSoilScenario.cs" />
-    <Compile Include="MacroStabilityInwardsPhreaticLine.cs" />
-    <Compile Include="MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs" />
-    <Compile Include="MacroStabilityInwardsShearStrengthModel.cs" />
-    <Compile Include="MacroStabilityInwardsSoilLayer2D.cs" />
-    <Compile Include="MacroStabilityInwardsSoilLayerData.cs" />
-    <Compile Include="MacroStabilityInwardsWaternet.cs" />
-    <Compile Include="MacroStabilityInwardsWaternetLine.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="MacroStabilityInwardsSurfaceLine.cs" />
-    <Compile Include="Ring.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Util</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
-      <Name>Riskeer.Common.Data</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
@@ -59,10 +22,17 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+
 </Project>
\ No newline at end of file
Fisheye: Tag eab9e44ec463eca0edfb6281e367ff3fbd69b5f5 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/Riskeer.MacroStabilityInwards.Service.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -reab9e44ec463eca0edfb6281e367ff3fbd69b5f5
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/Riskeer.MacroStabilityInwards.Service.csproj	(.../Riskeer.MacroStabilityInwards.Service.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/Riskeer.MacroStabilityInwards.Service.csproj	(.../Riskeer.MacroStabilityInwards.Service.csproj)	(revision eab9e44ec463eca0edfb6281e367ff3fbd69b5f5)
@@ -1,85 +1,56 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{55BE9A1B-68AB-488F-AF20-E037A50063DB}</ProjectGuid>
-    <RootNamespace>Riskeer.MacroStabilityInwards.Service</RootNamespace>
-    <AssemblyName>Riskeer.MacroStabilityInwards.Service</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Converters\MacroStabilityInwardsSlidingCurveConverter.cs" />
-    <Compile Include="Converters\MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs" />
-    <Compile Include="Converters\UpliftVanSlipPlaneConstraintsConverter.cs" />
-    <Compile Include="Converters\UpliftVanSlipPlaneConverter.cs" />
-    <Compile Include="MacroStabilityInwardsCalculationActivity.cs" />
-    <Compile Include="MacroStabilityInwardsCalculationService.cs" />
-    <Compile Include="MacroStabilityInwardsDataSynchronizationService.cs" />
-    <Compile Include="MacroStabilityInwardsInputService.cs" />
-    <Compile Include="MacroStabilityInwardsInputValidator.cs" />
-    <Compile Include="MacroStabilityInwardsCalculationActivityFactory.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
+    <None Include="..\..\..\..\build\Copying.licenseheader">
+      <Link>Copying.licenseheader</Link>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
-      <Name>Riskeer.Common.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj">
-      <Project>{4d840673-3812-4338-a352-84854e32b8a0}</Project>
-      <Name>Riskeer.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Service\Riskeer.Common.Service.csproj">
-      <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
-      <Name>Riskeer.Common.Service</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.CalculatedInput\Riskeer.MacroStabilityInwards.CalculatedInput.csproj">
-      <Project>{d0887613-858e-4eed-9320-8c5a09170761}</Project>
-      <Name>Riskeer.MacroStabilityInwards.CalculatedInput</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Data\Riskeer.MacroStabilityInwards.Data.csproj">
-      <Project>{83d6b73e-91d5-46b0-9218-955da1f75f7c}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.KernelWrapper\Riskeer.MacroStabilityInwards.KernelWrapper.csproj">
-      <Project>{3c0d3b38-a9f7-4b22-9705-513da26ae2cc}</Project>
-      <Name>Riskeer.MacroStabilityInwards.KernelWrapper</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Riskeer.MacroStabilityInwards.Primitives\Riskeer.MacroStabilityInwards.Primitives.csproj">
-      <Project>{e9b39743-2dc9-4922-9e0f-6ba3e0e54189}</Project>
-      <Name>Riskeer.MacroStabilityInwards.Primitives</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\..\build\Copying.licenseheader">
-      <Link>Copying.licenseheader</Link>
-    </None>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Riskeer.MacroStabilityInwards.Service.Test</_Parameter1>
+    </AssemblyAttribute>
   </ItemGroup>
 </Project>
\ No newline at end of file