Skip to content

fix: Xbox debug symbol upload #2329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 26, 2025
Merged

fix: Xbox debug symbol upload #2329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b54aa2d
Enable debug upload, Enable Native for Xbox
bitsandfoxes Sep 23, 2025
e8e7c05
Missed check
bitsandfoxes Sep 23, 2025
486ff49
Format code
getsentry-bot Sep 23, 2025
0eec491
Fixed BuildTargetGroup and BuildTarget mismatch
bitsandfoxes Sep 24, 2025
4ada605
Merge
bitsandfoxes Sep 24, 2025
293d02c
Updated CHANGELOG.md
bitsandfoxes Sep 24, 2025
41cc5b9
Merge branch 'main' into fix/xbox-followup
bitsandfoxes Sep 24, 2025
e4cc140
Fixed executable path
bitsandfoxes Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

### Features

- Added Xbox Native Support ([#2314](https://github.com/getsentry/sentry-unity/pull/2314))
- Added Xbox Native Support ([#2314](https://github.com/getsentry/sentry-unity/pull/2314), [#2329](https://github.com/getsentry/sentry-unity/pull/2329))

### Fixes

Expand Down
14 changes: 13 additions & 1 deletion package-dev/Runtime/Sentry.Unity.Native.dll.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 17 additions & 7 deletions src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,24 @@ public static void OnPostProcessBuild(BuildTarget target, string executablePath)
var isMono = PlayerSettings.GetScriptingBackend(targetGroup) == ScriptingImplementation.Mono2x;
#pragma warning restore CS0618

var executableName = Path.GetFileName(executablePath);
var buildOutputDir = Path.GetDirectoryName(executablePath);
// The executable path resolves to the following when pointing Unity into a `build/platform/` directory:
// - Desktop: `./samples/unity-of-bugs/builds/windows/unityofbugs.exe`
// - Xbox: `./samples/unity-of-bugs/builds/xsx/`
var buildOutputDir = targetGroup switch
{
BuildTargetGroup.Standalone => Path.GetDirectoryName(executablePath),
BuildTargetGroup.GameCoreXboxSeries => executablePath,
_ => string.Empty
};

if (string.IsNullOrEmpty(buildOutputDir))
{
logger.LogError("Failed to find build output directory based on the executable path '{0}'." +
"\nSkipping adding crash-handler and uploading debug symbols.", executablePath);
return;
}

UploadDebugSymbols(logger, target, buildOutputDir, executableName, options, cliOptions, isMono);
UploadDebugSymbols(logger, target, buildOutputDir, options, cliOptions, isMono);

if (!IsEnabledForPlatform(target, options))
{
Expand All @@ -62,7 +70,7 @@ public static void OnPostProcessBuild(BuildTarget target, string executablePath)

try
{
AddCrashHandler(logger, target, buildOutputDir, executableName);
AddCrashHandler(logger, target, buildOutputDir);
}
catch (Exception e)
{
Expand All @@ -81,7 +89,7 @@ public static void OnPostProcessBuild(BuildTarget target, string executablePath)
_ => false,
};

private static void AddCrashHandler(IDiagnosticLogger logger, BuildTarget target, string buildOutputDir, string executableName)
private static void AddCrashHandler(IDiagnosticLogger logger, BuildTarget target, string buildOutputDir)
{
switch (target)
{
Expand All @@ -97,7 +105,7 @@ private static void AddCrashHandler(IDiagnosticLogger logger, BuildTarget target
return;
case BuildTarget.GameCoreXboxSeries:
case BuildTarget.GameCoreXboxOne:
// TODO: Figure out if we need to ship with a crash handler
// No standalone crash handler for Xbox - comes with Breakpad
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that we plan to move to crashpad.
I'll add a link to this comment to that ticket

return;
default:
throw new ArgumentException($"Unsupported build target: {target}");
Expand All @@ -112,7 +120,7 @@ private static void CopyHandler(IDiagnosticLogger logger, string buildOutputDir,
File.Copy(fullHandlerPath, targetHandlerPath, true);
}

private static void UploadDebugSymbols(IDiagnosticLogger logger, BuildTarget target, string buildOutputDir, string executableName, SentryUnityOptions options, SentryCliOptions? cliOptions, bool isMono)
private static void UploadDebugSymbols(IDiagnosticLogger logger, BuildTarget target, string buildOutputDir, SentryUnityOptions options, SentryCliOptions? cliOptions, bool isMono)
{
var projectDir = Directory.GetParent(Application.dataPath).FullName;
if (cliOptions?.IsValid(logger, EditorUserBuildSettings.development) is not true)
Expand All @@ -135,6 +143,8 @@ private static void UploadDebugSymbols(IDiagnosticLogger logger, BuildTarget tar
{
case BuildTarget.StandaloneWindows:
case BuildTarget.StandaloneWindows64:
case BuildTarget.GameCoreXboxSeries:
case BuildTarget.GameCoreXboxOne:
var windowsSentryPdb = Path.GetFullPath($"Packages/{SentryPackageInfo.GetName()}/Plugins/Windows/Sentry/sentry.pdb");
if (File.Exists(windowsSentryPdb))
{
Expand Down