Index: Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj
===================================================================
diff -u -rb8f28b43208d1dac612347e750f26cd29ffd50e3 -r07749a5eb69caeb103195543e5548dae0f716d37
--- Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj	(.../Core.Components.Gis.Forms.Test.csproj)	(revision b8f28b43208d1dac612347e750f26cd29ffd50e3)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj	(.../Core.Components.Gis.Forms.Test.csproj)	(revision 07749a5eb69caeb103195543e5548dae0f716d37)
@@ -1,87 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{FC8F3315-E129-44AD-8A0E-F7979094EE4C}</ProjectGuid>
-    <RootNamespace>Core.Components.Gis.Forms.Test</RootNamespace>
-    <AssemblyName>Core.Components.Gis.Forms.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="BruTile, Version=0.20.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\BruTile.0.20.0\lib\portable-net45+win+WindowsPhoneApp81+Xamarin.iOS10+MonoAndroid10+MonoTouch10\BruTile.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="NUnitForms, Version=2.0.6219.18980, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <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>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Views\BackgroundMapDataSelectionControlTest.cs" />
-    <Compile Include="Views\WellKnownMapDataControlTest.cs" />
-    <Compile Include="Views\WmtsConnectionDialogTest.cs" />
-    <Compile Include="Views\WmtsLocationControlTest.cs" />
-    <Compile Include="WmtsCapabilityTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="app.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <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="..\..\..\Common\test\Core.Common.Util.TestUtil\Core.Common.Util.TestUtil.csproj">
-      <Project>{45193749-ECE8-40C4-8C4B-0C783AFFACB5}</Project>
-      <Name>Core.Common.Util.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Components.BruTile\Core.Components.BruTile.csproj">
-      <Project>{E02482C7-F12B-42F0-BB2B-C7EC17503A72}</Project>
-      <Name>Core.Components.BruTile</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj">
-      <Project>{4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}</Project>
-      <Name>Core.Components.Gis.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj">
-      <Project>{1081336C-D919-4249-AB33-9AF15F4D19EC}</Project>
-      <Name>Core.Components.BruTile.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj">
-      <Project>{F0FB401A-3494-4237-9E6D-02CDF77912A8}</Project>
-      <Name>Core.Components.Gis.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.Util.TestUtil\Core.Common.Util.TestUtil.csproj" />
+    <ProjectReference Include="..\..\src\Core.Components.BruTile\Core.Components.BruTile.csproj" />
+    <ProjectReference Include="..\..\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj" />
+    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj" />
+    <ProjectReference Include="..\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj" />
+    <ProjectReference Include="..\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BruTile">
+      <Version>0.20.0</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 07749a5eb69caeb103195543e5548dae0f716d37 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.Forms.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 07749a5eb69caeb103195543e5548dae0f716d37 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.Forms.Test/app.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 07749a5eb69caeb103195543e5548dae0f716d37 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.Forms.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?