From ea0ae438086c0986eff849f236762d7886ce5eed Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 5 Dec 2025 12:35:07 +0100
Subject: [PATCH 1/2] Move building into Directory.Build.targets

---
 Directory.Build.targets                        | 11 +++++++++++
 .../Sentry.Unity.Native.csproj                 | 18 ++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 125ade4ac..9091da33a 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -313,6 +313,17 @@ Expected to exist:
     <Exec WorkingDirectory="$(SentryLinuxArtifactsDestination)" Command="objcopy --add-gnu-debuglink=libsentry.dbg.so libsentry.so" />
   </Target>
 
+  <!-- Build PlayStation version of Sentry.Unity.Native: dotnet msbuild /t:BuildPlayStationAssembly src/Sentry.Unity.Native -->
+  <Target Name="BuildPlayStationAssembly"
+          AfterTargets="AfterBuild"
+          Condition="'$(MSBuildProjectName)' == 'Sentry.Unity.Native' AND '$(IsPlayStationBuild)' != 'true'">
+    <Message Importance="High" Text="Building PlayStation-specific native assembly." />
+
+    <MSBuild Projects="$(MSBuildProjectFile)"
+             Targets="Build"
+             Properties="IsPlayStationBuild=true;Configuration=$(Configuration)" />
+  </Target>
+
   <!-- 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 validate the build is actually working:
   The offending error:
diff --git a/src/Sentry.Unity.Native/Sentry.Unity.Native.csproj b/src/Sentry.Unity.Native/Sentry.Unity.Native.csproj
index bff0c10bc..b6963bffe 100644
--- a/src/Sentry.Unity.Native/Sentry.Unity.Native.csproj
+++ b/src/Sentry.Unity.Native/Sentry.Unity.Native.csproj
@@ -3,21 +3,15 @@
     <OutDir>$(PackageRuntimePath)</OutDir>
   </PropertyGroup>
 
+  <!-- Configure PlayStation-specific build -->
+  <PropertyGroup Condition="'$(IsPlayStationBuild)' == 'true'">
+    <DefineConstants>$(DefineConstants);SENTRY_NATIVE_PLAYSTATION</DefineConstants>
+    <AssemblyName>Sentry.Unity.Native.PlayStation</AssemblyName>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="../sentry-dotnet/src/Sentry/Sentry.csproj" Private="false" />
     <ProjectReference Include="../Sentry.Unity/Sentry.Unity.csproj" Private="false" />
   </ItemGroup>
 
-  <!-- Build Console version after the Desktop version -->
-  <Target Name="BuildConsoleAssembly" AfterTargets="AfterBuild">
-    <Csc
-      Sources="@(Compile)"
-      References="@(ReferencePath)"
-      OutputAssembly="$(OutDir)Sentry.Unity.Native.PlayStation.dll"
-      DefineConstants="$(DefineConstants);SENTRY_NATIVE_PLAYSTATION"
-      TargetType="library"
-      EmitDebugInformation="true"
-    />
-  </Target>
-
 </Project>

From 2f5b0dadfe6b400df2edac57158ebcc10ff66028 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 5 Dec 2025 14:36:07 +0100
Subject: [PATCH 2/2] Nullability

---
 Directory.Build.targets                       | 13 +---------
 .../Sentry.Unity.Native.csproj                | 24 ++++++++++++++-----
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 9091da33a..5e471defd 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -313,17 +313,6 @@ Expected to exist:
     <Exec WorkingDirectory="$(SentryLinuxArtifactsDestination)" Command="objcopy --add-gnu-debuglink=libsentry.dbg.so libsentry.so" />
   </Target>
 
-  <!-- Build PlayStation version of Sentry.Unity.Native: dotnet msbuild /t:BuildPlayStationAssembly src/Sentry.Unity.Native -->
-  <Target Name="BuildPlayStationAssembly"
-          AfterTargets="AfterBuild"
-          Condition="'$(MSBuildProjectName)' == 'Sentry.Unity.Native' AND '$(IsPlayStationBuild)' != 'true'">
-    <Message Importance="High" Text="Building PlayStation-specific native assembly." />
-
-    <MSBuild Projects="$(MSBuildProjectFile)"
-             Targets="Build"
-             Properties="IsPlayStationBuild=true;Configuration=$(Configuration)" />
-  </Target>
-
   <!-- 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 validate the build is actually working:
   The offending error:
@@ -616,4 +605,4 @@ void PrintFailedTests(XElement element)
     <Message Importance="High" Text="Restoring package-dev/Plugins to the latest git commit" />
     <Exec WorkingDirectory="$(RepoRoot)" Command="git restore package-dev/Plugins" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Sentry.Unity.Native/Sentry.Unity.Native.csproj b/src/Sentry.Unity.Native/Sentry.Unity.Native.csproj
index b6963bffe..569b9cee4 100644
--- a/src/Sentry.Unity.Native/Sentry.Unity.Native.csproj
+++ b/src/Sentry.Unity.Native/Sentry.Unity.Native.csproj
@@ -3,15 +3,27 @@
     <OutDir>$(PackageRuntimePath)</OutDir>
   </PropertyGroup>
 
-  <!-- Configure PlayStation-specific build -->
-  <PropertyGroup Condition="'$(IsPlayStationBuild)' == 'true'">
-    <DefineConstants>$(DefineConstants);SENTRY_NATIVE_PLAYSTATION</DefineConstants>
-    <AssemblyName>Sentry.Unity.Native.PlayStation</AssemblyName>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="../sentry-dotnet/src/Sentry/Sentry.csproj" Private="false" />
     <ProjectReference Include="../Sentry.Unity/Sentry.Unity.csproj" Private="false" />
   </ItemGroup>
 
+  <!-- Build PlayStation version after the main build -->
+  <Target Name="BuildPlayStationAssembly" AfterTargets="AfterBuild">
+    <Message Importance="High" Text="Building PlayStation-specific native assembly." />
+
+    <Csc
+      Sources="@(Compile)"
+      References="@(ReferencePath)"
+      OutputAssembly="$(OutDir)Sentry.Unity.Native.PlayStation.dll"
+      DefineConstants="$(DefineConstants);SENTRY_NATIVE_PLAYSTATION"
+      TargetType="library"
+      EmitDebugInformation="true"
+      Nullable="$(Nullable)"
+      LangVersion="$(LangVersion)"
+      TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
+      WarningLevel="$(WarningLevel)"
+    />
+  </Target>
+
 </Project>