diff --git a/.props b/.props
index 222c3c9..13314f6 100644
--- a/.props
+++ b/.props
@@ -10,4 +10,7 @@
 		<Copyright>Unordinal AB</Copyright>
 		<Description>DarkRift Networking - High Performance Networking Library for .NET and Unity Games</Description>
 	</PropertyGroup>
-</Project>
\ No newline at end of file
+  <PropertyGroup>
+    <DefaultItemExcludes>$(DefaultItemExcludes);**/*.meta;**/*.asmdef</DefaultItemExcludes>
+  </PropertyGroup>
+</Project>
diff --git a/DarkRift.Client/DarkRift.Client.csproj b/DarkRift.Client/DarkRift.Client.csproj
index 9f87da8..2b85688 100644
--- a/DarkRift.Client/DarkRift.Client.csproj
+++ b/DarkRift.Client/DarkRift.Client.csproj
@@ -1,16 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props (must be done here for Version to have effect on class libraries) -->
-  <Import Project="$(ProjectDir)..\.props" />
-
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(DRBuildMode)' != 'coreonly' ">net3.5;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DRBuildMode)' == 'coreonly' ">netstandard2.0</TargetFrameworks>
     <DocumentationFile>$(OutDir)\$(Configuration)\$(TargetFramework)\DarkRift.Client.xml</DocumentationFile>
     <Configurations>Debug;Release</Configurations>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-	<BaseOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\</BaseOutputPath>
-    <BaseIntermediateOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\</BaseIntermediateOutputPath>
-	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net3.5' ">
diff --git a/DarkRift.Server.Console/DarkRift.Server.Console.csproj b/DarkRift.Server.Console/DarkRift.Server.Console.csproj
index 8acf2ee..e8ed017 100644
--- a/DarkRift.Server.Console/DarkRift.Server.Console.csproj
+++ b/DarkRift.Server.Console/DarkRift.Server.Console.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props -->
-  <Import Project="$(ProjectDir)..\.props" />
-
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(DRBuildMode)' != 'coreonly' ">net4.0;netcoreapp2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DRBuildMode)' == 'coreonly' ">netcoreapp2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
@@ -14,8 +11,6 @@
     <!-- Don't generate a Windows exe, it doesn't work with our packing into ./lib -->
     <!-- TODO https://github.com/nulastudio/NetCoreBeauty? -->
     <UseAppHost>false</UseAppHost>
-	<BaseOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\</BaseOutputPath>
-    <BaseIntermediateOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\</BaseIntermediateOutputPath>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/DarkRift.Server.Testing/DarkRift.Server.Testing.csproj b/DarkRift.Server.Testing/DarkRift.Server.Testing.csproj
index c710ec9..20bbda1 100644
--- a/DarkRift.Server.Testing/DarkRift.Server.Testing.csproj
+++ b/DarkRift.Server.Testing/DarkRift.Server.Testing.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props (must be done here for Version to have effect on class libraries) -->
-  <Import Project="$(ProjectDir)..\.props" />
-
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(DRBuildMode)' != 'coreonly' ">net4.5;net6.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DRBuildMode)' == 'coreonly' ">net6.0</TargetFrameworks>
@@ -9,8 +6,6 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <!-- MSTest.TestAdapter package is for .NET Framework 4.6.1 so throws errors on .NET Standard build -->
     <NoWarn>NU1701</NoWarn>
-	<BaseOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\</BaseOutputPath>
-    <BaseIntermediateOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\</BaseIntermediateOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DarkRift.Server/DarkRift.Server.csproj b/DarkRift.Server/DarkRift.Server.csproj
index 0ff62c3..5d7e3ed 100644
--- a/DarkRift.Server/DarkRift.Server.csproj
+++ b/DarkRift.Server/DarkRift.Server.csproj
@@ -1,16 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props (must be done here for Version to have effect on class libraries) -->
-  <Import Project="$(ProjectDir)..\.props" />
-  
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(DRBuildMode)' != 'coreonly' ">net3.5;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DRBuildMode)' == 'coreonly' ">netstandard2.0</TargetFrameworks>
     <DocumentationFile>$(OutDir)\$(Configuration)\$(TargetFramework)\DarkRift.Server.xml</DocumentationFile>
     <Configurations>Debug;Release</Configurations>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-	<BaseOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\</BaseOutputPath>
-    <BaseIntermediateOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\</BaseIntermediateOutputPath>
-	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net3.5' ">
diff --git a/DarkRift.SystemTesting/DarkRift.SystemTesting.csproj b/DarkRift.SystemTesting/DarkRift.SystemTesting.csproj
index e60fb4e..d3e9078 100644
--- a/DarkRift.SystemTesting/DarkRift.SystemTesting.csproj
+++ b/DarkRift.SystemTesting/DarkRift.SystemTesting.csproj
@@ -1,15 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props (must be done here for Version to have effect on class libraries) -->
-  <Import Project="$(ProjectDir)..\.props" />
-
   <PropertyGroup>
     <TargetFrameworks>net6.0</TargetFrameworks>
     <Configurations>Debug;Release</Configurations>
     <IsTestProject>true</IsTestProject>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <IsPackable>false</IsPackable>
-	<BaseOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\</BaseOutputPath>
-    <BaseIntermediateOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\</BaseIntermediateOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DarkRift.Testing/DarkRift.Testing.csproj b/DarkRift.Testing/DarkRift.Testing.csproj
index a9b6de0..ffee5e7 100644
--- a/DarkRift.Testing/DarkRift.Testing.csproj
+++ b/DarkRift.Testing/DarkRift.Testing.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props (must be done here for Version to have effect on class libraries) -->
-  <Import Project="$(ProjectDir)..\.props" />
-  
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(DRBuildMode)' != 'coreonly' ">net4.5;net6.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DRBuildMode)' == 'coreonly' ">net6.0</TargetFrameworks>
@@ -10,8 +7,6 @@
     <!-- MSTest.TestAdapter package is for .NET Framework 4.6.1 so throws errors on .NET Standard build -->
     <NoWarn>NU1701</NoWarn>
     <IsPackable>false</IsPackable>
-	<BaseOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\</BaseOutputPath>
-    <BaseIntermediateOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\</BaseIntermediateOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DarkRift/DarkRift.csproj b/DarkRift/DarkRift.csproj
index 5e261d9..35f21d2 100644
--- a/DarkRift/DarkRift.csproj
+++ b/DarkRift/DarkRift.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Import global props (must be done here for Version to have effect on class libraries) -->
-  <Import Project="$(ProjectDir)..\.props" />
-
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(DRBuildMode)' != 'coreonly' ">net3.5;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DRBuildMode)' == 'coreonly' ">netstandard2.0</TargetFrameworks>
@@ -9,9 +6,7 @@
     <Configurations>Debug;Release</Configurations>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-	<BaseOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\</BaseOutputPath>
-    <BaseIntermediateOutputPath>$(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\</BaseIntermediateOutputPath>
-	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net3.5' ">
@@ -25,8 +20,8 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
-  
+
   <ItemGroup>
-    <None Include="..\README.md" Pack="true" PackagePath=""/>
+    <None Include="..\README.md" Pack="true" PackagePath="" />
   </ItemGroup>
 </Project>
diff --git a/DarkRift/Dispatching/FunctionDispatcherTask.cs b/DarkRift/Dispatching/FunctionDispatcherTask.cs
index f7ef604..6ab6970 100644
--- a/DarkRift/Dispatching/FunctionDispatcherTask.cs
+++ b/DarkRift/Dispatching/FunctionDispatcherTask.cs
@@ -55,7 +55,7 @@ internal override void Execute(bool synchronous)
             catch (Exception e)
             {
                 SetTaskFailed(e);
-                throw new DispatcherException("An exception occurred whilst running a dispatcher task. See inner exception for more details.", e); ;
+                throw new DispatcherException("An exception occurred whilst running a dispatcher task. See inner exception for more details.", e);
             }
 
             SetTaskComplete(synchronous);
diff --git a/DarkRift2.sln b/DarkRift2.sln
index 2da240a..d75c52a 100644
--- a/DarkRift2.sln
+++ b/DarkRift2.sln
@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.props = .props
 		.targets = .targets
 		bitbucket-pipelines.yml = bitbucket-pipelines.yml
+		Directory.Build.props = Directory.Build.props
 		ReadMe.md = ReadMe.md
 		DarkRift.Schemas\Server.config.xsd = DarkRift.Schemas\Server.config.xsd
 	EndProjectSection
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..52e02bd
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Common properties -->
+  <PropertyGroup>
+    <!-- SolutionDir is not defined when building projects explicitly -->
+    <SolutionDir Condition=" '$(SolutionDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), DarkRift2.sln))\</SolutionDir>
+    <!-- Output paths -->
+    <BaseIntermediateOutputPath>$(SolutionDir)..\unordinal\dr-build\$(MSBuildProjectName)\obj\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>$(SolutionDir)..\unordinal\dr-build\$(MSBuildProjectName)\obj\$(Configuration)</IntermediateOutputPath>
+    <MSBuildProjectExtensionsPath>$(IntermediateOutputPath)\</MSBuildProjectExtensionsPath>
+    <BaseOutputPath>$(SolutionDir)..\unordinal\dr-build\$(MSBuildProjectName)\bin\</BaseOutputPath>
+    <OutDir>$(OutputPath)</OutDir>
+  </PropertyGroup>
+
+  <Import Project="$(SolutionDir)\.props" />
+</Project>