From ea57a7a3bf77c2d7df8d4b1138ca936936f6823a Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 27 Sep 2024 10:17:40 +0200
Subject: [PATCH 01/10] bump to xcode 16

---
 .github/workflows/build.yml                                  | 2 +-
 samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj         | 5 +++++
 .../Sentry.Samples.MacCatalyst.csproj                        | 5 +++++
 samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj     | 5 +++++
 samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj       | 5 +++++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2ab22bc5e0..03cb7770ca 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
       - "**.md"
 
 env:
-  XCODE_VERSION: 15.4
+  XCODE_VERSION: 16.0
 
 jobs:
   build-sentry-native:
diff --git a/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj b/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj
index 1506de5f5e..02f926bf3f 100644
--- a/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj
+++ b/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj
@@ -10,6 +10,11 @@
     <PublishAot>true</PublishAot>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <Optimize>false</Optimize>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+
   <PropertyGroup>
     <SentryOrg>sentry-sdks</SentryOrg>
     <SentryProject>sentry-dotnet</SentryProject>
diff --git a/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj b/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj
index b738bd244b..d6d4babae1 100644
--- a/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj
+++ b/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj
@@ -9,6 +9,11 @@
     <SelfContained>true</SelfContained>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <Optimize>false</Optimize>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+
   <PropertyGroup>
     <SentryOrg>sentry-sdks</SentryOrg>
     <SentryProject>sentry-dotnet</SentryProject>
diff --git a/samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj b/samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj
index 6228d98e39..c7cca69e35 100644
--- a/samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj
+++ b/samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj
@@ -10,6 +10,11 @@
     <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <Optimize>false</Optimize>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+
   <!--
     For this demo app, let's upload sources and symbols to Sentry on every build, regardless of configuration.
     In a real app, you probably only want to do this on Release builds.
diff --git a/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj b/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj
index cf01a98dc5..84fe1020d0 100644
--- a/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj
+++ b/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj
@@ -42,6 +42,11 @@
     <DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <Optimize>false</Optimize>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+
   <PropertyGroup>
     <SentryOrg>sentry-sdks</SentryOrg>
     <SentryProject>sentry-dotnet</SentryProject>

From 239d10a9e5a85a8443d0485d0eddd1fc6891dd0f Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 27 Sep 2024 10:34:39 +0200
Subject: [PATCH 02/10] no to no-trimming

---
 samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj             | 1 -
 .../Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj | 1 -
 samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj         | 1 -
 samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj           | 1 -
 4 files changed, 4 deletions(-)

diff --git a/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj b/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj
index 02f926bf3f..0353300a9b 100644
--- a/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj
+++ b/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj
@@ -12,7 +12,6 @@
 
   <PropertyGroup>
     <Optimize>false</Optimize>
-    <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj b/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj
index d6d4babae1..8ebb97baa7 100644
--- a/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj
+++ b/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj
@@ -11,7 +11,6 @@
 
   <PropertyGroup>
     <Optimize>false</Optimize>
-    <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj b/samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj
index c7cca69e35..db1abcc537 100644
--- a/samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj
+++ b/samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj
@@ -12,7 +12,6 @@
 
   <PropertyGroup>
     <Optimize>false</Optimize>
-    <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 
   <!--
diff --git a/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj b/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj
index 84fe1020d0..fede9b8bcb 100644
--- a/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj
+++ b/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj
@@ -44,7 +44,6 @@
 
   <PropertyGroup>
     <Optimize>false</Optimize>
-    <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 
   <PropertyGroup>

From 0f3e4ad86e66d12aeb9a776aacc71554b4b8d2bc Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 27 Sep 2024 11:11:48 +0200
Subject: [PATCH 03/10] setting xcode manually

---
 .github/workflows/build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 03cb7770ca..a8f66bd9e1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,6 +70,12 @@ jobs:
         if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
         uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # Tag: 0.12.1
 
+      - name: Check Xcode version
+        run: xcodebuild -version
+
+      - name: Set Xcode version to 16.0
+        run: sudo xcode-select --switch /Applications/Xcode_16.0.app/Contents/Developer
+  
       # We only use Xcode 15.4
       - name: Remove unused applications
         if: matrix.os == 'macos-latest'

From 5446136ffbcb973d9c343d59a508455cb96fd987 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 27 Sep 2024 11:26:20 +0200
Subject: [PATCH 04/10] 16 - not 16.0

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a8f66bd9e1..e2d1074aab 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,8 +73,8 @@ jobs:
       - name: Check Xcode version
         run: xcodebuild -version
 
-      - name: Set Xcode version to 16.0
-        run: sudo xcode-select --switch /Applications/Xcode_16.0.app/Contents/Developer
+      - name: Set Xcode version to 16
+        run: sudo xcode-select --switch /Applications/Xcode_16.app/Contents/Developer
   
       # We only use Xcode 15.4
       - name: Remove unused applications

From f41b2ac34ce85ac8d25d7ab432a6f9e10d3d9389 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 27 Sep 2024 11:26:39 +0200
Subject: [PATCH 05/10] show me what you've got

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e2d1074aab..4d23c24a6a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,11 +70,11 @@ jobs:
         if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
         uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # Tag: 0.12.1
 
-      - name: Check Xcode version
-        run: xcodebuild -version
-
       - name: Set Xcode version to 16
         run: sudo xcode-select --switch /Applications/Xcode_16.app/Contents/Developer
+
+      - name: Check Xcode version
+        run: xcodebuild -version
   
       # We only use Xcode 15.4
       - name: Remove unused applications

From 648df29bdc6c5d1dab356f1a59d908a1d3fb75bb Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 27 Sep 2024 11:47:46 +0200
Subject: [PATCH 06/10] .

---
 .github/workflows/build.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4d23c24a6a..1440e33a0c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
       - "**.md"
 
 env:
-  XCODE_VERSION: 16.0
+  XCODE_VERSION: 16
 
 jobs:
   build-sentry-native:
@@ -70,13 +70,7 @@ jobs:
         if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
         uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # Tag: 0.12.1
 
-      - name: Set Xcode version to 16
-        run: sudo xcode-select --switch /Applications/Xcode_16.app/Contents/Developer
-
-      - name: Check Xcode version
-        run: xcodebuild -version
-  
-      # We only use Xcode 15.4
+      # We only use Xcode 16
       - name: Remove unused applications
         if: matrix.os == 'macos-latest'
         run: |
@@ -88,6 +82,9 @@ jobs:
           sudo rm -rf /Applications/Xcode_15.3.app
           df -hI /dev/disk3s1s1
 
+          sudo xcode-select --switch /Applications/Xcode_${{env.XCODE_VERSION}}.app/Contents/Developer
+          xcodebuild -version
+
       - name: Checkout
         uses: actions/checkout@v4
         with:

From 38950901e0081c2f81a0ff815f05134f5d513dd8 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 27 Sep 2024 11:48:57 +0200
Subject: [PATCH 07/10] ..

---
 .github/workflows/build.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1440e33a0c..1e5ed37930 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,6 +70,13 @@ jobs:
         if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
         uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # Tag: 0.12.1
 
+
+      - name: Setup Xcode
+        if: matrix.os == 'macos-latest'
+        run: |
+          sudo xcode-select --switch /Applications/Xcode_${{env.XCODE_VERSION}}.app/Contents/Developer
+          xcodebuild -version
+
       # We only use Xcode 16
       - name: Remove unused applications
         if: matrix.os == 'macos-latest'
@@ -82,9 +89,6 @@ jobs:
           sudo rm -rf /Applications/Xcode_15.3.app
           df -hI /dev/disk3s1s1
 
-          sudo xcode-select --switch /Applications/Xcode_${{env.XCODE_VERSION}}.app/Contents/Developer
-          xcodebuild -version
-
       - name: Checkout
         uses: actions/checkout@v4
         with:

From 4811c61259120ee1320c6f90f9c75517d3772af4 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 27 Sep 2024 14:11:09 +0200
Subject: [PATCH 08/10] skip this mean test, pls

---
 test/Sentry.Profiling.Tests/SamplingTransactionProfilerTests.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/Sentry.Profiling.Tests/SamplingTransactionProfilerTests.cs b/test/Sentry.Profiling.Tests/SamplingTransactionProfilerTests.cs
index 68d55e1893..8d42e1e13a 100644
--- a/test/Sentry.Profiling.Tests/SamplingTransactionProfilerTests.cs
+++ b/test/Sentry.Profiling.Tests/SamplingTransactionProfilerTests.cs
@@ -286,6 +286,8 @@ async Task VerifyAsync(HttpRequestMessage message)
     [SkippableFact]
     private async Task Profiler_ThrowingOnSessionStartup_DoesntBreakSentryInit()
     {
+        Skip.If(TestEnvironment.IsGitHubActions);
+
         SampleProfilerSession.ThrowOnNextStartupForTests = true;
 
         var tcs = new TaskCompletionSource<string>();

From 1a2204eb8e0ab9deebec18a6204b2ce4cba30906 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 27 Sep 2024 14:17:49 +0200
Subject: [PATCH 09/10] sounds good. doesn't work. does nothing, in fact.

---
 samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj          | 4 ----
 .../Sentry.Samples.MacCatalyst.csproj                         | 4 ----
 samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj      | 4 ----
 samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj        | 4 ----
 4 files changed, 16 deletions(-)

diff --git a/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj b/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj
index 0353300a9b..1506de5f5e 100644
--- a/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj
+++ b/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj
@@ -10,10 +10,6 @@
     <PublishAot>true</PublishAot>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-
   <PropertyGroup>
     <SentryOrg>sentry-sdks</SentryOrg>
     <SentryProject>sentry-dotnet</SentryProject>
diff --git a/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj b/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj
index 8ebb97baa7..b738bd244b 100644
--- a/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj
+++ b/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj
@@ -9,10 +9,6 @@
     <SelfContained>true</SelfContained>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-
   <PropertyGroup>
     <SentryOrg>sentry-sdks</SentryOrg>
     <SentryProject>sentry-dotnet</SentryProject>
diff --git a/samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj b/samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj
index db1abcc537..6228d98e39 100644
--- a/samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj
+++ b/samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj
@@ -10,10 +10,6 @@
     <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-
   <!--
     For this demo app, let's upload sources and symbols to Sentry on every build, regardless of configuration.
     In a real app, you probably only want to do this on Release builds.
diff --git a/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj b/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj
index fede9b8bcb..cf01a98dc5 100644
--- a/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj
+++ b/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj
@@ -42,10 +42,6 @@
     <DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-
   <PropertyGroup>
     <SentryOrg>sentry-sdks</SentryOrg>
     <SentryProject>sentry-dotnet</SentryProject>

From ea5b2f396f1b3387a64d4a4e9c2b559968f9bec4 Mon Sep 17 00:00:00 2001
From: James Crosswell <jamescrosswell@users.noreply.github.com>
Date: Mon, 30 Sep 2024 12:16:02 +1300
Subject: [PATCH 10/10] Select XCode 16 for integration tests

---
 .github/workflows/build.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e5ed37930..71a34d45ee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,7 +70,6 @@ jobs:
         if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
         uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # Tag: 0.12.1
 
-
       - name: Setup Xcode
         if: matrix.os == 'macos-latest'
         run: |
@@ -204,6 +203,12 @@ jobs:
         with:
           dotnet-version: 8.0.x
 
+      - name: Setup Xcode
+        if: matrix.os == 'macos-latest'
+        run: |
+          sudo xcode-select --switch /Applications/Xcode_${{env.XCODE_VERSION}}.app/Contents/Developer
+          xcodebuild -version
+
       # Needed for Android SDK setup step
       - uses: actions/setup-java@v4
         with: