Dotnet31 (#99)

* Upgrading to 3.1 * Removing and ignoring root nuget props files * Updating for 3.1 * cleaning up project references * Removing ReportGenerator from azure pipeline

Dotnet31 (#99)
* Upgrading to 3.1 * Removing and ignoring root nuget props files * Updating for 3.1 * cleaning up project references * Removing ReportGenerator from azure pipeline
26f88154 · Steve Smith · GitHub · 8ac5e4b7 · 26f88154 · 26f88154
Unverified Commit 26f88154 authored Feb 06, 2020 by Steve Smith Committed by GitHub Feb 06, 2020
22 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -255,3 +255,9 @@ paket-files/
 .idea/
 *.sln.iml
 *.sqlite
+
+# Nuget files
+DeploymentSettings.props
+Directory.Build.props
+Directory.Build.targets
+Packages.props
--- a/CleanArchitecture.sln
+++ b/CleanArchitecture.sln
@@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanArchitecture.Infrastru
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanArchitecture.Web", "src\CleanArchitecture.Web\CleanArchitecture.Web.csproj", "{C9751CB7-4CD6-4633-A99A-4F6ADD525437}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanArchitecture.UnitTests", "tests\CleanArchitecture.Tests\CleanArchitecture.UnitTests.csproj", "{AEE17BAB-D187-4BC5-B640-40CC0749566C}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{250F283E-FE2F-4BBD-9E63-A2265B84E23F}"
 	ProjectSection(SolutionItems) = preProject
 		azure-pipelines.yml = azure-pipelines.yml
@@ -35,7 +33,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanArchitecture.Integrati
 		{220361D6-9C76-4E3F-BD34-3C7B50E2CA4D} = {220361D6-9C76-4E3F-BD34-3C7B50E2CA4D}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CleanArchitecture.SharedKernel", "src\CleanArchitecture.SharedKernel\CleanArchitecture.SharedKernel.csproj", "{744AD1DC-E83E-4ACE-BE57-395395D6E357}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanArchitecture.SharedKernel", "src\CleanArchitecture.SharedKernel\CleanArchitecture.SharedKernel.csproj", "{744AD1DC-E83E-4ACE-BE57-395395D6E357}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanArchitecture.UnitTests", "tests\CleanArchitecture.UnitTests\CleanArchitecture.UnitTests.csproj", "{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -83,18 +83,6 @@ Global
 		{C9751CB7-4CD6-4633-A99A-4F6ADD525437}.Release|x64.Build.0 = Release|Any CPU
 		{C9751CB7-4CD6-4633-A99A-4F6ADD525437}.Release|x86.ActiveCfg = Release|Any CPU
 		{C9751CB7-4CD6-4633-A99A-4F6ADD525437}.Release|x86.Build.0 = Release|Any CPU
-		{AEE17BAB-D187-4BC5-B640-40CC0749566C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEE17BAB-D187-4BC5-B640-40CC0749566C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEE17BAB-D187-4BC5-B640-40CC0749566C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AEE17BAB-D187-4BC5-B640-40CC0749566C}.Debug|x64.Build.0 = Debug|Any CPU
-		{AEE17BAB-D187-4BC5-B640-40CC0749566C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AEE17BAB-D187-4BC5-B640-40CC0749566C}.Debug|x86.Build.0 = Debug|Any CPU
-		{AEE17BAB-D187-4BC5-B640-40CC0749566C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEE17BAB-D187-4BC5-B640-40CC0749566C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AEE17BAB-D187-4BC5-B640-40CC0749566C}.Release|x64.ActiveCfg = Release|Any CPU
-		{AEE17BAB-D187-4BC5-B640-40CC0749566C}.Release|x64.Build.0 = Release|Any CPU
-		{AEE17BAB-D187-4BC5-B640-40CC0749566C}.Release|x86.ActiveCfg = Release|Any CPU
-		{AEE17BAB-D187-4BC5-B640-40CC0749566C}.Release|x86.Build.0 = Release|Any CPU
 		{7D84EFEE-A7D9-44AD-A0A3-38EC7882D94C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7D84EFEE-A7D9-44AD-A0A3-38EC7882D94C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7D84EFEE-A7D9-44AD-A0A3-38EC7882D94C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -131,6 +119,18 @@ Global
 		{744AD1DC-E83E-4ACE-BE57-395395D6E357}.Release|x64.Build.0 = Release|Any CPU
 		{744AD1DC-E83E-4ACE-BE57-395395D6E357}.Release|x86.ActiveCfg = Release|Any CPU
 		{744AD1DC-E83E-4ACE-BE57-395395D6E357}.Release|x86.Build.0 = Release|Any CPU
+		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5}.Debug|x64.Build.0 = Debug|Any CPU
+		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5}.Debug|x86.Build.0 = Debug|Any CPU
+		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5}.Release|x64.ActiveCfg = Release|Any CPU
+		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5}.Release|x64.Build.0 = Release|Any CPU
+		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5}.Release|x86.ActiveCfg = Release|Any CPU
+		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -139,10 +139,10 @@ Global
 		{4548EB20-1D1B-477B-AF6E-DD55653A6583} = {106AE906-5075-410A-B941-912F811848EE}
 		{220361D6-9C76-4E3F-BD34-3C7B50E2CA4D} = {106AE906-5075-410A-B941-912F811848EE}
 		{C9751CB7-4CD6-4633-A99A-4F6ADD525437} = {106AE906-5075-410A-B941-912F811848EE}
-		{AEE17BAB-D187-4BC5-B640-40CC0749566C} = {B31B4797-1D9F-4288-808C-BE9A31A98C7D}
 		{7D84EFEE-A7D9-44AD-A0A3-38EC7882D94C} = {B31B4797-1D9F-4288-808C-BE9A31A98C7D}
 		{0776DC14-9000-47A4-A3F4-ECBCF8CEBC17} = {B31B4797-1D9F-4288-808C-BE9A31A98C7D}
 		{744AD1DC-E83E-4ACE-BE57-395395D6E357} = {106AE906-5075-410A-B941-912F811848EE}
+		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5} = {B31B4797-1D9F-4288-808C-BE9A31A98C7D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B0F19343-8185-4A9F-9165-0EA8544BC925}

--- a/DeploymentSettings.props
+++ b/DeploymentSettings.props
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <DeployNugetPackages>false</DeployNugetPackages>
-  </PropertyGroup>
-
-</Project>
\ No newline at end of file
--- a/Directory.Build.props
+++ b/Directory.Build.props
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Import Project="DeploymentSettings.props" />
-
-  <PropertyGroup>
-    <Company>Clean Architecture</Company>
-    <Authors>$(Company)</Authors>
-    <Copyright>Copyright © $(Company) $([System.DateTime]::Now.Year)</Copyright>
-    <Trademark>$(Company)™</Trademark>
-    <Product>$(Company) Projects</Product>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <LangVersion>latest</LangVersion>
-    <NoWarn>1591;1701;1702;8032;NU1701;AD0001</NoWarn>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="content\*" Pack="true" PackagePath="content" />
-    <None Include="build\*" Pack="true" PackagePath="build" />
-    <None Include="lib\*" Pack="true" PackagePath="lib" />
-  </ItemGroup>
-  
-  <ItemGroup Condition="Exists('$(MSBuildProjectDirectory)\xunit.runner.json')">
-    <None Update="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-  
-  <ItemGroup Condition="'$(WebProjectMode)' == 'true'">
-    <Content Update="wwwroot\**\*;Views\**\*;Areas\**\Views;appsettings.json;web.config">
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    
-    <DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.8.391" />
-    
-    <Content Update="Pages\_ViewImports.cshtml">
-      <Pack>$(IncludeRazorContentInPack)</Pack>
-    </Content>
-    <Content Update="Pages\_ViewStart.cshtml">
-      <Pack>$(IncludeRazorContentInPack)</Pack>
-    </Content>
-  </ItemGroup>
-  
-  <PropertyGroup Condition="'$(TestProjectMode)' == 'true'">
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
-<?xml version="1.0" encoding="utf-8" ?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Scripts">
-    <PowerShell>powershell -NoProfile -ExecutionPolicy Unrestricted -command</PowerShell>
-    <Pack>dotnet pack &quot;$(MSBuildProjectDirectory)\$(ProjectFileName)&quot; --no-build -o C:\NugetSource -c $(Configuration)</Pack>
-  </PropertyGroup>
-
-  <Target Name="PackNugets" AfterTargets="AfterBuild" Condition="'$(DeployNugetPackages)'=='true'">
-    <Exec Command="$(Pack)"/>
-  </Target>
-  
-  <!-- https://github.com/NuGet/Home/issues/4412. -->
-  <Target Name="CopyDepsFiles" AfterTargets="Build" Condition="'$(TargetFramework)'!=''">
-    <ItemGroup>
-      <DepsFilePaths Include="$([System.IO.Path]::ChangeExtension('%(_ResolvedProjectReferencePaths.FullPath)', '.deps.json'))" />
-    </ItemGroup>
-    <Copy SourceFiles="%(DepsFilePaths.FullPath)" DestinationFolder="$(OutputPath)" Condition="Exists('%(DepsFilePaths.FullPath)')" />
-  </Target>
-  
-  <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish" Condition="'$(WebProjectMode)' == 'true'">
-    <Exec Command="bower install" />
-    <Exec Command="dotnet bundle" />
-  </Target>
-</Project>
\ No newline at end of file
--- a/Packages.props
+++ b/Packages.props
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Update="ReportGenerator" Version="4.2.20" />
-    <PackageReference Update="Moq" Version="4.13.0" />
-    <PackageReference Update="Ardalis.ListStartupServices" Version="1.1.3" />
-    <PackageReference Update="Autofac" Version="4.9.4" />
-    <PackageReference Update="Autofac.Extensions.DependencyInjection" Version="5.0.0" />
-    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
-    <PackageReference Update="Microsoft.Web.LibraryManager.Build" Version="2.0.76" />
-    <PackageReference Update="Swashbuckle.AspNetCore" Version="5.0.0-rc3" />
-    <PackageReference Update="SQLite" Version="3.13.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0" />
-    <PackageReference Update="Ardalis.EFCore.Extensions" Version="1.1.0" />
-    <PackageReference Update="Ardalis.GuardClauses" Version="1.2.9" />
-    <PackageReference Update="NETStandard.Library" Version="2.0.3" />
-  </ItemGroup>
-  
-  <ItemGroup Condition="'$(TestProjectMode)' == 'true'">
-    <PackageReference Include="NETStandard.Library" Version="2.0.3" />
-    <PackageReference Include="coverlet.msbuild" Version="2.7.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.0.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.console" Version="2.4.1" PrivateAssets="all" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,20 +30,20 @@ steps:
    projects: 'tests/**/*.csproj'
    nobuild: true

- task: Palmmedia.reportgenerator.reportgenerator-build-release-task.reportgenerator@4
-  displayName: ReportGenerator
-  inputs:
-    reports: '$(Build.SourcesDirectory)/tests/**/coverage.cobertura.xml'
-    targetdir: '$(Build.SourcesDirectory)/CodeCoverage'
-    reporttypes: 'HtmlInline_AzurePipelines;Cobertura;Badges'
-    assemblyfilters: '-xunit*'
+#- task: Palmmedia.reportgenerator.reportgenerator-build-release-task.reportgenerator@4
+#  displayName: ReportGenerator
+#  inputs:
+#    reports: '$(Build.SourcesDirectory)/tests/**/coverage.cobertura.xml'
+#    targetdir: '$(Build.SourcesDirectory)/CodeCoverage'
+#    reporttypes: 'HtmlInline_AzurePipelines;Cobertura;Badges'
+#    assemblyfilters: '-xunit*'

 # Publish the code coverage result (summary and web site)
 # The summary allows to view the coverage percentage in the summary tab
 # The web site allows to view which lines are covered directly in Azure Pipeline
- task: PublishCodeCoverageResults@1
-  displayName: 'Publish code coverage'
-  inputs:
-    codeCoverageTool: Cobertura
-    summaryFileLocation: '$(Build.SourcesDirectory)/CodeCoverage/Cobertura.xml'
-    reportDirectory: '$(Build.SourcesDirectory)/CodeCoverage'
+#- task: PublishCodeCoverageResults@1
+#  displayName: 'Publish code coverage'
+#  inputs:
+#    codeCoverageTool: Cobertura
+#    summaryFileLocation: '$(Build.SourcesDirectory)/CodeCoverage/Cobertura.xml'
+#    reportDirectory: '$(Build.SourcesDirectory)/CodeCoverage'
--- a/src/CleanArchitecture.Core/CleanArchitecture.Core.csproj
+++ b/src/CleanArchitecture.Core/CleanArchitecture.Core.csproj
@@ -6,7 +6,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Ardalis.GuardClauses" />
+    <PackageReference Include="Ardalis.GuardClauses" Version="1.3.3" />
  </ItemGroup>

  <ItemGroup>

--- a/src/CleanArchitecture.Infrastructure/CleanArchitecture.Infrastructure.csproj
+++ b/src/CleanArchitecture.Infrastructure/CleanArchitecture.Infrastructure.csproj
@@ -2,18 +2,18 @@
  <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.46" />
  
  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Autofac" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" />
-    <PackageReference Include="Ardalis.EFCore.Extensions" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
-    <PackageReference Include="SQLite" />
-    <PackageReference Include="NETStandard.Library" />
+    <PackageReference Include="Autofac" Version="5.0.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Ardalis.EFCore.Extensions" Version="1.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="all" Version="3.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.1" />
+    <PackageReference Include="SQLite" Version="3.13.0" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.3" />
  </ItemGroup>
  
  <ItemGroup>

--- a/src/CleanArchitecture.Web/CleanArchitecture.Web.csproj
+++ b/src/CleanArchitecture.Web/CleanArchitecture.Web.csproj
@@ -2,19 +2,20 @@
  <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.46" />
  
  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <PreserveCompilationContext>true</PreserveCompilationContext>
    <OutputType>Exe</OutputType>
    <WebProjectMode>true</WebProjectMode>
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Ardalis.ListStartupServices" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Web.LibraryManager.Build" />
-    <PackageReference Include="Swashbuckle.AspNetCore" />
-    <PackageReference Include="NETStandard.Library" />
+    <PackageReference Include="Ardalis.ListStartupServices" Version="1.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="all" Version="3.1.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" PrivateAssets="All" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.0.96" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.3" />
  </ItemGroup>
  
  <ItemGroup>

--- a/tests/CleanArchitecture.FunctionalTests/CleanArchitecture.FunctionalTests.csproj
+++ b/tests/CleanArchitecture.FunctionalTests/CleanArchitecture.FunctionalTests.csproj
@@ -2,12 +2,22 @@
  <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.46" />
  
  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <TestProjectMode>true</TestProjectMode>
  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="coverlet.collector" Version="1.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\CleanArchitecture.Tests\CleanArchitecture.UnitTests.csproj" />
+    <ProjectReference Include="..\CleanArchitecture.UnitTests\CleanArchitecture.UnitTests.csproj" />
  </ItemGroup>

 </Project>
--- a/tests/CleanArchitecture.FunctionalTests/CustomWebApplicationFactory.cs
+++ b/tests/CleanArchitecture.FunctionalTests/CustomWebApplicationFactory.cs
@@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System;
+using Microsoft.AspNetCore.TestHost;

 namespace CleanArchitecture.FunctionalTests
 {
@@ -15,7 +16,9 @@ namespace CleanArchitecture.FunctionalTests
    {
        protected override void ConfigureWebHost(IWebHostBuilder builder)
        {
-            builder.ConfigureServices(services =>
+            builder
+                .UseSolutionRelativeContentRoot("src/CleanArchitecture.Web")
+                .ConfigureServices(services =>
            {
                // Create a new service provider.
                var serviceProvider = new ServiceCollection()

--- a/tests/CleanArchitecture.IntegrationTests/CleanArchitecture.IntegrationTests.csproj
+++ b/tests/CleanArchitecture.IntegrationTests/CleanArchitecture.IntegrationTests.csproj
@@ -2,12 +2,21 @@
  <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.46" />

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <TestProjectMode>true</TestProjectMode>
  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="coverlet.collector" Version="1.0.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.1" />
+  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\CleanArchitecture.Tests\CleanArchitecture.UnitTests.csproj" />
+    <ProjectReference Include="..\CleanArchitecture.UnitTests\CleanArchitecture.UnitTests.csproj" />
  </ItemGroup>

 </Project>
--- a/tests/CleanArchitecture.IntegrationTests/Data/BaseEfRepoTestFixture.cs
+++ b/tests/CleanArchitecture.IntegrationTests/Data/BaseEfRepoTestFixture.cs
@@ -35,7 +35,5 @@ namespace CleanArchitecture.IntegrationTests.Data
            _dbContext = new AppDbContext(options, mockDispatcher.Object);
            return new EfRepository(_dbContext);
        }
-
-
    }
 }
--- a/tests/CleanArchitecture.IntegrationTests/Data/EfRepositoryAdd.cs
+++ b/tests/CleanArchitecture.IntegrationTests/Data/EfRepositoryAdd.cs
@@ -7,7 +7,6 @@ namespace CleanArchitecture.IntegrationTests.Data
 {
    public class EfRepositoryAdd : BaseEfRepoTestFixture
    {
-
        [Fact]
        public void AddsItemAndSetsId()
        {

--- a/tests/CleanArchitecture.Tests/CleanArchitecture.UnitTests.csproj
+++ b/tests/CleanArchitecture.Tests/CleanArchitecture.UnitTests.csproj
@@ -2,14 +2,18 @@
  <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.46" />

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <PreserveCompilationContext>true</PreserveCompilationContext>
    <TestProjectMode>true</TestProjectMode>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Moq" />
-    <PackageReference Include="ReportGenerator" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="coverlet.collector" Version="1.0.1" />
+    <PackageReference Include="Moq" Version="4.13.1" />
+    <PackageReference Include="ReportGenerator" Version="4.4.6" />
+    <PackageReference Include="xunit" Version="2.4.1" />
  </ItemGroup>
  
  <ItemGroup>

--- a/tests/CleanArchitecture.Tests/Core/DomainEvents/DomainEventDispatcherShould.cs
+++ b/tests/CleanArchitecture.Tests/Core/DomainEvents/DomainEventDispatcherShould.cs
--- a/tests/CleanArchitecture.Tests/Core/Entities/ToDoItemMarkComplete.cs
+++ b/tests/CleanArchitecture.Tests/Core/Entities/ToDoItemMarkComplete.cs
--- a/tests/CleanArchitecture.Tests/Core/Handlers/ItemCompletedEmailNotificationHandlerHandle.cs
+++ b/tests/CleanArchitecture.Tests/Core/Handlers/ItemCompletedEmailNotificationHandlerHandle.cs
--- a/tests/CleanArchitecture.Tests/NoOpDomainEventDispatcher.cs
+++ b/tests/CleanArchitecture.Tests/NoOpDomainEventDispatcher.cs
--- a/tests/CleanArchitecture.Tests/ToDoItemBuilder.cs
+++ b/tests/CleanArchitecture.Tests/ToDoItemBuilder.cs
--- a/tests/CleanArchitecture.Tests/xunit.runner.json
+++ b/tests/CleanArchitecture.Tests/xunit.runner.json