Index: Core/Components/test/Core.Components.GraphSharp.TestUtil/Core.Components.GraphSharp.TestUtil.csproj
===================================================================
diff -u -r4b9bb58c473d9c3652aaa5436eabfadb195423b6 -r70f3aff041ddf1f56c44cebc1f7f7819a504fa97
--- Core/Components/test/Core.Components.GraphSharp.TestUtil/Core.Components.GraphSharp.TestUtil.csproj	(.../Core.Components.GraphSharp.TestUtil.csproj)	(revision 4b9bb58c473d9c3652aaa5436eabfadb195423b6)
+++ Core/Components/test/Core.Components.GraphSharp.TestUtil/Core.Components.GraphSharp.TestUtil.csproj	(.../Core.Components.GraphSharp.TestUtil.csproj)	(revision 70f3aff041ddf1f56c44cebc1f7f7819a504fa97)
@@ -1,72 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{0500CA45-1791-4C91-9243-EF95567068A3}</ProjectGuid>
-    <RootNamespace>Core.Components.GraphSharp.TestUtil</RootNamespace>
-    <AssemblyName>Core.Components.GraphSharp.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
-    <Compile Include="PointedTreeGraphControlHelper.cs" />
-    <Compile Include="PointedTreeTestDataFactory.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Util</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Components.GraphSharp.Forms\Core.Components.GraphSharp.Forms.csproj">
-      <Project>{4E575459-AD64-4F5F-B313-9F8E0EC8C03F}</Project>
-      <Name>Core.Components.GraphSharp.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Components.GraphSharp\Core.Components.GraphSharp.csproj">
-      <Project>{32358941-77C5-48A7-AD8B-DFB4F23B12A5}</Project>
-      <Name>Core.Components.GraphSharp</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.GraphSharp.Forms\Core.Components.GraphSharp.Forms.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.GraphSharp\Core.Components.GraphSharp.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="GraphSharp, Version=1.0.2.0, Culture=neutral, PublicKeyToken=f9c24778325a6b82, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="GraphSharp.Controls, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f9c24778325a6b82, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.Controls.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="QuickGraph, Version=3.6.61114.0, Culture=neutral, PublicKeyToken=f3fb40175eec2af3, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="QuickGraph.Data, Version=3.6.61114.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Data.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="QuickGraph.Graphviz, Version=3.6.61114.0, Culture=neutral, PublicKeyToken=f3fb40175eec2af3, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Graphviz.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="QuickGraph.Serialization, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Serialization.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="WindowsBase" />
     <Reference Include="WindowsFormsIntegration" />
-    <Reference Include="WPFExtensions, Version=1.0.3437.34043, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\WPFExtensions.1.0.0\lib\WPFExtensions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="GraphSharp">
+      <Version>1.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="WPFExtensions">
+      <Version>1.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 70f3aff041ddf1f56c44cebc1f7f7819a504fa97 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.GraphSharp.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 70f3aff041ddf1f56c44cebc1f7f7819a504fa97 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.GraphSharp.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?