Merge remote-tracking branch 'origin/main' into armcknight/fix/launch-profile-rerun

Author: armcknight

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Fix building with Xcode 26 (#5386)
 - Fix usage of `@available` to be `iOS` instead of `iOSApplicationExtension` (#5361)
 - Improve launch profile configuration management (#5318)
+- Robustness against corrupt launch profile configuration files (#5447)
 
 ### Improvements
 
@@ -19,6 +20,10 @@
 - Move SentryExperimentalOptions to a property defined in Swift (#5329)
 - Add redaction in session replay for `SFSafariView` used by `SFSafariViewController` and `ASWebAuthenticationSession` (#5408)
 
+### Fixes
+
+- Manually add `dyld` image to image cache to fix dyld symbols appearing as `unknown` (#5418)
+
 ## 8.52.1
 
 ### Fixes

Samples/SentrySampleShared/SentrySampleShared.yml

@@ -27,3 +27,13 @@ targets:
       Release: SentrySampleShared.xcconfig
       Test: SentrySampleShared.xcconfig
       TestCI: SentrySampleShared.xcconfig
+  SentrySampleUITestShared:
+    type: framework
+    platform: auto
+    sources:
+      - SentrySampleUITestShared
+    configFiles:
+      Debug: SentrySampleUITestShared.xcconfig
+      Release: SentrySampleUITestShared.xcconfig
+      Test: SentrySampleUITestShared.xcconfig
+      TestCI: SentrySampleUITestShared.xcconfig

Samples/SentrySampleShared/SentrySampleUITestShared.xcconfig

@@ -0,0 +1,34 @@
+#include "../Shared/Config/Architectures.xcconfig"
+#include "../Shared/Config/BuildOptions.xcconfig"
+#include "../Shared/Config/Deployment.xcconfig"
+#include "../Shared/Config/Linking.xcconfig"
+#include "../Shared/Config/Localization.xcconfig"
+#include "../Shared/Config/Packaging.xcconfig"
+#include "../Shared/Config/SearchPaths.xcconfig"
+#include "../Shared/Config/Signing.xcconfig"
+#include "../Shared/Config/Versioning.xcconfig"
+#include "../Shared/Config/CodeGeneration.xcconfig"
+#include "../Shared/Config/ClangLanguage.xcconfig"
+#include "../Shared/Config/ClangCppLanguage.xcconfig"
+#include "../Shared/Config/ClangModules.xcconfig"
+#include "../Shared/Config/ClangObjCLanguage.xcconfig"
+#include "../Shared/Config/ClangPreprocessing.xcconfig"
+#include "../Shared/Config/ClangWarnings.xcconfig"
+#include "../Shared/Config/ClangWarningsCpp.xcconfig"
+#include "../Shared/Config/ClangWarningsObjC.xcconfig"
+#include "../Shared/Config/AssetCatalog.xcconfig"
+#include "../Shared/Config/ClangAnalyzer.xcconfig"
+#include "../Shared/Config/Swift.xcconfig"
+#include "../Shared/Config/Metal.xcconfig"
+
+PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySampleUITestShared
+INFOPLIST_FILE = SentrySampleUITestShared/Info.plist
+SUPPORTED_PLATFORMS = xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos
+
+CODE_SIGN_STYLE = Manual
+CODE_SIGN_IDENTITY =
+CODE_SIGN_IDENTITY[sdk=macosx*] =
+PROVISIONING_PROFILE_SPECIFIER =
+DEVELOPMENT_TEAM =
+
+TARGETED_DEVICE_FAMILY = 1,2,3,4,7

Samples/SentrySampleShared/SentrySampleUITestShared/Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string></string>
+</dict>
+</plist>

Samples/iOS-Swift/iOS-Benchmarking/SentryProcessInfo.h renamed to Samples/SentrySampleShared/SentrySampleUITestShared/SentryProcessInfo.h

@@ -0,0 +1,9 @@
+#import <Foundation/Foundation.h>
+
+//! Project version number for SentrySampleUITestShared.
+FOUNDATION_EXPORT double SentrySampleUITestSharedVersionNumber;
+
+//! Project version string for SentrySampleUITestShared.
+FOUNDATION_EXPORT const unsigned char SentrySampleUITestSharedVersionString[];
+
+#import <SentrySampleUITestShared/SentryProcessInfo.h>

Samples/iOS-Swift/iOS-Benchmarking/SentryProcessInfo.m renamed to Samples/SentrySampleShared/SentrySampleUITestShared/SentryProcessInfo.m

@@ -1,4 +1,4 @@
-#import "SentryProcessInfo.h"
+@import SentrySampleUITestShared;
 #import <XCTest/XCTest.h>
 #import <objc/runtime.h>
 

Samples/SentrySampleShared/SentrySampleUITestShared/SentrySampleUITestShared.h

@@ -1,3 +1,4 @@
+import SentrySampleUITestShared
 import XCTest
 
 class BaseUITest: XCTestCase {
@@ -37,10 +38,17 @@ extension BaseUITest {
         for (k, v) in env {
             app.launchEnvironment[k] = v
         }
+
         // App prewarming can sometimes cause simulators to get stuck in UI tests, activating them
         // before launching clears any prewarming state.
         app.activate()
-        app.launch()
+
+        // Calling activate() and then launch() effectively launches the app twice, interfering with
+        // local debugging. Check for attached debuggers first.
+        if !isDebugging() {
+            app.launch()
+        }
+        
         waitForExistenceOfMainScreen()
     }
 

Samples/iOS-Swift/iOS-Benchmarking/SentrySDKPerformanceBenchmarkTests.m

@@ -71,6 +71,8 @@ targets:
     platform: auto
     sources:
       - iOS-Swift-UITests
+    dependencies:
+      - target: SentrySampleShared/SentrySampleUITestShared
     configFiles:
       Debug: iOS-Swift-UITests.xcconfig
       Release: iOS-Swift-UITests.xcconfig
@@ -82,6 +84,8 @@ targets:
     sources:
       - iOS-Benchmarking
       - ../Shared/SampleAssets.xcassets
+    dependencies:
+      - target: SentrySampleShared/SentrySampleUITestShared
     configFiles:
       Debug: iOS-Benchmarking.xcconfig
       Release: iOS-Benchmarking.xcconfig