Index: Migration/Console/src/Migration.Console/Migration.Console.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -r9b1f7014dd34ee1b9f90a96e828bf55f648cd04c
--- Migration/Console/src/Migration.Console/Migration.Console.csproj	(.../Migration.Console.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Migration/Console/src/Migration.Console/Migration.Console.csproj	(.../Migration.Console.csproj)	(revision 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c)
@@ -1,44 +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>{2E2C9B96-E72A-4C10-AA54-A5381FE30B0D}</ProjectGuid>
-    <RootNamespace>Migration.Console</RootNamespace>
-    <AssemblyName>Migration.Console</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="EnvironmentControl.cs" />
-    <Compile Include="ErrorCode.cs" />
-    <Compile Include="ConsoleHelper.cs" />
-    <Compile Include="ConsoleBase.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\..\Scripts\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj">
-      <Project>{D08DB9E2-6861-44C8-A725-71A70274CC77}</Project>
-      <Name>Migration.Scripts.Data</Name>
       <Private>False</Private>
     </ProjectReference>
   </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 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Console/src/Migration.Console/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Migration/Console/test/Migration.Console.Test/Migration.Console.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r9b1f7014dd34ee1b9f90a96e828bf55f648cd04c
--- Migration/Console/test/Migration.Console.Test/Migration.Console.Test.csproj	(.../Migration.Console.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Migration/Console/test/Migration.Console.Test/Migration.Console.Test.csproj	(.../Migration.Console.Test.csproj)	(revision 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c)
@@ -1,43 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{FC777320-4550-45DF-B31B-C33BA4505AC4}</ProjectGuid>
-    <RootNamespace>Migration.Console.Test</RootNamespace>
-    <AssemblyName>Migration.Console.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <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="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ConsoleBaseTest.cs" />
-    <Compile Include="ConsoleHelperTest.cs" />
-    <Compile Include="EnvironmentControlTest.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="..\..\..\Scripts\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj">
-      <Project>{D08DB9E2-6861-44C8-A725-71A70274CC77}</Project>
-      <Name>Migration.Scripts.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Migration.Console\Migration.Console.csproj">
-      <Project>{2E2C9B96-E72A-4C10-AA54-A5381FE30B0D}</Project>
-      <Name>Migration.Console</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Migration.Console.TestUtil\Migration.Console.TestUtil.csproj">
-      <Project>{679D3CE6-0820-49CF-9D56-D1CF7F1B853A}</Project>
-      <Name>Migration.Console.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\Scripts\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Migration.Console\Migration.Console.csproj"/>
+    <ProjectReference Include="..\Migration.Console.TestUtil\Migration.Console.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Console/test/Migration.Console.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Console/test/Migration.Console.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Migration/Console/test/Migration.Console.TestUtil.Test/Migration.Console.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r9b1f7014dd34ee1b9f90a96e828bf55f648cd04c
--- Migration/Console/test/Migration.Console.TestUtil.Test/Migration.Console.TestUtil.Test.csproj	(.../Migration.Console.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Migration/Console/test/Migration.Console.TestUtil.Test/Migration.Console.TestUtil.Test.csproj	(.../Migration.Console.TestUtil.Test.csproj)	(revision 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c)
@@ -1,42 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{420712BC-8C50-4033-9261-19C7D5641657}</ProjectGuid>
-    <RootNamespace>Migration.Console.TestUtil.Test</RootNamespace>
-    <AssemblyName>Migration.Console.TestUtil.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <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="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ConsoleOutputTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestEnvironmentControlTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\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\Migration.Console\Migration.Console.csproj">
-      <Project>{2E2C9B96-E72A-4C10-AA54-A5381FE30B0D}</Project>
-      <Name>Migration.Console</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Migration.Console.TestUtil\Migration.Console.TestUtil.csproj">
-      <Project>{679D3CE6-0820-49CF-9D56-D1CF7F1B853A}</Project>
-      <Name>Migration.Console.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Migration.Console\Migration.Console.csproj"/>
+    <ProjectReference Include="..\Migration.Console.TestUtil\Migration.Console.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Console/test/Migration.Console.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Console/test/Migration.Console.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Migration/Console/test/Migration.Console.TestUtil/Migration.Console.TestUtil.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -r9b1f7014dd34ee1b9f90a96e828bf55f648cd04c
--- Migration/Console/test/Migration.Console.TestUtil/Migration.Console.TestUtil.csproj	(.../Migration.Console.TestUtil.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Migration/Console/test/Migration.Console.TestUtil/Migration.Console.TestUtil.csproj	(.../Migration.Console.TestUtil.csproj)	(revision 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c)
@@ -1,29 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{679D3CE6-0820-49CF-9D56-D1CF7F1B853A}</ProjectGuid>
-    <RootNamespace>Migration.Console.TestUtil</RootNamespace>
-    <AssemblyName>Migration.Console.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ConsoleOutput.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestEnvironmentControl.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Migration.Console\Migration.Console.csproj">
-      <Project>{2E2C9B96-E72A-4C10-AA54-A5381FE30B0D}</Project>
-      <Name>Migration.Console</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Migration.Console\Migration.Console.csproj"/>
   </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Console/test/Migration.Console.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Migration/Core/src/Migration.Core.Storage/Migration.Core.Storage.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -r9b1f7014dd34ee1b9f90a96e828bf55f648cd04c
--- Migration/Core/src/Migration.Core.Storage/Migration.Core.Storage.csproj	(.../Migration.Core.Storage.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Migration/Core/src/Migration.Core.Storage/Migration.Core.Storage.csproj	(.../Migration.Core.Storage.csproj)	(revision 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c)
@@ -1,46 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{EFD7E662-5B69-4B71-A448-565B64E9C033}</ProjectGuid>
-    <RootNamespace>Migration.Core.Storage</RootNamespace>
-    <AssemblyName>Migration.Core.Storage</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="VersionedFileMigrator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <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="..\..\..\Scripts\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj">
-      <Project>{d08db9e2-6861-44c8-a725-71a70274cc77}</Project>
-      <Name>Migration.Scripts.Data</Name>
       <Private>False</Private>
     </ProjectReference>
   </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 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Core/src/Migration.Core.Storage/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Migration/Core/test/Migration.Core.Storage.Test/Migration.Core.Storage.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r9b1f7014dd34ee1b9f90a96e828bf55f648cd04c
--- Migration/Core/test/Migration.Core.Storage.Test/Migration.Core.Storage.Test.csproj	(.../Migration.Core.Storage.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Migration/Core/test/Migration.Core.Storage.Test/Migration.Core.Storage.Test.csproj	(.../Migration.Core.Storage.Test.csproj)	(revision 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c)
@@ -1,49 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{01776D8B-4BAC-444C-B566-5E398088BDFC}</ProjectGuid>
-    <RootNamespace>Migration.Core.Storage.Test</RootNamespace>
-    <AssemblyName>Migration.Core.Storage.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <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="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" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="VersionedFileMigratorTest.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="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Scripts\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj">
-      <Project>{D08DB9E2-6861-44C8-A725-71A70274CC77}</Project>
-      <Name>Migration.Scripts.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Scripts\test\Migration.Scripts.Data.TestUtil\Migration.Scripts.Data.TestUtil.csproj">
-      <Project>{E4B36055-A984-4D40-9A70-34354054FE46}</Project>
-      <Name>Migration.Scripts.Data.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Migration.Core.Storage\Migration.Core.Storage.csproj">
-      <Project>{EFD7E662-5B69-4B71-A448-565B64E9C033}</Project>
-      <Name>Migration.Core.Storage</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\Scripts\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj"/>
+    <ProjectReference Include="..\..\..\Scripts\test\Migration.Scripts.Data.TestUtil\Migration.Scripts.Data.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Migration.Core.Storage\Migration.Core.Storage.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <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 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Core/test/Migration.Core.Storage.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Core/test/Migration.Core.Storage.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Migration/Core/test/Migration.Core.Storage.TestUtil.Test/Migration.Core.Storage.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r9b1f7014dd34ee1b9f90a96e828bf55f648cd04c
--- Migration/Core/test/Migration.Core.Storage.TestUtil.Test/Migration.Core.Storage.TestUtil.Test.csproj	(.../Migration.Core.Storage.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Migration/Core/test/Migration.Core.Storage.TestUtil.Test/Migration.Core.Storage.TestUtil.Test.csproj	(.../Migration.Core.Storage.TestUtil.Test.csproj)	(revision 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c)
@@ -1,45 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{36F67E99-1546-4E12-876B-0FC121D52EEB}</ProjectGuid>
-    <RootNamespace>Migration.Core.Storage.TestUtil.Test</RootNamespace>
-    <AssemblyName>Migration.Core.Storage.TestUtil.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <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="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" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestVersionedFileMigratorTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Scripts\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj">
-      <Project>{D08DB9E2-6861-44C8-A725-71A70274CC77}</Project>
-      <Name>Migration.Scripts.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Migration.Core.Storage\Migration.Core.Storage.csproj">
-      <Project>{EFD7E662-5B69-4B71-A448-565B64E9C033}</Project>
-      <Name>Migration.Core.Storage</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Migration.Core.Storage.TestUtil\Migration.Core.Storage.TestUtil.csproj">
-      <Project>{92CFD164-3E35-440A-85A7-A7F5A43B1B12}</Project>
-      <Name>Migration.Core.Storage.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\Scripts\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Migration.Core.Storage\Migration.Core.Storage.csproj"/>
+    <ProjectReference Include="..\Migration.Core.Storage.TestUtil\Migration.Core.Storage.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <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 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Core/test/Migration.Core.Storage.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Core/test/Migration.Core.Storage.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Migration/Core/test/Migration.Core.Storage.TestUtil/Migration.Core.Storage.TestUtil.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -r9b1f7014dd34ee1b9f90a96e828bf55f648cd04c
--- Migration/Core/test/Migration.Core.Storage.TestUtil/Migration.Core.Storage.TestUtil.csproj	(.../Migration.Core.Storage.TestUtil.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Migration/Core/test/Migration.Core.Storage.TestUtil/Migration.Core.Storage.TestUtil.csproj	(.../Migration.Core.Storage.TestUtil.csproj)	(revision 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c)
@@ -1,32 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{92CFD164-3E35-440A-85A7-A7F5A43B1B12}</ProjectGuid>
-    <RootNamespace>Migration.Core.Storage.TestUtil</RootNamespace>
-    <AssemblyName>Migration.Core.Storage.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestVersionedFileMigrator.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Scripts\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj">
-      <Project>{D08DB9E2-6861-44C8-A725-71A70274CC77}</Project>
-      <Name>Migration.Scripts.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Migration.Core.Storage\Migration.Core.Storage.csproj">
-      <Project>{EFD7E662-5B69-4B71-A448-565B64E9C033}</Project>
-      <Name>Migration.Core.Storage</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\Scripts\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Migration.Core.Storage\Migration.Core.Storage.csproj"/>
   </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Core/test/Migration.Core.Storage.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Migration/Scripts/src/Migration.Scripts.Data/Migration.Scripts.Data.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -r9b1f7014dd34ee1b9f90a96e828bf55f648cd04c
--- Migration/Scripts/src/Migration.Scripts.Data/Migration.Scripts.Data.csproj	(.../Migration.Scripts.Data.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Migration/Scripts/src/Migration.Scripts.Data/Migration.Scripts.Data.csproj	(.../Migration.Scripts.Data.csproj)	(revision 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c)
@@ -1,37 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{D08DB9E2-6861-44C8-A725-71A70274CC77}</ProjectGuid>
-    <RootNamespace>Migration.Scripts.Data</RootNamespace>
-    <AssemblyName>Migration.Scripts.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="CreateScript.cs" />
-    <Compile Include="Exceptions\CriticalMigrationException.cs" />
-    <Compile Include="IVersionedFile.cs" />
-    <Compile Include="FileMigrationScript.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UpgradeScript.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.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.Util\Core.Common.Util.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Util</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
Fisheye: Tag 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Scripts/src/Migration.Scripts.Data/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Migration/Scripts/test/Migration.Scripts.Data.Test/Migration.Scripts.Data.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r9b1f7014dd34ee1b9f90a96e828bf55f648cd04c
--- Migration/Scripts/test/Migration.Scripts.Data.Test/Migration.Scripts.Data.Test.csproj	(.../Migration.Scripts.Data.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Migration/Scripts/test/Migration.Scripts.Data.Test/Migration.Scripts.Data.Test.csproj	(.../Migration.Scripts.Data.Test.csproj)	(revision 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c)
@@ -1,48 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{A60F35B7-7538-4516-94BB-09B19FE22FAA}</ProjectGuid>
-    <RootNamespace>Migration.Scripts.Data.Test</RootNamespace>
-    <AssemblyName>Migration.Scripts.Data.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <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="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" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CreateScriptTest.cs" />
-    <Compile Include="Exceptions\CriticalMigrationExceptionTest.cs" />
-    <Compile Include="FileMigrationScriptTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UpgradeScriptTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\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\Migration.Scripts.Data\Migration.Scripts.Data.csproj">
-      <Project>{D08DB9E2-6861-44C8-A725-71A70274CC77}</Project>
-      <Name>Migration.Scripts.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Migration.Scripts.Data.TestUtil\Migration.Scripts.Data.TestUtil.csproj">
-      <Project>{E4B36055-A984-4D40-9A70-34354054FE46}</Project>
-      <Name>Migration.Scripts.Data.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj"/>
+    <ProjectReference Include="..\Migration.Scripts.Data.TestUtil\Migration.Scripts.Data.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <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 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Scripts/test/Migration.Scripts.Data.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Scripts/test/Migration.Scripts.Data.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Migration/Scripts/test/Migration.Scripts.Data.TestUtil.Test/Migration.Scripts.Data.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r9b1f7014dd34ee1b9f90a96e828bf55f648cd04c
--- Migration/Scripts/test/Migration.Scripts.Data.TestUtil.Test/Migration.Scripts.Data.TestUtil.Test.csproj	(.../Migration.Scripts.Data.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Migration/Scripts/test/Migration.Scripts.Data.TestUtil.Test/Migration.Scripts.Data.TestUtil.Test.csproj	(.../Migration.Scripts.Data.TestUtil.Test.csproj)	(revision 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c)
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{8ADC8891-1D6C-4E15-B7BC-DE9641E83BEF}</ProjectGuid>
-    <RootNamespace>Migration.Scripts.Data.TestUtil.Test</RootNamespace>
-    <AssemblyName>Migration.Scripts.Data.TestUtil.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <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="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestCreateScriptTest.cs" />
-    <Compile Include="TestUpgradeScriptTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj">
-      <Project>{D08DB9E2-6861-44C8-A725-71A70274CC77}</Project>
-      <Name>Migration.Scripts.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Migration.Scripts.Data.TestUtil\Migration.Scripts.Data.TestUtil.csproj">
-      <Project>{E4B36055-A984-4D40-9A70-34354054FE46}</Project>
-      <Name>Migration.Scripts.Data.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj"/>
+    <ProjectReference Include="..\Migration.Scripts.Data.TestUtil\Migration.Scripts.Data.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Scripts/test/Migration.Scripts.Data.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Scripts/test/Migration.Scripts.Data.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Migration/Scripts/test/Migration.Scripts.Data.TestUtil/Migration.Scripts.Data.TestUtil.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -r9b1f7014dd34ee1b9f90a96e828bf55f648cd04c
--- Migration/Scripts/test/Migration.Scripts.Data.TestUtil/Migration.Scripts.Data.TestUtil.csproj	(.../Migration.Scripts.Data.TestUtil.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Migration/Scripts/test/Migration.Scripts.Data.TestUtil/Migration.Scripts.Data.TestUtil.csproj	(.../Migration.Scripts.Data.TestUtil.csproj)	(revision 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c)
@@ -1,29 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{E4B36055-A984-4D40-9A70-34354054FE46}</ProjectGuid>
-    <RootNamespace>Migration.Scripts.Data.TestUtil</RootNamespace>
-    <AssemblyName>Migration.Scripts.Data.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestCreateScript.cs" />
-    <Compile Include="TestUpgradeScript.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj">
-      <Project>{D08DB9E2-6861-44C8-A725-71A70274CC77}</Project>
-      <Name>Migration.Scripts.Data</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Migration.Scripts.Data\Migration.Scripts.Data.csproj"/>
   </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 9b1f7014dd34ee1b9f90a96e828bf55f648cd04c refers to a dead (removed) revision in file `Migration/Scripts/test/Migration.Scripts.Data.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?