diff --git a/.gitignore b/.gitignore
index 5e79d0f3c..6162be06a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ package-dev/**/*.dll
 package-dev/**/*.meta
 package-dev/**/*.pdb
 package-dev/**/*.xml
+package-dev/**/TestSentryOptions.json
 
 # Build output of Sentry.Unity
 sentry-unity/Assets/Plugins/Sentry/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4dd141cd6..4509d09d3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,12 +15,12 @@ Overall, there are two "flows" to take into account - `Development` and `Release
 
 ## Finding the Unity installation
 
-The `UnityPath` configured in `src/Directory.Build.props` does a lookup at different locations to find Unity.
+The `UnityPath` in `src/Directory.Build.props` does a lookup at different locations to find Unity.
 This is different per operating system. You can adjust it as needed:
 
 ```xml
 <Project>
-  <!-- Other propertes & groups -->
+  <!-- Other properties & groups -->
   <PropertyGroup>
     <UnityPath Condition="<YOUR_PATH_CONDITION>">YOUR_PATH</UnityPath>
   </PropertyGroup>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f9e975c45..c45fee843 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,4 +1,5 @@
 <Project>
+
   <PropertyGroup>
     <Version>0.0.9</Version>
     <LangVersion>9</LangVersion>
@@ -9,18 +10,53 @@
     <PackageFolderName>package-dev</PackageFolderName>
     <PackageRuntimePath>../../$(PackageFolderName)/Runtime</PackageRuntimePath>
     <PackageEditorPath>../../$(PackageFolderName)/Editor</PackageEditorPath>
+    <!-- warning NU1701: Package 'NUnit 3.5.0' was restored using '.NETFramework,Version=v4.6.1 -->
+    <NoWarn>$(NoWarn);NU1701</NoWarn>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Roslynator.Analyzers" Version="3.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.0" PrivateAssets="All" />
     <PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="All" />
   </ItemGroup>
-  <PropertyGroup>
-    <UnityPath Condition="Exists('C:\Program Files\Unity\Hub\Editor\$(UnityVersion)\Editor\Data\Managed\UnityEngine.dll')">C:\Program Files\Unity\Hub\Editor\$(UnityVersion)\Editor\Data\Managed</UnityPath>
-    <UnityPath Condition="$(UnityPath) == '' AND Exists('/Applications/Unity/Hub/Editor/$(UnityVersion)/Unity.app/Contents/Managed/UnityEngine.dll')">/Applications/Unity/Hub/Editor/$(UnityVersion)/Unity.app/Contents/Managed/</UnityPath>
+
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
+    <UnityRoot Condition="Exists('C:\Program Files\Unity\Hub\Editor\$(UnityVersion)\Editor\Data\Managed\UnityEngine.dll')">C:\Program Files\Unity\Hub\Editor\$(UnityVersion)\Editor</UnityRoot>
+    <!--If not using Unity Hub, tries to pick whatever Unity version is installed on the machine-->
+    <UnityRoot Condition="$(UnityRoot) == '' AND Exists('C:\Program Files\Unity\Editor\Data\Managed\UnityEngine.dll')">C:\Program Files\Unity\Editor</UnityRoot>
+    <UnityManagedPath>$(UnityRoot)\Data\Managed</UnityManagedPath>
+    <UnityExec>$(UnityRoot)\Unity.exe</UnityExec>
+    <StandalonePlayerName>buildWindows64Player</StandalonePlayerName>
+    <ArtifactName>game.exe</ArtifactName>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
+    <UnityRoot Condition="Exists('/Applications/Unity/Hub/Editor/$(UnityVersion)/Unity.app/Contents/Managed/UnityEngine.dll')">/Applications/Unity/Hub/Editor/$(UnityVersion)/Unity.app/</UnityRoot>
     <!--If not using Unity Hub, tries to pick whatever Unity version is installed on the machine-->
-    <UnityPath Condition="$(UnityPath) == '' AND Exists('C:\Program Files\Unity\Editor\Data\Managed\UnityEngine.dll')">C:\Program Files\Unity\Editor\Data\Managed</UnityPath>
-    <UnityPath Condition="$(UnityPath) == '' AND Exists('/Applications/Unity/Unity.app/Contents/Managed/UnityEngine.dll')">/Applications/Unity/Unity.app/Contents/Managed</UnityPath>
+    <UnityRoot Condition="$(UnityRoot) == '' AND Exists('/Applications/Unity/Unity.app/Contents/Managed/UnityEngine.dll')">/Applications/Unity/Unity.app/</UnityRoot>
+    <UnityManagedPath>$(UnityRoot)/Contents/Managed</UnityManagedPath>
+    <UnityExec>$(UnityRoot)/Contents/MacOS/Unity</UnityExec>
+    <StandalonePlayerName>buildMacOS64Player</StandalonePlayerName>
+    <ArtifactName>game</ArtifactName>
   </PropertyGroup>
+
+  <!-- If Unity Libraries don't exist, run a Unity build -->
+  <Target Name="BuildUnityProject"
+    Condition="'$(MSBuildProjectName)' == 'Sentry.Unity' and !Exists('$(MSBuildProjectDirectory)/../../samples/unity-of-bugs/Library')"
+    BeforeTargets="BeforeBuild">
+    <Error Condition="$(UnityRoot) == ''" Text="Couldn't find Unity."></Error>
+
+    <!-- Even with a successful build, Unity will error on 'usbmuxd' or log out to std-error which breaks msbuild.
+    We need to run a unity build to restore the test packages and for that reason we'll ignore errors here and assume a later step will validation the build is actually working:
+      The offending error:
+      [usbmuxd] Stop listen thread
+      [usbmuxd] Error: 
+      [usbmuxd] Listen thread exitingit -batchmode -nographics -logFile - -projectPath $(MSBuildProjectDirectory)/../../samples/unity-of-bugs -$(StandalonePlayerName) $(ArtifactName)
+    Related: https://forum.unity.com/threads/6572-debugger-agent-unable-to-listen-on-27.500387/  -->
+    <Exec Command="$(UnityExec) -quit -batchmode -nographics -logFile - -projectPath $(MSBuildProjectDirectory)/../../samples/unity-of-bugs -$(StandalonePlayerName) $(ArtifactName) "
+    IgnoreStandardErrorWarningFormat="true"
+    IgnoreExitCode="true"></Exec>
+  </Target>
+
 </Project>
diff --git a/src/Sentry.Unity.Editor/Sentry.Unity.Editor.csproj b/src/Sentry.Unity.Editor/Sentry.Unity.Editor.csproj
index 7ce0088d3..97aede6ed 100644
--- a/src/Sentry.Unity.Editor/Sentry.Unity.Editor.csproj
+++ b/src/Sentry.Unity.Editor/Sentry.Unity.Editor.csproj
@@ -7,11 +7,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="UnityEngine">
-      <HintPath>$(UnityPath)\UnityEngine.dll</HintPath>
+      <HintPath>$(UnityManagedPath)\UnityEngine.dll</HintPath>
       <Private>false</Private>
     </Reference>
     <Reference Include="UnityEditor">
-      <HintPath>$(UnityPath)\UnityEditor.dll</HintPath>
+      <HintPath>$(UnityManagedPath)\UnityEditor.dll</HintPath>
       <Private>false</Private>
     </Reference>
   </ItemGroup>
diff --git a/src/Sentry.Unity/Sentry.Unity.csproj b/src/Sentry.Unity/Sentry.Unity.csproj
index a44f962ef..d66aeffe7 100644
--- a/src/Sentry.Unity/Sentry.Unity.csproj
+++ b/src/Sentry.Unity/Sentry.Unity.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="UnityEngine">
-      <HintPath>$(UnityPath)\UnityEngine.dll</HintPath>
+      <HintPath>$(UnityManagedPath)\UnityEngine.dll</HintPath>
       <Private>false</Private>
     </Reference>
   </ItemGroup>
diff --git a/src/test/Directory.Build.props b/src/test/Directory.Build.props
index 819551158..ee45ce8e2 100644
--- a/src/test/Directory.Build.props
+++ b/src/test/Directory.Build.props
@@ -17,7 +17,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="UnityEngine">
-      <HintPath>$(UnityPath)/UnityEngine.dll</HintPath>
+      <HintPath>$(UnityManagedPath)/UnityEngine.dll</HintPath>
       <Private>false</Private>
     </Reference>
     <Reference Include="UnityEditor.TestRunner">
diff --git a/src/test/Sentry.Unity.Editor.Tests/Sentry.Unity.Editor.Tests.csproj b/src/test/Sentry.Unity.Editor.Tests/Sentry.Unity.Editor.Tests.csproj
index 9e2d6d04f..897b52310 100644
--- a/src/test/Sentry.Unity.Editor.Tests/Sentry.Unity.Editor.Tests.csproj
+++ b/src/test/Sentry.Unity.Editor.Tests/Sentry.Unity.Editor.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="UnityEditor">
-      <HintPath>$(UnityPath)/UnityEditor.dll</HintPath>
+      <HintPath>$(UnityManagedPath)/UnityEditor.dll</HintPath>
       <Private>false</Private>
     </Reference>
   </ItemGroup>