Index: Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj	(.../Application.Riskeer.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj	(.../Application.Riskeer.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -10,17 +10,17 @@
     <None Remove="Resources\MadeBy.png" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
     
     
     
+    
+    
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="WindowsBase" />
+    
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
Index: Application/Riskeer/test/Application.Riskeer.Integration.Test/Application.Riskeer.Integration.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Application/Riskeer/test/Application.Riskeer.Integration.Test/Application.Riskeer.Integration.Test.csproj	(.../Application.Riskeer.Integration.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Application/Riskeer/test/Application.Riskeer.Integration.Test/Application.Riskeer.Integration.Test.csproj	(.../Application.Riskeer.Integration.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -6,13 +6,13 @@
     <None Remove="test-data\**" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Application/Riskeer/test/Application.Riskeer.Test/Application.Riskeer.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Application/Riskeer/test/Application.Riskeer.Test/Application.Riskeer.Test.csproj	(.../Application.Riskeer.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Application/Riskeer/test/Application.Riskeer.Test/Application.Riskeer.Test.csproj	(.../Application.Riskeer.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="$(SolutionDir)build\Test.targets" />
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -5,13 +5,13 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core.Common.Base\Core.Common.Base.csproj" />
Index: Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj	(.../Core.Common.Controls.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj	(.../Core.Common.Controls.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -4,13 +4,13 @@
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
Index: Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -14,15 +14,15 @@
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj" />
Index: Core/Common/test/Core.Common.Util.Test/Core.Common.Util.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Core/Common/test/Core.Common.Util.Test/Core.Common.Util.Test.csproj	(.../Core.Common.Util.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Core/Common/test/Core.Common.Util.Test/Core.Common.Util.Test.csproj	(.../Core.Common.Util.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -6,12 +6,12 @@
     <None Remove="test-data\**" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="PresentationCore" />
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj" />
Index: Core/Components/src/Core.Components.GraphSharp.Forms/Core.Components.GraphSharp.Forms.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Core/Components/src/Core.Components.GraphSharp.Forms/Core.Components.GraphSharp.Forms.csproj	(.../Core.Components.GraphSharp.Forms.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Core/Components/src/Core.Components.GraphSharp.Forms/Core.Components.GraphSharp.Forms.csproj	(.../Core.Components.GraphSharp.Forms.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -4,15 +4,15 @@
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
+    
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Components/src/Core.Components.GraphSharp/Core.Components.GraphSharp.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Core/Components/src/Core.Components.GraphSharp/Core.Components.GraphSharp.csproj	(.../Core.Components.GraphSharp.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Core/Components/src/Core.Components.GraphSharp/Core.Components.GraphSharp.csproj	(.../Core.Components.GraphSharp.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -5,11 +5,11 @@
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PresentationCore" />
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
Index: Core/Components/test/Core.Components.GraphSharp.Forms.Test/Core.Components.GraphSharp.Forms.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Core/Components/test/Core.Components.GraphSharp.Forms.Test/Core.Components.GraphSharp.Forms.Test.csproj	(.../Core.Components.GraphSharp.Forms.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Core/Components/test/Core.Components.GraphSharp.Forms.Test/Core.Components.GraphSharp.Forms.Test.csproj	(.../Core.Components.GraphSharp.Forms.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="$(SolutionDir)build\Test.targets" />
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
Index: Core/Components/test/Core.Components.GraphSharp.Test/Core.Components.GraphSharp.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Core/Components/test/Core.Components.GraphSharp.Test/Core.Components.GraphSharp.Test.csproj	(.../Core.Components.GraphSharp.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Core/Components/test/Core.Components.GraphSharp.Test/Core.Components.GraphSharp.Test.csproj	(.../Core.Components.GraphSharp.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="$(SolutionDir)build\Test.targets" />
   <ItemGroup>
-    <Reference Include="PresentationCore" />
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
Index: Core/Components/test/Core.Components.GraphSharp.TestUtil/Core.Components.GraphSharp.TestUtil.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Core/Components/test/Core.Components.GraphSharp.TestUtil/Core.Components.GraphSharp.TestUtil.csproj	(.../Core.Components.GraphSharp.TestUtil.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Core/Components/test/Core.Components.GraphSharp.TestUtil/Core.Components.GraphSharp.TestUtil.csproj	(.../Core.Components.GraphSharp.TestUtil.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -12,11 +12,11 @@
     <ProjectReference Include="..\..\src\Core.Components.GraphSharp\Core.Components.GraphSharp.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
-    <Reference Include="WindowsBase" />
+    
+    
+    
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Gui/src/Core.Gui/Core.Gui.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Core/Gui/src/Core.Gui/Core.Gui.csproj	(.../Core.Gui.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Core/Gui/src/Core.Gui/Core.Gui.csproj	(.../Core.Gui.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -6,8 +6,6 @@
     <EnableDefaultPageItems>false</EnableDefaultPageItems>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
     
@@ -16,7 +14,9 @@
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
+    
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Gui/test/Core.Gui.Test/Core.Gui.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Core/Gui/test/Core.Gui.Test/Core.Gui.Test.csproj	(.../Core.Gui.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Core/Gui/test/Core.Gui.Test/Core.Gui.Test.csproj	(.../Core.Gui.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -4,16 +4,16 @@
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
     
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
+    
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Gui/test/Core.Gui.TestUtil/Core.Gui.TestUtil.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Core/Gui/test/Core.Gui.TestUtil/Core.Gui.TestUtil.csproj	(.../Core.Gui.TestUtil.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Core/Gui/test/Core.Gui.TestUtil/Core.Gui.TestUtil.csproj	(.../Core.Gui.TestUtil.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -4,7 +4,7 @@
     
     
     
-    <Reference Include="WindowsBase" />
+    
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/Riskeer.ClosingStructures.Plugin.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/Riskeer.ClosingStructures.Plugin.Test.csproj	(.../Riskeer.ClosingStructures.Plugin.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/Riskeer.ClosingStructures.Plugin.Test.csproj	(.../Riskeer.ClosingStructures.Plugin.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -4,11 +4,11 @@
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
     
     
     
     
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Riskeer/Common/src/Riskeer.Common.Forms/Riskeer.Common.Forms.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/Common/src/Riskeer.Common.Forms/Riskeer.Common.Forms.csproj	(.../Riskeer.Common.Forms.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Riskeer.Common.Forms.csproj	(.../Riskeer.Common.Forms.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="$(SolutionDir)build\Source.targets" />
   <ItemGroup>
-    <Reference Include="PresentationCore" />
     
     
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
Index: Riskeer/Common/src/Riskeer.Common.Plugin/Riskeer.Common.Plugin.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/Common/src/Riskeer.Common.Plugin/Riskeer.Common.Plugin.csproj	(.../Riskeer.Common.Plugin.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/Common/src/Riskeer.Common.Plugin/Riskeer.Common.Plugin.csproj	(.../Riskeer.Common.Plugin.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="$(SolutionDir)build\Source.targets" />
   <ItemGroup>
-    <Reference Include="PresentationCore" />
     
     
     
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Riskeer/Common/test/Riskeer.Common.Plugin.Test/Riskeer.Common.Plugin.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/Common/test/Riskeer.Common.Plugin.Test/Riskeer.Common.Plugin.Test.csproj	(.../Riskeer.Common.Plugin.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.Test/Riskeer.Common.Plugin.Test.csproj	(.../Riskeer.Common.Plugin.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="$(SolutionDir)build\Test.targets" />
   <ItemGroup>
-    <Reference Include="PresentationCore" />
     
     
     
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/Riskeer.GrassCoverErosionInwards.Plugin.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/Riskeer.GrassCoverErosionInwards.Plugin.Test.csproj	(.../Riskeer.GrassCoverErosionInwards.Plugin.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/Riskeer.GrassCoverErosionInwards.Plugin.Test.csproj	(.../Riskeer.GrassCoverErosionInwards.Plugin.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -4,11 +4,11 @@
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
     
     
     
     
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/Riskeer.GrassCoverErosionOutwards.Plugin.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/Riskeer.GrassCoverErosionOutwards.Plugin.Test.csproj	(.../Riskeer.GrassCoverErosionOutwards.Plugin.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/Riskeer.GrassCoverErosionOutwards.Plugin.Test.csproj	(.../Riskeer.GrassCoverErosionOutwards.Plugin.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -4,11 +4,11 @@
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
     
     
     
     
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/Riskeer.HeightStructures.Plugin.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/Riskeer.HeightStructures.Plugin.Test.csproj	(.../Riskeer.HeightStructures.Plugin.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/Riskeer.HeightStructures.Plugin.Test.csproj	(.../Riskeer.HeightStructures.Plugin.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -4,11 +4,11 @@
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
     
     
     
     
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj	(.../Riskeer.Integration.Plugin.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj	(.../Riskeer.Integration.Plugin.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="$(SolutionDir)build\Source.targets" />
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj	(.../Riskeer.Integration.Plugin.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj	(.../Riskeer.Integration.Plugin.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -9,14 +9,14 @@
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/Riskeer.MacroStabilityInwards.Plugin.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/Riskeer.MacroStabilityInwards.Plugin.csproj	(.../Riskeer.MacroStabilityInwards.Plugin.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/Riskeer.MacroStabilityInwards.Plugin.csproj	(.../Riskeer.MacroStabilityInwards.Plugin.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -4,13 +4,13 @@
     <Reference Include="Components.Persistence.Stability">
       <HintPath>..\..\..\..\lib\Plugins\Wti\Components.Persistence.Stability.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
     
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/Riskeer.MacroStabilityInwards.Plugin.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/Riskeer.MacroStabilityInwards.Plugin.Test.csproj	(.../Riskeer.MacroStabilityInwards.Plugin.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/Riskeer.MacroStabilityInwards.Plugin.Test.csproj	(.../Riskeer.MacroStabilityInwards.Plugin.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -9,13 +9,13 @@
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
     
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/Riskeer.Piping.Plugin.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/Riskeer.Piping.Plugin.csproj	(.../Riskeer.Piping.Plugin.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/Riskeer.Piping.Plugin.csproj	(.../Riskeer.Piping.Plugin.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="$(SolutionDir)build\Source.targets" />
   <ItemGroup>
-    <Reference Include="PresentationCore" />
     
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/Riskeer.Piping.Plugin.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/Riskeer.Piping.Plugin.Test.csproj	(.../Riskeer.Piping.Plugin.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/Riskeer.Piping.Plugin.Test.csproj	(.../Riskeer.Piping.Plugin.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -4,13 +4,13 @@
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
     
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/Riskeer.StabilityPointStructures.Plugin.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/Riskeer.StabilityPointStructures.Plugin.Test.csproj	(.../Riskeer.StabilityPointStructures.Plugin.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/Riskeer.StabilityPointStructures.Plugin.Test.csproj	(.../Riskeer.StabilityPointStructures.Plugin.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -4,7 +4,7 @@
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
+    
     <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
       <Private>True</Private>
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/Riskeer.StabilityStoneCover.Plugin.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/Riskeer.StabilityStoneCover.Plugin.Test.csproj	(.../Riskeer.StabilityStoneCover.Plugin.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/Riskeer.StabilityStoneCover.Plugin.Test.csproj	(.../Riskeer.StabilityStoneCover.Plugin.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -4,11 +4,11 @@
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
     
     
     
     
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Riskeer.Storage.Core.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Riskeer.Storage.Core.Test.csproj	(.../Riskeer.Storage.Core.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Riskeer.Storage.Core.Test.csproj	(.../Riskeer.Storage.Core.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -6,16 +6,16 @@
     <None Remove="test-data\**" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     
     
     
     
     
     
     
-    <Reference Include="WindowsBase" />
+    
+    
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj
===================================================================
diff -u -ra9b873fb46b7760fd9a98f47ebc96570164aab87 -r724b38c17d254f1c5a2043b92336e293ccf2a73e
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj	(.../Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj)	(revision a9b873fb46b7760fd9a98f47ebc96570164aab87)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj	(.../Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj)	(revision 724b38c17d254f1c5a2043b92336e293ccf2a73e)
@@ -4,11 +4,11 @@
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationCore" />
     
     
     
     
+    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">