diff --git a/.vs/DataAnnotationsValidator/v16/TestStore/0/000.testlog b/.vs/DataAnnotationsValidator/v16/TestStore/0/000.testlog
new file mode 100644
index 0000000..b2aed35
Binary files /dev/null and b/.vs/DataAnnotationsValidator/v16/TestStore/0/000.testlog differ
diff --git a/.vs/DataAnnotationsValidator/v16/TestStore/0/testlog.manifest b/.vs/DataAnnotationsValidator/v16/TestStore/0/testlog.manifest
new file mode 100644
index 0000000..e92ede2
Binary files /dev/null and b/.vs/DataAnnotationsValidator/v16/TestStore/0/testlog.manifest differ
diff --git a/DataAnnotationsValidator.sln b/DataAnnotationsValidator.sln
new file mode 100644
index 0000000..d80efb5
--- /dev/null
+++ b/DataAnnotationsValidator.sln
@@ -0,0 +1,41 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30413.136
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{01E8FDFE-435E-4F24-AD27-D4DAA621523B}"
+	ProjectSection(SolutionItems) = preProject
+		DataAnnotationsValidatorRecursive.snk = DataAnnotationsValidatorRecursive.snk
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E3276157-B94F-471C-B929-37232C110430}"
+	ProjectSection(SolutionItems) = preProject
+		DataAnnotationsValidator\Directory.Build.props = DataAnnotationsValidator\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataAnnotationsValidator", "DataAnnotationsValidator\DataAnnotationsValidator\DataAnnotationsValidator.csproj", "{7CFD7060-1A89-48F3-A3E0-5F71B4FCAE53}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataAnnotationsValidator.Tests", "DataAnnotationsValidator\DataAnnotationsValidator.Tests\DataAnnotationsValidator.Tests.csproj", "{30D2BD69-474E-459E-9F29-9018EDDF1E0D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7CFD7060-1A89-48F3-A3E0-5F71B4FCAE53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CFD7060-1A89-48F3-A3E0-5F71B4FCAE53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CFD7060-1A89-48F3-A3E0-5F71B4FCAE53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CFD7060-1A89-48F3-A3E0-5F71B4FCAE53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30D2BD69-474E-459E-9F29-9018EDDF1E0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30D2BD69-474E-459E-9F29-9018EDDF1E0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30D2BD69-474E-459E-9F29-9018EDDF1E0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30D2BD69-474E-459E-9F29-9018EDDF1E0D}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {13229DDB-D9D4-4A44-A6BE-A8944601B56D}
+	EndGlobalSection
+EndGlobal
diff --git a/DataAnnotationsValidator/.nuget/NuGet.Config b/DataAnnotationsValidator/.nuget/NuGet.Config
deleted file mode 100644
index 67f8ea0..0000000
--- a/DataAnnotationsValidator/.nuget/NuGet.Config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
-</configuration>
\ No newline at end of file
diff --git a/DataAnnotationsValidator/.nuget/NuGet.exe b/DataAnnotationsValidator/.nuget/NuGet.exe
deleted file mode 100644
index 6bb79fe..0000000
Binary files a/DataAnnotationsValidator/.nuget/NuGet.exe and /dev/null differ
diff --git a/DataAnnotationsValidator/.nuget/NuGet.targets b/DataAnnotationsValidator/.nuget/NuGet.targets
deleted file mode 100644
index 3f8c37b..0000000
--- a/DataAnnotationsValidator/.nuget/NuGet.targets
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-
-        <!-- Enable the restore command to run before builds -->
-        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
-
-        <!-- Property that enables building a package from a project -->
-        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
-
-        <!-- Determines if package restore consent is required to restore packages -->
-        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
-
-        <!-- Download NuGet.exe if it does not already exist -->
-        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
-    </PropertyGroup>
-
-    <ItemGroup Condition=" '$(PackageSources)' == '' ">
-        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
-        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
-        <!--
-            <PackageSource Include="https://www.nuget.org/api/v2/" />
-            <PackageSource Include="https://my-nuget-source/nuget/" />
-        -->
-    </ItemGroup>
-
-    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
-        <!-- Windows specific commands -->
-        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
-        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
-        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
-        <PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
-      <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup>
-        <!-- NuGet command -->
-        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
-        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
-
-        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
-        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 "$(NuGetExePath)"</NuGetCommand>
-
-        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
-
-        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
-        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
-
-        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
-        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
-
-        <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
-
-        <!-- We need to ensure packages are restored prior to assembly resolve -->
-        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
-            RestorePackages;
-            $(BuildDependsOn);
-        </BuildDependsOn>
-
-        <!-- Make the build depend on restore packages -->
-        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
-            $(BuildDependsOn);
-            BuildPackage;
-        </BuildDependsOn>
-    </PropertyGroup>
-
-    <Target Name="CheckPrerequisites">
-        <!-- Raise an error if we're unable to locate nuget.exe  -->
-        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
-        <!--
-        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
-        This effectively acts as a lock that makes sure that the download operation will only happen once and all
-        parallel builds will have to wait for it to complete.
-        -->
-        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
-    </Target>
-
-    <Target Name="_DownloadNuGet">
-        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
-    </Target>
-
-    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">        
-        <Exec Command="$(RestoreCommand)"
-              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
-
-        <Exec Command="$(RestoreCommand)"
-              LogStandardErrorAsError="true"
-              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
-    </Target>
-
-    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(BuildCommand)"
-              Condition=" '$(OS)' != 'Windows_NT' " />
-
-        <Exec Command="$(BuildCommand)"
-              LogStandardErrorAsError="true"
-              Condition=" '$(OS)' == 'Windows_NT' " />
-    </Target>
-
-    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-        <ParameterGroup>
-            <OutputFilename ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Reference Include="System.Core" />
-            <Using Namespace="System" />
-            <Using Namespace="System.IO" />
-            <Using Namespace="System.Net" />
-            <Using Namespace="Microsoft.Build.Framework" />
-            <Using Namespace="Microsoft.Build.Utilities" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                try {
-                    OutputFilename = Path.GetFullPath(OutputFilename);
-
-                    Log.LogMessage("Downloading latest version of NuGet.exe...");
-                    WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
-
-                    return true;
-                }
-                catch (Exception ex) {
-                    Log.LogErrorFromException(ex);
-                    return false;
-                }
-            ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-</Project>
diff --git a/DataAnnotationsValidator/DataAnnotationsValidator.Tests/App.config b/DataAnnotationsValidator/DataAnnotationsValidator.Tests/App.config
new file mode 100644
index 0000000..57b2ac7
--- /dev/null
+++ b/DataAnnotationsValidator/DataAnnotationsValidator.Tests/App.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/DataAnnotationsValidator/DataAnnotationsValidator.Tests/DataAnnotationsValidator.Tests.csproj b/DataAnnotationsValidator/DataAnnotationsValidator.Tests/DataAnnotationsValidator.Tests.csproj
index 6061c99..a126737 100644
--- a/DataAnnotationsValidator/DataAnnotationsValidator.Tests/DataAnnotationsValidator.Tests.csproj
+++ b/DataAnnotationsValidator/DataAnnotationsValidator.Tests/DataAnnotationsValidator.Tests.csproj
@@ -1,85 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{019E325C-9923-4643-8834-1A301F148093}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DataAnnotationsValidator.Tests</RootNamespace>
-    <AssemblyName>DataAnnotationsValidator.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
+    <TargetFramework>net472</TargetFramework>
+    <AssemblyTitle>DataAnnotationsValidator.Tests</AssemblyTitle>
+    <Product>DataAnnotationsValidator.Tests</Product>
   </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>
-    <Prefer32Bit>false</Prefer32Bit>
   </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>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.9.0\lib\net40\nunit.framework.dll</HintPath>
-    </Reference>
-    <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.Xml" />
+    <PackageReference Include="NUnit" Version="3.9.0" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Child.cs" />
-    <Compile Include="ClassWithNullableEnumeration.cs" />
-    <Compile Include="ClassWithDictionary.cs" />
-    <Compile Include="DataAnnotationsValidatorTests.cs" />
-    <Compile Include="GrandChild.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Parent.cs" />
-    <Compile Include="SaveValidationContextAttribute.cs" />
+    <ProjectReference Include="..\DataAnnotationsValidator\DataAnnotationsValidator.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\DataAnnotationsValidator\DataAnnotationsValidator.csproj">
-      <Project>{218B0C2C-19AD-4C7B-B583-840FF755A76D}</Project>
-      <Name>DataAnnotationsValidator</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- 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/DataAnnotationsValidator/DataAnnotationsValidator.Tests/Properties/AssemblyInfo.cs b/DataAnnotationsValidator/DataAnnotationsValidator.Tests/Properties/AssemblyInfo.cs
index f13cc17..24d0e9c 100644
--- a/DataAnnotationsValidator/DataAnnotationsValidator.Tests/Properties/AssemblyInfo.cs
+++ b/DataAnnotationsValidator/DataAnnotationsValidator.Tests/Properties/AssemblyInfo.cs
@@ -2,18 +2,6 @@
 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("DataAnnotationsValidator.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DataAnnotationsValidator.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2011")]
-[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.
@@ -21,16 +9,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("220ab1f3-e5a1-47c1-8b8d-33f94f8165dd")]
-
-// 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/DataAnnotationsValidator/DataAnnotationsValidator.Tests/packages.config b/DataAnnotationsValidator/DataAnnotationsValidator.Tests/packages.config
deleted file mode 100644
index 0b8738f..0000000
--- a/DataAnnotationsValidator/DataAnnotationsValidator.Tests/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="3.9.0" targetFramework="net40" requireReinstallation="true" />
-</packages>
\ No newline at end of file
diff --git a/DataAnnotationsValidator/DataAnnotationsValidator.sln b/DataAnnotationsValidator/DataAnnotationsValidator.sln
deleted file mode 100644
index f86925c..0000000
--- a/DataAnnotationsValidator/DataAnnotationsValidator.sln
+++ /dev/null
@@ -1,40 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataAnnotationsValidator.Tests", "DataAnnotationsValidator.Tests\DataAnnotationsValidator.Tests.csproj", "{019E325C-9923-4643-8834-1A301F148093}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataAnnotationsValidator", "DataAnnotationsValidator\DataAnnotationsValidator.csproj", "{218B0C2C-19AD-4C7B-B583-840FF755A76D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{AC4200BF-B65D-4BC7-B12B-53617385CC56}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{01E8FDFE-435E-4F24-AD27-D4DAA621523B}"
-	ProjectSection(SolutionItems) = preProject
-		DataAnnotationsValidatorRecursive.snk = DataAnnotationsValidatorRecursive.snk
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{019E325C-9923-4643-8834-1A301F148093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{019E325C-9923-4643-8834-1A301F148093}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{019E325C-9923-4643-8834-1A301F148093}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{019E325C-9923-4643-8834-1A301F148093}.Release|Any CPU.Build.0 = Release|Any CPU
-		{218B0C2C-19AD-4C7B-B583-840FF755A76D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{218B0C2C-19AD-4C7B-B583-840FF755A76D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{218B0C2C-19AD-4C7B-B583-840FF755A76D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{218B0C2C-19AD-4C7B-B583-840FF755A76D}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/DataAnnotationsValidator/DataAnnotationsValidator/DataAnnotationsValidator.csproj b/DataAnnotationsValidator/DataAnnotationsValidator/DataAnnotationsValidator.csproj
index e6020f7..bcf67d1 100644
--- a/DataAnnotationsValidator/DataAnnotationsValidator/DataAnnotationsValidator.csproj
+++ b/DataAnnotationsValidator/DataAnnotationsValidator/DataAnnotationsValidator.csproj
@@ -1,49 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NuGet.Build.Packaging.0.1.248\build\NuGet.Build.Packaging.props" Condition="Exists('..\packages\NuGet.Build.Packaging.0.1.248\build\NuGet.Build.Packaging.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{218B0C2C-19AD-4C7B-B583-840FF755A76D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DataAnnotationsValidator</RootNamespace>
-    <AssemblyName>DataAnnotationsValidator</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PackOnBuild>true</PackOnBuild>
-    <PackageId>DataAnnotationsValidator</PackageId>
-    <PackageVersion>2.1.0.0</PackageVersion>
-    <Authors>Mike Reust</Authors>
-    <NeutralLanguage>en-US</NeutralLanguage>
-    <PackageLicenseUrl>https://github.com/reustmd/DataAnnotationsValidatorRecursive/blob/master/License.md</PackageLicenseUrl>
-    <Owners>Mike Reust</Owners>
-    <PackageProjectUrl>https://github.com/reustmd/DataAnnotationsValidatorRecursive</PackageProjectUrl>
-    <PackageTags>DataAnnotation validation validator</PackageTags>
-    <Title>DataAnnotationsValidator</Title>
-    <Description>The helper will recursively traverse your object graph and invoke validation against DataAnnotations. This originated from following Stackoverflow answer: http://stackoverflow.com/a/8090614/605586</Description>
-    <TargetFrameworkProfile />
+    <TargetFramework>netstandard2.0</TargetFramework>
   </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>
-    <Prefer32Bit>false</Prefer32Bit>
   </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>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -51,39 +14,9 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\DataAnnotationsValidatorRecursive.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
-    <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.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DataAnnotationsValidator.cs" />
-    <Compile Include="IDataAnnotationsValidator.cs" />
-    <Compile Include="ObjectExtensions.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SkipRecursiveValidation.cs" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="..\DataAnnotationsValidatorRecursive.snk">
       <Link>DataAnnotationsValidatorRecursive.snk</Link>
     </None>
-    <None Include="DataAnnotationsValidator.nuspec">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config" />
   </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="..\packages\NuGet.Build.Packaging.0.1.248\build\NuGet.Build.Packaging.targets" Condition="Exists('..\packages\NuGet.Build.Packaging.0.1.248\build\NuGet.Build.Packaging.targets')" />
 </Project>
\ No newline at end of file
diff --git a/DataAnnotationsValidator/DataAnnotationsValidator/DataAnnotationsValidator.nuspec b/DataAnnotationsValidator/DataAnnotationsValidator/DataAnnotationsValidator.nuspec
deleted file mode 100644
index 77f4e77..0000000
--- a/DataAnnotationsValidator/DataAnnotationsValidator/DataAnnotationsValidator.nuspec
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>DataAnnotationsValidator</id>
-    <version>2.2.0</version>
-    <authors>Mike Reust</authors>
-    <owners>Mike Reust</owners>
-    <licenseUrl>https://github.com/reustmd/DataAnnotationsValidatorRecursive/blob/master/License.md</licenseUrl>
-    <projectUrl>https://github.com/reustmd/DataAnnotationsValidatorRecursive</projectUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>Allows scanning object graph and validates every object using .NET standatd System.ComponentModel.DataAnnotations.Validator</description>
-    <copyright>Copyright © 2018</copyright>
-    <tags>DataAnnotation validation validator</tags>
-    <dependencies />
-  </metadata>
-</package>
\ No newline at end of file
diff --git a/DataAnnotationsValidator/DataAnnotationsValidator/Properties/AssemblyInfo.cs b/DataAnnotationsValidator/DataAnnotationsValidator/Properties/AssemblyInfo.cs
index 452ae0d..2d1ed86 100644
--- a/DataAnnotationsValidator/DataAnnotationsValidator/Properties/AssemblyInfo.cs
+++ b/DataAnnotationsValidator/DataAnnotationsValidator/Properties/AssemblyInfo.cs
@@ -2,18 +2,6 @@
 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("TryValidateObjectRecursive")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TryValidateObjectRecursive")]
-[assembly: AssemblyCopyright("Copyright ©  2011")]
-[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.
@@ -21,16 +9,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("9e99ddf6-daa3-455c-b9af-126b2d740af6")]
-
-// 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("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
diff --git a/DataAnnotationsValidator/DataAnnotationsValidator/packages.config b/DataAnnotationsValidator/DataAnnotationsValidator/packages.config
deleted file mode 100644
index 1aa0b1d..0000000
--- a/DataAnnotationsValidator/DataAnnotationsValidator/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NuGet.Build.Packaging" version="0.1.248" targetFramework="net40" developmentDependency="true" />
-</packages>
\ No newline at end of file
diff --git a/DataAnnotationsValidator/Directory.Build.props b/DataAnnotationsValidator/Directory.Build.props
new file mode 100644
index 0000000..e67e64f
--- /dev/null
+++ b/DataAnnotationsValidator/Directory.Build.props
@@ -0,0 +1,33 @@
+<Project>
+  <PropertyGroup>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <PackOnBuild>true</PackOnBuild>
+    <PackageId>DataAnnotationsValidator</PackageId>
+    <PackageVersion>2.1.0.0</PackageVersion>
+    <Authors>Mike Reust</Authors>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <PackageLicenseUrl>https://github.com/reustmd/DataAnnotationsValidatorRecursive/blob/master/License.md</PackageLicenseUrl>
+    <Owners>Mike Reust</Owners>
+    <PackageProjectUrl>https://github.com/reustmd/DataAnnotationsValidatorRecursive</PackageProjectUrl>
+    <PackageTags>DataAnnotation validation validator</PackageTags>
+    <Title>DataAnnotationsValidator</Title>
+    <Description>The helper will recursively traverse your object graph and invoke validation against DataAnnotations. This originated from following Stackoverflow answer: http://stackoverflow.com/a/8090614/605586</Description>
+    <AssemblyTitle>TryValidateObjectRecursive</AssemblyTitle>
+    <Product>TryValidateObjectRecursive</Product>
+    <Description>Allows scanning object graph and validates every object using .NET standatd System.ComponentModel.DataAnnotations.Validator</Description>
+    <Copyright>Copyright © 2018</Copyright>
+    <Version>3.0.0</Version>
+    <AssemblyVersion>3.0.0.0</AssemblyVersion>
+    <FileVersion>3.0.0.0</FileVersion>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Csharp" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0-preview.7.20364.11" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.6.0-preview3.19128.7" />
+  </ItemGroup>
+</Project>
\ No newline at end of file