diff --git a/SelfInitializingFakes.sln b/SelfInitializingFakes.sln
index c1253ce..3b0389b 100644
--- a/SelfInitializingFakes.sln
+++ b/SelfInitializingFakes.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26114.2
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -38,6 +38,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfInitializingFakes.Tests.FIE.5.5.0", "tests\SelfInitializingFakes.Tests.FIE.5.5.0\SelfInitializingFakes.Tests.FIE.5.5.0.csproj", "{27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SelfInitializingFakes.Tests.FIE.6.2.1", "tests\SelfInitializingFakes.Tests.FIE.6.2.1\SelfInitializingFakes.Tests.FIE.6.2.1.csproj", "{1B26FDE1-F5FA-4F3F-91B9-997B30D9119E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -68,6 +70,10 @@ Global
 		{27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B26FDE1-F5FA-4F3F-91B9-997B30D9119E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B26FDE1-F5FA-4F3F-91B9-997B30D9119E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B26FDE1-F5FA-4F3F-91B9-997B30D9119E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B26FDE1-F5FA-4F3F-91B9-997B30D9119E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -79,6 +85,7 @@ Global
 		{7F7EC34C-AA06-460B-B0B7-EF429DD99E21} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF}
 		{FB3705B3-8BD8-4293-9266-6DE11FDACB2B} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF}
 		{27DE54D0-FB17-4A30-AB53-2FC98EEF2C4C} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF}
+		{1B26FDE1-F5FA-4F3F-91B9-997B30D9119E} = {71C0B811-4069-4D47-8D81-1F4EC66E21BF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A306C694-22A2-4AFB-974B-24B3629C8F28}
diff --git a/appveyor.yml b/appveyor.yml
index 1ebf732..31226f1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 version: '{build}'
 
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 branches:
     only:
diff --git a/src/SelfInitializingFakes/SelfInitializingFakes.csproj b/src/SelfInitializingFakes/SelfInitializingFakes.csproj
index 998ab35..c2c4b89 100644
--- a/src/SelfInitializingFakes/SelfInitializingFakes.csproj
+++ b/src/SelfInitializingFakes/SelfInitializingFakes.csproj
@@ -28,17 +28,18 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
-    <PackageReference Include="FakeItEasy" Version="[3.0.0,7.0.0)" />
+  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0' AND '$(TargetFramework)' != 'netstandard1.6'">
+    <PackageReference Include="FakeItEasy" Version="[3.0.0,8.0.0)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="FakeItEasy" Version="[4.9.2,7.0.0)" />
+    <PackageReference Include="FakeItEasy" Version="[4.9.2,8.0.0)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
     <!-- FakeItEasy 3.0 depends on Castle.Core 4.0, which depends on non-existent TypecConverter 4.0.1 -->
     <PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
+    <PackageReference Include="FakeItEasy" Version="[3.0.0,7.0.0)" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index ce5c82f..b56b049 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -3,7 +3,7 @@
   <Import Project="../Directory.Build.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\SelfInitializingFakes.Tests.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
@@ -36,6 +36,10 @@
     <Compile Include="..\Conventions\**\*.cs"><Link>Conventions/%(Filename)%(Extension)</Link></Compile>
   </ItemGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' != 'netcoreapp1.0' ">
+    <DefineConstants>$(DefineConstants);FRAMEWORK_WEAK_TYPE_CLASS</DefineConstants>
+  </PropertyGroup>
+
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
     <DefineConstants>$(DefineConstants);FRAMEWORK_WEAK_TYPE_CLASS</DefineConstants>
   </PropertyGroup>
diff --git a/tests/SelfInitializingFakes.Tests.FIE.4.9.2/SelfInitializingFakes.Tests.FIE.4.9.2.csproj b/tests/SelfInitializingFakes.Tests.FIE.4.9.2/SelfInitializingFakes.Tests.FIE.4.9.2.csproj
index 2b2b466..dc27b7e 100644
--- a/tests/SelfInitializingFakes.Tests.FIE.4.9.2/SelfInitializingFakes.Tests.FIE.4.9.2.csproj
+++ b/tests/SelfInitializingFakes.Tests.FIE.4.9.2/SelfInitializingFakes.Tests.FIE.4.9.2.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <TargetFrameworks>net452;netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>SelfInitializingFakes.Tests.FIE.4.9.2</AssemblyName>
     <PackageId>SelfInitializingFakes.Tests.FIE.4.9.2</PackageId>
   </PropertyGroup>
diff --git a/tests/SelfInitializingFakes.Tests.FIE.5.5.0/SelfInitializingFakes.Tests.FIE.5.5.0.csproj b/tests/SelfInitializingFakes.Tests.FIE.5.5.0/SelfInitializingFakes.Tests.FIE.5.5.0.csproj
index fbe76c2..29d55f3 100644
--- a/tests/SelfInitializingFakes.Tests.FIE.5.5.0/SelfInitializingFakes.Tests.FIE.5.5.0.csproj
+++ b/tests/SelfInitializingFakes.Tests.FIE.5.5.0/SelfInitializingFakes.Tests.FIE.5.5.0.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <TargetFrameworks>net452;netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>SelfInitializingFakes.Tests.FIE.5.5.0</AssemblyName>
     <PackageId>SelfInitializingFakes.Tests.FIE.5.5.0</PackageId>
   </PropertyGroup>
diff --git a/tests/SelfInitializingFakes.Tests.FIE.6.2.1/SelfInitializingFakes.Tests.FIE.6.2.1.csproj b/tests/SelfInitializingFakes.Tests.FIE.6.2.1/SelfInitializingFakes.Tests.FIE.6.2.1.csproj
new file mode 100644
index 0000000..4269748
--- /dev/null
+++ b/tests/SelfInitializingFakes.Tests.FIE.6.2.1/SelfInitializingFakes.Tests.FIE.6.2.1.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net452;netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
+    <AssemblyName>SelfInitializingFakes.Tests.FIE.6.2.1</AssemblyName>
+    <PackageId>SelfInitializingFakes.Tests.FIE.6.2.1</PackageId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FakeItEasy" Version="6.2.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/tools/targets/Targets.csproj b/tools/targets/Targets.csproj
index 054d6f4..f022c0f 100644
--- a/tools/targets/Targets.csproj
+++ b/tools/targets/Targets.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <LangVersion>latest</LangVersion>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
     <!--
     <ItemGroup>