diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a613996..77e9ea0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -40,11 +40,11 @@ steps:
     version: '3.1.200'
 
 # https://dotnet.microsoft.com/download/dotnet/5.0
-# - task: UseDotNet@2
-#   displayName: Install .Net Core 5.0.101
-#   inputs:
-#     packageType: 'sdk'
-#     version: '5.0.101'
+- task: UseDotNet@2
+  displayName: Install .Net Core 5.0.101
+  inputs:
+    packageType: 'sdk'
+    version: '5.0.101'
 
 - script: |
     echo buildConfiguration: $(buildConfiguration)
@@ -76,7 +76,7 @@ steps:
     publishWebProjects: false
     projects: |
       **/samples/Opw.PineBlog.Sample/*.csproj
-    arguments: '--configuration $(buildConfiguration) --framework netcoreapp3.1 --output $(build.artifactstagingdirectory) /p:Version=$(GitVersion.SemVer) --no-build'
+    arguments: '--configuration $(buildConfiguration) --framework net5.0 --output $(build.artifactstagingdirectory) /p:Version=$(GitVersion.SemVer) --no-build'
     zipAfterPublish: false
 
 # Delete the "Areas" folder, this should not be deployed
diff --git a/samples/Opw.PineBlog.Sample.NuGet/Opw.PineBlog.Sample.NuGet.csproj b/samples/Opw.PineBlog.Sample.NuGet/Opw.PineBlog.Sample.NuGet.csproj
index a995208..112f77d 100644
--- a/samples/Opw.PineBlog.Sample.NuGet/Opw.PineBlog.Sample.NuGet.csproj
+++ b/samples/Opw.PineBlog.Sample.NuGet/Opw.PineBlog.Sample.NuGet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,14 +14,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.2" />
     <PackageReference Include="Opw.PineBlog" Version="2.0.0-beta0001" />
     <PackageReference Include="Opw.PineBlog.MongoDb" Version="2.0.0-beta0001" />
     <PackageReference Include="Mongo2Go" Version="2.2.16" />
     <PackageReference Include="WaffleGenerator" Version="4.2.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Update="wwwroot\favicon.ico">
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
diff --git a/samples/Opw.PineBlog.Sample/Opw.PineBlog.Sample.csproj b/samples/Opw.PineBlog.Sample/Opw.PineBlog.Sample.csproj
index a2bc464..e55b0ff 100644
--- a/samples/Opw.PineBlog.Sample/Opw.PineBlog.Sample.csproj
+++ b/samples/Opw.PineBlog.Sample/Opw.PineBlog.Sample.csproj
@@ -1,30 +1,37 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <None Remove="Resources\post-pineblog-demo-markdown.md" />
-        <None Remove="Resources\post-pineblog-demo-website.md" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <EmbeddedResource Include="Resources\post-pineblog-demo-markdown.md" />
-        <EmbeddedResource Include="Resources\post-pineblog-demo-website.md" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.16.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.2" />
-        <PackageReference Include="Mongo2Go" Version="2.2.16" />
-        <PackageReference Include="WaffleGenerator" Version="4.2.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\..\ref\Opw.PineBlog\Opw.PineBlog.csproj" />
-        <ProjectReference Include="..\..\src\Opw.PineBlog.MongoDb\Opw.PineBlog.MongoDb.csproj" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Resources\post-pineblog-demo-markdown.md" />
+    <None Remove="Resources\post-pineblog-demo-website.md" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\post-pineblog-demo-markdown.md" />
+    <EmbeddedResource Include="Resources\post-pineblog-demo-website.md" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.16.0" />
+    <PackageReference Include="Mongo2Go" Version="2.2.16" />
+    <PackageReference Include="WaffleGenerator" Version="4.2.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\ref\Opw.PineBlog\Opw.PineBlog.csproj" />
+    <ProjectReference Include="..\..\src\Opw.PineBlog.MongoDb\Opw.PineBlog.MongoDb.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/samples/Opw.PineBlog.Sample/Startup.cs b/samples/Opw.PineBlog.Sample/Startup.cs
index e552681..3c9b2de 100644
--- a/samples/Opw.PineBlog.Sample/Startup.cs
+++ b/samples/Opw.PineBlog.Sample/Startup.cs
@@ -62,7 +62,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-                app.UseDatabaseErrorPage();
             }
             else
             {
diff --git a/src/Opw.AspNetCore.Testing/Opw.AspNetCore.Testing.csproj b/src/Opw.AspNetCore.Testing/Opw.AspNetCore.Testing.csproj
index 906ea4c..7a3f3b2 100644
--- a/src/Opw.AspNetCore.Testing/Opw.AspNetCore.Testing.csproj
+++ b/src/Opw.AspNetCore.Testing/Opw.AspNetCore.Testing.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <IsPackable>false</IsPackable>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <FrameworkReference Include="Microsoft.AspNetCore.App"></FrameworkReference>
-    </ItemGroup>
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App"></FrameworkReference>
+  </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.8" />
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.8" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Opw.PineBlog.Abstractions/Opw.PineBlog.Abstractions.csproj b/src/Opw.PineBlog.Abstractions/Opw.PineBlog.Abstractions.csproj
index dded4f0..391a60b 100644
--- a/src/Opw.PineBlog.Abstractions/Opw.PineBlog.Abstractions.csproj
+++ b/src/Opw.PineBlog.Abstractions/Opw.PineBlog.Abstractions.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
-        <RootNamespace>Opw.PineBlog</RootNamespace>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <RootNamespace>Opw.PineBlog</RootNamespace>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Opw.Core" Version="1.3.0" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Opw.Core" Version="1.4.1" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Opw.PineBlog.Core/Opw.PineBlog.Core.csproj b/src/Opw.PineBlog.Core/Opw.PineBlog.Core.csproj
index 6aad75a..80ab8fa 100644
--- a/src/Opw.PineBlog.Core/Opw.PineBlog.Core.csproj
+++ b/src/Opw.PineBlog.Core/Opw.PineBlog.Core.csproj
@@ -1,38 +1,41 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
-        <RootNamespace>Opw.PineBlog</RootNamespace>
-        <Description>PineBlog core package.</Description>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <PackageId>Opw.PineBlog.Core</PackageId>
-        <PackageTags>blog core</PackageTags>
-        <NuspecFile>Opw.PineBlog.Core.nuspec</NuspecFile>
-        <NuspecProperties>version=$(PackageVersion)</NuspecProperties>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <RootNamespace>Opw.PineBlog</RootNamespace>
+    <Description>PineBlog core package.</Description>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageId>Opw.PineBlog.Core</PackageId>
+    <PackageTags>blog core</PackageTags>
+    <NuspecFile>Opw.PineBlog.Core.nuspec</NuspecFile>
+    <NuspecProperties>version=$(PackageVersion)</NuspecProperties>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <Compile Remove="Files\Azure\_namespace.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="Files\Azure\_namespace.cs" />
+  </ItemGroup>
 
-    <ItemGroup>
-      <None Include="Files\Azure\_namespace.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <None Include="Files\Azure\_namespace.cs" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Markdig" Version="0.22.1" />
-        <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-        <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.1.3" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.2" />
-        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.2" />
-        <PackageReference Include="MimeMapping" Version="1.0.1.30" />
-        <PackageReference Include="System.ServiceModel.Syndication" Version="4.7.0" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Markdig" Version="0.22.1" />
+    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.1.3" />
+    <PackageReference Include="MimeMapping" Version="1.0.1.30" />
+    <PackageReference Include="System.ServiceModel.Syndication" Version="4.7.0" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Opw.PineBlog.Abstractions\Opw.PineBlog.Abstractions.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Opw.PineBlog.Abstractions\Opw.PineBlog.Abstractions.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Opw.PineBlog.Core/Opw.PineBlog.Core.nuspec b/src/Opw.PineBlog.Core/Opw.PineBlog.Core.nuspec
index ceb668a..ca5d7bf 100644
--- a/src/Opw.PineBlog.Core/Opw.PineBlog.Core.nuspec
+++ b/src/Opw.PineBlog.Core/Opw.PineBlog.Core.nuspec
@@ -1,37 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-    <metadata>
-        <id>Opw.PineBlog.Core</id>
-        <version>0.0.0</version>
-        <authors>Of Pine Wood</authors>
-        <owners>Of Pine Wood</owners>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <licenseUrl>https://github.com/ofpinewood/pineblog/blob/master/LICENSE</licenseUrl>
-        <projectUrl>https://github.com/ofpinewood/pineblog</projectUrl>
-        <iconUrl>https://github.com/ofpinewood/pineblog/blob/master/pineblog-logo-256x256.gif?raw=true</iconUrl>
-        <description>PineBlog core package.</description>
-        <tags>blog core</tags>
-        <repository type="git" url="https://github.com/ofpinewood/pineblog" />
-        <dependencies>
-            <group targetFramework=".NETStandard2.1">
-                <!-- Opw.PineBlog.Core -->
-                <dependency id="Markdig" version="0.22.1" exclude="Build,Analyzers" />
-                <dependency id="MediatR.Extensions.Microsoft.DependencyInjection" version="8.0.0" exclude="Build,Analyzers" />
-                <dependency id="Microsoft.AspNetCore.Http.Abstractions" version="2.2.0" exclude="Build,Analyzers" />
-                <dependency id="Microsoft.Extensions.DependencyInjection" version="3.1.2" />
-                <dependency id="Microsoft.Extensions.Options" version="3.1.2" exclude="Build,Analyzers" />
-                <dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="3.1.2" exclude="Build,Analyzers" />
-                <dependency id="MimeMapping" version="1.0.1.30" exclude="Build,Analyzers" />
-                <dependency id="Microsoft.Azure.Storage.Blob" version="11.1.3" exclude="Build,Analyzers" />
-                <dependency id="System.ServiceModel.Syndication" version="4.7.0" exclude="Build,Analyzers" />
+  <metadata>
+    <id>Opw.PineBlog.Core</id>
+    <version>0.0.0</version>
+    <authors>Of Pine Wood</authors>
+    <owners>Of Pine Wood</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <licenseUrl>https://github.com/ofpinewood/pineblog/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/ofpinewood/pineblog</projectUrl>
+    <iconUrl>https://github.com/ofpinewood/pineblog/blob/master/pineblog-logo-256x256.gif?raw=true</iconUrl>
+    <description>PineBlog core package.</description>
+    <tags>blog core</tags>
+    <repository type="git" url="https://github.com/ofpinewood/pineblog" />
+    <dependencies>
+      <group targetFramework=".NETStandard2.1">
+        <!-- Opw.PineBlog.Core -->
+        <dependency id="Markdig" version="0.22.1" exclude="Build,Analyzers" />
+        <dependency id="MediatR.Extensions.Microsoft.DependencyInjection" version="8.0.0" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.AspNetCore.Http.Abstractions" version="2.2.0" exclude="Build,Analyzers" />
+        <dependency id="MimeMapping" version="1.0.1.30" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Azure.Storage.Blob" version="11.1.3" exclude="Build,Analyzers" />
+        <dependency id="System.ServiceModel.Syndication" version="4.7.0" exclude="Build,Analyzers" />
 
-                <!-- Opw.PineBlog.Abstractions -->
-                <dependency id="Opw.Core" version="1.3.0" exclude="Build,Analyzers" />
-            </group>
-        </dependencies>
-    </metadata>
-    <files>
-        <file src="bin\Release\netstandard2.1\*.dll" target="lib\netstandard2.1\"/>
-        <file src="bin\Release\netstandard2.1\*.xml" target="lib\netstandard2.1\"/>
-    </files>
+        <dependency id="Microsoft.Extensions.DependencyInjection" version="3.1.2" />
+        <dependency id="Microsoft.Extensions.Options" version="3.1.2" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="3.1.2" exclude="Build,Analyzers" />
+
+        <!-- Opw.PineBlog.Abstractions -->
+        <dependency id="Opw.Core" version="1.4.1" exclude="Build,Analyzers" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="bin\Release\netstandard2.1\*.dll" target="lib\netstandard2.1\"/>
+    <file src="bin\Release\netstandard2.1\*.xml" target="lib\netstandard2.1\"/>
+  </files>
 </package>
\ No newline at end of file
diff --git a/src/Opw.PineBlog.EntityFrameworkCore/Opw.PineBlog.EntityFrameworkCore.csproj b/src/Opw.PineBlog.EntityFrameworkCore/Opw.PineBlog.EntityFrameworkCore.csproj
index 0aec27f..04fdf84 100644
--- a/src/Opw.PineBlog.EntityFrameworkCore/Opw.PineBlog.EntityFrameworkCore.csproj
+++ b/src/Opw.PineBlog.EntityFrameworkCore/Opw.PineBlog.EntityFrameworkCore.csproj
@@ -1,29 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <Description>PineBlog data provider that uses Entity Framework Core.</Description>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <PackageId>Opw.PineBlog.EntityFrameworkCore</PackageId>
-        <PackageTags>blog efcore entityframeworkcore</PackageTags>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Description>PineBlog data provider that uses Entity Framework Core.</Description>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageId>Opw.PineBlog.EntityFrameworkCore</PackageId>
+    <PackageTags>blog efcore entityframeworkcore</PackageTags>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.2" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.2" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.2" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.2" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
-        <PackageReference Include="Opw.EntityFrameworkCore" Version="1.3.0" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Opw.EntityFrameworkCore" Version="1.4.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Opw.PineBlog.Core\Opw.PineBlog.Core.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Opw.PineBlog.Core\Opw.PineBlog.Core.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Opw.PineBlog.RazorPages/Opw.PineBlog.RazorPages.csproj b/src/Opw.PineBlog.RazorPages/Opw.PineBlog.RazorPages.csproj
index 3e8e15b..a6739c6 100644
--- a/src/Opw.PineBlog.RazorPages/Opw.PineBlog.RazorPages.csproj
+++ b/src/Opw.PineBlog.RazorPages/Opw.PineBlog.RazorPages.csproj
@@ -1,43 +1,50 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-        <RootNamespace>Opw.PineBlog.RazorPages</RootNamespace>
-        <Description>PineBlog UI using ASP.NET Core MVC Razor Pages.</Description>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <PackageId>Opw.PineBlog.RazorPages</PackageId>
-        <PackageTags>blog aspnetcore mvc razor razorpages</PackageTags>
-        <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-    </PropertyGroup>
-
-    <Target Name="MyPreCompileTarget" BeforeTargets="Build">
-        <!-- Ensure Node.js is installed -->
-        <Exec Command="node --version" ContinueOnError="true">
-            <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
-        </Exec>
-        <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
-        <Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
-        <Exec WorkingDirectory="$(ProjectDir)" Command="npm install" />
-        <Exec WorkingDirectory="$(ProjectDir)" Command="node_modules\.bin\gulp default" />
-    </Target>
-
-    <ItemGroup>
-        <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="FluentValidation.AspNetCore" Version="8.6.2" />
-        <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.2" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Opw.PineBlog.Core\Opw.PineBlog.Core.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <EmbeddedResource Include="wwwroot\**\css\*" />
-        <EmbeddedResource Include="wwwroot\**\js\*" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+    <RootNamespace>Opw.PineBlog.RazorPages</RootNamespace>
+    <Description>PineBlog UI using ASP.NET Core MVC Razor Pages.</Description>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageId>Opw.PineBlog.RazorPages</PackageId>
+    <PackageTags>blog aspnetcore mvc razor razorpages</PackageTags>
+    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+  </PropertyGroup>
+
+  <Target Name="MyPreCompileTarget" BeforeTargets="Build">
+    <!-- Ensure Node.js is installed -->
+    <Exec Command="node --version" ContinueOnError="true">
+      <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
+    </Exec>
+    <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
+    <Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
+    <Exec WorkingDirectory="$(ProjectDir)" Command="npm install" />
+    <Exec WorkingDirectory="$(ProjectDir)" Command="node_modules\.bin\gulp default" />
+  </Target>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentValidation.AspNetCore" Version="8.6.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Opw.PineBlog.Core\Opw.PineBlog.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="wwwroot\**\css\*" />
+    <EmbeddedResource Include="wwwroot\**\js\*" />
+  </ItemGroup>
 
 </Project>
diff --git a/tests/Opw.PineBlog.Abstractions.Tests/Opw.PineBlog.Abstractions.Tests.csproj b/tests/Opw.PineBlog.Abstractions.Tests/Opw.PineBlog.Abstractions.Tests.csproj
index c3fbe75..e26d9ae 100644
--- a/tests/Opw.PineBlog.Abstractions.Tests/Opw.PineBlog.Abstractions.Tests.csproj
+++ b/tests/Opw.PineBlog.Abstractions.Tests/Opw.PineBlog.Abstractions.Tests.csproj
@@ -1,27 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <IsPackable>false</IsPackable>
-        <RootNamespace>Opw.PineBlog</RootNamespace>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+    <RootNamespace>Opw.PineBlog</RootNamespace>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="coverlet.msbuild" Version="2.9.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\src\Opw.PineBlog.Abstractions\Opw.PineBlog.Abstractions.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Opw.PineBlog.Abstractions\Opw.PineBlog.Abstractions.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/tests/Opw.PineBlog.Core.Tests/Opw.PineBlog.Core.Tests.csproj b/tests/Opw.PineBlog.Core.Tests/Opw.PineBlog.Core.Tests.csproj
index d57a110..2d69e80 100644
--- a/tests/Opw.PineBlog.Core.Tests/Opw.PineBlog.Core.Tests.csproj
+++ b/tests/Opw.PineBlog.Core.Tests/Opw.PineBlog.Core.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <RootNamespace>Opw.PineBlog</RootNamespace>
   </PropertyGroup>
@@ -21,8 +21,12 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Opw.PineBlog.EntityFrameworkCore.Tests/Opw.PineBlog.EntityFrameworkCore.Tests.csproj b/tests/Opw.PineBlog.EntityFrameworkCore.Tests/Opw.PineBlog.EntityFrameworkCore.Tests.csproj
index 759c747..3d9107c 100644
--- a/tests/Opw.PineBlog.EntityFrameworkCore.Tests/Opw.PineBlog.EntityFrameworkCore.Tests.csproj
+++ b/tests/Opw.PineBlog.EntityFrameworkCore.Tests/Opw.PineBlog.EntityFrameworkCore.Tests.csproj
@@ -1,35 +1,43 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <IsPackable>false</IsPackable>
-        <RootNamespace>Opw.PineBlog.EntityFrameworkCore</RootNamespace>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+    <RootNamespace>Opw.PineBlog.EntityFrameworkCore</RootNamespace>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="coverlet.msbuild" Version="2.9.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.2" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-        <PackageReference Include="Moq" Version="4.15.2" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Moq" Version="4.15.2" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\src\Opw.PineBlog.EntityFrameworkCore\Opw.PineBlog.EntityFrameworkCore.csproj" />
-    </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.2" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <None Update="appsettings.json">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Opw.PineBlog.EntityFrameworkCore\Opw.PineBlog.EntityFrameworkCore.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
 </Project>
diff --git a/tests/Opw.PineBlog.MongoDb.Tests/Opw.PineBlog.MongoDb.Tests.csproj b/tests/Opw.PineBlog.MongoDb.Tests/Opw.PineBlog.MongoDb.Tests.csproj
index 4a9c3a0..0f97fc8 100644
--- a/tests/Opw.PineBlog.MongoDb.Tests/Opw.PineBlog.MongoDb.Tests.csproj
+++ b/tests/Opw.PineBlog.MongoDb.Tests/Opw.PineBlog.MongoDb.Tests.csproj
@@ -1,37 +1,44 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <IsPackable>false</IsPackable>
-        <RootNamespace>Opw.PineBlog.MongoDb</RootNamespace>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+    <RootNamespace>Opw.PineBlog.MongoDb</RootNamespace>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="coverlet.msbuild" Version="2.9.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.2" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-        <PackageReference Include="Mongo2Go" Version="2.2.16" />
-        <PackageReference Include="Moq" Version="4.15.2" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Mongo2Go" Version="2.2.16" />
+    <PackageReference Include="Moq" Version="4.15.2" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\src\Opw.PineBlog.MongoDb\Opw.PineBlog.MongoDb.csproj" />
-    </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.2" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <None Update="appsettings.json">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Opw.PineBlog.MongoDb\Opw.PineBlog.MongoDb.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
 </Project>
diff --git a/tests/Opw.PineBlog.RazorPages.Tests/Opw.PineBlog.RazorPages.Tests.csproj b/tests/Opw.PineBlog.RazorPages.Tests/Opw.PineBlog.RazorPages.Tests.csproj
index c25a658..08f9a45 100644
--- a/tests/Opw.PineBlog.RazorPages.Tests/Opw.PineBlog.RazorPages.Tests.csproj
+++ b/tests/Opw.PineBlog.RazorPages.Tests/Opw.PineBlog.RazorPages.Tests.csproj
@@ -1,28 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <IsPackable>false</IsPackable>
-        <RootNamespace>Opw.PineBlog</RootNamespace>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+    <RootNamespace>Opw.PineBlog</RootNamespace>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="coverlet.msbuild" Version="2.9.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-        <PackageReference Include="Moq" Version="4.15.2" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Moq" Version="4.15.2" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\src\Opw.PineBlog.RazorPages\Opw.PineBlog.RazorPages.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Opw.PineBlog.RazorPages\Opw.PineBlog.RazorPages.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/tests/Opw.PineBlog.Sample.Tests/Opw.PineBlog.Sample.Tests.csproj b/tests/Opw.PineBlog.Sample.Tests/Opw.PineBlog.Sample.Tests.csproj
index 2f33e53..e2e3295 100644
--- a/tests/Opw.PineBlog.Sample.Tests/Opw.PineBlog.Sample.Tests.csproj
+++ b/tests/Opw.PineBlog.Sample.Tests/Opw.PineBlog.Sample.Tests.csproj
@@ -1,46 +1,51 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <IsPackable>false</IsPackable>
-        <RootNamespace>Opw.PineBlog.Sample</RootNamespace>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <None Remove="Resources\large-image.jpg" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <EmbeddedResource Include="Resources\large-image.jpg" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="coverlet.msbuild" Version="2.9.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.2" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\..\samples\Opw.PineBlog.Sample\Opw.PineBlog.Sample.csproj" />
-        <ProjectReference Include="..\..\src\Opw.AspNetCore.Testing\Opw.AspNetCore.Testing.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <None Update="appsettings.json">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+    <RootNamespace>Opw.PineBlog.Sample</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Resources\large-image.jpg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\large-image.jpg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\samples\Opw.PineBlog.Sample\Opw.PineBlog.Sample.csproj" />
+    <ProjectReference Include="..\..\src\Opw.AspNetCore.Testing\Opw.AspNetCore.Testing.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
 </Project>