From 7a8f0e3031bc5df59a154eefe98a651266584119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Kapplm=C3=BCller?=
<christian.kapplmueller@tonestro.com>
Date: Mon, 17 Mar 2025 08:49:45 +0100
Subject: [PATCH 1/7] Changed default value for
SentryOptions.EnableAppHangTrackingV2 to false
---
src/Sentry/Platforms/Cocoa/SentryOptions.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Sentry/Platforms/Cocoa/SentryOptions.cs b/src/Sentry/Platforms/Cocoa/SentryOptions.cs
index 21ead2c413..2197098d8a 100644
--- a/src/Sentry/Platforms/Cocoa/SentryOptions.cs
+++ b/src/Sentry/Platforms/Cocoa/SentryOptions.cs
@@ -83,7 +83,7 @@ internal NativeOptions(SentryOptions options)
/// <remarks>
/// See https://docs.sentry.io/platforms/apple/configuration/app-hangs/#app-hangs-v2
/// </remarks>
- public bool EnableAppHangTrackingV2 { get; set; } = true;
+ public bool EnableAppHangTrackingV2 { get; set; } = false;
/// <summary>
/// When enabled, the SDK adds breadcrumbs for various system events.
From 6246b7abb6f716cf20bd468723c2028a5d2b2909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Kapplm=C3=BCller?=
<christian.kapplmueller@tonestro.com>
Date: Mon, 17 Mar 2025 08:53:09 +0100
Subject: [PATCH 2/7] added changelog entry
---
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d7b3b2d7d..d0d48c16af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
### Fixes
- Target `net9.0` on Sentry.Google.Cloud.Functions to avoid conflict with Sentry.AspNetCore ([#4039](https://github.com/getsentry/sentry-dotnet/pull/4039))
+- Changed default value for `SentryOptions.EnableAppHangTrackingV2` to `false` ([#4041](https://github.com/getsentry/sentry-dotnet/pull/4041))
### Features
From 9235d0245b15d4e445f4f4b8a040ce8499c14019 Mon Sep 17 00:00:00 2001
From: James Crosswell <jamescrosswell@users.noreply.github.com>
Date: Tue, 18 Mar 2025 09:13:02 +1300
Subject: [PATCH 3/7] Update CHANGELOG.md
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0d48c16af..808b13708b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
### Fixes
- Target `net9.0` on Sentry.Google.Cloud.Functions to avoid conflict with Sentry.AspNetCore ([#4039](https://github.com/getsentry/sentry-dotnet/pull/4039))
-- Changed default value for `SentryOptions.EnableAppHangTrackingV2` to `false` ([#4041](https://github.com/getsentry/sentry-dotnet/pull/4041))
+- Changed default value for `SentryOptions.EnableAppHangTrackingV2` to `false` ([#4042](https://github.com/getsentry/sentry-dotnet/pull/4042))
### Features
From dd10a8a3cb3fe49f91901c8c045455aacf4c4ede Mon Sep 17 00:00:00 2001
From: Sentry Github Bot <bot+github-bot@sentry.io>
Date: Wed, 19 Mar 2025 17:59:34 +1300
Subject: [PATCH 4/7] Run format workflow on Windows instead of macOS
---
.github/workflows/format-code.yml | 5 +++--
scripts/commit-formatted-code.ps1 | 19 +++++++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 scripts/commit-formatted-code.ps1
diff --git a/.github/workflows/format-code.yml b/.github/workflows/format-code.yml
index b0cf8ecf90..274d0c8a43 100644
--- a/.github/workflows/format-code.yml
+++ b/.github/workflows/format-code.yml
@@ -12,7 +12,7 @@ jobs:
name: Format Code
# Run on 'macos' because Linux is missing the `ios` workload: https://github.com/dotnet/runtime/issues/85505
# Pin macos to get the version of XCode that we need: https://github.com/actions/runner-images/issues/10703
- runs-on: macos-15
+ runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -40,4 +40,5 @@ jobs:
# we need to pass the current branch, otherwise we can't commit the changes.
# GITHUB_HEAD_REF is the name of the head branch. GitHub Actions only sets this for PRs.
- name: Commit Formatted Code
- run: ./scripts/commit-formatted-code.sh $GITHUB_HEAD_REF
+ shell: pwsh
+ run: pwsh ./scripts/commit-formatted-code.ps1 $GITHUB_HEAD_REF
diff --git a/scripts/commit-formatted-code.ps1 b/scripts/commit-formatted-code.ps1
new file mode 100644
index 0000000000..5f641c9f07
--- /dev/null
+++ b/scripts/commit-formatted-code.ps1
@@ -0,0 +1,19 @@
+# Requires at least PowerShell 5.1 or PowerShell Core
+
+param (
+ [string]$GITHUB_BRANCH
+)
+
+$gitStatus = git status
+
+if ($gitStatus -match "nothing to commit") {
+ Write-Host "Nothing to commit. All code formatted correctly."
+} else {
+ Write-Host "Formatted some code. Going to push the changes."
+ git config --global user.name 'Sentry Github Bot'
+ git config --global user.email 'bot+github-bot@sentry.io'
+ git fetch
+ git checkout $GITHUB_BRANCH
+ git commit -am "Format code"
+ git push --set-upstream origin $GITHUB_BRANCH
+}
From 9246a29106c4f18958d385e51e4ef10085d5a884 Mon Sep 17 00:00:00 2001
From: James Crosswell <jamescrosswell@users.noreply.github.com>
Date: Thu, 20 Mar 2025 07:48:01 +1300
Subject: [PATCH 5/7] Revert "Run format workflow on Windows instead of macOS"
This reverts commit dd10a8a3cb3fe49f91901c8c045455aacf4c4ede.
---
.github/workflows/format-code.yml | 5 ++---
scripts/commit-formatted-code.ps1 | 19 -------------------
2 files changed, 2 insertions(+), 22 deletions(-)
delete mode 100644 scripts/commit-formatted-code.ps1
diff --git a/.github/workflows/format-code.yml b/.github/workflows/format-code.yml
index 274d0c8a43..b0cf8ecf90 100644
--- a/.github/workflows/format-code.yml
+++ b/.github/workflows/format-code.yml
@@ -12,7 +12,7 @@ jobs:
name: Format Code
# Run on 'macos' because Linux is missing the `ios` workload: https://github.com/dotnet/runtime/issues/85505
# Pin macos to get the version of XCode that we need: https://github.com/actions/runner-images/issues/10703
- runs-on: windows-latest
+ runs-on: macos-15
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -40,5 +40,4 @@ jobs:
# we need to pass the current branch, otherwise we can't commit the changes.
# GITHUB_HEAD_REF is the name of the head branch. GitHub Actions only sets this for PRs.
- name: Commit Formatted Code
- shell: pwsh
- run: pwsh ./scripts/commit-formatted-code.ps1 $GITHUB_HEAD_REF
+ run: ./scripts/commit-formatted-code.sh $GITHUB_HEAD_REF
diff --git a/scripts/commit-formatted-code.ps1 b/scripts/commit-formatted-code.ps1
deleted file mode 100644
index 5f641c9f07..0000000000
--- a/scripts/commit-formatted-code.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-# Requires at least PowerShell 5.1 or PowerShell Core
-
-param (
- [string]$GITHUB_BRANCH
-)
-
-$gitStatus = git status
-
-if ($gitStatus -match "nothing to commit") {
- Write-Host "Nothing to commit. All code formatted correctly."
-} else {
- Write-Host "Formatted some code. Going to push the changes."
- git config --global user.name 'Sentry Github Bot'
- git config --global user.email 'bot+github-bot@sentry.io'
- git fetch
- git checkout $GITHUB_BRANCH
- git commit -am "Format code"
- git push --set-upstream origin $GITHUB_BRANCH
-}
From 33cea55c2e82f4b114e7bcfc519750c781a65c1e Mon Sep 17 00:00:00 2001
From: James Crosswell <jamescrosswell@users.noreply.github.com>
Date: Thu, 20 Mar 2025 15:48:25 +1300
Subject: [PATCH 6/7] Disable rollForward to pin specific version of
dotnet-format that is used
---
.github/actions/environment/action.yml | 2 +-
global.json | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/actions/environment/action.yml b/.github/actions/environment/action.yml
index f67824f33f..b907b85596 100644
--- a/.github/actions/environment/action.yml
+++ b/.github/actions/environment/action.yml
@@ -60,7 +60,7 @@ runs:
with:
dotnet-version: |
8.0.x
- 9.0.100
+ 9.0.103
- name: Install .NET Workloads
shell: bash
diff --git a/global.json b/global.json
index 40584df3e9..ead9a7d035 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
{
"sdk": {
- "version": "9.0.100",
- "rollForward": "latestMinor",
+ "version": "9.0.103",
+ "rollForward": "disable",
"allowPrerelease": false
}
}
From 28b8aa30fd96acc9a78d899f85cbec08520eb69a Mon Sep 17 00:00:00 2001
From: James Crosswell <jamescrosswell@users.noreply.github.com>
Date: Fri, 21 Mar 2025 11:04:37 +1300
Subject: [PATCH 7/7] Bump .NET SDK to 9.0.202
---
.github/actions/environment/action.yml | 2 +-
global.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/actions/environment/action.yml b/.github/actions/environment/action.yml
index b907b85596..80582afd47 100644
--- a/.github/actions/environment/action.yml
+++ b/.github/actions/environment/action.yml
@@ -60,7 +60,7 @@ runs:
with:
dotnet-version: |
8.0.x
- 9.0.103
+ 9.0.202
- name: Install .NET Workloads
shell: bash
diff --git a/global.json b/global.json
index ead9a7d035..e721e283bc 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "9.0.103",
+ "version": "9.0.202",
"rollForward": "disable",
"allowPrerelease": false
}