All the bits rehomed.

Source/Check.That/Check.cs

@@ -6,9 +6,9 @@
 using System.Reflection;
 using CheckThat.Expectations;
 using CheckThat.Expressions;
+using CheckThat.Formatting;
 using CheckThat.Internals;
 using Cone;
-using Cone.Core;
 
 namespace CheckThat
 {

Source/Check.That/Expectations/BinaryExpect.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Linq.Expressions;
 using System.Reflection;
+using CheckThat.Formatting;
 using CheckThat.Internals;
-using Cone.Core;
 
 namespace CheckThat.Expectations
 {

Source/Check.That/Expectations/BooleanExpect.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Linq.Expressions;
 using System.Reflection;
+using CheckThat.Formatting;
 using CheckThat.Internals;
-using Cone.Core;
 
 namespace CheckThat.Expectations
 {

Source/Check.That/Expectations/ExceptionExpect.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq.Expressions;
 using CheckThat.Expressions;
-using Cone.Core;
+using CheckThat.Formatting;
 
 namespace CheckThat.Expectations
 {

Source/Check.That/Expectations/ExpectFactory.cs

@@ -4,8 +4,8 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using CheckThat.Expressions;
+using CheckThat.Formatting;
 using CheckThat.Internals;
-using Cone.Core;
 
 namespace CheckThat.Expectations
 {

Source/Check.That/Expectations/ExpectMessages.cs

@@ -1,5 +1,3 @@
-using Cone.Core;
-
 namespace CheckThat.Expectations
 {
     public static class ExpectMessages

Source/Check.That/Expectations/ExpectValue.cs

@@ -1,4 +1,4 @@
-using Cone.Core;
+using CheckThat.Formatting;
 
 namespace CheckThat.Expectations
 {

Source/Check.That/Expectations/IExpect.cs

@@ -1,5 +1,5 @@
 using System.Linq.Expressions;
-using Cone.Core;
+using CheckThat.Formatting;
 
 namespace CheckThat.Expectations
 {

Source/Check.That/Expectations/MemberMethodExpect.cs

@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
+using CheckThat.Formatting;
 using CheckThat.Internals;
-using Cone.Core;
 
 namespace CheckThat.Expectations
 {

Source/Check.That/Expectations/NotExpect.cs

@@ -1,5 +1,5 @@
 using System.Linq.Expressions;
-using Cone.Core;
+using CheckThat.Formatting;
 
 namespace CheckThat.Expectations
 {

Source/Check.That/Expectations/StringEqualExpect.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq.Expressions;
+using CheckThat.Formatting;
 using CheckThat.Internals;
-using Cone.Core;
 
 namespace CheckThat.Expectations
 {

Source/Check.That/Expectations/StringMethodExpect.cs

@@ -3,7 +3,7 @@
 using System.Globalization;
 using System.Linq.Expressions;
 using System.Reflection;
-using Cone.Core;
+using CheckThat.Formatting;
 
 namespace CheckThat.Expectations
 {

Source/Check.That/Expressions/ExpressionEvaluatorContext.cs

@@ -5,7 +5,6 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using CheckThat.Internals;
-using Cone.Core;
 
 namespace CheckThat.Expressions
 {

Source/Check.That/FailedExpectation.cs

@@ -2,7 +2,6 @@
 using System.Linq;
 using CheckThat.Expectations;
 using CheckThat.Internals;
-using Cone.Core;
 
 namespace CheckThat
 {

Source/Check.That/Core/ArrayExpressionStringBuilder.cs → Source/Check.That/Formatting/ArrayExpressionStringBuilder.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Cone.Core
+namespace CheckThat.Formatting
 {
 	public class ArrayExpressionStringBuilder<T> : ICollectionFormatter<T>
 	{

Source/Check.That/Core/ExpressionFormatter.cs → Source/Check.That/Formatting/ExpressionFormatter.cs

@@ -6,7 +6,7 @@
 using System.Text;
 using CheckThat.Internals;
 
-namespace Cone.Core
+namespace CheckThat.Formatting
 {   
 	public class ExpressionFormatter : IFormatter<Expression>
 	{

Source/Check.That/Core/ICollectionFormatter.cs → Source/Check.That/Formatting/ICollectionFormatter.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Cone.Core
+namespace CheckThat.Formatting
 {
     public interface ICollectionFormatter<T> : IFormatter<IEnumerable<T>>, IFormatter<IEnumerable>
     {

Source/Check.That/Core/IFormatter.cs → Source/Check.That/Formatting/IFormatter.cs

@@ -1,4 +1,4 @@
-namespace Cone.Core
+namespace CheckThat.Formatting
 {
     public interface IFormatter<T>
     {

Source/Check.That/Core/ParameterFormatter.cs → Source/Check.That/Formatting/ParameterFormatter.cs

@@ -3,7 +3,7 @@
 using System.Text;
 using CheckThat.Internals;
 
-namespace Cone.Core
+namespace CheckThat.Formatting
 {
 	public class ParameterFormatter : IFormatter<object>
 	{

Source/Check.That/Core/TypeFormatter.cs → Source/Check.That/Formatting/TypeFormatter.cs

@@ -1,7 +1,7 @@
 using System;
 using CheckThat.Internals;
 
-namespace Cone.Core
+namespace CheckThat.Formatting
 {
 	public class TypeFormatter 
 	{

Source/Check.That/Internals/MemberInfoExtensions.cs

@@ -11,8 +11,11 @@ static class MemberInfoExtensions
 
 		static readonly ConcurrentDictionary<MemberInfo, Getter> getterCache = new ConcurrentDictionary<MemberInfo, Getter>();
 
-		public static object GetValue(this MemberInfo self, object target) =>
-			getterCache.GetOrAdd(self, CreateGetter)(target);
+		public static object GetValue(this MemberInfo self, object target) {
+			var get = getterCache.GetOrAdd(self, CreateGetter);
+			try { return get(target); }
+			catch(Exception ex) { throw new TargetInvocationException(ex); }
+		}
 
 		static Getter CreateGetter(MemberInfo x) {
 			var input = Expression.Parameter(typeof(object));

Source/Check.That/Core/ObjectConverter.cs → Source/Check.That/Internals/ObjectConverter.cs

@@ -2,20 +2,16 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using CheckThat.Internals;
 
-namespace Cone.Core
+namespace CheckThat.Internals
 {
     static class ObjectConverter 
     {
         static readonly ConcurrentDictionary<KeyValuePair<Type, Type>, Func<object, object>> converters = new ConcurrentDictionary<KeyValuePair<Type, Type>,Func<object,object>>();
         static readonly Func<object,object> Identity = x => x;
 
-        public static object ChangeType(object value, Type to) {
-            if(value == null)
-                return null;
-            return GetConverter(value.GetType(), to)(value); 
-        }
+        public static object ChangeType(object value, Type to) =>
+			value == null ? null : GetConverter(value.GetType(), to)(value); 
 
         static Func<object, object> GetConverter(Type from, Type to) =>
 			converters.GetOrAdd(Key(from, to), x => CreateConverter(x.Key, x.Value));
@@ -28,8 +24,7 @@ static class ObjectConverter
             return Expression.Lambda<Func<object, object>>(input.Convert(from).Convert(to).Box(), input).Compile();
         }
 
-        static KeyValuePair<Type, Type> Key(Type from, Type to) {
-            return new KeyValuePair<Type,Type>(from, to);
-        }
+        static KeyValuePair<Type, Type> Key(Type from, Type to) =>
+			new KeyValuePair<Type,Type>(from, to);
     }
 }

Source/Check.That/Internals/TypeExtensions.cs

@@ -6,7 +6,7 @@ namespace CheckThat.Internals
     public static class TypeExtensions
     {
         public static bool Has<T>(this Type type) =>
-			type.GetCustomAttribute(type, true) != null;
+			type.GetCustomAttribute(typeof(T), true) != null;
 
         public static bool HasAny(this Type self, params Type[] attributeTypes) {
             var attributes = self.GetCustomAttributes(true);

Source/Check.That/NotExpectedExpect.cs

@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
 using CheckThat.Expectations;
+using CheckThat.Formatting;
 using CheckThat.Internals;
-using Cone.Core;
 
 namespace CheckThat
 {

Source/Cone.TestAdapter/Cone.TestAdapter.csproj

@@ -9,6 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.1.1" PrivateAssets="All" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
+    <ProjectReference Include="..\Check.That\Check.That.csproj" />
     <ProjectReference Include="..\Cone\Cone.csproj" PrivateAssets="All" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>

Source/Cone.Worker/Cone.Worker.csproj

@@ -2,7 +2,7 @@
   <Import Project="$(SolutionDir)\Cone.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net452;net462;net472;netcoreapp2.0;netcoreapp2.2</TargetFrameworks>
+    <TargetFrameworks>net452;net462;net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
     <TargetFrameworkFamily Condition="$(TargetFramework.StartsWith('net4'))">NETFX</TargetFrameworkFamily>
     <DefineConstants>$(DefineConstants);$(TargetFrameworkFamily)</DefineConstants>
     <ApplicationIcon />

Source/Cone/Core/BasicTestNamer.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Reflection;
+using CheckThat.Formatting;
 
 namespace Cone.Core
 {

Source/Cone/Core/ConeStackFrame.cs

@@ -1,6 +1,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using CheckThat.Formatting;
 using CheckThat.Internals;
 using Cone.Core;
 

Source/Cone/Core/ConeTestNamer.cs

@@ -2,6 +2,7 @@
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
+using CheckThat.Formatting;
 
 namespace Cone.Core
 {

Source/Cone/Core/ObjectInspector.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using CheckThat.Formatting;
 using CheckThat.Internals;
 
 namespace Cone.Core

Source/Cone/DisplayClassAttribute.cs

@@ -1,9 +1,9 @@
-using Cone.Core;
 using System;
+using CheckThat.Formatting;
 
 namespace Cone
 {
-    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
+	[AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
     public class DisplayClassAttribute : Attribute 
     {
         readonly Type displayClass;

Source/dotnet-conesole/dotnet-conesole.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp2.2</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>

Specs/Cone.Specs/BinaryExpectSpec.cs

@@ -2,9 +2,8 @@
 using System.Linq.Expressions;
 using CheckThat;
 using CheckThat.Expectations;
+using CheckThat.Formatting;
 using CheckThat.Internals;
-using Cone.Core;
-using Cone.Expectations;
 using Moq;
 
 namespace Cone

Specs/Cone.Specs/CheckThat.Expressions/ExpressionEvaluatorSpec.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using CheckThat.Formatting;
 using Cone;
 using Cone.Core;
 

Specs/Cone.Specs/ExpressionFormatterSpec.cs → Specs/Cone.Specs/CheckThat.Formatting/ExpressionFormatterSpec.cs

@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
-using System.Runtime.CompilerServices;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Reflection;
-using CheckThat;
+using System.Runtime.CompilerServices;
 using CheckThat.Internals;
+using Cone;
 
-namespace Cone.Core
+namespace CheckThat.Formatting
 {
 	static class Extensions
 	{

Specs/Cone.Specs/ParameterFormatterSpec.cs → Specs/Cone.Specs/CheckThat.Formatting/ParameterFormatterSpec.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
-using CheckThat;
+using Cone;
+using Cone.Core;
 
-namespace Cone.Core
+namespace CheckThat.Formatting
 {
     enum DummyEnum { Value }
     [Describe(typeof(ParameterFormatter))]

Specs/Cone.Specs/Core/TypeFormatterSpec.cs → Specs/Cone.Specs/CheckThat.Formatting/TypeFormatterSpec.cs

@@ -1,8 +1,7 @@
 using System;
-using CheckThat;
+using Cone;
 
-
-namespace Cone.Core
+namespace CheckThat.Formatting
 {
 	[Describe(typeof(TypeFormatterSpec))]
 	public class TypeFormatterSpec

Specs/Cone.Specs/Cone.Specs.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">  
   <PropertyGroup>
-      <TargetFrameworks>net452;;net462;netcoreapp2.2</TargetFrameworks>
+      <TargetFrameworks>net452;net472;netcoreapp2.1</TargetFrameworks>
       <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
       <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)'!='netcoreapp2.2'">
+  <ItemGroup Condition="'$(TargetFramework)'!='netcoreapp2.1'">
     <Compile Remove="NetStandard\**" />
     <None Include="NetStandard\**" />
     <ProjectReference Include="..\..\Source\Cone.TestAdapter\Cone.TestAdapter.csproj" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.2'">
+  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
     <Compile Remove="NetFramework\**" />
   </ItemGroup>
   <ItemGroup>

Specs/Cone.Specs/ConeTestNamerSpec.cs

@@ -2,6 +2,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using CheckThat;
+using CheckThat.Formatting;
 
 namespace Cone.Core
 {