diff --git a/Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj b/Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj
index a1c7ca6a..5c19e2e3 100644
--- a/Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj
+++ b/Telerik.JustMock.DemoLib/Telerik.JustMock.DemoLib.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net45;net472;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
     <Configurations>Debug;Release;ReleaseFree;DebugFree</Configurations>
     <AssemblyName>Telerik.JustMock.DemoLib</AssemblyName>
     <RootNamespace>Telerik.JustMock.DemoLib</RootNamespace>
@@ -8,6 +8,10 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(PreviewTargetFramework)' != '' ">
+    <NetCoreSupportedVersions>$(NetCoreSupportedVersions);$(PreviewTargetFramework)</NetCoreSupportedVersions>
+    <TargetFrameworks>$(TargetFrameworks);$(PreviewTargetFramework)</TargetFrameworks>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -92,7 +96,7 @@
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile />
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net472' ">
     <Reference Include="System.Web" />
     <Reference Include="System.Data.DataSetExtensions" />
   </ItemGroup>
diff --git a/Telerik.JustMock.DemoLibSigned/Telerik.JustMock.DemoLibSigned.csproj b/Telerik.JustMock.DemoLibSigned/Telerik.JustMock.DemoLibSigned.csproj
index c0cb234c..84ce93a7 100644
--- a/Telerik.JustMock.DemoLibSigned/Telerik.JustMock.DemoLibSigned.csproj
+++ b/Telerik.JustMock.DemoLibSigned/Telerik.JustMock.DemoLibSigned.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net45;net472;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
     <Configurations>Debug;Release;DebugFree;ReleaseFree</Configurations>
     <AssemblyName>Telerik.JustMock.DemoLibSigned</AssemblyName>
     <RootNamespace>Telerik.JustMock.DemoLibSigned</RootNamespace>
@@ -9,6 +9,10 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(PreviewTargetFramework)' != '' ">
+    <NetCoreSupportedVersions>$(NetCoreSupportedVersions);$(PreviewTargetFramework)</NetCoreSupportedVersions>
+    <TargetFrameworks>$(TargetFrameworks);$(PreviewTargetFramework)</TargetFrameworks>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -69,7 +73,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>snkey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net472' ">
     <Reference Include="System.Data.DataSetExtensions" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj b/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj
index 891d8db7..c63b8690 100644
--- a/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj
+++ b/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NetCoreSupportedVersions>netcoreapp2.1;netcoreapp3.1;net5.0</NetCoreSupportedVersions>
-    <TargetFrameworks>net451;$(NetCoreSupportedVersions)</TargetFrameworks>
+    <TargetFrameworks>net451;net472;$(NetCoreSupportedVersions)</TargetFrameworks>
     <Configurations>Debug;Release;ReleaseFree;DebugFree</Configurations>
     <AssemblyName>Telerik.JustMock.MSTest2.Tests</AssemblyName>
     <RootNamespace>Telerik.JustMock.Tests</RootNamespace>
@@ -65,6 +65,9 @@
   <PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
     <DefineConstants>$(DefineConstants);NETCORE31;NET50</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'">
+    <DefineConstants>$(DefineConstants);NETCORE31;NET50;NET70</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
diff --git a/Telerik.JustMock.Tests/InteropFixture.cs b/Telerik.JustMock.Tests/InteropFixture.cs
index 988cb78d..db3f579f 100644
--- a/Telerik.JustMock.Tests/InteropFixture.cs
+++ b/Telerik.JustMock.Tests/InteropFixture.cs
@@ -81,7 +81,18 @@ public abstract class UnsafeClassRef
 
 		public delegate void DoDelegate(ref IntPtr arg);
 
-		[TestMethod, TestCategory("Interop")]
+#if NET70
+#if XUNIT
+		[TestMethod(Skip = SkipReason.Value)]
+#elif NUNIT
+		[TestMethod, Ignore("")]
+#else
+		[TestMethod, Ignore]
+#endif
+#else
+        [TestMethod]
+#endif
+		[TestCategory("Interop")]
 		public void ShouldPassPointersByRef()
 		{
 			var mock = Mock.Create<UnsafeClassRef>();
diff --git a/Telerik.JustMock.XUnit.Tests/Telerik.JustMock.XUnit.Tests.csproj b/Telerik.JustMock.XUnit.Tests/Telerik.JustMock.XUnit.Tests.csproj
index 12bd7a19..58baaacf 100644
--- a/Telerik.JustMock.XUnit.Tests/Telerik.JustMock.XUnit.Tests.csproj
+++ b/Telerik.JustMock.XUnit.Tests/Telerik.JustMock.XUnit.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net452;net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
     <Configurations>Debug;Release;DebugFree;ReleaseFree</Configurations>
     <AssemblyName>Telerik.JustMock.XUnit.Tests</AssemblyName>
     <RootNamespace>Telerik.JustMock.Tests</RootNamespace>
diff --git a/Telerik.JustMock/Directory.Build.targets b/Telerik.JustMock/Directory.Build.targets
new file mode 100644
index 00000000..2906a4b2
--- /dev/null
+++ b/Telerik.JustMock/Directory.Build.targets
@@ -0,0 +1,7 @@
+<Project>
+
+  <PropertyGroup>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file
diff --git a/Telerik.JustMock/Telerik.JustMock.csproj b/Telerik.JustMock/Telerik.JustMock.csproj
index a5be0198..b0395b0a 100644
--- a/Telerik.JustMock/Telerik.JustMock.csproj
+++ b/Telerik.JustMock/Telerik.JustMock.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NetCoreSupportedVersions>netcoreapp2.0</NetCoreSupportedVersions>
-    <TargetFrameworks>net45;$(NetCoreSupportedVersions)</TargetFrameworks>
+    <TargetFrameworks>net45;net472;$(NetCoreSupportedVersions)</TargetFrameworks>
     <Configurations>Debug;Release;ReleaseFree;DebugFree</Configurations>
     <AssemblyName>Telerik.JustMock</AssemblyName>
     <RootNamespace>Telerik.JustMock</RootNamespace>
@@ -54,7 +54,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net45' ">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net472'">
     <DefineConstants>$(DefineConstants);FEATURE_REMOTING;FEATURE_APPDOMAIN;FEATURE_ASSEMBLYBUILDER_SAVE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="$(NetCoreSupportedVersions.Contains('$(TargetFramework)'))">
@@ -84,7 +84,7 @@
   <PropertyGroup>
     <PostBuildEvent />
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net472'">
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Core" />