diff --git a/.gitignore b/.gitignore
index 6ea0185..550e699 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,7 @@ _ReSharper.*
 packages
 *.DotSettings
 *.ncrunchproject
-*.ncrunchsolution
\ No newline at end of file
+*.ncrunchsolution
+
+# Visual Studio 2015 cache/options directory
+.vs/
\ No newline at end of file
diff --git a/NuGet.config b/NuGet.config
new file mode 100644
index 0000000..3f0e003
--- /dev/null
+++ b/NuGet.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>
\ No newline at end of file
diff --git a/TestStack.Dossier.Tests/Assembly.cs b/TestStack.Dossier.Tests/Assembly.cs
new file mode 100644
index 0000000..7db8497
--- /dev/null
+++ b/TestStack.Dossier.Tests/Assembly.cs
@@ -0,0 +1,3 @@
+using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/TestStack.Dossier.Tests/Builder_CreateListTests.cs b/TestStack.Dossier.Tests/Builder_CreateListTests.cs
index 62be8bc..dde56aa 100644
--- a/TestStack.Dossier.Tests/Builder_CreateListTests.cs
+++ b/TestStack.Dossier.Tests/Builder_CreateListTests.cs
@@ -170,6 +170,7 @@ public void WhenBuildingObjectsImplicitly_ThenTheAnonymousValueFixtureIsSharedAc
             studentViewModels.Select(x => x.Grade).ShouldBeUnique();
         }
 
+        [Fact]
         public void WhenBuildingObjectsWithCtorAndPrivateSetters_ThenSetPrivateSettersByDefault()
         {
             var dto = Builder<MixedAccessibilityDto>.CreateListOfSize(1)
diff --git a/TestStack.Dossier.Tests/DataSources/DataSourceConventionTests.cs b/TestStack.Dossier.Tests/DataSources/DataSourceConventionTests.cs
index 7fa4538..8087e27 100644
--- a/TestStack.Dossier.Tests/DataSources/DataSourceConventionTests.cs
+++ b/TestStack.Dossier.Tests/DataSources/DataSourceConventionTests.cs
@@ -3,14 +3,14 @@
 using Shouldly;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.DataSources
 {
     public class DataSourceConventionTests
     {
         [Theory]
-        [PropertyData("TestCases")]
+        [MemberData(nameof(TestCases))]
         public void DataSourceConventions(DataSource<string> sut, int expectedCount)
         {
             var collection = sut.Data.ToList();
diff --git a/TestStack.Dossier.Tests/DataSources/Dictionaries/Resources/FileDataConventions.cs b/TestStack.Dossier.Tests/DataSources/Dictionaries/Resources/FileDataConventions.cs
index afd5b62..4cfd92c 100644
--- a/TestStack.Dossier.Tests/DataSources/Dictionaries/Resources/FileDataConventions.cs
+++ b/TestStack.Dossier.Tests/DataSources/Dictionaries/Resources/FileDataConventions.cs
@@ -13,7 +13,7 @@ public class FileDataConventions
         [Fact]
         public void ApplyConventions()
         {
-            var assembly = typeof(IAnonymousValueSupplier).Assembly;
+            var assembly = typeof(IAnonymousValueSupplier).GetTypeInfo().Assembly;
             var resources = assembly
                 .GetManifestResourceNames()
                 .Where(x => x.EndsWith(".txt"))
@@ -27,7 +27,7 @@ public void ApplyConventions()
             }
         }
 
-        public void Should_not_contain_duplicates(List<string> collection, string fileName)
+        private void Should_not_contain_duplicates(List<string> collection, string fileName)
         {
             var duplicates = collection
                 .GroupBy(x => x)
@@ -43,7 +43,7 @@ public void Should_not_contain_duplicates(List<string> collection, string fileNa
             }
         }
 
-        public void Should_not_contain_null_or_empty_values(List<string> collection, string fileName)
+        private void Should_not_contain_null_or_empty_values(List<string> collection, string fileName)
         {
             var blanks = collection.Where(string.IsNullOrEmpty).ToList();
             if (blanks.Any())
diff --git a/TestStack.Dossier.Tests/DataSources/Generators/RandomGeneratorTests.cs b/TestStack.Dossier.Tests/DataSources/Generators/RandomGeneratorTests.cs
index 3670841..9c94484 100644
--- a/TestStack.Dossier.Tests/DataSources/Generators/RandomGeneratorTests.cs
+++ b/TestStack.Dossier.Tests/DataSources/Generators/RandomGeneratorTests.cs
@@ -3,7 +3,6 @@
 using Shouldly;
 using TestStack.Dossier.DataSources.Generators;
 using Xunit;
-using Xunit.Extensions;
 
 namespace TestStack.Dossier.Tests.DataSources.Generators
 {
diff --git a/TestStack.Dossier.Tests/DataSources/Generators/SequentiaGeneratorTests.cs b/TestStack.Dossier.Tests/DataSources/Generators/SequentiaGeneratorTests.cs
index a3f22ae..113cbb9 100644
--- a/TestStack.Dossier.Tests/DataSources/Generators/SequentiaGeneratorTests.cs
+++ b/TestStack.Dossier.Tests/DataSources/Generators/SequentiaGeneratorTests.cs
@@ -2,7 +2,6 @@
 using Shouldly;
 using TestStack.Dossier.DataSources.Generators;
 using Xunit;
-using Xunit.Extensions;
 
 namespace TestStack.Dossier.Tests.DataSources.Generators
 {
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/AddressAusEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/AddressAusEquivalenceTests.cs
index 692e899..03efd7d 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/AddressAusEquivalenceTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/AddressAusEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/AddressUkEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/AddressUkEquivalenceTests.cs
index 18f051b..578daea 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/AddressUkEquivalenceTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/AddressUkEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/AddressUsEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/AddressUsEquivalenceTests.cs
index 183ec9a..2f13ccd 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/AddressUsEquivalenceTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/AddressUsEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/ColourEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/ColourEquivalenceTests.cs
index 94749ae..ca48af8 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/ColourEquivalenceTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/ColourEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/CompanyEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/CompanyEquivalenceTests.cs
index 4c9aed2..60a4530 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/CompanyEquivalenceTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/CompanyEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/FinanceEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/FinanceEquivalenceTests.cs
index a4ecc00..35aa1fa 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/FinanceEquivalenceTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/FinanceEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/FrequencyEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/FrequencyEquivalenceTests.cs
index d817874..ab7e107 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/FrequencyEquivalenceTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/FrequencyEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/GeoEquivalenceClassesTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/GeoEquivalenceClassesTests.cs
index d48a7d1..40a5181 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/GeoEquivalenceClassesTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/GeoEquivalenceClassesTests.cs
@@ -2,7 +2,7 @@
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
 using TestStack.Dossier.EquivalenceClasses.Geo;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
@@ -22,11 +22,11 @@ protected override List<object[]> GetData()
         {
             return new List<object[]>
             {
-                new object[] {new Words(FromDictionary.GeoContinent), GenerateTestCasesForSut(Any.Continent)},
-                new object[] {new Words(FromDictionary.GeoCountry), GenerateTestCasesForSut(Any.Country)},
-                new object[] {new Words(FromDictionary.GeoCountryCode), GenerateTestCasesForSut(Any.CountryCode)},
-                new object[] {new Words(FromDictionary.GeoLatitude), GenerateTestCasesForSut(Any.Latitude)},
-                new object[] {new Words(FromDictionary.GeoLongitude), GenerateTestCasesForSut(Any.Longitude)},
+                new object[] {new Words(FromDictionary.GeoContinent), GenerateTestCasesForSut(Any.Geography.Continent)},
+                new object[] {new Words(FromDictionary.GeoCountry), GenerateTestCasesForSut(Any.Geography.Country)},
+                new object[] {new Words(FromDictionary.GeoCountryCode), GenerateTestCasesForSut(Any.Geography.CountryCode)},
+                new object[] {new Words(FromDictionary.GeoLatitude), GenerateTestCasesForSut(Any.Geography.Latitude)},
+                new object[] {new Words(FromDictionary.GeoLongitude), GenerateTestCasesForSut(Any.Geography.Longitude)},
             };
         }
     }
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/GeoEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/GeoEquivalenceTests.cs
index b68a9e0..69e5803 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/GeoEquivalenceTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/GeoEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/IdentifierEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/IdentifierEquivalenceTests.cs
index ad9ab21..45950ba 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/IdentifierEquivalenceTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/IdentifierEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/IntegerEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/IntegerEquivalenceTests.cs
index af0db97..9df140e 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/IntegerEquivalenceTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/IntegerEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/LoremIpsumEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/LoremIpsumEquivalenceTests.cs
index 0e97f89..b652093 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/LoremIpsumEquivalenceTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/LoremIpsumEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/PersonEquivalenceClassesTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/PersonEquivalenceClassesTests.cs
index 58edd33..7f13c4a 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/PersonEquivalenceClassesTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/PersonEquivalenceClassesTests.cs
@@ -5,7 +5,6 @@
 using TestStack.Dossier.DataSources.Dictionaries;
 using TestStack.Dossier.EquivalenceClasses.Person;
 using Xunit;
-using Xunit.Extensions;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
@@ -26,10 +25,10 @@ public void WhenGettingUniqueEmail_ThenReturnUniqueEmailsAcrossFixtureInstances(
             var any2 = new AnonymousValueFixture();
 
             PersonEquivalenceExtensions.InitializeUniqueEmailAddressSource();
-            generatedValues.Add(any2.UniqueEmailAddress());
+            generatedValues.Add(any2.Person.UniqueEmailAddress());
             for (var i = 0; i < source.Data.Count - 1; i++)
             {
-                generatedValues.Add(Any.UniqueEmailAddress());
+                generatedValues.Add(Any.Person.UniqueEmailAddress());
             }
 
             generatedValues.Distinct().Count()
@@ -44,17 +43,17 @@ protected override List<object[]> GetData()
             return new List<object[]>
             {
                 new object[]
-                {new Words(FromDictionary.PersonEmailAddress), GenerateTestCasesForSut(Any.EmailAddress)},
-                new object[] {new Words(FromDictionary.PersonLanguage), GenerateTestCasesForSut(Any.Language)},
+                {new Words(FromDictionary.PersonEmailAddress), GenerateTestCasesForSut(Any.Person.EmailAddress)},
+                new object[] {new Words(FromDictionary.PersonLanguage), GenerateTestCasesForSut(Any.Person.Language)},
                 new object[]
-                {new Words(FromDictionary.PersonNameFirstFemale), GenerateTestCasesForSut(Any.FemaleFirstName)},
-                new object[] {new Words(FromDictionary.PersonNameFirst), GenerateTestCasesForSut(Any.FirstName)},
-                new object[] {new Words(FromDictionary.PersonNameFull), GenerateTestCasesForSut(Any.FullName)},
-                new object[] {new Words(FromDictionary.PersonNameLast), GenerateTestCasesForSut(Any.LastName)},
+                {new Words(FromDictionary.PersonNameFirstFemale), GenerateTestCasesForSut(Any.Person.NameFirstFemale)},
+                new object[] {new Words(FromDictionary.PersonNameFirst), GenerateTestCasesForSut(Any.Person.NameFirst)},
+                new object[] {new Words(FromDictionary.PersonNameFull), GenerateTestCasesForSut(Any.Person.NameFull)},
+                new object[] {new Words(FromDictionary.PersonNameLast), GenerateTestCasesForSut(Any.Person.NameLast)},
                 new object[]
-                {new Words(FromDictionary.PersonNameFirstMale), GenerateTestCasesForSut(Any.MaleFirstName)},
-                new object[] {new Words(FromDictionary.PersonNameSuffix), GenerateTestCasesForSut(Any.Suffix)},
-                new object[] {new Words(FromDictionary.PersonNameTitle), GenerateTestCasesForSut(Any.Title)},
+                {new Words(FromDictionary.PersonNameFirstMale), GenerateTestCasesForSut(Any.Person.NameFirstMale)},
+                new object[] {new Words(FromDictionary.PersonNameSuffix), GenerateTestCasesForSut(Any.Person.NameSuffix)},
+                new object[] {new Words(FromDictionary.PersonNameTitle), GenerateTestCasesForSut(Any.Person.NameTitle)},
             };
         }
     }
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/PersonEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/PersonEquivalenceTests.cs
index bf540f4..f057e2d 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/PersonEquivalenceTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/PersonEquivalenceTests.cs
@@ -4,7 +4,6 @@
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
 using Xunit;
-using Xunit.Extensions;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/ShirtSizeEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/ShirtSizeEquivalenceTests.cs
index d5b8bf9..2795f7c 100644
--- a/TestStack.Dossier.Tests/EquivalenceClasses/ShirtSizeEquivalenceTests.cs
+++ b/TestStack.Dossier.Tests/EquivalenceClasses/ShirtSizeEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
diff --git a/TestStack.Dossier.Tests/Properties/AssemblyInfo.cs b/TestStack.Dossier.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index e5d5cf8..0000000
--- a/TestStack.Dossier.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("TestStack.Dossier.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TestStack.Dossier.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("295d98e2-8a24-4bbb-9455-08f915d782b7")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/TestStack.Dossier.Tests/ProxyBuilderTests.cs b/TestStack.Dossier.Tests/ProxyBuilderTests.cs
index c6c662b..62cbc2a 100644
--- a/TestStack.Dossier.Tests/ProxyBuilderTests.cs
+++ b/TestStack.Dossier.Tests/ProxyBuilderTests.cs
@@ -7,7 +7,7 @@
 
 namespace TestStack.Dossier.Tests
 {
-    class ProxyBuilderTests
+    public class ProxyBuilderTests
     {
         [Fact]
         public void GivenClassToProxyWithNoProperties_WhenBuildingProxy_ReturnAClassWithNoReturnsValuesSet()
diff --git a/TestStack.Dossier.Tests/PublicApiApproval/PublicApiApproverTests.GivenDossierAssembly_WhenPublicApiChecked_ShouldHaveNoChanges.approved.txt b/TestStack.Dossier.Tests/PublicApiApproval/PublicApiApproverTests.GivenDossierAssembly_WhenPublicApiChecked_ShouldHaveNoChanges.approved.txt
index c1b8966..ad5a50a 100644
--- a/TestStack.Dossier.Tests/PublicApiApproval/PublicApiApproverTests.GivenDossierAssembly_WhenPublicApiChecked_ShouldHaveNoChanges.approved.txt
+++ b/TestStack.Dossier.Tests/PublicApiApproval/PublicApiApproverTests.GivenDossierAssembly_WhenPublicApiChecked_ShouldHaveNoChanges.approved.txt
@@ -1,12 +1,5 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute("DynamicProxyGenAssembly2")]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute("TestStack.Dossier.Tests")]
-[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
-[assembly: System.Runtime.InteropServices.GuidAttribute("24a139fb-b390-4f14-9be6-cf9fb354bb5d")]
-[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName=".NET Framework 4")]
-
 namespace TestStack.Dossier
 {
-    
     public class AddressAusEquivalence
     {
         public AddressAusEquivalence(TestStack.Dossier.AnonymousValueFixture fixture) { }
@@ -55,14 +48,14 @@ namespace TestStack.Dossier
         public TestStack.Dossier.CompanyEquivalence Company { get; }
         public static System.Collections.Generic.IEnumerable<TestStack.Dossier.IAnonymousValueSupplier> DefaultValueSuppliers { get; }
         public TestStack.Dossier.FinanceEquivalence Finance { get; }
-        public Ploeh.AutoFixture.Fixture Fixture { get; }
+        public AutoFixture.Fixture Fixture { get; }
         public TestStack.Dossier.GeoEquivalence Geography { get; }
         public static System.Collections.Generic.ICollection<TestStack.Dossier.IAnonymousValueSupplier> GlobalValueSuppliers { get; }
         public TestStack.Dossier.IdentifierEquivalence Identifier { get; }
         public TestStack.Dossier.InternetEquivalence Internet { get; }
         public System.Collections.Generic.ICollection<TestStack.Dossier.IAnonymousValueSupplier> LocalValueSuppliers { get; }
         public TestStack.Dossier.PersonEquivalence Person { get; }
-        public Ploeh.AutoFixture.RegularExpressionGenerator RegexGenerator { get; }
+        public AutoFixture.RegularExpressionGenerator RegexGenerator { get; }
         public T Get<TObject, T>(System.Linq.Expressions.Expression<System.Func<TObject, T>> property) { }
         public object Get(System.Type type, string propertyName) { }
         public TestStack.Dossier.DataSources.Dictionaries.Words Words(string dictionaryName) { }
@@ -200,15 +193,15 @@ namespace TestStack.Dossier
         protected bool Has<TValue>(System.Linq.Expressions.Expression<System.Func<TObject, TValue>> property) { }
         protected bool Has(string propertyName) { }
         public virtual bool IsListBuilderProxy() { }
+        public static TObject op_Implicit(TestStack.Dossier.TestDataBuilder<TObject, TBuilder> builder) { }
+        public static System.Collections.Generic.List<TObject> op_Implicit(TestStack.Dossier.TestDataBuilder<TObject, TBuilder> builder) { }
         public virtual TBuilder Set<TValue>(System.Linq.Expressions.Expression<System.Func<TObject, TValue>> property, TValue value) { }
         public virtual TBuilder Set<TValue>(System.Linq.Expressions.Expression<System.Func<TObject, TValue>> property, System.Func<TValue> factory) { }
     }
 }
 namespace TestStack.Dossier.DataSources
 {
-    
     public abstract class DataSource<T> : TestStack.Dossier.DataSources.IDataSource<T>
-    
     {
         protected DataSource(TestStack.Dossier.DataSources.Generators.IGenerator generator) { }
         protected DataSource() { }
@@ -218,7 +211,6 @@ namespace TestStack.Dossier.DataSources
         public virtual T Next() { }
     }
     public interface IDataSource<T>
-    
     {
         System.Collections.Generic.IList<T> Data { get; }
         TestStack.Dossier.DataSources.Generators.IGenerator Generator { get; }
@@ -227,7 +219,6 @@ namespace TestStack.Dossier.DataSources
 }
 namespace TestStack.Dossier.DataSources.Dictionaries
 {
-    
     [System.ObsoleteAttribute("FileDictionarySource is deprecated, please use Words(FromDictionary) instead.")]
     public abstract class FileDictionarySource : TestStack.Dossier.DataSources.DataSource<string>
     {
@@ -310,7 +301,6 @@ namespace TestStack.Dossier.DataSources.Dictionaries
 }
 namespace TestStack.Dossier.DataSources.Generators
 {
-    
     public interface IGenerator
     {
         int ListSize { get; set; }
@@ -337,7 +327,6 @@ namespace TestStack.Dossier.DataSources.Generators
 }
 namespace TestStack.Dossier.DataSources.Geography
 {
-    
     [System.ObsoleteAttribute("GeoContinentSource is deprecated, please use Words(FromDictionary.GeoContinent) i" +
         "nstead.")]
     public class GeoContinentSource : TestStack.Dossier.DataSources.Dictionaries.FileDictionarySource
@@ -371,7 +360,6 @@ namespace TestStack.Dossier.DataSources.Geography
 }
 namespace TestStack.Dossier.DataSources.Person
 {
-    
     [System.ObsoleteAttribute("PersonEmailAddressSource is deprecated, please use Words(FromDictionary.PersonEma" +
         "ilAddress) instead.")]
     public class PersonEmailAddressSource : TestStack.Dossier.DataSources.Dictionaries.FileDictionarySource
@@ -430,7 +418,6 @@ namespace TestStack.Dossier.DataSources.Person
 }
 namespace TestStack.Dossier.DataSources.Picking
 {
-    
     public class Pick
     {
         public Pick() { }
@@ -438,13 +425,11 @@ namespace TestStack.Dossier.DataSources.Picking
         public static TestStack.Dossier.DataSources.Picking.RepeatingSequenceSource<T> RepeatingSequenceFrom<T>(System.Collections.Generic.IList<T> list) { }
     }
     public class RandomItemSource<T> : TestStack.Dossier.DataSources.DataSource<T>
-    
     {
         public RandomItemSource(System.Collections.Generic.IList<T> list) { }
         protected override System.Collections.Generic.IList<T> InitializeDataSource() { }
     }
     public class RepeatingSequenceSource<T> : TestStack.Dossier.DataSources.DataSource<T>
-    
     {
         public RepeatingSequenceSource(System.Collections.Generic.IList<T> list) { }
         protected override System.Collections.Generic.IList<T> InitializeDataSource() { }
@@ -452,7 +437,6 @@ namespace TestStack.Dossier.DataSources.Picking
 }
 namespace TestStack.Dossier.EquivalenceClasses
 {
-    
     public class static EnumEquivalenceClasses
     {
         public static TEnum Except<TEnum>(this TestStack.Dossier.AnonymousValueFixture fixture, params TEnum[] except)
@@ -477,7 +461,6 @@ namespace TestStack.Dossier.EquivalenceClasses
 }
 namespace TestStack.Dossier.EquivalenceClasses.Geo
 {
-    
     public class static GeographyEquivalenceClassescs
     {
         [System.ObsoleteAttribute("Continent is deprecated, please use Geography.Continent instead.")]
@@ -494,7 +477,6 @@ namespace TestStack.Dossier.EquivalenceClasses.Geo
 }
 namespace TestStack.Dossier.EquivalenceClasses.Person
 {
-    
     public class static PersonEquivalenceClasses
     {
         [System.ObsoleteAttribute("EmailAddress is deprecated, please use Person.EmailAddress instead.")]
@@ -521,7 +503,6 @@ namespace TestStack.Dossier.EquivalenceClasses.Person
 }
 namespace TestStack.Dossier.Factories
 {
-    
     public class AllPropertiesFactory : TestStack.Dossier.Factories.CallConstructorFactory
     {
         public AllPropertiesFactory() { }
@@ -559,7 +540,6 @@ namespace TestStack.Dossier.Factories
 }
 namespace TestStack.Dossier.Lists
 {
-    
     public class ListBuilder<TObject, TBuilder>
         where TObject :  class
         where TBuilder : TestStack.Dossier.TestDataBuilder<, >, new ()
@@ -567,6 +547,7 @@ namespace TestStack.Dossier.Lists
         public TBuilder All() { }
         public System.Collections.Generic.IList<TObject> BuildList() { }
         public System.Collections.Generic.IEnumerable<TBuilder> GetBuilders() { }
+        public static System.Collections.Generic.List<TObject> op_Implicit(TestStack.Dossier.Lists.ListBuilder<TObject, TBuilder> builder) { }
         public TBuilder TheFirst(int howMany) { }
         public TBuilder TheLast(int howMany) { }
         public TBuilder TheNext(int howMany) { }
@@ -600,7 +581,6 @@ namespace TestStack.Dossier.Lists
 }
 namespace TestStack.Dossier.Suppliers
 {
-    
     public class DefaultEmailValueSupplier : TestStack.Dossier.IAnonymousValueSupplier
     {
         public DefaultEmailValueSupplier() { }
diff --git a/TestStack.Dossier.Tests/PublicApiApproval/PublicApiApproverTests.cs b/TestStack.Dossier.Tests/PublicApiApproval/PublicApiApproverTests.cs
index bfc026b..fd38952 100644
--- a/TestStack.Dossier.Tests/PublicApiApproval/PublicApiApproverTests.cs
+++ b/TestStack.Dossier.Tests/PublicApiApproval/PublicApiApproverTests.cs
@@ -9,8 +9,8 @@ public class PublicApiApproverTests
         public void GivenDossierAssembly_WhenPublicApiChecked_ShouldHaveNoChanges()
         {
             ShouldlyConfiguration.DiffTools.KnownDoNotLaunchStrategies.TeamCity.ShouldNotLaunch();
-            var dossierAssembly = typeof (AnonymousValueFixture).Assembly;
-            var publicApi = PublicApiGenerator.PublicApiGenerator.GetPublicApi(dossierAssembly);
+            var dossierAssembly = typeof(AnonymousValueFixture).Assembly;
+            var publicApi = PublicApiGenerator.ApiGenerator.GeneratePublicApi(dossierAssembly, shouldIncludeAssemblyAttributes: false);
             publicApi.ShouldMatchApproved();
         }
     }
diff --git a/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj b/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj
index dec25d4..a1a527f 100644
--- a/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj
+++ b/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj
@@ -1,153 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.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>{DC49CE57-CB3F-487D-83DC-6A4E78CB908C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TestStack.Dossier.Tests</RootNamespace>
-    <AssemblyName>TestStack.Dossier.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>660882d1</NuGetPackageImportStamp>
+    <TargetFrameworks>netcoreapp2.0;net472</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>5</LangVersion>
-  </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>
-    <Prefer32Bit>false</Prefer32Bit>
+    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="NSubstitute, Version=1.8.1.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NSubstitute.1.8.1.0\lib\net45\NSubstitute.dll</HintPath>
-    </Reference>
-    <Reference Include="PublicApiGenerator, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PublicApiGenerator.4.0.1\lib\net40\PublicApiGenerator.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Shouldly, Version=2.7.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
-      <HintPath>..\packages\Shouldly.2.7.0-beta0003\lib\net40\Shouldly.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="xunit">
-      <HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.extensions">
-      <HintPath>..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Castle.Core" Version="4.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="NSubstitute" Version="3.1.0" />
+    <PackageReference Include="publicapigenerator" Version="8.1.0" />
+    <PackageReference Include="Shouldly" Version="3.0.2" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Builder_CreateListTests.cs" />
-    <Compile Include="Builder_CreateNewTests.cs" />
-    <Compile Include="Builder_SetUsingBuilderTests.cs" />
-    <Compile Include="EquivalenceClasses\AddressAusEquivalenceTests.cs" />
-    <Compile Include="EquivalenceClasses\AddressUkEquivalenceTests.cs" />
-    <Compile Include="EquivalenceClasses\AddressUsEquivalenceTests.cs" />
-    <Compile Include="EquivalenceClasses\ColourEquivalenceTests.cs" />
-    <Compile Include="EquivalenceClasses\CompanyEquivalenceTests.cs" />
-    <Compile Include="EquivalenceClasses\FileDictionaryEquivalenceTestCases.cs" />
-    <Compile Include="EquivalenceClasses\FileDictionaryEquivalenceTests.cs" />
-    <Compile Include="EquivalenceClasses\FinanceEquivalenceTests.cs" />
-    <Compile Include="EquivalenceClasses\FrequencyEquivalenceTests.cs" />
-    <Compile Include="EquivalenceClasses\GeoEquivalenceClassesTests.cs" />
-    <Compile Include="EquivalenceClasses\IdentifierEquivalenceTests.cs" />
-    <Compile Include="EquivalenceClasses\IntegerEquivalenceTests.cs" />
-    <Compile Include="EquivalenceClasses\LoremIpsumEquivalenceTests.cs" />
-    <Compile Include="EquivalenceClasses\PersonEquivalenceClassesTests.cs" />
-    <Compile Include="EquivalenceClasses\ShirtSizeEquivalenceTests.cs" />
-    <Compile Include="PublicApiApproval\PublicApiApproverTests.cs" />
-    <Compile Include="DataSources\Picking\PickingTests.cs" />
-    <Compile Include="TestHelpers\Builders\AddressViewModelBuilder.cs" />
-    <Compile Include="TestHelpers\Builders\AutoConstructorCustomerBuilder.cs" />
-    <Compile Include="ChildBuilderTests.cs" />
-    <Compile Include="Factories\AllPropertiesFactoryTests.cs" />
-    <Compile Include="Factories\AutoFixtureFactoryTests.cs" />
-    <Compile Include="Factories\CallConstructorFactoryTests.cs" />
-    <Compile Include="Factories\PublicPropertySettersFactoryTests.cs" />
-    <Compile Include="TestHelpers\Builders\BuilderWithDefaults.cs" />
-    <Compile Include="TestHelpers\Objects\Entities\Address.cs" />
-    <Compile Include="TestHelpers\Objects\Entities\Company.cs" />
-    <Compile Include="TestHelpers\Objects\Entities\Customer.cs" />
-    <Compile Include="TestHelpers\Objects\Entities\CustomerClass.cs" />
-    <Compile Include="DataSources\DataSourceTests.cs" />
-    <Compile Include="DataSources\Dictionaries\WordsCacheTests.cs" />
-    <Compile Include="DataSources\Dictionaries\CachedFileDictionaryRepositoryIntegrationTests.cs" />
-    <Compile Include="DataSources\Dictionaries\WordsTests.cs" />
-    <Compile Include="DataSources\Dictionaries\Resources\FileDataConventions.cs" />
-    <Compile Include="DataSources\Generators\RandomGeneratorTests.cs" />
-    <Compile Include="DataSources\Generators\SequentiaGeneratorTests.cs" />
-    <Compile Include="DataSources\DataSourceConventionTests.cs" />
-    <Compile Include="EquivalenceClasses\GeoEquivalenceTests.cs" />
-    <Compile Include="EquivalenceClasses\PersonEquivalenceTests.cs" />
-    <Compile Include="EquivalenceClasses\IntegerEquivalenceClassesTests.cs" />
-    <Compile Include="EquivalenceClasses\EnumEquivalenceClassesTests.cs" />
-    <Compile Include="EquivalenceClasses\StringEquivalenceClassesTests.cs" />
-    <Compile Include="AsProxyTests.cs" />
-    <Compile Include="BuildListTests.cs" />
-    <Compile Include="TestHelpers\Builders\BasicCustomerBuilder.cs" />
-    <Compile Include="TestHelpers\Builders\CustomerBuilder.cs" />
-    <Compile Include="TestHelpers\Builders\ProxyAlteringCustomerBuilder.cs" />
-    <Compile Include="BuildTests.cs" />
-    <Compile Include="GetAnonymousTests.cs" />
-    <Compile Include="GetOrDefaultTests.cs" />
-    <Compile Include="GetSetTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ProxyBuilderTests.cs" />
-    <Compile Include="TestHelpers\Objects\ViewModels\AddressViewModel.cs" />
-    <Compile Include="TestHelpers\Objects\ViewModels\Grade.cs" />
-    <Compile Include="TestHelpers\Objects\Examples\MixedAccessibilityDto.cs" />
-    <Compile Include="TestHelpers\Objects\ViewModels\StudentViewModel.cs" />
-    <Compile Include="TestHelpers\StaticAnonymousValueSupplier.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <ProjectReference Include="..\TestStack.Dossier\TestStack.Dossier.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <Content Include="SampleDictionaryFile.txt">
+    <None Update="SampleDictionaryFile.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\TestStack.Dossier\TestStack.Dossier.csproj">
-      <Project>{01e4ee61-ab1a-4177-8b6c-d50205d167a9}</Project>
-      <Name>TestStack.Dossier</Name>
-    </ProjectReference>
+    </None>
   </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/TestStack.Dossier.Tests/packages.config b/TestStack.Dossier.Tests/packages.config
deleted file mode 100644
index 30cb97f..0000000
--- a/TestStack.Dossier.Tests/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NSubstitute" version="1.8.1.0" targetFramework="net451" />
-  <package id="PublicApiGenerator" version="4.0.1" targetFramework="net451" />
-  <package id="Shouldly" version="2.7.0-beta0003" targetFramework="net451" />
-  <package id="xunit" version="1.9.2" targetFramework="net451" />
-  <package id="xunit.extensions" version="1.9.2" targetFramework="net451" />
-</packages>
\ No newline at end of file
diff --git a/TestStack.Dossier.sln b/TestStack.Dossier.sln
index 78b68bf..ea72a89 100644
--- a/TestStack.Dossier.sln
+++ b/TestStack.Dossier.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26014.0
+VisualStudioVersion = 15.0.26430.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BC8508D1-6FCB-46B2-9C14-F41F6AD76B09}"
 	ProjectSection(SolutionItems) = preProject
@@ -14,9 +14,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.Dossier.Tests", "TestStack.Dossier.Tests\TestStack.Dossier.Tests.csproj", "{DC49CE57-CB3F-487D-83DC-6A4E78CB908C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.Dossier", "TestStack.Dossier\TestStack.Dossier.csproj", "{768AF10B-5E0C-46BB-B6CD-B202AF39A0EF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.Dossier", "TestStack.Dossier\TestStack.Dossier.csproj", "{01E4EE61-AB1A-4177-8B6C-D50205D167A9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.Dossier.Tests", "TestStack.Dossier.Tests\TestStack.Dossier.Tests.csproj", "{5B38B893-1018-4F0D-9999-4DA1385EB94A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,14 +24,14 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DC49CE57-CB3F-487D-83DC-6A4E78CB908C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC49CE57-CB3F-487D-83DC-6A4E78CB908C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC49CE57-CB3F-487D-83DC-6A4E78CB908C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC49CE57-CB3F-487D-83DC-6A4E78CB908C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01E4EE61-AB1A-4177-8B6C-D50205D167A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01E4EE61-AB1A-4177-8B6C-D50205D167A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01E4EE61-AB1A-4177-8B6C-D50205D167A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01E4EE61-AB1A-4177-8B6C-D50205D167A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{768AF10B-5E0C-46BB-B6CD-B202AF39A0EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{768AF10B-5E0C-46BB-B6CD-B202AF39A0EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{768AF10B-5E0C-46BB-B6CD-B202AF39A0EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{768AF10B-5E0C-46BB-B6CD-B202AF39A0EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B38B893-1018-4F0D-9999-4DA1385EB94A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B38B893-1018-4F0D-9999-4DA1385EB94A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B38B893-1018-4F0D-9999-4DA1385EB94A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B38B893-1018-4F0D-9999-4DA1385EB94A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/TestStack.Dossier/AnonymousValueFixture.cs b/TestStack.Dossier/AnonymousValueFixture.cs
index 83a6dc2..0e641ae 100644
--- a/TestStack.Dossier/AnonymousValueFixture.cs
+++ b/TestStack.Dossier/AnonymousValueFixture.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using Ploeh.AutoFixture;
+using AutoFixture;
 using TestStack.Dossier.DataSources.Dictionaries;
 using TestStack.Dossier.Suppliers;
 
diff --git a/TestStack.Dossier/AssemblyInfo.cs b/TestStack.Dossier/AssemblyInfo.cs
new file mode 100644
index 0000000..66feadf
--- /dev/null
+++ b/TestStack.Dossier/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+using System.Runtime.CompilerServices;
+
+// Handling InternalsVisibleTo in new .csproj
+// https://stackoverflow.com/questions/42810705/visual-studio-2017-new-csproj-internalsvisibleto
+[assembly: InternalsVisibleTo("TestStack.Dossier.Tests")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] 
\ No newline at end of file
diff --git a/TestStack.Dossier/DataSources/Dictionaries/CachedFileDictionaryRepository.cs b/TestStack.Dossier/DataSources/Dictionaries/CachedFileDictionaryRepository.cs
index 0a783d1..2bf84bd 100644
--- a/TestStack.Dossier/DataSources/Dictionaries/CachedFileDictionaryRepository.cs
+++ b/TestStack.Dossier/DataSources/Dictionaries/CachedFileDictionaryRepository.cs
@@ -22,7 +22,7 @@ public IList<string> GetWordsFrom(string dictionary)
             else
             {
                 var resourceName = string.Format("TestStack.Dossier.DataSources.Dictionaries.Resources.{0}", name);
-                words = GetWordsFromEmbeddedResource(GetType().Assembly, resourceName).ToList();
+                words = GetWordsFromEmbeddedResource(GetType().GetTypeInfo().Assembly, resourceName).ToList();
             }
 
             return words;
diff --git a/TestStack.Dossier/EquivalenceClasses/EnumEquivalenceClasses.cs b/TestStack.Dossier/EquivalenceClasses/EnumEquivalenceClasses.cs
index a37f287..c5c5b47 100644
--- a/TestStack.Dossier/EquivalenceClasses/EnumEquivalenceClasses.cs
+++ b/TestStack.Dossier/EquivalenceClasses/EnumEquivalenceClasses.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using Ploeh.AutoFixture;
+using AutoFixture;
 
 namespace TestStack.Dossier.EquivalenceClasses
 {
diff --git a/TestStack.Dossier/EquivalenceClasses/FinanceEquivalence.cs b/TestStack.Dossier/EquivalenceClasses/FinanceEquivalence.cs
index e3f2364..c98e8a0 100644
--- a/TestStack.Dossier/EquivalenceClasses/FinanceEquivalence.cs
+++ b/TestStack.Dossier/EquivalenceClasses/FinanceEquivalence.cs
@@ -22,7 +22,6 @@ public FinanceEquivalence(AnonymousValueFixture fixture)
         /// <summary>
         /// Generate and return a finance credit card number.
         /// </summary>
-        /// <param name="fixture">The fixture to generate a value for.</param>
         /// <returns>The generated value.</returns>
         public string CreditCardNumber()
         {
@@ -32,7 +31,6 @@ public string CreditCardNumber()
         /// <summary>
         /// Generate and return a finance credit card type.
         /// </summary>
-        /// <param name="fixture">The fixture to generate a value for.</param>
         /// <returns>The generated value.</returns>
         public string CreditCardType()
         {
@@ -42,7 +40,6 @@ public string CreditCardType()
         /// <summary>
         /// Generate and return a finance currency name.
         /// </summary>
-        /// <param name="fixture">The fixture to generate a value for.</param>
         /// <returns>The generated value.</returns>
         public string Currency()
         {
@@ -52,7 +49,6 @@ public string Currency()
         /// <summary>
         /// Generate and return a finance currency code.
         /// </summary>
-        /// <param name="fixture">The fixture to generate a value for.</param>
         /// <returns>The generated value.</returns>
         public string CurrencyCode()
         {
diff --git a/TestStack.Dossier/EquivalenceClasses/IntegerEquivalenceClasses.cs b/TestStack.Dossier/EquivalenceClasses/IntegerEquivalenceClasses.cs
index 9c60524..32c9acf 100644
--- a/TestStack.Dossier/EquivalenceClasses/IntegerEquivalenceClasses.cs
+++ b/TestStack.Dossier/EquivalenceClasses/IntegerEquivalenceClasses.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Ploeh.AutoFixture;
+using AutoFixture;
 
 namespace TestStack.Dossier.EquivalenceClasses
 {
diff --git a/TestStack.Dossier/EquivalenceClasses/StringEquivalenceClasses.cs b/TestStack.Dossier/EquivalenceClasses/StringEquivalenceClasses.cs
index f694f9e..4ad3ae9 100644
--- a/TestStack.Dossier/EquivalenceClasses/StringEquivalenceClasses.cs
+++ b/TestStack.Dossier/EquivalenceClasses/StringEquivalenceClasses.cs
@@ -1,6 +1,6 @@
 using System.Text;
-using Ploeh.AutoFixture;
-using Ploeh.AutoFixture.Kernel;
+using AutoFixture;
+using AutoFixture.Kernel;
 
 namespace TestStack.Dossier.EquivalenceClasses
 {
@@ -48,7 +48,8 @@ public object Resolve(object request)
         /// <returns>The generated string</returns>
         public static string StringStartingWith(this AnonymousValueFixture fixture, string prefix)
         {
-            return fixture.Fixture.Create(prefix);
+            //return fixture.Fixture.Create<string>(prefix);
+            return string.Format("{0}{1}", prefix, fixture.Fixture.Create<string>());
         }
 
         /// <summary>
diff --git a/TestStack.Dossier/Factories/AllPropertiesFactory.cs b/TestStack.Dossier/Factories/AllPropertiesFactory.cs
index 1f105b3..1696811 100644
--- a/TestStack.Dossier/Factories/AllPropertiesFactory.cs
+++ b/TestStack.Dossier/Factories/AllPropertiesFactory.cs
@@ -1,4 +1,4 @@
-using Ploeh.AutoFixture;
+using AutoFixture;
 
 namespace TestStack.Dossier.Factories
 {
diff --git a/TestStack.Dossier/Factories/AutoFixtureFactory.cs b/TestStack.Dossier/Factories/AutoFixtureFactory.cs
index 8c8b4ec..588817d 100644
--- a/TestStack.Dossier/Factories/AutoFixtureFactory.cs
+++ b/TestStack.Dossier/Factories/AutoFixtureFactory.cs
@@ -1,4 +1,4 @@
-using Ploeh.AutoFixture;
+using AutoFixture;
 
 namespace TestStack.Dossier.Factories
 {
diff --git a/TestStack.Dossier/Properties/AssemblyInfo.cs b/TestStack.Dossier/Properties/AssemblyInfo.cs
deleted file mode 100644
index 35a1828..0000000
--- a/TestStack.Dossier/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("TestStack.Dossier")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TestStack.Dossier")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: InternalsVisibleTo("TestStack.Dossier.Tests")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] 
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("24a139fb-b390-4f14-9be6-cf9fb354bb5d")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/TestStack.Dossier/Suppliers/DefaultValueSupplier.cs b/TestStack.Dossier/Suppliers/DefaultValueSupplier.cs
index fe3f0d9..bfbea1c 100644
--- a/TestStack.Dossier/Suppliers/DefaultValueSupplier.cs
+++ b/TestStack.Dossier/Suppliers/DefaultValueSupplier.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 
 namespace TestStack.Dossier.Suppliers
 {
@@ -17,7 +18,7 @@ public bool CanSupplyValue(Type type, string propertyName)
         public object GenerateAnonymousValue(AnonymousValueFixture any, Type type, string propertyName)
         {
             // See stackoverflow: http://stackoverflow.com/questions/325426/programmatic-equivalent-of-defaulttype
-            if (type.IsValueType)
+            if (type.GetTypeInfo().IsValueType)
             {
                 return Activator.CreateInstance(type);
             }
diff --git a/TestStack.Dossier/Suppliers/DefaultValueTypeValueSupplier.cs b/TestStack.Dossier/Suppliers/DefaultValueTypeValueSupplier.cs
index 1e0ec24..ae7ba85 100644
--- a/TestStack.Dossier/Suppliers/DefaultValueTypeValueSupplier.cs
+++ b/TestStack.Dossier/Suppliers/DefaultValueTypeValueSupplier.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Linq;
-using Ploeh.AutoFixture;
-using Ploeh.AutoFixture.Kernel;
+using System.Reflection;
+using AutoFixture;
+using AutoFixture.Kernel;
 
 namespace TestStack.Dossier.Suppliers
 {
@@ -13,7 +14,7 @@ public class DefaultValueTypeValueSupplier : IAnonymousValueSupplier
         /// <inerhitdoc />
         public bool CanSupplyValue(Type type, string propertyName)
         {
-            return type.IsValueType;
+            return type.GetTypeInfo().IsValueType;
         }
 
         /// <inerhitdoc />
diff --git a/TestStack.Dossier/TestStack.Dossier.csproj b/TestStack.Dossier/TestStack.Dossier.csproj
index 6643fca..5fc48a2 100644
--- a/TestStack.Dossier/TestStack.Dossier.csproj
+++ b/TestStack.Dossier/TestStack.Dossier.csproj
@@ -1,141 +1,97 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.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>{01E4EE61-AB1A-4177-8B6C-D50205D167A9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TestStack.Dossier</RootNamespace>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>TestStack.Dossier</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <PackageId>TestStack.Dossier</PackageId>
+    <Authors>Robert Moore, Michael Whelan, TestStack</Authors>
+    <Description>
+      TestStack.Dossier provides you with the code infrastructure to easily and quickly generate test fixture data for your automated tests in a terse, readable and maintainable way using the Test Data Builder, anonymous value and equivalence class patterns. Formerly called NTestDataBuilder.
+    </Description>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageTags>testing data-generation test-fixture nbuilder nsubstitute autofixture mocking equivalence-class test-data-builder anonymous-value ntestdatabuilder</PackageTags>
+    <RepositoryUrl>https://github.com/TestStack/TestStack.Dossier</RepositoryUrl>
   </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>
-    <DocumentationFile>bin\Debug\TestStack.Dossier.xml</DocumentationFile>
-    <LangVersion>5</LangVersion>
-  </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>
-    <DocumentationFile>bin\Release\TestStack.Dossier.xml</DocumentationFile>
+
+  <PropertyGroup>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
+
+  <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
+    <ItemGroup>
+      <DocFile Include="bin\$(Configuration)\$(TargetFramework)\$(TargetName).xml" />
+    </ItemGroup>
+    <Copy SourceFiles="@(DocFile)" DestinationFolder="$(PublishDir)" SkipUnchangedFiles="false" />
+  </Target>
+
   <ItemGroup>
-    <Reference Include="Castle.Core">
-      <HintPath>..\packages\Castle.Core.3.3.1\lib\net40-client\Castle.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="NSubstitute, Version=1.8.1.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NSubstitute.1.8.1.0\lib\net40\NSubstitute.dll</HintPath>
-    </Reference>
-    <Reference Include="Ploeh.AutoFixture">
-      <HintPath>..\packages\AutoFixture.3.20.0\lib\net40\Ploeh.AutoFixture.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AnonymousValueFixture.cs" />
-    <Compile Include="Builder.cs" />
-    <Compile Include="DataSources\Dictionaries\FileDictionarySource.cs" />
-    <Compile Include="DataSources\Dictionaries\Words.cs" />
-    <Compile Include="DataSources\Dictionaries\FromDictionary.cs" />
-    <Compile Include="DataSources\Geography\GeoContinentSource.cs" />
-    <Compile Include="DataSources\Geography\GeoCountryCodeSource.cs" />
-    <Compile Include="DataSources\Geography\GeoCountrySource.cs" />
-    <Compile Include="DataSources\Geography\GeoLatitudeSource.cs" />
-    <Compile Include="DataSources\Geography\GeoLongitudeSource.cs" />
-    <Compile Include="DataSources\Person\PersonEmailAddressSource.cs" />
-    <Compile Include="DataSources\Person\PersonLanguageSource.cs" />
-    <Compile Include="DataSources\Person\PersonNameFirstFemaleSource.cs" />
-    <Compile Include="DataSources\Person\PersonNameFirstMaleSource.cs" />
-    <Compile Include="DataSources\Person\PersonNameFirstSource.cs" />
-    <Compile Include="DataSources\Person\PersonNameFullSource.cs" />
-    <Compile Include="DataSources\Person\PersonNameLastSource.cs" />
-    <Compile Include="DataSources\Person\PersonNameSuffixSource.cs" />
-    <Compile Include="DataSources\Person\PersonNameTitleSource.cs" />
-    <Compile Include="EquivalenceClasses\AddressAusEquivalence.cs" />
-    <Compile Include="EquivalenceClasses\AddressUkEquivalence.cs" />
-    <Compile Include="EquivalenceClasses\AddressUsEquivalence.cs" />
-    <Compile Include="EquivalenceClasses\Equivalence.cs" />
-    <Compile Include="EquivalenceClasses\Geo\GeographyEquivalenceClassescs.cs" />
-    <Compile Include="EquivalenceClasses\PersonEquivalenceExtensions.cs" />
-    <Compile Include="EquivalenceClasses\Person\PersonEquivalenceClasses.cs" />
-    <Compile Include="EquivalenceClasses\ShirtSizeEquivalence.cs" />
-    <Compile Include="EquivalenceClasses\ColourEquivalence.cs" />
-    <Compile Include="EquivalenceClasses\CompanyEquivalence.cs" />
-    <Compile Include="EquivalenceClasses\FinanceEquivalence.cs" />
-    <Compile Include="EquivalenceClasses\FrequencyEquivalence.cs" />
-    <Compile Include="EquivalenceClasses\GeoEquivalence.cs" />
-    <Compile Include="EquivalenceClasses\IdentifierEquivalence.cs" />
-    <Compile Include="EquivalenceClasses\InternetEquivalence.cs" />
-    <Compile Include="EquivalenceClasses\LoremIpsumEquivalence.cs" />
-    <Compile Include="EquivalenceClasses\PersonEquivalence.cs" />
-    <Compile Include="DataSources\Picking\Pick.cs" />
-    <Compile Include="DataSources\Picking\RandomItemSource.cs" />
-    <Compile Include="DataSources\Picking\RepeatingSequenceSource.cs" />
-    <Compile Include="ITestDataBuilder.cs" />
-    <Compile Include="DataSources\Dictionaries\WordsCache.cs" />
-    <Compile Include="DataSources\Dictionaries\IDictionaryRepository.cs" />
-    <Compile Include="DataSources\Dictionaries\CachedFileDictionaryRepository.cs" />
-    <Compile Include="DataSources\DataSource.cs" />
-    <Compile Include="DataSources\IDataSource.cs" />
-    <Compile Include="EquivalenceClasses\EnumEquivalenceClasses.cs" />
-    <Compile Include="EquivalenceClasses\IntegerEquivalenceClasses.cs" />
-    <Compile Include="DataSources\Generators\IGenerator.cs" />
-    <Compile Include="DataSources\Generators\RandomGenerator.cs" />
-    <Compile Include="DataSources\Generators\SequentialGenerator.cs" />
-    <Compile Include="EquivalenceClasses\StringEquivalenceClasses.cs" />
-    <Compile Include="Factories\AutoFixtureFactory.cs" />
-    <Compile Include="Factories\CallConstructorFactory.cs" />
-    <Compile Include="Factories\AllPropertiesFactory.cs" />
-    <Compile Include="Factories\PublicPropertySettersFactory.cs" />
-    <Compile Include="IAnonymousValueSupplier.cs" />
-    <Compile Include="Lists\EnsureAllMethodsVirtual.cs" />
-    <Compile Include="Lists\ListBuilder.cs" />
-    <Compile Include="Lists\ListBuilderExtensions.cs" />
-    <Compile Include="Lists\ListBuilderGenerator.cs" />
-    <Compile Include="Lists\ListBuilderInterceptor.cs" />
-    <Compile Include="NullingExpandoObject.cs" />
-    <Compile Include="Factories\IFactory.cs" />
-    <Compile Include="PathExpressionVisitor.cs" />
-    <Compile Include="Reflector.cs" />
-    <Compile Include="Suppliers\DefaultEmailValueSupplier.cs" />
-    <Compile Include="Suppliers\DefaultLastNameValueSupplier.cs" />
-    <Compile Include="Suppliers\DefaultFirstNameValueSupplier.cs" />
-    <Compile Include="Suppliers\DefaultValueSupplier.cs" />
-    <Compile Include="Suppliers\DefaultStringValueSupplier.cs" />
-    <Compile Include="Suppliers\DefaultValueTypeValueSupplier.cs" />
-    <Compile Include="TestDataBuilder.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ProxyBuilder.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="TestStack.Dossier.nuspec" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="DataSources\Dictionaries\Resources\GeoContinent.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="DataSources\Dictionaries\Resources\GeoCountry.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressAusCity.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressAusCompany.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressAusPhone.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressAusPostCode.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressAusState.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressAusStateAbbreviation.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressAusStreet.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressAusWebsite.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUKCity.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUKCompany.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUKCounty.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUKPhone.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUKPostCode.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUKStreet.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUKWebsite.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUSCity.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUSCompany.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUSPhone.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUSSocialSecurityNumber.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUSState.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUSStateAbbreviation.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUSStreet.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUSWebsite.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\AddressUSZipCode.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\ColourHex.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\ColourName.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\CompanyIndustry.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\CompanyJobTitle.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\CompanyLocation.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\CompanyName.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\FinanceCreditCardNumber.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\FinanceCreditCardType.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\FinanceCurrency.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\FinanceCurrencyCode.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\Frequency.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\GeoContinent.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\GeoCountry.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\GeoCountryCode.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\GeoLatitude.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\GeoLongitude.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\IdentifierBitcoinAddress.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\IdentifierIBAN.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\IdentifierIPAddressV4.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\IdentifierIPAddressV6.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\IdentifierISBN.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\IdentifierMacAddress.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\InternetDomainCountryCodeTopLevelDomain.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\InternetDomainName.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\InternetDomainTopLevel.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\InternetURL.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\LoremIpsum.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\PersonEmailAddress.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\PersonLanguage.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\PersonNameFirst.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\PersonNameFirstFemale.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\PersonNameFirstMale.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\PersonNameFull.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\PersonNameLast.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\PersonNameSuffix.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\PersonNameTitle.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\PersonPassword.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\PersonRace.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\PersonUsername.txt" />
+    <None Remove="DataSources\Dictionaries\Resources\ShirtSize.txt" />
   </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Include="DataSources\Dictionaries\Resources\AddressAusCity.txt" />
     <EmbeddedResource Include="DataSources\Dictionaries\Resources\AddressAusCompany.txt" />
@@ -172,6 +128,8 @@
     <EmbeddedResource Include="DataSources\Dictionaries\Resources\FinanceCurrency.txt" />
     <EmbeddedResource Include="DataSources\Dictionaries\Resources\FinanceCurrencyCode.txt" />
     <EmbeddedResource Include="DataSources\Dictionaries\Resources\Frequency.txt" />
+    <EmbeddedResource Include="DataSources\Dictionaries\Resources\GeoContinent.txt" />
+    <EmbeddedResource Include="DataSources\Dictionaries\Resources\GeoCountry.txt" />
     <EmbeddedResource Include="DataSources\Dictionaries\Resources\GeoCountryCode.txt" />
     <EmbeddedResource Include="DataSources\Dictionaries\Resources\GeoLatitude.txt" />
     <EmbeddedResource Include="DataSources\Dictionaries\Resources\GeoLongitude.txt" />
@@ -200,14 +158,17 @@
     <EmbeddedResource Include="DataSources\Dictionaries\Resources\PersonUsername.txt" />
     <EmbeddedResource Include="DataSources\Dictionaries\Resources\ShirtSize.txt" />
   </ItemGroup>
-  <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="AutoFixture" Version="4.6.0" />
+    <PackageReference Include="Castle.Core" Version="4.3.1" />
+    <PackageReference Include="NSubstitute" Version="3.1.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
+    <PackageReference Include="AutoFixture">
+      <Version>4.0.0-alpha.230</Version>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/TestStack.Dossier/TestStack.Dossier.nuspec b/TestStack.Dossier/TestStack.Dossier.nuspec
deleted file mode 100644
index b45f643..0000000
--- a/TestStack.Dossier/TestStack.Dossier.nuspec
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?> 
-<package>
-  <metadata>
-    <id>
-       TestStack.Dossier
-    </id>
-    <version>
-       1.0.0
-    </version>
-    <authors>
-       Robert Moore, Michael Whelan, TestStack
-    </authors>
-    <description>
-      TestStack.Dossier provides you with the code infrastructure to easily and quickly generate test fixture data for your automated tests in a terse, readable and maintainable way using the Test Data Builder, anonymous value and equivalence class patterns.
-      
-      Formerly called NTestDataBuilder.
-    </description>
-    <projectUrl>
-      https://github.com/TestStack/TestStack.Dossier
-    </projectUrl>
-    <licenseUrl>
-      https://github.com/TestStack/TestStack.Dossier/blob/master/LICENSE
-    </licenseUrl>
-    <iconUrl>
-      https://raw.github.com/TestStack/TestStack.Dossier/master/logo.png
-    </iconUrl>
-    <tags>
-       testing data-generation test-fixture nbuilder nsubstitute autofixture mocking equivalence-class test-data-builder anonymous-value ntestdatabuilder
-    </tags>
-    <language>
-       en-US 
-    </language>
-    <dependencies>
-      <dependency id="NSubstitute" version="1.8.1.0" />
-      <dependency id="Castle.Core" version="3.3.1" />
-      <dependency id="AutoFixture" version="3.20.0" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Release\TestStack.Dossier.dll" target="lib\NET40" />
-    <file src="bin\Release\TestStack.Dossier.pdb" target="lib\NET40" />
-    <file src="bin\Release\TestStack.Dossier.XML" target="lib\NET40" />
-    <file src="**\*.cs" exclude="obj\**\*.*" target="src" />
-  </files>
-</package>
diff --git a/TestStack.Dossier/packages.config b/TestStack.Dossier/packages.config
deleted file mode 100644
index d6889a8..0000000
--- a/TestStack.Dossier/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AutoFixture" version="3.20.0" targetFramework="net40" />
-  <package id="Castle.Core" version="3.3.1" targetFramework="net40" />
-  <package id="NSubstitute" version="1.8.1.0" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 54dbffc..5a5ab94 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,28 +8,20 @@ environment:
     secure: cBxvAtTgSlWVblTXtx8QKygh2HQeYZ9i0plMjJzCTNInGCm1XyG+nrSs18qUtC8W
 before_build:
 - ps: >-
-    nuget restore
+    dotnet restore
 
-    choco install -y --no-progress git.install GitReleaseManager.Portable
+    dotnet tool install -g GitVersion.Tool --version 4.0.1-beta1-58
 
-    npm install github-release-notes -g
-    
-    GitVersion /output buildserver /updateassemblyinfo
-
-    If (Test-Path ".\PreBuild.ps1") {
-
-      & ".\PreBuild.ps1"
+    dotnet gitversion /output buildserver
 
-    }
-
-build:
-  parallel: true
-  verbosity: minimal
+    npm install github-release-notes -g
+build_script:
+- ps: dotnet build --source "**/*.csproj" --configuration Release --verbosity minimal -p:VersionPrefix="$Env:GitVersion_NuGetVersion" -p:FileVersion="$Env:GitVersion_AssemblySemFileVer" -p:InformationalVersion="$Env:GitVersion_InformationalVersion"
 after_build:
 - ps: >-
-    Get-ChildItem -Recurse *.nuspec | foreach { nuget pack $_.FullName -Properties "Configuration=Release;Platform=AnyCPU" -Symbols -Version $Env:GitVersion_NuGetVersion }
+    dotnet pack $Env:APPVEYOR_PROJECT_NAME/$Env:APPVEYOR_PROJECT_NAME.csproj --configuration Release /p:PackageVersion="$Env:GitVersion_NuGetVersion" --no-build --output "$Env:APPVEYOR_BUILD_FOLDER" --include-symbols
 
-    $currentTag = git tag -l --points-at HEAD
+    $currentCommitIsTagged = git tag -l --points-at HEAD
 
     $HTTP_Request = [System.Net.WebRequest]::Create("https://api.github.com/repos/$env:GitHubOrganisation/$env:APPVEYOR_PROJECT_NAME/releases/tags/$Env:GitVersion_NuGetVersion")
 
@@ -42,8 +34,9 @@ after_build:
     } catch [Net.WebException] { 
 
         [System.Net.HttpWebResponse] $resp = [System.Net.HttpWebResponse] $_.Exception.Response  
+        $noExistingGitHubRelease = $resp.StatusCode -eq 404
 
-        if ($currentTag -And $resp.StatusCode -eq 404) {
+        if ($currentCommitIsTagged -And $noExistingGitHubRelease) {
 
           $env:SHOULD_DEPLOY = 'true'