Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -rd98a49035ddfbdd477bb48870cee4c3ec18c80f7 -r54eaeeec98bf8513617808fde953a216c569874a
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision d98a49035ddfbdd477bb48870cee4c3ec18c80f7)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 54eaeeec98bf8513617808fde953a216c569874a)
@@ -1,18 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</ProjectGuid>
-    <RootNamespace>Core.Common.Gui</RootNamespace>
-    <AssemblyName>Core.Common.Gui</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
-    <Reference Include="Fluent">
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net45\Fluent.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
@@ -24,216 +12,32 @@
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
     <Reference Include="WindowsFormsIntegration" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=2.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\AvalonDock.2.0.2000\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
-    </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Appenders\RiskeerUserDataFolderConverter.cs" />
-    <Compile Include="Attributes\DynamicPropertyOrderEvaluationMethodAttribute.cs" />
-    <Compile Include="Attributes\DynamicPropertyOrderAttribute.cs" />
-    <Compile Include="Attributes\DynamicReadOnlyAttribute.cs" />
-    <Compile Include="Attributes\DynamicReadOnlyValidationMethodAttribute.cs" />
-    <Compile Include="Attributes\DynamicVisibleAttribute.cs" />
-    <Compile Include="Attributes\DynamicVisibleValidationMethodAttribute.cs" />
-    <Compile Include="Attributes\PropertyOrderAttribute.cs" />
-    <Compile Include="Commands\ApplicationFeatureCommandHandler.cs" />
-    <Compile Include="Commands\GuiExportHandler.cs" />
-    <Compile Include="Commands\GuiUpdateHandler.cs" />
-    <Compile Include="Commands\GuiImportHandler.cs" />
-    <Compile Include="Commands\IApplicationFeatureCommands.cs" />
-    <Compile Include="Commands\ICommandsOwner.cs" />
-    <Compile Include="Commands\IExportCommandHandler.cs" />
-    <Compile Include="Commands\IUpdateCommandHandler.cs" />
-    <Compile Include="Commands\IImportCommandHandler.cs" />
-    <Compile Include="Commands\IStorageCommands.cs" />
-    <Compile Include="Commands\IViewCommands.cs" />
-    <Compile Include="Commands\StorageCommandHandler.cs" />
-    <Compile Include="Commands\ViewCommandHandler.cs" />
-    <Compile Include="ContextMenu\IContextMenuBuilderProvider.cs" />
-    <Compile Include="Converters\ExpandableArrayConverter.cs" />
-    <Compile Include="Converters\ExpandableReadOnlyArrayConverter.cs" />
-    <Compile Include="Converters\ColorTypeConverter.cs" />
-    <Compile Include="Converters\KeyValueAsRoundedDoubleWithoutTrailingZeroesElementAttribute.cs" />
-    <Compile Include="Converters\KeyValueElementAttribute.cs" />
-    <Compile Include="Converters\KeyValueExpandableArrayConverter.cs" />
-    <Compile Include="Converters\PngToIconConverter.cs" />
-    <Compile Include="DialogBasedInquiryHelper.cs" />
-    <Compile Include="ExceptionDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ExceptionDialog.Designer.cs">
-      <DependentUpon>ExceptionDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\MainWindow\MainWindowCommands.cs" />
-    <Compile Include="Forms\MessageWindow\MessageWindowDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\MessageWindow\MessageWindowDialog.Designer.cs">
-      <DependentUpon>MessageWindowDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\RichTextFile.cs" />
-    <Compile Include="Forms\ViewHost\AvalonDockViewHost.xaml.cs">
-      <DependentUpon>AvalonDockViewHost.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\ViewHost\IDocumentViewController.cs" />
-    <Compile Include="Forms\ViewHost\ToolViewLocation.cs" />
-    <Compile Include="Forms\ViewHost\ViewChangeEventArgs.cs" />
-    <Compile Include="IInquiryHelper.cs" />
-    <Compile Include="IViewController.cs" />
-    <Compile Include="IPluginsHost.cs" />
-    <Compile Include="IMainWindowController.cs" />
-    <Compile Include="IProjectOwner.cs" />
-    <Compile Include="OpenProjectActivity.cs" />
-    <Compile Include="OptionalStepResult.cs" />
-    <Compile Include="Plugin\ExportInfo.cs" />
-    <Compile Include="Plugin\UpdateInfo.cs" />
-    <Compile Include="Plugin\ImportInfo.cs" />
-    <Compile Include="Plugin\PluginBase.cs" />
-    <Compile Include="Plugin\PropertyInfo.cs" />
-    <Compile Include="Plugin\ViewInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="PropertyBag\DynamicPropertyBag.cs" />
-    <Compile Include="PropertyBag\IObjectProperties.cs" />
-    <Compile Include="PropertyBag\ObjectProperties.cs" />
-    <Compile Include="PropertyBag\PropertySpec.cs" />
-    <Compile Include="PropertyBag\PropertySpecDescriptor.cs" />
-    <Compile Include="PropertyBag\ReadOnlyPropertyDescriptorDecorator.cs" />
-    <Compile Include="SaveProjectActivity.cs" />
-    <Compile Include="Selection\IApplicationSelection.cs" />
-    <Compile Include="Settings\GuiCoreSettings.cs" />
-    <Compile Include="Settings\ISettingsOwner.cs" />
-    <Compile Include="ContextMenu\ContextMenuBuilderException.cs" />
-    <Compile Include="ContextMenu\IContextMenuBuilder.cs" />
-    <Compile Include="Forms\ProgressDialog\ActivityProgressDialogRunner.cs" />
-    <Compile Include="ContextMenu\ContextMenuBuilder.cs" />
-    <Compile Include="ContextMenu\StrictContextMenuItem.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ContextMenu\TreeViewContextMenuItemFactory.cs" />
-    <Compile Include="Forms\ProgressDialog\ActivityProgressDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\ProgressDialog\ActivityProgressDialog.Designer.cs">
-      <DependentUpon>ActivityProgressDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\PropertyGridView\IPropertyResolver.cs" />
-    <Compile Include="GuiCore.cs" />
-    <Compile Include="ContextMenu\GuiContextMenuItemFactory.cs" />
-    <Compile Include="Forms\IRibbonCommandHandler.cs" />
-    <Compile Include="Forms\IProjectExplorer.cs" />
-    <Compile Include="Forms\MainWindow\IMainWindow.cs" />
-    <Compile Include="Forms\MainWindow\MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\MessageWindow\IMessageWindow.cs" />
-    <Compile Include="Forms\MessageWindow\MessageWindow.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Forms\MessageWindow\MessageWindow.Designer.cs">
-      <DependentUpon>MessageWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\MessageWindow\MessageWindowLogAppender.cs" />
-    <Compile Include="Forms\PropertyGridView\PropertyGridView.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Forms\PropertyGridView\PropertyResolver.cs" />
-    <Compile Include="Forms\RichTextView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Forms\RichTextView.Designer.cs">
-      <DependentUpon>RichTextView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\SelectItemDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\SelectItemDialog.Designer.cs">
-      <DependentUpon>SelectItemDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\SelectViewDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\SelectViewDialog.Designer.cs">
-      <DependentUpon>SelectViewDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\SplashScreen\SplashScreen.xaml.cs">
-      <DependentUpon>SplashScreen.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\ViewHost\IViewHost.cs" />
-    <Compile Include="Forms\ViewHost\DocumentViewController.cs" />
-    <Compile Include="IGui.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UITypeEditors\ColorEditor.cs" />
-    <Compile Include="UITypeEditors\SelectionEditor.cs" />
-    <Compile Include="ViewPropertyEditor.cs" />
+   <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Core.Common.Gui.Test</_Parameter1>
+    </AssemblyAttribute>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\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.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
-      <Project>{1d27f91f-4e62-4eaf-a0a8-a32708b9a9b1}</Project>
-      <Name>Core.Common.Controls.TreeView</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
-      <Name>Core.Common.Controls</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Util</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="ExceptionDialog.resx">
-      <DependentUpon>ExceptionDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\MessageWindow\MessageWindow.resx">
-      <DependentUpon>MessageWindow.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\MessageWindow\MessageWindowDialog.resx">
-      <DependentUpon>MessageWindowDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\ProgressDialog\ActivityProgressDialog.resx">
-      <DependentUpon>ActivityProgressDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\RichTextView.resx">
-      <DependentUpon>RichTextView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\SelectItemDialog.resx">
-      <DependentUpon>SelectItemDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\SelectViewDialog.resx">
-      <DependentUpon>SelectViewDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="nl\Xceed.Wpf.AvalonDock.resources.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -297,4 +101,28 @@
     <None Include="Resources\bug-exclamation.ico" />
     <None Include="Resources\textfield_rename.png" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="AvalonDock">
+      <Version>2.0.2000</Version>
+    </PackageReference>
+    <PackageReference Include="Fluent.Ribbon">
+      <Version>3.4.0</Version>
+    </PackageReference>
+    <PackageReference Include="log4net">
+      <Version>2.0.8</Version>
+    </PackageReference>
+  </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 54eaeeec98bf8513617808fde953a216c569874a refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f -r54eaeeec98bf8513617808fde953a216c569874a
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 54eaeeec98bf8513617808fde953a216c569874a)
@@ -40,7 +40,7 @@
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
Fisheye: Tag 54eaeeec98bf8513617808fde953a216c569874a refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/StorageCommandHandler.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer.sln
===================================================================
diff -u -r35ab361c6739652e8b57865eb816e540af213338 -r54eaeeec98bf8513617808fde953a216c569874a
--- Riskeer.sln	(.../Riskeer.sln)	(revision 35ab361c6739652e8b57865eb816e540af213338)
+++ Riskeer.sln	(.../Riskeer.sln)	(revision 54eaeeec98bf8513617808fde953a216c569874a)
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2026
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29806.167
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{89F6BC2C-78E6-42F1-A056-704C877B5453}"
 EndProject
@@ -127,10 +127,7 @@
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Gui", "Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj", "{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Common.Gui", "Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj", "{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Base", "Core\Common\src\Core.Common.Base\Core.Common.Base.csproj", "{3BBFD65B-B277-4E50-AE6D-BD24C3434609}"
 	ProjectSection(ProjectDependencies) = postProject