From 584a57fac3f779b4fad75dd3b729896073c0c128 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 Mar 2026 21:40:27 +0000 Subject: [PATCH 1/8] build(deps): bump dotnet-sdk from 10.0.102 to 10.0.201 Bumps [dotnet-sdk](https://github.com/dotnet/sdk) from 10.0.102 to 10.0.201. - [Release notes](https://github.com/dotnet/sdk/releases) - [Commits](https://github.com/dotnet/sdk/compare/v10.0.102...v10.0.201) --- updated-dependencies: - dependency-name: dotnet-sdk dependency-version: 10.0.201 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index df06b73791..edcd540fee 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "10.0.102", - "workloadVersion": "10.0.102", + "version": "10.0.201", + "workloadVersion": "10.0.201", "rollForward": "disable", "allowPrerelease": false } From d104890db405f1a11c4d2b0cbd8e7a31b15a7b36 Mon Sep 17 00:00:00 2001 From: James Crosswell Date: Wed, 25 Mar 2026 18:34:15 +1300 Subject: [PATCH 2/8] Workaround regression in .net 10.0.201 --- integration-test/cli.Tests.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/integration-test/cli.Tests.ps1 b/integration-test/cli.Tests.ps1 index d44e2ed8f8..d4388c7a2b 100644 --- a/integration-test/cli.Tests.ps1 +++ b/integration-test/cli.Tests.ps1 @@ -127,7 +127,9 @@ Describe 'MAUI ()' -ForEach @( $tfs = $IsMacos ? "$framework-android$androidTpv;$framework-ios$iosTpv;$framework-maccatalyst$iosTpv" : "$framework-android$androidTpv" (Get-Content $name/$name.csproj) -replace '[^<]+', "$tfs" | Set-Content $name/$name.csproj - dotnet remove $name/$name.csproj package 'Microsoft.Extensions.Logging.Debug' | ForEach-Object { Write-Host $_ } + Push-Location $name + dotnet remove "${name}.csproj" package 'Microsoft.Extensions.Logging.Debug' | ForEach-Object { Write-Host $_ } + Pop-Location if ($LASTEXITCODE -ne 0) { throw "Failed to remove package" From 309b7efd80bfcd9c0ddd7ff8fbc9988cb87ee270 Mon Sep 17 00:00:00 2001 From: James Crosswell Date: Wed, 25 Mar 2026 18:42:02 +1300 Subject: [PATCH 3/8] review feedback --- integration-test/cli.Tests.ps1 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/integration-test/cli.Tests.ps1 b/integration-test/cli.Tests.ps1 index d4388c7a2b..d03d5c235a 100644 --- a/integration-test/cli.Tests.ps1 +++ b/integration-test/cli.Tests.ps1 @@ -128,11 +128,17 @@ Describe 'MAUI ()' -ForEach @( (Get-Content $name/$name.csproj) -replace '[^<]+', "$tfs" | Set-Content $name/$name.csproj Push-Location $name - dotnet remove "${name}.csproj" package 'Microsoft.Extensions.Logging.Debug' | ForEach-Object { Write-Host $_ } - Pop-Location - if ($LASTEXITCODE -ne 0) + try { - throw "Failed to remove package" + dotnet remove "${name}.csproj" package 'Microsoft.Extensions.Logging.Debug' | ForEach-Object { Write-Host $_ } + if ($LASTEXITCODE -ne 0) + { + throw "Failed to remove package" + } + } + finally + { + Pop-Location } if (Test-Path env:CI) From 2c0b75bd8550c294abcb4f74d492d72a5ed735d1 Mon Sep 17 00:00:00 2001 From: James Crosswell Date: Wed, 25 Mar 2026 19:29:09 +1300 Subject: [PATCH 4/8] . --- integration-test/runtime.Tests.ps1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/integration-test/runtime.Tests.ps1 b/integration-test/runtime.Tests.ps1 index 0fa357c3fa..8ada08eb09 100644 --- a/integration-test/runtime.Tests.ps1 +++ b/integration-test/runtime.Tests.ps1 @@ -190,7 +190,15 @@ Describe 'Console app regression (missing System.Reflection.Metadata)' { } AfterAll { - dotnet remove ./net4-console/console-app.csproj package Sentry + Push-Location ./net4-console + try + { + dotnet remove console-app.csproj package Sentry + } + finally + { + Pop-Location + } } It 'Ensure System.Reflection.Metadata is not missing' -Skip:(!$IsWindows) { From 67ebac150a938fc5d90b1e7e622db952a2546a24 Mon Sep 17 00:00:00 2001 From: James Crosswell Date: Wed, 25 Mar 2026 23:24:34 +1300 Subject: [PATCH 5/8] Bump runner for msbuild tests to windows-2025-vs2026 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fac89dfc60..4520a61fe5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -302,7 +302,7 @@ jobs: ms-build: needs: build-sentry-native name: MSBuild - runs-on: windows-latest + runs-on: windows-2025-vs2026 steps: - name: Checkout From a08828e197008860edb2bc9b8f9cc00c23fe9990 Mon Sep 17 00:00:00 2001 From: James Crosswell Date: Thu, 26 Mar 2026 11:58:20 +1300 Subject: [PATCH 6/8] Added missing mapping --- src/Sentry/PlatformAbstractions/FrameworkInfo.cs | 3 ++- .../PlatformAbstractions/RuntimeInfoTests.cs | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Sentry/PlatformAbstractions/FrameworkInfo.cs b/src/Sentry/PlatformAbstractions/FrameworkInfo.cs index 6eb543c443..5b301bff90 100644 --- a/src/Sentry/PlatformAbstractions/FrameworkInfo.cs +++ b/src/Sentry/PlatformAbstractions/FrameworkInfo.cs @@ -36,6 +36,7 @@ public static partial class FrameworkInfo {528372, "4.8"}, {528449, "4.8"}, {533320, "4.8.1"}, - {533325, "4.8.1"} + {533325, "4.8.1"}, + {533509, "4.8.1"} }; } diff --git a/test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs b/test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs index 6e2fd51183..b5dd1b69d1 100644 --- a/test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs +++ b/test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs @@ -25,11 +25,12 @@ public void GetRuntime_AllProperties() Assert.Equal(".NET Framework", actual.Name); actual.FrameworkInstallation.Should().NotBeNull("FrameworkInstallation is null"); // TODO: Windows ARM64 broke in CI... the timing wasn't very good (same day .NET 10 was announced) and I - // don't have a Windows ARM64 device to test on. Will need to debug in CI when we've released V6. - if (RuntimeInformation.ProcessArchitecture != Architecture.Arm64) - { + // don't have a Windows ARM64 device to test on. Will need to debug in CI when we've released V6. Note that + // this probably just needs another entry in FrameworkInfo.NetFxReleaseVersionMap + //if (RuntimeInformation.ProcessArchitecture != Architecture.Arm64) + //{ actual.FrameworkInstallation.Version.Should().NotBeNull("FrameworkInstallation.Version is null"); - } + //} } else { From fe87919abe381083c758585b776e37a05f5033b7 Mon Sep 17 00:00:00 2001 From: James Crosswell Date: Thu, 26 Mar 2026 13:15:47 +1300 Subject: [PATCH 7/8] . --- .vscode/settings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 1d95e38aac..877612375c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,5 @@ { "omnisharp.useModernNet": true, - "dotnet.defaultSolution": "Sentry.slnx" + "dotnet.defaultSolution": "Sentry.slnx", + "java.configuration.updateBuildConfiguration": "interactive" } From 4fbbe569fee2c26809b0b169125b63147ddb256d Mon Sep 17 00:00:00 2001 From: James Crosswell Date: Thu, 26 Mar 2026 13:16:57 +1300 Subject: [PATCH 8/8] Remove redundant comments - tests now pass on Win Arm64 --- .../Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs b/test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs index b5dd1b69d1..66ba53cef2 100644 --- a/test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs +++ b/test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs @@ -24,13 +24,7 @@ public void GetRuntime_AllProperties() { Assert.Equal(".NET Framework", actual.Name); actual.FrameworkInstallation.Should().NotBeNull("FrameworkInstallation is null"); - // TODO: Windows ARM64 broke in CI... the timing wasn't very good (same day .NET 10 was announced) and I - // don't have a Windows ARM64 device to test on. Will need to debug in CI when we've released V6. Note that - // this probably just needs another entry in FrameworkInfo.NetFxReleaseVersionMap - //if (RuntimeInformation.ProcessArchitecture != Architecture.Arm64) - //{ - actual.FrameworkInstallation.Version.Should().NotBeNull("FrameworkInstallation.Version is null"); - //} + actual.FrameworkInstallation.Version.Should().NotBeNull("FrameworkInstallation.Version is null"); } else {