From 23aae696846513eedea1bebb31a9be3fc1eacdad Mon Sep 17 00:00:00 2001
From: Bertrand Giot <bgiot@dotconsulting.be>
Date: Sat, 10 Oct 2020 10:21:07 +0200
Subject: [PATCH] Move to VS 2019 new project file format

---
 src/Dotc.Common/Dotc.Common.csproj            |  70 +-
 src/Dotc.Common/Dotc.Common.csproj.old        |  82 +++
 .../Dotc.MQ.Websphere.csproj                  | 121 +---
 .../Dotc.MQ.Websphere.csproj.old              | 128 ++++
 src/Dotc.MQ/Dotc.MQ.csproj                    |  68 +-
 src/Dotc.MQ/Dotc.MQ.csproj.old                |  91 +++
 .../Dotc.MQExplorerPlus.Core.csproj           | 249 +------
 .../Dotc.MQExplorerPlus.Core.csproj.old       | 264 +++++++
 .../Dotc.MQExplorerPlus.csproj                | 466 +-----------
 .../Dotc.MQExplorerPlus.csproj.old            | 661 ++++++++++++++++++
 src/Dotc.Mvvm/Dotc.Mvvm.csproj                |  92 +--
 src/Dotc.Mvvm/Dotc.Mvvm.csproj.old            | 116 +++
 src/Dotc.Wpf/Dotc.Wpf.csproj                  | 193 +----
 src/Dotc.Wpf/Dotc.Wpf.csproj.old              | 220 ++++++
 14 files changed, 1688 insertions(+), 1133 deletions(-)
 create mode 100644 src/Dotc.Common/Dotc.Common.csproj.old
 create mode 100644 src/Dotc.MQ.Websphere/Dotc.MQ.Websphere.csproj.old
 create mode 100644 src/Dotc.MQ/Dotc.MQ.csproj.old
 create mode 100644 src/Dotc.MQExplorerPlus.Core/Dotc.MQExplorerPlus.Core.csproj.old
 create mode 100644 src/Dotc.MQExplorerPlus/Dotc.MQExplorerPlus.csproj.old
 create mode 100644 src/Dotc.Mvvm/Dotc.Mvvm.csproj.old
 create mode 100644 src/Dotc.Wpf/Dotc.Wpf.csproj.old

diff --git a/src/Dotc.Common/Dotc.Common.csproj b/src/Dotc.Common/Dotc.Common.csproj
index fc47037..05812ff 100644
--- a/src/Dotc.Common/Dotc.Common.csproj
+++ b/src/Dotc.Common/Dotc.Common.csproj
@@ -1,58 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{8A198528-4367-4670-8F24-863404FA0A9C}</ProjectGuid>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Dotc.Common</RootNamespace>
-    <AssemblyName>Dotc.Common</AssemblyName>
-    <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
     <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\Infra.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\DotAssemblyInfo.cs">
       <Link>Properties\DotAssemblyInfo.cs</Link>
@@ -60,23 +20,9 @@
     <Compile Include="..\InfraAssemblyInfo.cs">
       <Link>Properties\InfraAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="ClipboardHelper.cs" />
-    <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="NativeMethods.cs" />
-    <Compile Include="ObservableObject.cs" />
-    <Compile Include="SqlFormatProvider.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UriExtensions.cs" />
-    <Compile Include="UrlFormatProvider.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <!--  <Import Project="..\VersionSpecificSymbols.Common.prop" />
-  -->
+  <ItemGroup>
+    <!--<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />-->
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Dotc.Common/Dotc.Common.csproj.old b/src/Dotc.Common/Dotc.Common.csproj.old
new file mode 100644
index 0000000..fc47037
--- /dev/null
+++ b/src/Dotc.Common/Dotc.Common.csproj.old
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{8A198528-4367-4670-8F24-863404FA0A9C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Dotc.Common</RootNamespace>
+    <AssemblyName>Dotc.Common</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\Infra.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\DotAssemblyInfo.cs">
+      <Link>Properties\DotAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\InfraAssemblyInfo.cs">
+      <Link>Properties\InfraAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="ClipboardHelper.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
+    <Compile Include="NativeMethods.cs" />
+    <Compile Include="ObservableObject.cs" />
+    <Compile Include="SqlFormatProvider.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UriExtensions.cs" />
+    <Compile Include="UrlFormatProvider.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <!--  <Import Project="..\VersionSpecificSymbols.Common.prop" />
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Dotc.MQ.Websphere/Dotc.MQ.Websphere.csproj b/src/Dotc.MQ.Websphere/Dotc.MQ.Websphere.csproj
index c942c1e..f5541b2 100644
--- a/src/Dotc.MQ.Websphere/Dotc.MQ.Websphere.csproj
+++ b/src/Dotc.MQ.Websphere/Dotc.MQ.Websphere.csproj
@@ -1,64 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{4E9223B9-1BC2-45EA-97E0-BA0E1D7A1961}</ProjectGuid>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Dotc.MQ.Websphere</RootNamespace>
-    <AssemblyName>Dotc.MQ.Websphere</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\MQ.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="amqmdnet, Version=9.0.0.0, Culture=neutral, PublicKeyToken=dd3cb1c9aae9ec97, processorArchitecture=MSIL">
-      <SpecificVersion>True</SpecificVersion>
-      <HintPath>..\..\libs\amqmdnet.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
+  <!--<ItemGroup>
     <Reference Include="System.configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
+  </ItemGroup>-->
   <ItemGroup>
     <Compile Include="..\DotAssemblyInfo.cs">
       <Link>Properties\DotAssemblyInfo.cs</Link>
@@ -66,63 +22,28 @@
     <Compile Include="..\MQAssemblyInfo.Client.cs">
       <Link>Properties\MQAssemblyInfo.Client.cs</Link>
     </Compile>
-    <Compile Include="Configuration\WSConfiguration.cs" />
-    <Compile Include="ExtensionMethods.cs" />
-    <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="MCASecurityExit.cs" />
-    <Compile Include="PCF\CMQCFC.cs" />
-    <Compile Include="PCF\MQCFBS.cs" />
-    <Compile Include="PCF\MQCFH.cs" />
-    <Compile Include="PCF\MQCFIL.cs" />
-    <Compile Include="PCF\MQCFIN.cs" />
-    <Compile Include="PCF\MQCFSL.cs" />
-    <Compile Include="PCF\MQCFST.cs" />
-    <Compile Include="PCF\PCFAgent.cs" />
-    <Compile Include="PCF\PCFAgentResponseTracker.cs" />
-    <Compile Include="PCF\PCFException.cs" />
-    <Compile Include="PCF\PCFHeader.cs" />
-    <Compile Include="PCF\PCFMessage.cs" />
-    <Compile Include="PCF\PCFMessageAgent.cs" />
-    <Compile Include="PCF\PCFParameter.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SecureStringHelper.cs" />
-    <Compile Include="SecurityExit.cs" />
-    <Compile Include="WSChannel.cs" />
-    <Compile Include="WSChannelType.cs" />
-    <Compile Include="WsDump2.cs" />
-    <Compile Include="WsListener.cs" />
-    <Compile Include="WSMessage.cs" />
-    <Compile Include="WSMessageAgent.cs" />
-    <Compile Include="WsObjectProvider.cs" />
-    <Compile Include="WSQueue.cs" />
-    <Compile Include="WSQueueManager.cs" />
-    <Compile Include="WSQueueManagerFactory.cs" />
-    <Compile Include="WSObjectNameFilter.cs" />
-    <Compile Include="WSQueueType.cs" />
-    <Compile Include="WSSoftwareInfo.cs" />
-    <Compile Include="WsUtils.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Dotc.Common\Dotc.Common.csproj">
-      <Project>{8a198528-4367-4670-8f24-863404fa0a9c}</Project>
-      <Name>Dotc.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Dotc.MQ\Dotc.MQ.csproj">
-      <Project>{f567819e-199b-48ce-8ff9-cc1d803b3abb}</Project>
-      <Name>Dotc.MQ</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Dotc.Common\Dotc.Common.csproj" />
+    <ProjectReference Include="..\Dotc.MQ\Dotc.MQ.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\mqep.licenseheader">
       <Link>mqep.licenseheader</Link>
     </None>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Composition" Version="4.7.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="WSDump.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="amqmdnet">
+      <HintPath>..\..\Libs\amqmdnet.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Dotc.MQ.Websphere/Dotc.MQ.Websphere.csproj.old b/src/Dotc.MQ.Websphere/Dotc.MQ.Websphere.csproj.old
new file mode 100644
index 0000000..c942c1e
--- /dev/null
+++ b/src/Dotc.MQ.Websphere/Dotc.MQ.Websphere.csproj.old
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{4E9223B9-1BC2-45EA-97E0-BA0E1D7A1961}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Dotc.MQ.Websphere</RootNamespace>
+    <AssemblyName>Dotc.MQ.Websphere</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\MQ.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="amqmdnet, Version=9.0.0.0, Culture=neutral, PublicKeyToken=dd3cb1c9aae9ec97, processorArchitecture=MSIL">
+      <SpecificVersion>True</SpecificVersion>
+      <HintPath>..\..\libs\amqmdnet.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\DotAssemblyInfo.cs">
+      <Link>Properties\DotAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\MQAssemblyInfo.Client.cs">
+      <Link>Properties\MQAssemblyInfo.Client.cs</Link>
+    </Compile>
+    <Compile Include="Configuration\WSConfiguration.cs" />
+    <Compile Include="ExtensionMethods.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
+    <Compile Include="MCASecurityExit.cs" />
+    <Compile Include="PCF\CMQCFC.cs" />
+    <Compile Include="PCF\MQCFBS.cs" />
+    <Compile Include="PCF\MQCFH.cs" />
+    <Compile Include="PCF\MQCFIL.cs" />
+    <Compile Include="PCF\MQCFIN.cs" />
+    <Compile Include="PCF\MQCFSL.cs" />
+    <Compile Include="PCF\MQCFST.cs" />
+    <Compile Include="PCF\PCFAgent.cs" />
+    <Compile Include="PCF\PCFAgentResponseTracker.cs" />
+    <Compile Include="PCF\PCFException.cs" />
+    <Compile Include="PCF\PCFHeader.cs" />
+    <Compile Include="PCF\PCFMessage.cs" />
+    <Compile Include="PCF\PCFMessageAgent.cs" />
+    <Compile Include="PCF\PCFParameter.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SecureStringHelper.cs" />
+    <Compile Include="SecurityExit.cs" />
+    <Compile Include="WSChannel.cs" />
+    <Compile Include="WSChannelType.cs" />
+    <Compile Include="WsDump2.cs" />
+    <Compile Include="WsListener.cs" />
+    <Compile Include="WSMessage.cs" />
+    <Compile Include="WSMessageAgent.cs" />
+    <Compile Include="WsObjectProvider.cs" />
+    <Compile Include="WSQueue.cs" />
+    <Compile Include="WSQueueManager.cs" />
+    <Compile Include="WSQueueManagerFactory.cs" />
+    <Compile Include="WSObjectNameFilter.cs" />
+    <Compile Include="WSQueueType.cs" />
+    <Compile Include="WSSoftwareInfo.cs" />
+    <Compile Include="WsUtils.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Dotc.Common\Dotc.Common.csproj">
+      <Project>{8a198528-4367-4670-8f24-863404fa0a9c}</Project>
+      <Name>Dotc.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Dotc.MQ\Dotc.MQ.csproj">
+      <Project>{f567819e-199b-48ce-8ff9-cc1d803b3abb}</Project>
+      <Name>Dotc.MQ</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\mqep.licenseheader">
+      <Link>mqep.licenseheader</Link>
+    </None>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Dotc.MQ/Dotc.MQ.csproj b/src/Dotc.MQ/Dotc.MQ.csproj
index 2edf8ac..f48d69c 100644
--- a/src/Dotc.MQ/Dotc.MQ.csproj
+++ b/src/Dotc.MQ/Dotc.MQ.csproj
@@ -1,60 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F567819E-199B-48CE-8FF9-CC1D803B3ABB}</ProjectGuid>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Dotc.MQ</RootNamespace>
-    <AssemblyName>Dotc.MQ</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\MQ.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\DotAssemblyInfo.cs">
       <Link>Properties\DotAssemblyInfo.cs</Link>
@@ -62,30 +25,15 @@
     <Compile Include="..\MQAssemblyInfo.Client.cs">
       <Link>Properties\MQAssemblyInfo.Client.cs</Link>
     </Compile>
-    <Compile Include="DumpException.cs" />
-    <Compile Include="ExtensionMethods.cs" />
-    <Compile Include="IChannel.cs" />
-    <Compile Include="IDump.cs" />
-    <Compile Include="IListener.cs" />
-    <Compile Include="IMessage.cs" />
-    <Compile Include="IObjectProvider.cs" />
-    <Compile Include="IQueue.cs" />
-    <Compile Include="IQueueManager.cs" />
-    <Compile Include="IQueueManagerFactory.cs" />
-    <Compile Include="MQException.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\mqep.licenseheader">
       <Link>mqep.licenseheader</Link>
     </None>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <ItemGroup>
+    <!--<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Composition" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />-->
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Dotc.MQ/Dotc.MQ.csproj.old b/src/Dotc.MQ/Dotc.MQ.csproj.old
new file mode 100644
index 0000000..2edf8ac
--- /dev/null
+++ b/src/Dotc.MQ/Dotc.MQ.csproj.old
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{F567819E-199B-48CE-8FF9-CC1D803B3ABB}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Dotc.MQ</RootNamespace>
+    <AssemblyName>Dotc.MQ</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\MQ.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\DotAssemblyInfo.cs">
+      <Link>Properties\DotAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\MQAssemblyInfo.Client.cs">
+      <Link>Properties\MQAssemblyInfo.Client.cs</Link>
+    </Compile>
+    <Compile Include="DumpException.cs" />
+    <Compile Include="ExtensionMethods.cs" />
+    <Compile Include="IChannel.cs" />
+    <Compile Include="IDump.cs" />
+    <Compile Include="IListener.cs" />
+    <Compile Include="IMessage.cs" />
+    <Compile Include="IObjectProvider.cs" />
+    <Compile Include="IQueue.cs" />
+    <Compile Include="IQueueManager.cs" />
+    <Compile Include="IQueueManagerFactory.cs" />
+    <Compile Include="MQException.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\mqep.licenseheader">
+      <Link>mqep.licenseheader</Link>
+    </None>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Dotc.MQExplorerPlus.Core/Dotc.MQExplorerPlus.Core.csproj b/src/Dotc.MQExplorerPlus.Core/Dotc.MQExplorerPlus.Core.csproj
index 63c5d56..7259679 100644
--- a/src/Dotc.MQExplorerPlus.Core/Dotc.MQExplorerPlus.Core.csproj
+++ b/src/Dotc.MQExplorerPlus.Core/Dotc.MQExplorerPlus.Core.csproj
@@ -1,100 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{287B10C6-E27D-4E64-B2AB-7EB97B1E66ED}</ProjectGuid>
+    <TargetFramework>net48</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Dotc.MQExplorerPlus.Core</RootNamespace>
-    <AssemblyName>Dotc.MQExplorerPlus.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;CODE_ANALYSIS;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\MQ.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.1.278, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
-      <HintPath>..\packages\AvalonEdit.6.0.1\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Reactive, Version=4.4.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.4.4.1\lib\net46\System.Reactive.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.Core.4.4.1\lib\net46\System.Reactive.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.Interfaces.4.4.1\lib\net46\System.Reactive.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Linq, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.Linq.4.4.1\lib\net46\System.Reactive.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.PlatformServices.4.4.1\lib\net46\System.Reactive.PlatformServices.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Windows.Threading, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.Windows.Threading.4.4.1\lib\net46\System.Reactive.Windows.Threading.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Windows" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\DotAssemblyInfo.cs">
@@ -103,142 +33,12 @@
     <Compile Include="..\MQAssemblyInfo.Client.cs">
       <Link>Properties\MQAssemblyInfo.Client.cs</Link>
     </Compile>
-    <Compile Include="Models\DumpContext.cs" />
-    <Compile Include="Models\LabelValuePair.cs" />
-    <Compile Include="Models\ProgressActiveScope.cs" />
-    <Compile Include="ObservableProgress.cs" />
-    <Compile Include="CompositionHost.cs" />
-    <Compile Include="Controllers\ApplicationController.cs" />
-    <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="Models\ApplicationInfo.cs" />
-    <Compile Include="Models\AppSettings.cs" />
-    <Compile Include="Models\BrowseFilter.cs" />
-    <Compile Include="Models\ChannelInfo.cs" />
-    <Compile Include="Models\ChannelResetParameters.cs" />
-    <Compile Include="Models\ChannelResolveParameters.cs" />
-    <Compile Include="Models\ChannelStopParameters.cs" />
-    <Compile Include="Models\ListenerInfo.cs" />
-    <Compile Include="Models\Parser\Configuration\CaseCollection.cs" />
-    <Compile Include="Models\Parser\Configuration\CaseElement.cs" />
-    <Compile Include="Models\Parser\Configuration\ConstantElement.cs" />
-    <Compile Include="Models\Parser\Configuration\ElseElement.cs" />
-    <Compile Include="Models\Parser\Configuration\Extensions.cs" />
-    <Compile Include="Models\Parser\Configuration\FieldCollectionBase.cs" />
-    <Compile Include="Models\Parser\GroupResult.cs" />
-    <Compile Include="Models\Parser\Configuration\PartFieldCollection.cs" />
-    <Compile Include="Models\Parser\Configuration\PartRefElement.cs" />
-    <Compile Include="Models\Parser\Configuration\SwitchElement.cs" />
-    <Compile Include="Models\Parser\Configuration\ElementBase.cs" />
-    <Compile Include="Models\Parser\Configuration\FieldCollection.cs" />
-    <Compile Include="Models\Parser\Configuration\FieldElementBase.cs" />
-    <Compile Include="Models\Parser\Configuration\GroupElement.cs" />
-    <Compile Include="Models\Parser\Configuration\LoopElement.cs" />
-    <Compile Include="Models\Parser\Configuration\MessageElement.cs" />
-    <Compile Include="Models\Parser\Configuration\PartCollection.cs" />
-    <Compile Include="Models\Parser\Configuration\PartElement.cs" />
-    <Compile Include="Models\Parser\Configuration\ParserConfiguration.cs" />
-    <Compile Include="Models\Parser\Configuration\FieldElement.cs" />
-    <Compile Include="Models\Parser\ConstantResult.cs" />
-    <Compile Include="Models\Parser\FieldResult.cs" />
-    <Compile Include="Models\Parser\LoopResult.cs" />
-    <Compile Include="Models\Parser\ParserEngine.cs" />
-    <Compile Include="Models\Parser\ParserException.cs" />
-    <Compile Include="Models\Parser\ParsingContext.cs" />
-    <Compile Include="Models\Parser\ParsingResult.cs" />
-    <Compile Include="Models\Parser\ParsingResultNode.cs" />
-    <Compile Include="Models\Parser\ParsingResultNodeList.cs" />
-    <Compile Include="Models\Parser\StringReaderEx.cs" />
-    <Compile Include="Models\Parser\SwitchResult.cs" />
-    <Compile Include="Models\QueueDepthValidator.cs" />
-    <Compile Include="Models\QueueDepthWarningThresholdValidationAttribute.cs" />
-    <Compile Include="Models\RecentConnection.cs" />
-    <Compile Include="Models\RequiredIfAttribute.cs" />
-    <Compile Include="Models\UserSettings.cs" />
-    <Compile Include="ViewModels\ExportMessagesSettingsViewModel.cs" />
-    <Compile Include="Views\IExportMessagesSettingsView.cs" />
-    <Compile Include="MQExplorerPlusException.cs" />
-    <Compile Include="Services\CountdownService.cs" />
-    <Compile Include="Services\FileDialogResult.cs" />
-    <Compile Include="Services\FileType.cs" />
-    <Compile Include="Services\ISettingsProvider.cs" />
-    <Compile Include="Services\IFileDialogService.cs" />
-    <Compile Include="Services\IMessageService.cs" />
-    <Compile Include="Services\ISupportAutomaticRefresh.cs" />
-    <Compile Include="Services\IViewService.cs" />
-    <Compile Include="Models\MessageInfo.cs" />
-    <Compile Include="Models\QueueInfo.cs" />
-    <Compile Include="Models\RangeProgress.cs" />
-    <Compile Include="Models\SelectableItem.cs" />
-    <Compile Include="Models\SelectableItemCollection.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\IKeyboardCommands.cs" />
-    <Compile Include="Controllers\MQController.cs" />
-    <Compile Include="Services\ShellService.cs" />
-    <Compile Include="TraceHelper.cs" />
-    <Compile Include="ViewModels\ChannelListStatusInfo.cs" />
-    <Compile Include="ViewModels\ChannelListViewModel.cs" />
-    <Compile Include="ViewModels\ChannelResetParametersViewModel.cs" />
-    <Compile Include="ViewModels\ChannelResolveParametersViewModel.cs" />
-    <Compile Include="ViewModels\ChannelStopParametersViewModel.cs" />
-    <Compile Include="ViewModels\DumpCreationSettingsViewModel.cs" />
-    <Compile Include="ViewModels\DumpLoadSettingsViewModel.cs" />
-    <Compile Include="ViewModels\ErrorViewModel.cs" />
-    <Compile Include="ViewModels\ListenerListStatusInfo.cs" />
-    <Compile Include="ViewModels\ListenerListViewModel.cs" />
-    <Compile Include="ViewModels\MainViewModel.cs" />
-    <Compile Include="ViewModels\AboutViewModel.cs" />
-    <Compile Include="ViewModels\OpenQueueManagerViewModel.cs" />
-    <Compile Include="ViewModels\OpenQueueViewModel.cs" />
-    <Compile Include="ViewModels\ParsingEditorViewModel.cs" />
-    <Compile Include="ViewModels\ModalViewModel.cs" />
-    <Compile Include="ViewModels\PutMessageViewModel.cs" />
-    <Compile Include="ViewModels\MessageListViewModel.cs" />
-    <Compile Include="ViewModels\QueueListStatusInfo.cs" />
-    <Compile Include="ViewModels\QueueListViewModel.cs" />
-    <Compile Include="ViewModels\QueueManagerViewModel.cs" />
-    <Compile Include="ViewModels\SettingsViewModel.cs" />
-    <Compile Include="ViewModels\ShellViewModel.cs" />
-    <Compile Include="ViewModels\StatusInfoViewModel.cs" />
-    <Compile Include="ViewModels\DocumentViewModel.cs" />
-    <Compile Include="ViewModels\ViewModel.cs" />
-    <Compile Include="ViewModels\WelcomeViewModel.cs" />
-    <Compile Include="Views\IChannelResetParametersView.cs" />
-    <Compile Include="Views\IChannelResolveParametersView.cs" />
-    <Compile Include="Views\IChannelStopParametersView.cs" />
-    <Compile Include="Views\IDumpCreationSettingsView.cs" />
-    <Compile Include="Views\IDumpLoadSettingsView.cs" />
-    <Compile Include="Views\IMainView.cs" />
-    <Compile Include="Views\IOpenQueueManagerView.cs" />
-    <Compile Include="Views\IOpenQueueView.cs" />
-    <Compile Include="Views\IParsingEditorView.cs" />
-    <Compile Include="Views\IModalView.cs" />
-    <Compile Include="Views\IPutMessageView.cs" />
-    <Compile Include="Views\IMessageListView.cs" />
-    <Compile Include="Views\IQueueManagerView.cs" />
-    <Compile Include="Views\ISettingsView.cs" />
-    <Compile Include="Views\IShellView.cs" />
-    <Compile Include="Views\IDocumentView.cs" />
-    <Compile Include="Views\IView.cs" />
-    <Compile Include="Views\IAboutView.cs" />
-    <Compile Include="Views\IWelcomeView.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Dotc.Common\Dotc.Common.csproj">
-      <Project>{8a198528-4367-4670-8f24-863404fa0a9c}</Project>
-      <Name>Dotc.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Dotc.MQ\Dotc.MQ.csproj">
-      <Project>{f567819e-199b-48ce-8ff9-cc1d803b3abb}</Project>
-      <Name>Dotc.MQ</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Dotc.Mvvm\Dotc.Mvvm.csproj">
-      <Project>{aae57d58-ca38-49c5-8f3c-91859d79cc90}</Project>
-      <Name>Dotc.Mvvm</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Dotc.Wpf\Dotc.Wpf.csproj">
-      <Project>{58baaa1b-5a98-4a98-9ab1-dc257885b084}</Project>
-      <Name>Dotc.Wpf</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Dotc.Common\Dotc.Common.csproj" />
+    <ProjectReference Include="..\Dotc.MQ\Dotc.MQ.csproj" />
+    <ProjectReference Include="..\Dotc.Mvvm\Dotc.Mvvm.csproj" />
+    <ProjectReference Include="..\Dotc.Wpf\Dotc.Wpf.csproj" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Models\Parser\Configuration\ParserSchema.xsd">
@@ -249,16 +49,25 @@
     <None Include="..\mqep.licenseheader">
       <Link>mqep.licenseheader</Link>
     </None>
-    <None Include="app.config" />
-    <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Composition" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+    <PackageReference Include="System.Management" Version="4.7.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="AvalonEdit" Version="6.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="System.Reactive" Version="4.4.1" />
+    <PackageReference Include="System.Reactive.Core" Version="4.4.1" />
+    <PackageReference Include="System.Reactive.Interfaces" Version="4.4.1" />
+    <PackageReference Include="System.Reactive.Linq" Version="4.4.1" />
+    <PackageReference Include="System.Reactive.PlatformServices" Version="4.4.1" />
+    <PackageReference Include="System.Reactive.Windows.Threading" Version="4.4.1" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Dotc.MQExplorerPlus.Core/Dotc.MQExplorerPlus.Core.csproj.old b/src/Dotc.MQExplorerPlus.Core/Dotc.MQExplorerPlus.Core.csproj.old
new file mode 100644
index 0000000..63c5d56
--- /dev/null
+++ b/src/Dotc.MQExplorerPlus.Core/Dotc.MQExplorerPlus.Core.csproj.old
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{287B10C6-E27D-4E64-B2AB-7EB97B1E66ED}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Dotc.MQExplorerPlus.Core</RootNamespace>
+    <AssemblyName>Dotc.MQExplorerPlus.Core</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;CODE_ANALYSIS;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\MQ.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.1.278, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
+      <HintPath>..\packages\AvalonEdit.6.0.1\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Reactive, Version=4.4.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.4.4.1\lib\net46\System.Reactive.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Core.4.4.1\lib\net46\System.Reactive.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Interfaces, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Interfaces.4.4.1\lib\net46\System.Reactive.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Linq, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Linq.4.4.1\lib\net46\System.Reactive.Linq.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.PlatformServices, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.PlatformServices.4.4.1\lib\net46\System.Reactive.PlatformServices.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Windows.Threading, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Windows.Threading.4.4.1\lib\net46\System.Reactive.Windows.Threading.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\DotAssemblyInfo.cs">
+      <Link>Properties\DotAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\MQAssemblyInfo.Client.cs">
+      <Link>Properties\MQAssemblyInfo.Client.cs</Link>
+    </Compile>
+    <Compile Include="Models\DumpContext.cs" />
+    <Compile Include="Models\LabelValuePair.cs" />
+    <Compile Include="Models\ProgressActiveScope.cs" />
+    <Compile Include="ObservableProgress.cs" />
+    <Compile Include="CompositionHost.cs" />
+    <Compile Include="Controllers\ApplicationController.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
+    <Compile Include="Models\ApplicationInfo.cs" />
+    <Compile Include="Models\AppSettings.cs" />
+    <Compile Include="Models\BrowseFilter.cs" />
+    <Compile Include="Models\ChannelInfo.cs" />
+    <Compile Include="Models\ChannelResetParameters.cs" />
+    <Compile Include="Models\ChannelResolveParameters.cs" />
+    <Compile Include="Models\ChannelStopParameters.cs" />
+    <Compile Include="Models\ListenerInfo.cs" />
+    <Compile Include="Models\Parser\Configuration\CaseCollection.cs" />
+    <Compile Include="Models\Parser\Configuration\CaseElement.cs" />
+    <Compile Include="Models\Parser\Configuration\ConstantElement.cs" />
+    <Compile Include="Models\Parser\Configuration\ElseElement.cs" />
+    <Compile Include="Models\Parser\Configuration\Extensions.cs" />
+    <Compile Include="Models\Parser\Configuration\FieldCollectionBase.cs" />
+    <Compile Include="Models\Parser\GroupResult.cs" />
+    <Compile Include="Models\Parser\Configuration\PartFieldCollection.cs" />
+    <Compile Include="Models\Parser\Configuration\PartRefElement.cs" />
+    <Compile Include="Models\Parser\Configuration\SwitchElement.cs" />
+    <Compile Include="Models\Parser\Configuration\ElementBase.cs" />
+    <Compile Include="Models\Parser\Configuration\FieldCollection.cs" />
+    <Compile Include="Models\Parser\Configuration\FieldElementBase.cs" />
+    <Compile Include="Models\Parser\Configuration\GroupElement.cs" />
+    <Compile Include="Models\Parser\Configuration\LoopElement.cs" />
+    <Compile Include="Models\Parser\Configuration\MessageElement.cs" />
+    <Compile Include="Models\Parser\Configuration\PartCollection.cs" />
+    <Compile Include="Models\Parser\Configuration\PartElement.cs" />
+    <Compile Include="Models\Parser\Configuration\ParserConfiguration.cs" />
+    <Compile Include="Models\Parser\Configuration\FieldElement.cs" />
+    <Compile Include="Models\Parser\ConstantResult.cs" />
+    <Compile Include="Models\Parser\FieldResult.cs" />
+    <Compile Include="Models\Parser\LoopResult.cs" />
+    <Compile Include="Models\Parser\ParserEngine.cs" />
+    <Compile Include="Models\Parser\ParserException.cs" />
+    <Compile Include="Models\Parser\ParsingContext.cs" />
+    <Compile Include="Models\Parser\ParsingResult.cs" />
+    <Compile Include="Models\Parser\ParsingResultNode.cs" />
+    <Compile Include="Models\Parser\ParsingResultNodeList.cs" />
+    <Compile Include="Models\Parser\StringReaderEx.cs" />
+    <Compile Include="Models\Parser\SwitchResult.cs" />
+    <Compile Include="Models\QueueDepthValidator.cs" />
+    <Compile Include="Models\QueueDepthWarningThresholdValidationAttribute.cs" />
+    <Compile Include="Models\RecentConnection.cs" />
+    <Compile Include="Models\RequiredIfAttribute.cs" />
+    <Compile Include="Models\UserSettings.cs" />
+    <Compile Include="ViewModels\ExportMessagesSettingsViewModel.cs" />
+    <Compile Include="Views\IExportMessagesSettingsView.cs" />
+    <Compile Include="MQExplorerPlusException.cs" />
+    <Compile Include="Services\CountdownService.cs" />
+    <Compile Include="Services\FileDialogResult.cs" />
+    <Compile Include="Services\FileType.cs" />
+    <Compile Include="Services\ISettingsProvider.cs" />
+    <Compile Include="Services\IFileDialogService.cs" />
+    <Compile Include="Services\IMessageService.cs" />
+    <Compile Include="Services\ISupportAutomaticRefresh.cs" />
+    <Compile Include="Services\IViewService.cs" />
+    <Compile Include="Models\MessageInfo.cs" />
+    <Compile Include="Models\QueueInfo.cs" />
+    <Compile Include="Models\RangeProgress.cs" />
+    <Compile Include="Models\SelectableItem.cs" />
+    <Compile Include="Models\SelectableItemCollection.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\IKeyboardCommands.cs" />
+    <Compile Include="Controllers\MQController.cs" />
+    <Compile Include="Services\ShellService.cs" />
+    <Compile Include="TraceHelper.cs" />
+    <Compile Include="ViewModels\ChannelListStatusInfo.cs" />
+    <Compile Include="ViewModels\ChannelListViewModel.cs" />
+    <Compile Include="ViewModels\ChannelResetParametersViewModel.cs" />
+    <Compile Include="ViewModels\ChannelResolveParametersViewModel.cs" />
+    <Compile Include="ViewModels\ChannelStopParametersViewModel.cs" />
+    <Compile Include="ViewModels\DumpCreationSettingsViewModel.cs" />
+    <Compile Include="ViewModels\DumpLoadSettingsViewModel.cs" />
+    <Compile Include="ViewModels\ErrorViewModel.cs" />
+    <Compile Include="ViewModels\ListenerListStatusInfo.cs" />
+    <Compile Include="ViewModels\ListenerListViewModel.cs" />
+    <Compile Include="ViewModels\MainViewModel.cs" />
+    <Compile Include="ViewModels\AboutViewModel.cs" />
+    <Compile Include="ViewModels\OpenQueueManagerViewModel.cs" />
+    <Compile Include="ViewModels\OpenQueueViewModel.cs" />
+    <Compile Include="ViewModels\ParsingEditorViewModel.cs" />
+    <Compile Include="ViewModels\ModalViewModel.cs" />
+    <Compile Include="ViewModels\PutMessageViewModel.cs" />
+    <Compile Include="ViewModels\MessageListViewModel.cs" />
+    <Compile Include="ViewModels\QueueListStatusInfo.cs" />
+    <Compile Include="ViewModels\QueueListViewModel.cs" />
+    <Compile Include="ViewModels\QueueManagerViewModel.cs" />
+    <Compile Include="ViewModels\SettingsViewModel.cs" />
+    <Compile Include="ViewModels\ShellViewModel.cs" />
+    <Compile Include="ViewModels\StatusInfoViewModel.cs" />
+    <Compile Include="ViewModels\DocumentViewModel.cs" />
+    <Compile Include="ViewModels\ViewModel.cs" />
+    <Compile Include="ViewModels\WelcomeViewModel.cs" />
+    <Compile Include="Views\IChannelResetParametersView.cs" />
+    <Compile Include="Views\IChannelResolveParametersView.cs" />
+    <Compile Include="Views\IChannelStopParametersView.cs" />
+    <Compile Include="Views\IDumpCreationSettingsView.cs" />
+    <Compile Include="Views\IDumpLoadSettingsView.cs" />
+    <Compile Include="Views\IMainView.cs" />
+    <Compile Include="Views\IOpenQueueManagerView.cs" />
+    <Compile Include="Views\IOpenQueueView.cs" />
+    <Compile Include="Views\IParsingEditorView.cs" />
+    <Compile Include="Views\IModalView.cs" />
+    <Compile Include="Views\IPutMessageView.cs" />
+    <Compile Include="Views\IMessageListView.cs" />
+    <Compile Include="Views\IQueueManagerView.cs" />
+    <Compile Include="Views\ISettingsView.cs" />
+    <Compile Include="Views\IShellView.cs" />
+    <Compile Include="Views\IDocumentView.cs" />
+    <Compile Include="Views\IView.cs" />
+    <Compile Include="Views\IAboutView.cs" />
+    <Compile Include="Views\IWelcomeView.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Dotc.Common\Dotc.Common.csproj">
+      <Project>{8a198528-4367-4670-8f24-863404fa0a9c}</Project>
+      <Name>Dotc.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Dotc.MQ\Dotc.MQ.csproj">
+      <Project>{f567819e-199b-48ce-8ff9-cc1d803b3abb}</Project>
+      <Name>Dotc.MQ</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Dotc.Mvvm\Dotc.Mvvm.csproj">
+      <Project>{aae57d58-ca38-49c5-8f3c-91859d79cc90}</Project>
+      <Name>Dotc.Mvvm</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Dotc.Wpf\Dotc.Wpf.csproj">
+      <Project>{58baaa1b-5a98-4a98-9ab1-dc257885b084}</Project>
+      <Name>Dotc.Wpf</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Models\Parser\Configuration\ParserSchema.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\mqep.licenseheader">
+      <Link>mqep.licenseheader</Link>
+    </None>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Dotc.MQExplorerPlus/Dotc.MQExplorerPlus.csproj b/src/Dotc.MQExplorerPlus/Dotc.MQExplorerPlus.csproj
index b23dfe5..49c876f 100644
--- a/src/Dotc.MQExplorerPlus/Dotc.MQExplorerPlus.csproj
+++ b/src/Dotc.MQExplorerPlus/Dotc.MQExplorerPlus.csproj
@@ -1,48 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{3FC26AF2-9E09-48F2-8E3B-6214B037AEB0}</ProjectGuid>
+    <TargetFramework>net48</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Dotc.MQExplorerPlus</RootNamespace>
-    <AssemblyName>Dotc.MQExplorerPlus</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
     <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
@@ -51,383 +27,26 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\Images\Sphere_grid_64.ico</ApplicationIcon>
   </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\MQ.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="amqmdnet, Version=9.0.0.0, Culture=neutral, PublicKeyToken=dd3cb1c9aae9ec97, processorArchitecture=MSIL">
-      <SpecificVersion>True</SpecificVersion>
-      <HintPath>..\..\libs\amqmdnet.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.1.278, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
-      <HintPath>..\packages\AvalonEdit.6.0.1\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.4\lib\net45\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.ComponentModel.Composition.registration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.configuration" />
-    <Reference Include="System.Data" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Reactive, Version=4.4.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.4.4.1\lib\net46\System.Reactive.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.Core.4.4.1\lib\net46\System.Reactive.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.Interfaces.4.4.1\lib\net46\System.Reactive.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Linq, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.Linq.4.4.1\lib\net46\System.Reactive.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.PlatformServices.4.4.1\lib\net46\System.Reactive.PlatformServices.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Windows.Threading, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reactive.Windows.Threading.4.4.1\lib\net46\System.Reactive.Windows.Threading.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reflection.Context" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
     <Reference Include="System.Transactions" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Windows" />
-    <Reference Include="System.Windows.Controls.Ribbon" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.2\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.2\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.2\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.2\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.2\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
     <Compile Include="..\DotAssemblyInfo.cs">
       <Link>Properties\DotAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="..\MQAssemblyInfo.Client.cs">
       <Link>Properties\MQAssemblyInfo.Client.cs</Link>
     </Compile>
-    <Compile Include="Behaviors\TextBoxInputRegExBehavior.cs" />
-    <Compile Include="Configuration\AppSettingsConfiguration.cs" />
-    <Compile Include="Converters\BytesToAsciiStringConverter.cs" />
-    <Compile Include="Converters\BytesToHexStringConverter.cs" />
-    <Compile Include="Converters\EnumBooleanConverter.cs" />
-    <Compile Include="SettingsProvider.cs" />
-    <Compile Include="Bootstrapper.cs" />
-    <Compile Include="Configuration\ConnectionConfigElement.cs" />
-    <Compile Include="Configuration\GeneralConfigElement.cs" />
-    <Compile Include="Configuration\MessagesConfigElement.cs" />
-    <Compile Include="Configuration\QueuesConfigElement.cs" />
-    <Compile Include="Configuration\RecentConnectionsConfigElement.cs" />
-    <Compile Include="Configuration\UserSettingsConfiguration.cs" />
-    <Compile Include="Converters\BooleanToChildWindowStateConverter.cs" />
-    <Compile Include="Converters\BooleanToIndoubtConverter.cs" />
-    <Compile Include="Converters\CheckQueueDepthTresholdConverter.cs" />
-    <Compile Include="Converters\EmptyStringToBooleanConverter.cs" />
-    <Compile Include="Converters\EmptyStringToIntegerConverter.cs" />
-    <Compile Include="Converters\PutMessageModeConverter.cs" />
-    <Compile Include="Converters\QueueManagerActiveContentConverter.cs" />
-    <Compile Include="Converters\WsChannelTypeNameConverter.cs" />
-    <Compile Include="Converters\WSQueueTypeNameConverter.cs" />
-    <Compile Include="DesignTime\ErrorViewModelDesignTime.cs" />
-    <Compile Include="DesignTime\QueueInfoExtDesignTime.cs" />
-    <Compile Include="FileDialogService.cs" />
-    <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="MessageService.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="SplashScreenManager.cs" />
-    <Compile Include="Styles\RibbonStyle.xaml.cs">
-      <DependentUpon>RibbonStyle.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Styles\WindowStyle.xaml.cs">
-      <DependentUpon>WindowStyle.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ViewService.cs" />
-    <Compile Include="Views\AboutView.xaml.cs">
-      <DependentUpon>AboutView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ChannelListStatusInfoView.xaml.cs">
-      <DependentUpon>ChannelListStatusInfoView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ChannelListView.xaml.cs">
-      <DependentUpon>ChannelListView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ChannelResetParametersView.xaml.cs">
-      <DependentUpon>ChannelResetParametersView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ChannelResolveParametersView.xaml.cs">
-      <DependentUpon>ChannelResolveParametersView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ChannelStopParametersView.xaml.cs">
-      <DependentUpon>ChannelStopParametersView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\DumpCreationSettingsView.xaml.cs">
-      <DependentUpon>DumpCreationSettingsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\DumpLoadSettingsView.xaml.cs">
-      <DependentUpon>DumpLoadSettingsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ErrorPanelView.xaml.cs">
-      <DependentUpon>ErrorPanelView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ExportMessagesSettingsView.xaml.cs">
-      <DependentUpon>ExportMessagesSettingsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ListenerListStatusInfoView.xaml.cs">
-      <DependentUpon>ListenerListStatusInfoView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ListenerListView.xaml.cs">
-      <DependentUpon>ListenerListView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MessageListStatusInfoView.xaml.cs">
-      <DependentUpon>MessageListStatusInfoView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\OpenQueueManagerView.xaml.cs">
-      <DependentUpon>OpenQueueManagerView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MainView.xaml.cs">
-      <DependentUpon>MainView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\OpenQueueView.xaml.cs">
-      <DependentUpon>OpenQueueView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ParsingEditorView.xaml.cs">
-      <DependentUpon>ParsingEditorView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ParsingResultView.xaml.cs">
-      <DependentUpon>ParsingResultView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\PutMessageView.xaml.cs">
-      <DependentUpon>PutMessageView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\QueueListStatusInfoView.xaml.cs">
-      <DependentUpon>QueueListStatusInfoView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\QueueListView.xaml.cs">
-      <DependentUpon>QueueListView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MessageListView.xaml.cs">
-      <DependentUpon>MessageListView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\QueueManagerView.xaml.cs">
-      <DependentUpon>QueueManagerView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\SettingsView.xaml.cs">
-      <DependentUpon>SettingsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ShellWindow.xaml.cs">
-      <DependentUpon>ShellWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Views\SplashScreenWindow.xaml.cs">
-      <DependentUpon>SplashScreenWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\WelcomeView.xaml.cs">
-      <DependentUpon>WelcomeView.xaml</DependentUpon>
-    </Compile>
-    <Page Include="Resources\ApplicationResources.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\ImageResources.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Styles\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\ChildWindowStyle.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\RibbonStyle.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\WindowStyle.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\AboutView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ChannelListStatusInfoView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ChannelListView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ChannelResetParametersView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ChannelResolveParametersView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ChannelStopParametersView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\DumpCreationSettingsView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\DumpLoadSettingsView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ErrorPanelView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ExportMessagesSettingsView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ListenerListStatusInfoView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ListenerListView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\MessageListStatusInfoView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\OpenQueueManagerView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\MainView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\OpenQueueView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ParsingEditorView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ParsingResultView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\PutMessageView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\QueueListStatusInfoView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\QueueListView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\MessageListView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\QueueManagerView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\SettingsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\ShellWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\SplashScreenWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\WelcomeView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
     <None Include="..\..\EULA.rtf">
       <Link>EULA.rtf</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -435,41 +54,15 @@
     <None Include="..\mqep.licenseheader">
       <Link>mqep.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Dotc.Common\Dotc.Common.csproj">
-      <Project>{8a198528-4367-4670-8f24-863404fa0a9c}</Project>
-      <Name>Dotc.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Dotc.MQ.Websphere\Dotc.MQ.Websphere.csproj">
-      <Project>{4e9223b9-1bc2-45ea-97e0-ba0e1d7a1961}</Project>
-      <Name>Dotc.MQ.Websphere</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Dotc.MQExplorerPlus.Core\Dotc.MQExplorerPlus.Core.csproj">
-      <Project>{287b10c6-e27d-4e64-b2ab-7eb97b1e66ed}</Project>
-      <Name>Dotc.MQExplorerPlus.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Dotc.MQ\Dotc.MQ.csproj">
-      <Project>{f567819e-199b-48ce-8ff9-cc1d803b3abb}</Project>
-      <Name>Dotc.MQ</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Dotc.Mvvm\Dotc.Mvvm.csproj">
-      <Project>{aae57d58-ca38-49c5-8f3c-91859d79cc90}</Project>
-      <Name>Dotc.Mvvm</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Dotc.Wpf\Dotc.Wpf.csproj">
-      <Project>{58baaa1b-5a98-4a98-9ab1-dc257885b084}</Project>
-      <Name>Dotc.Wpf</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Dotc.Common\Dotc.Common.csproj" />
+    <ProjectReference Include="..\Dotc.MQ.Websphere\Dotc.MQ.Websphere.csproj" />
+    <ProjectReference Include="..\Dotc.MQExplorerPlus.Core\Dotc.MQExplorerPlus.Core.csproj" />
+    <ProjectReference Include="..\Dotc.MQ\Dotc.MQ.csproj" />
+    <ProjectReference Include="..\Dotc.Mvvm\Dotc.Mvvm.csproj" />
+    <ProjectReference Include="..\Dotc.Wpf\Dotc.Wpf.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Images\Bold.png" />
@@ -650,12 +243,25 @@
   <ItemGroup>
     <Resource Include="Resources\Images\sort-down.png" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <ItemGroup>
+    <PackageReference Include="AvalonEdit" Version="6.0.1" />
+    <PackageReference Include="Extended.Wpf.Toolkit" Version="3.8.2" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="NLog" Version="4.7.4" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Composition" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+    <PackageReference Include="System.Reactive" Version="4.4.1" />
+    <PackageReference Include="System.Reactive.Core" Version="4.4.1" />
+    <PackageReference Include="System.Reactive.Interfaces" Version="4.4.1" />
+    <PackageReference Include="System.Reactive.Linq" Version="4.4.1" />
+    <PackageReference Include="System.Reactive.PlatformServices" Version="4.4.1" />
+    <PackageReference Include="System.Reactive.Windows.Threading" Version="4.4.1" />
+    <PackageReference Include="System.Reflection.Context" Version="4.7.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Dotc.MQExplorerPlus/Dotc.MQExplorerPlus.csproj.old b/src/Dotc.MQExplorerPlus/Dotc.MQExplorerPlus.csproj.old
new file mode 100644
index 0000000..b23dfe5
--- /dev/null
+++ b/src/Dotc.MQExplorerPlus/Dotc.MQExplorerPlus.csproj.old
@@ -0,0 +1,661 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{3FC26AF2-9E09-48F2-8E3B-6214B037AEB0}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Dotc.MQExplorerPlus</RootNamespace>
+    <AssemblyName>Dotc.MQExplorerPlus</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>Dotc.MQExplorerPlus.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Resources\Images\Sphere_grid_64.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\MQ.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="amqmdnet, Version=9.0.0.0, Culture=neutral, PublicKeyToken=dd3cb1c9aae9ec97, processorArchitecture=MSIL">
+      <SpecificVersion>True</SpecificVersion>
+      <HintPath>..\..\libs\amqmdnet.dll</HintPath>
+    </Reference>
+    <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.1.278, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
+      <HintPath>..\packages\AvalonEdit.6.0.1\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.7.4\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.ComponentModel.Composition.registration" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Reactive, Version=4.4.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.4.4.1\lib\net46\System.Reactive.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Core.4.4.1\lib\net46\System.Reactive.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Interfaces, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Interfaces.4.4.1\lib\net46\System.Reactive.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Linq, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Linq.4.4.1\lib\net46\System.Reactive.Linq.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.PlatformServices, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.PlatformServices.4.4.1\lib\net46\System.Reactive.PlatformServices.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Windows.Threading, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Windows.Threading.4.4.1\lib\net46\System.Reactive.Windows.Threading.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reflection.Context" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows" />
+    <Reference Include="System.Windows.Controls.Ribbon" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.2\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.2\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.2\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.2\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.2\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="..\DotAssemblyInfo.cs">
+      <Link>Properties\DotAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\MQAssemblyInfo.Client.cs">
+      <Link>Properties\MQAssemblyInfo.Client.cs</Link>
+    </Compile>
+    <Compile Include="Behaviors\TextBoxInputRegExBehavior.cs" />
+    <Compile Include="Configuration\AppSettingsConfiguration.cs" />
+    <Compile Include="Converters\BytesToAsciiStringConverter.cs" />
+    <Compile Include="Converters\BytesToHexStringConverter.cs" />
+    <Compile Include="Converters\EnumBooleanConverter.cs" />
+    <Compile Include="SettingsProvider.cs" />
+    <Compile Include="Bootstrapper.cs" />
+    <Compile Include="Configuration\ConnectionConfigElement.cs" />
+    <Compile Include="Configuration\GeneralConfigElement.cs" />
+    <Compile Include="Configuration\MessagesConfigElement.cs" />
+    <Compile Include="Configuration\QueuesConfigElement.cs" />
+    <Compile Include="Configuration\RecentConnectionsConfigElement.cs" />
+    <Compile Include="Configuration\UserSettingsConfiguration.cs" />
+    <Compile Include="Converters\BooleanToChildWindowStateConverter.cs" />
+    <Compile Include="Converters\BooleanToIndoubtConverter.cs" />
+    <Compile Include="Converters\CheckQueueDepthTresholdConverter.cs" />
+    <Compile Include="Converters\EmptyStringToBooleanConverter.cs" />
+    <Compile Include="Converters\EmptyStringToIntegerConverter.cs" />
+    <Compile Include="Converters\PutMessageModeConverter.cs" />
+    <Compile Include="Converters\QueueManagerActiveContentConverter.cs" />
+    <Compile Include="Converters\WsChannelTypeNameConverter.cs" />
+    <Compile Include="Converters\WSQueueTypeNameConverter.cs" />
+    <Compile Include="DesignTime\ErrorViewModelDesignTime.cs" />
+    <Compile Include="DesignTime\QueueInfoExtDesignTime.cs" />
+    <Compile Include="FileDialogService.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
+    <Compile Include="MessageService.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="SplashScreenManager.cs" />
+    <Compile Include="Styles\RibbonStyle.xaml.cs">
+      <DependentUpon>RibbonStyle.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Styles\WindowStyle.xaml.cs">
+      <DependentUpon>WindowStyle.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ViewService.cs" />
+    <Compile Include="Views\AboutView.xaml.cs">
+      <DependentUpon>AboutView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ChannelListStatusInfoView.xaml.cs">
+      <DependentUpon>ChannelListStatusInfoView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ChannelListView.xaml.cs">
+      <DependentUpon>ChannelListView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ChannelResetParametersView.xaml.cs">
+      <DependentUpon>ChannelResetParametersView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ChannelResolveParametersView.xaml.cs">
+      <DependentUpon>ChannelResolveParametersView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ChannelStopParametersView.xaml.cs">
+      <DependentUpon>ChannelStopParametersView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DumpCreationSettingsView.xaml.cs">
+      <DependentUpon>DumpCreationSettingsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DumpLoadSettingsView.xaml.cs">
+      <DependentUpon>DumpLoadSettingsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ErrorPanelView.xaml.cs">
+      <DependentUpon>ErrorPanelView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ExportMessagesSettingsView.xaml.cs">
+      <DependentUpon>ExportMessagesSettingsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ListenerListStatusInfoView.xaml.cs">
+      <DependentUpon>ListenerListStatusInfoView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ListenerListView.xaml.cs">
+      <DependentUpon>ListenerListView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MessageListStatusInfoView.xaml.cs">
+      <DependentUpon>MessageListStatusInfoView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\OpenQueueManagerView.xaml.cs">
+      <DependentUpon>OpenQueueManagerView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MainView.xaml.cs">
+      <DependentUpon>MainView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\OpenQueueView.xaml.cs">
+      <DependentUpon>OpenQueueView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ParsingEditorView.xaml.cs">
+      <DependentUpon>ParsingEditorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ParsingResultView.xaml.cs">
+      <DependentUpon>ParsingResultView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\PutMessageView.xaml.cs">
+      <DependentUpon>PutMessageView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\QueueListStatusInfoView.xaml.cs">
+      <DependentUpon>QueueListStatusInfoView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\QueueListView.xaml.cs">
+      <DependentUpon>QueueListView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MessageListView.xaml.cs">
+      <DependentUpon>MessageListView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\QueueManagerView.xaml.cs">
+      <DependentUpon>QueueManagerView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SettingsView.xaml.cs">
+      <DependentUpon>SettingsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ShellWindow.xaml.cs">
+      <DependentUpon>ShellWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Views\SplashScreenWindow.xaml.cs">
+      <DependentUpon>SplashScreenWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\WelcomeView.xaml.cs">
+      <DependentUpon>WelcomeView.xaml</DependentUpon>
+    </Compile>
+    <Page Include="Resources\ApplicationResources.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\ImageResources.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Styles\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ChildWindowStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\RibbonStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\WindowStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\AboutView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ChannelListStatusInfoView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ChannelListView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ChannelResetParametersView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ChannelResolveParametersView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ChannelStopParametersView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\DumpCreationSettingsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\DumpLoadSettingsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ErrorPanelView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ExportMessagesSettingsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ListenerListStatusInfoView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ListenerListView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\MessageListStatusInfoView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\OpenQueueManagerView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\MainView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\OpenQueueView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ParsingEditorView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ParsingResultView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\PutMessageView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\QueueListStatusInfoView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\QueueListView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\MessageListView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\QueueManagerView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\SettingsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\ShellWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\SplashScreenWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\WelcomeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="..\..\EULA.rtf">
+      <Link>EULA.rtf</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\mqep.licenseheader">
+      <Link>mqep.licenseheader</Link>
+    </None>
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Dotc.Common\Dotc.Common.csproj">
+      <Project>{8a198528-4367-4670-8f24-863404fa0a9c}</Project>
+      <Name>Dotc.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Dotc.MQ.Websphere\Dotc.MQ.Websphere.csproj">
+      <Project>{4e9223b9-1bc2-45ea-97e0-ba0e1d7a1961}</Project>
+      <Name>Dotc.MQ.Websphere</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Dotc.MQExplorerPlus.Core\Dotc.MQExplorerPlus.Core.csproj">
+      <Project>{287b10c6-e27d-4e64-b2ab-7eb97b1e66ed}</Project>
+      <Name>Dotc.MQExplorerPlus.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Dotc.MQ\Dotc.MQ.csproj">
+      <Project>{f567819e-199b-48ce-8ff9-cc1d803b3abb}</Project>
+      <Name>Dotc.MQ</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Dotc.Mvvm\Dotc.Mvvm.csproj">
+      <Project>{aae57d58-ca38-49c5-8f3c-91859d79cc90}</Project>
+      <Name>Dotc.Mvvm</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Dotc.Wpf\Dotc.Wpf.csproj">
+      <Project>{58baaa1b-5a98-4a98-9ab1-dc257885b084}</Project>
+      <Name>Dotc.Wpf</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Bold.png" />
+    <Resource Include="Resources\Images\Bullets.png" />
+    <Resource Include="Resources\Images\CheckSpelling.png" />
+    <Resource Include="Resources\Images\CheckSpellingLarge.png" />
+    <Resource Include="Resources\Images\CloseLarge.png" />
+    <Resource Include="Resources\Images\ClosePreview.png" />
+    <Resource Include="Resources\Images\CloseSmall.png" />
+    <Resource Include="Resources\Images\Copy.png" />
+    <Resource Include="Resources\Images\CopyLarge.png" />
+    <Resource Include="Resources\Images\Cut.png" />
+    <Resource Include="Resources\Images\DecreaseIndentation.png" />
+    <Resource Include="Resources\Images\Delete.png" />
+    <Resource Include="Resources\Images\EmptyLarge.png" />
+    <Resource Include="Resources\Images\FlagDe.png" />
+    <Resource Include="Resources\Images\FlagEn.png" />
+    <Resource Include="Resources\Images\GetAllow.png" />
+    <Resource Include="Resources\Images\Help.png" />
+    <Resource Include="Resources\Images\IncreaseIndentation.png" />
+    <Resource Include="Resources\Images\Italic.png" />
+    <Resource Include="Resources\Images\New.png" />
+    <Resource Include="Resources\Images\NewLarge.png" />
+    <Resource Include="Resources\Images\Numbering.png" />
+    <Resource Include="Resources\Images\Open.png" />
+    <Resource Include="Resources\Images\OpenLarge.png" />
+    <Resource Include="Resources\Images\Paste.png" />
+    <Resource Include="Resources\Images\PasteLarge.png" />
+    <Resource Include="Resources\Images\Pin.png" />
+    <Resource Include="Resources\Images\Pinned.png" />
+    <Resource Include="Resources\Images\Print.png" />
+    <Resource Include="Resources\Images\PrintLarge.png" />
+    <Resource Include="Resources\Images\PrintPreview.png" />
+    <Resource Include="Resources\Images\PutAllow.png" />
+    <Resource Include="Resources\Images\Redo.png" />
+    <Resource Include="Resources\Images\Save.png" />
+    <Resource Include="Resources\Images\SaveLarge.png" />
+    <Resource Include="Resources\Images\SelectAll.png" />
+    <Resource Include="Resources\Images\Underline.png" />
+    <Resource Include="Resources\Images\Undo.png" />
+    <Resource Include="Resources\Images\Writer.ico" />
+    <Resource Include="Resources\Images\ZoomInLarge.png" />
+    <Resource Include="Resources\Images\ZoomOutLarge.png" />
+    <Resource Include="Resources\Images\ZoomPageWidth.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\globe_32xLG.png" />
+    <Resource Include="Resources\Images\SingleOutput_8170_32x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\CameraOrbit_32x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\FilteredObject_13400_32x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\folder_Open_32xLG.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Security_Shields_Complete_and_ok_32xLG_color.png" />
+    <Resource Include="Resources\Images\Security_Shields_Critical_32xLG_color.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\StatusAnnotationRed_No_32xLG.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\StatusAnnotations_Complete_and_ok_32xLG_color.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\BrushTool_207.png" />
+    <Resource Include="Resources\Images\Cancel%28build%29_194.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Delete-icon.png" />
+    <Resource Include="Resources\Images\Editing-Delete-icon.png" />
+    <Resource Include="Resources\Images\email-delete-icon.png" />
+    <Resource Include="Resources\Images\Eraser-icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\refresh-icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\GetInhibit.png" />
+    <Resource Include="Resources\Images\PutInhibit.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\InvertSelection.png" />
+    <Resource Include="Resources\Images\SelectNone.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Sphere_grid_64.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Sphere_grid_64.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\AnimatedWheel.gif" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\AnimatedWheel2.gif" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\AnimatedWheel3.gif" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\AnimatedWheel4.gif" />
+    <Resource Include="Resources\Images\AnimatedWheel5.gif" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\PublicQueue_256x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\cancel.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Cancel2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Collapse.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Expand.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Next.png" />
+    <Resource Include="Resources\Images\previous.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\NextGrey.png" />
+    <Resource Include="Resources\Images\PreviousGrey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\1467838003_tick_16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Done-Shield-WF.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\connection_q.png" />
+    <Resource Include="Resources\Images\connection_qm.png" />
+    <Resource Include="Resources\Images\connection_remote_q.png" />
+    <Resource Include="Resources\Images\connection_remote_qm.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Reload.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\add-button.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Put-message.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\CSV-Export.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Clean.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Open-folder.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Load-dump.png" />
+    <Resource Include="Resources\Images\Save-dump.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Trash-can.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Delete-message.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\Forward-message.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\three-dots-punctuation-sign.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\sort-down.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Dotc.Mvvm/Dotc.Mvvm.csproj b/src/Dotc.Mvvm/Dotc.Mvvm.csproj
index 2e19a21..8e25d69 100644
--- a/src/Dotc.Mvvm/Dotc.Mvvm.csproj
+++ b/src/Dotc.Mvvm/Dotc.Mvvm.csproj
@@ -1,83 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{AAE57D58-CA38-49C5-8F3C-91859D79CC90}</ProjectGuid>
+    <TargetFramework>net48</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Dotc.Mvvm</RootNamespace>
-    <AssemblyName>Dotc.Mvvm</AssemblyName>
-    <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\Infra.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net45|AnyCPU'">
+  <!--<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net45|AnyCPU'">
     <OutputPath>bin\Net45\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net46|AnyCPU'">
     <OutputPath>bin\Net46\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
+  </PropertyGroup>-->
   <ItemGroup>
     <Compile Include="..\DotAssemblyInfo.cs">
       <Link>Properties\DotAssemblyInfo.cs</Link>
@@ -85,32 +36,13 @@
     <Compile Include="..\InfraAssemblyInfo.cs">
       <Link>Properties\InfraAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="AwaitableRelayCommand.cs" />
-    <Compile Include="BindableBase.cs" />
-    <Compile Include="DisabledCommand.cs" />
-    <Compile Include="ErrorsContainer.cs" />
-    <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="IAsyncCommand.cs" />
-    <Compile Include="IRaiseCanExecuteChanged.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertySupport.cs" />
-    <Compile Include="RelayAsyncCommand.cs" />
-    <Compile Include="RelayCommand.cs" />
-    <Compile Include="ValidatableBindableBase.cs" />
-    <Compile Include="ViewModelBase.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Dotc.Common\Dotc.Common.csproj">
-      <Project>{8a198528-4367-4670-8f24-863404fa0a9c}</Project>
-      <Name>Dotc.Common</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Dotc.Common\Dotc.Common.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <!--<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> -->
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+    <!--<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />-->
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/src/Dotc.Mvvm/Dotc.Mvvm.csproj.old b/src/Dotc.Mvvm/Dotc.Mvvm.csproj.old
new file mode 100644
index 0000000..2e19a21
--- /dev/null
+++ b/src/Dotc.Mvvm/Dotc.Mvvm.csproj.old
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{AAE57D58-CA38-49C5-8F3C-91859D79CC90}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Dotc.Mvvm</RootNamespace>
+    <AssemblyName>Dotc.Mvvm</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\Infra.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net45|AnyCPU'">
+    <OutputPath>bin\Net45\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net46|AnyCPU'">
+    <OutputPath>bin\Net46\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\DotAssemblyInfo.cs">
+      <Link>Properties\DotAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\InfraAssemblyInfo.cs">
+      <Link>Properties\InfraAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="AwaitableRelayCommand.cs" />
+    <Compile Include="BindableBase.cs" />
+    <Compile Include="DisabledCommand.cs" />
+    <Compile Include="ErrorsContainer.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
+    <Compile Include="IAsyncCommand.cs" />
+    <Compile Include="IRaiseCanExecuteChanged.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PropertySupport.cs" />
+    <Compile Include="RelayAsyncCommand.cs" />
+    <Compile Include="RelayCommand.cs" />
+    <Compile Include="ValidatableBindableBase.cs" />
+    <Compile Include="ViewModelBase.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Dotc.Common\Dotc.Common.csproj">
+      <Project>{8a198528-4367-4670-8f24-863404fa0a9c}</Project>
+      <Name>Dotc.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Dotc.Wpf/Dotc.Wpf.csproj b/src/Dotc.Wpf/Dotc.Wpf.csproj
index 0b5579d..0282593 100644
--- a/src/Dotc.Wpf/Dotc.Wpf.csproj
+++ b/src/Dotc.Wpf/Dotc.Wpf.csproj
@@ -1,92 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{58BAAA1B-5A98-4A98-9AB1-DC257885B084}</ProjectGuid>
+    <TargetFramework>net48</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Dotc.Wpf</RootNamespace>
-    <AssemblyName>Dotc.Wpf</AssemblyName>
-    <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
     <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\Infra.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net45|AnyCPU'">
+  <!--<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net45|AnyCPU'">
     <OutputPath>bin\Net45\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net46|AnyCPU'">
     <OutputPath>bin\Net46\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-  </PropertyGroup>
+  </PropertyGroup>-->
   <ItemGroup>
-    <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.1.278, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
-      <HintPath>..\packages\AvalonEdit.6.0.1\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     <Reference Include="PresentationFramework.Aero" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows" />
-    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Presentation" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\DotAssemblyInfo.cs">
@@ -95,126 +36,16 @@
     <Compile Include="..\InfraAssemblyInfo.cs">
       <Link>Properties\InfraAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="BindingProxy.cs" />
-    <Compile Include="CommandReference.cs" />
-    <Compile Include="Controls\AnimatedGif.cs" />
-    <Compile Include="Controls\EnhancedTreeView\EnhancedTreeView.cs" />
-    <Compile Include="Controls\EnhancedTreeView\EnhancedTreeViewItem.cs" />
-    <Compile Include="Controls\HexViewer\Array16Bytes.cs" />
-    <Compile Include="Controls\HexViewer\ByteCharConverter.cs" />
-    <Compile Include="Controls\JsonViewer\JsonViewer.cs" />
-    <Compile Include="Controls\JsonViewer\TemplateSelectors\JPropertyDataTemplateSelector.cs" />
-    <Compile Include="Controls\JsonViewer\ValueConverters\JArrayLengthConverter.cs" />
-    <Compile Include="Controls\JsonViewer\ValueConverters\JPropertyTypeToColorConverter.cs" />
-    <Compile Include="Controls\JsonViewer\ValueConverters\JValueConverter.cs" />
-    <Compile Include="Controls\JsonViewer\ValueConverters\JValueTypeToColorConverter.cs" />
-    <Compile Include="Controls\SearchableTextBlock\RegexSearchStrategy.cs" />
-    <Compile Include="Controls\SearchableTextBlock\SearchableTextBlock.cs" />
-    <Compile Include="Controls\SearchableTextBlock\SearchResult.cs" />
-    <Compile Include="Controls\SearchableTextBlock\SearchResultBackgroundRenderer.cs" />
-    <Compile Include="Controls\TreeListView\TreeListView.cs" />
-    <Compile Include="Controls\TreeListView\TreeListViewConverter.cs" />
-    <Compile Include="Controls\TreeListView\TreeListViewExpander.cs" />
-    <Compile Include="Controls\TreeListView\TreeListViewItem.cs" />
-    <Compile Include="Controls\VisualTreeAssist.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\CodeCompletionBinding.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\CompletionContext.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\CustomCommands.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\ICompletionItem.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\ICompletionItemList.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\ICompletionListWindow.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\ICompletionWindow.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\QualifiedName.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\QualifiedNameCollection.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\SchemaDocumentation.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\SharpDevelopCompletionWindow.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\StringToVisibilityConverter.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlCodeCompletionBinding.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlCompletionItem.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlCompletionItemCollection.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlElementPath.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlElementPathsByNamespace.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlNamespace.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlNamespaceCollection.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlParser.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlSchemaCompletion.cs" />
-    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlSchemaCompletionCollection.cs" />
-    <Compile Include="Controls\XmlEditor\Folding\DomRegion.cs" />
-    <Compile Include="Controls\XmlEditor\Folding\FoldingManagerAdapter.cs" />
-    <Compile Include="Controls\XmlEditor\Folding\FoldingRegion.cs" />
-    <Compile Include="Controls\XmlEditor\Folding\IFoldingManager.cs" />
-    <Compile Include="Controls\XmlEditor\Folding\IXmlFoldParser.cs" />
-    <Compile Include="Controls\XmlEditor\Folding\XmlCommentFold.cs" />
-    <Compile Include="Controls\XmlEditor\Folding\XmlElementFold.cs" />
-    <Compile Include="Controls\XmlEditor\Folding\XmlFoldingManager.cs" />
-    <Compile Include="Controls\XmlEditor\Folding\XmlFoldParser.cs" />
-    <Compile Include="Controls\XmlEditor\Formatting\DocumentUtilities.cs" />
-    <Compile Include="Controls\XmlEditor\Formatting\IFormattingStrategy.cs" />
-    <Compile Include="Controls\XmlEditor\Formatting\IndentationStrategyAdapter.cs" />
-    <Compile Include="Controls\XmlEditor\Formatting\XmlFormattingStrategy.cs" />
-    <Compile Include="Controls\XmlEditor\TextMarkerService.cs" />
-    <Compile Include="Controls\XmlEditor\XmlEditor.xaml.cs">
-      <DependentUpon>XmlEditor.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="DependencyObjectExtensions.cs" />
-    <Compile Include="Controls\FixedWidthGridViewColumn.cs" />
-    <Compile Include="FrameworkElementExtensions.cs" />
-    <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="GridViewSort.cs" />
-    <Compile Include="Controls\HexViewer\HexViewer.xaml.cs">
-      <DependentUpon>HexViewer.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\HexViewer\HexViewerModel.cs" />
-    <Compile Include="PasswordHelper.cs" />
-    <Compile Include="SelectTextOnFocus.cs" />
-    <Compile Include="Controls\XmlViewer.xaml.cs">
-      <DependentUpon>XmlViewer.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UIDispatcher.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Controls\HexViewer\HexViewer.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\Themes\JsonViewerResources.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\Themes\SearchableTextBlockResources.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Controls\Themes\TreeListViewResources.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\XmlEditor\XmlEditor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\XmlViewer.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
+    <!--<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />-->
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\Dotc.Mvvm\Dotc.Mvvm.csproj" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
-    <ProjectReference Include="..\Dotc.Mvvm\Dotc.Mvvm.csproj">
-      <Project>{AAE57D58-CA38-49C5-8F3C-91859D79CC90}</Project>
-      <Name>Dotc.Mvvm</Name>
-    </ProjectReference>
+    <PackageReference Include="AvalonEdit" Version="6.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/src/Dotc.Wpf/Dotc.Wpf.csproj.old b/src/Dotc.Wpf/Dotc.Wpf.csproj.old
new file mode 100644
index 0000000..0b5579d
--- /dev/null
+++ b/src/Dotc.Wpf/Dotc.Wpf.csproj.old
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{58BAAA1B-5A98-4A98-9AB1-DC257885B084}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Dotc.Wpf</RootNamespace>
+    <AssemblyName>Dotc.Wpf</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <CodeAnalysisRuleSet>..\DotConsulting.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\Infra.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net45|AnyCPU'">
+    <OutputPath>bin\Net45\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net46|AnyCPU'">
+    <OutputPath>bin\Net46\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.1.278, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
+      <HintPath>..\packages\AvalonEdit.6.0.1\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="PresentationFramework.Aero" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Presentation" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\DotAssemblyInfo.cs">
+      <Link>Properties\DotAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\InfraAssemblyInfo.cs">
+      <Link>Properties\InfraAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="BindingProxy.cs" />
+    <Compile Include="CommandReference.cs" />
+    <Compile Include="Controls\AnimatedGif.cs" />
+    <Compile Include="Controls\EnhancedTreeView\EnhancedTreeView.cs" />
+    <Compile Include="Controls\EnhancedTreeView\EnhancedTreeViewItem.cs" />
+    <Compile Include="Controls\HexViewer\Array16Bytes.cs" />
+    <Compile Include="Controls\HexViewer\ByteCharConverter.cs" />
+    <Compile Include="Controls\JsonViewer\JsonViewer.cs" />
+    <Compile Include="Controls\JsonViewer\TemplateSelectors\JPropertyDataTemplateSelector.cs" />
+    <Compile Include="Controls\JsonViewer\ValueConverters\JArrayLengthConverter.cs" />
+    <Compile Include="Controls\JsonViewer\ValueConverters\JPropertyTypeToColorConverter.cs" />
+    <Compile Include="Controls\JsonViewer\ValueConverters\JValueConverter.cs" />
+    <Compile Include="Controls\JsonViewer\ValueConverters\JValueTypeToColorConverter.cs" />
+    <Compile Include="Controls\SearchableTextBlock\RegexSearchStrategy.cs" />
+    <Compile Include="Controls\SearchableTextBlock\SearchableTextBlock.cs" />
+    <Compile Include="Controls\SearchableTextBlock\SearchResult.cs" />
+    <Compile Include="Controls\SearchableTextBlock\SearchResultBackgroundRenderer.cs" />
+    <Compile Include="Controls\TreeListView\TreeListView.cs" />
+    <Compile Include="Controls\TreeListView\TreeListViewConverter.cs" />
+    <Compile Include="Controls\TreeListView\TreeListViewExpander.cs" />
+    <Compile Include="Controls\TreeListView\TreeListViewItem.cs" />
+    <Compile Include="Controls\VisualTreeAssist.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\CodeCompletionBinding.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\CompletionContext.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\CustomCommands.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\ICompletionItem.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\ICompletionItemList.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\ICompletionListWindow.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\ICompletionWindow.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\QualifiedName.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\QualifiedNameCollection.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\SchemaDocumentation.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\SharpDevelopCompletionWindow.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\StringToVisibilityConverter.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlCodeCompletionBinding.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlCompletionItem.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlCompletionItemCollection.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlElementPath.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlElementPathsByNamespace.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlNamespace.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlNamespaceCollection.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlParser.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlSchemaCompletion.cs" />
+    <Compile Include="Controls\XmlEditor\CodeCompletion\XmlSchemaCompletionCollection.cs" />
+    <Compile Include="Controls\XmlEditor\Folding\DomRegion.cs" />
+    <Compile Include="Controls\XmlEditor\Folding\FoldingManagerAdapter.cs" />
+    <Compile Include="Controls\XmlEditor\Folding\FoldingRegion.cs" />
+    <Compile Include="Controls\XmlEditor\Folding\IFoldingManager.cs" />
+    <Compile Include="Controls\XmlEditor\Folding\IXmlFoldParser.cs" />
+    <Compile Include="Controls\XmlEditor\Folding\XmlCommentFold.cs" />
+    <Compile Include="Controls\XmlEditor\Folding\XmlElementFold.cs" />
+    <Compile Include="Controls\XmlEditor\Folding\XmlFoldingManager.cs" />
+    <Compile Include="Controls\XmlEditor\Folding\XmlFoldParser.cs" />
+    <Compile Include="Controls\XmlEditor\Formatting\DocumentUtilities.cs" />
+    <Compile Include="Controls\XmlEditor\Formatting\IFormattingStrategy.cs" />
+    <Compile Include="Controls\XmlEditor\Formatting\IndentationStrategyAdapter.cs" />
+    <Compile Include="Controls\XmlEditor\Formatting\XmlFormattingStrategy.cs" />
+    <Compile Include="Controls\XmlEditor\TextMarkerService.cs" />
+    <Compile Include="Controls\XmlEditor\XmlEditor.xaml.cs">
+      <DependentUpon>XmlEditor.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DependencyObjectExtensions.cs" />
+    <Compile Include="Controls\FixedWidthGridViewColumn.cs" />
+    <Compile Include="FrameworkElementExtensions.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
+    <Compile Include="GridViewSort.cs" />
+    <Compile Include="Controls\HexViewer\HexViewer.xaml.cs">
+      <DependentUpon>HexViewer.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\HexViewer\HexViewerModel.cs" />
+    <Compile Include="PasswordHelper.cs" />
+    <Compile Include="SelectTextOnFocus.cs" />
+    <Compile Include="Controls\XmlViewer.xaml.cs">
+      <DependentUpon>XmlViewer.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UIDispatcher.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Controls\HexViewer\HexViewer.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Controls\Themes\JsonViewerResources.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Controls\Themes\SearchableTextBlockResources.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Controls\Themes\TreeListViewResources.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Controls\XmlEditor\XmlEditor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Controls\XmlViewer.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\Dotc.Mvvm\Dotc.Mvvm.csproj">
+      <Project>{AAE57D58-CA38-49C5-8F3C-91859D79CC90}</Project>
+      <Name>Dotc.Mvvm</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file