Index: Core/Components/test/Core.Components.GraphSharp.TestUtil.Test/Core.Components.GraphSharp.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rd33f1d82052fd312b64538ee1b549c183973f8e5
--- Core/Components/test/Core.Components.GraphSharp.TestUtil.Test/Core.Components.GraphSharp.TestUtil.Test.csproj	(.../Core.Components.GraphSharp.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Components/test/Core.Components.GraphSharp.TestUtil.Test/Core.Components.GraphSharp.TestUtil.Test.csproj	(.../Core.Components.GraphSharp.TestUtil.Test.csproj)	(revision d33f1d82052fd312b64538ee1b549c183973f8e5)
@@ -1,77 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{98B55901-9726-4172-A179-E2BF640FEDA8}</ProjectGuid>
-    <RootNamespace>Core.Components.GraphSharp.TestUtil.Test</RootNamespace>
-    <AssemblyName>Core.Components.GraphSharp.TestUtil.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets"/> 
   <ItemGroup>
-    <Compile Include="PointedTreeGraphControlHelperTest.cs" />
-    <Compile Include="PointedTreeTestDataFactoryTest.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>
-    <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="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </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="System.Xaml" />
     <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>
-    <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="..\..\src\Core.Components.PointedTree.Forms\Core.Components.PointedTree.Forms.csproj">
-      <Project>{DBF5A590-2A11-4EB4-A8CC-F3036475E4D5}</Project>
-      <Name>Core.Components.PointedTree.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Core.Components.GraphSharp.TestUtil\Core.Components.GraphSharp.TestUtil.csproj">
-      <Project>{0500CA45-1791-4C91-9243-EF95567068A3}</Project>
-      <Name>Core.Components.GraphSharp.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Components.GraphSharp.Forms\Core.Components.GraphSharp.Forms.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.GraphSharp\Core.Components.GraphSharp.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.PointedTree.Forms\Core.Components.PointedTree.Forms.csproj"/>
+    <ProjectReference Include="..\Core.Components.GraphSharp.TestUtil\Core.Components.GraphSharp.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="GraphSharp">
+      <Version>1.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="WPFExtensions">
+      <Version>1.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag d33f1d82052fd312b64538ee1b549c183973f8e5 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.GraphSharp.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d33f1d82052fd312b64538ee1b549c183973f8e5 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.GraphSharp.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?