diff --git a/.gitignore b/.gitignore
index 0cc2124b..4086144d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.iml
 .idea/
+.vs/
diff --git a/expensereport-csharp/expensereport-csharp.sln b/expensereport-csharp/expensereport-csharp.sln
index 610ec3b8..d148071f 100644
--- a/expensereport-csharp/expensereport-csharp.sln
+++ b/expensereport-csharp/expensereport-csharp.sln
@@ -1,8 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "expensereport-csharp", "expensereport-csharp\expensereport-csharp.csproj", "{4D670DD0-5E29-49CE-AFE9-F5C7ACDB89D0}"
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31729.503
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "expensereport-csharp", "expensereport-csharp\expensereport-csharp.csproj", "{4D670DD0-5E29-49CE-AFE9-F5C7ACDB89D0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "expensereport-ut", "expensereport-ut\expensereport-ut.csproj", "{07C2B482-2F0F-4B66-9F09-9D9505C9466E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "expensereport-ut", "expensereport-ut\expensereport-ut.csproj", "{07C2B482-2F0F-4B66-9F09-9D9505C9466E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,4 +22,10 @@ Global
 		{07C2B482-2F0F-4B66-9F09-9D9505C9466E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07C2B482-2F0F-4B66-9F09-9D9505C9466E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D8E57AC7-4260-4074-A137-17A1F45B7713}
+	EndGlobalSection
 EndGlobal
diff --git a/expensereport-csharp/expensereport-csharp/expensereport-csharp.csproj b/expensereport-csharp/expensereport-csharp/expensereport-csharp.csproj
index bbca9dbd..14f46c1b 100644
--- a/expensereport-csharp/expensereport-csharp/expensereport-csharp.csproj
+++ b/expensereport-csharp/expensereport-csharp/expensereport-csharp.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
-        <RootNamespace>expensereport_csharp</RootNamespace>
+		<TargetFramework>net5.0</TargetFramework>
+		<nullable>Enable</nullable>
+		<RootNamespace>expensereport_csharp</RootNamespace>
     </PropertyGroup>
 
 </Project>
diff --git a/expensereport-csharp/expensereport-ut/UnitTest1.cs b/expensereport-csharp/expensereport-ut/UnitTest1.cs
index 794c4081..6fe93ca4 100644
--- a/expensereport-csharp/expensereport-ut/UnitTest1.cs
+++ b/expensereport-csharp/expensereport-ut/UnitTest1.cs
@@ -1,18 +1,14 @@
-using NUnit.Framework;
+using System;
+using Xunit;
 
 namespace Tests
 {
-    public class Tests
+    public class UnitTest1
     {
-        [SetUp]
-        public void Setup()
-        {
-        }
-
-        [Test]
+        [Fact]
         public void Test1()
         {
-            Assert.Pass();
+
         }
     }
-}
\ No newline at end of file
+}
diff --git a/expensereport-csharp/expensereport-ut/expensereport-ut.csproj b/expensereport-csharp/expensereport-ut/expensereport-ut.csproj
index 89b9b0d1..0c408bce 100644
--- a/expensereport-csharp/expensereport-ut/expensereport-ut.csproj
+++ b/expensereport-csharp/expensereport-ut/expensereport-ut.csproj
@@ -1,15 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+		<TargetFramework>net5.0</TargetFramework>
 
-        <IsPackable>false</IsPackable>
-    </PropertyGroup>
+		<IsPackable>false</IsPackable>
+        <nullable>Enable</nullable>
+	</PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="nunit" Version="3.11.0"/>
-        <PackageReference Include="NUnit3TestAdapter" Version="3.11.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+          <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\expensereport-csharp\expensereport-csharp.csproj" />
     </ItemGroup>
 
 </Project>