Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"omnisharp.useModernNet": true,
"dotnet.defaultSolution": "Sentry.slnx"
"dotnet.defaultSolution": "Sentry.slnx",
"java.configuration.updateBuildConfiguration": "interactive"
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Unrelated Java VS Code setting accidentally committed

Low Severity

The java.configuration.updateBuildConfiguration setting is a Java extension preference that has no relation to this .NET SDK bump PR. This appears to be a local VS Code configuration change that was unintentionally staged and committed alongside the actual changes. It adds noise to the shared workspace settings for a project that has no Java components.

Fix in Cursor Fix in Web

}
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -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
}
Expand Down
14 changes: 11 additions & 3 deletions integration-test/cli.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,18 @@ Describe 'MAUI (<framework>)' -ForEach @(
$tfs = $IsMacos ? "$framework-android$androidTpv;$framework-ios$iosTpv;$framework-maccatalyst$iosTpv" : "$framework-android$androidTpv"
(Get-Content $name/$name.csproj) -replace '<TargetFrameworks>[^<]+</TargetFrameworks>', "<TargetFrameworks>$tfs</TargetFrameworks>" | Set-Content $name/$name.csproj

dotnet remove $name/$name.csproj package 'Microsoft.Extensions.Logging.Debug' | ForEach-Object { Write-Host $_ }
if ($LASTEXITCODE -ne 0)
Push-Location $name
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)
Expand Down
10 changes: 9 additions & 1 deletion integration-test/runtime.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion src/Sentry/PlatformAbstractions/FrameworkInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +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.
if (RuntimeInformation.ProcessArchitecture != Architecture.Arm64)
{
actual.FrameworkInstallation.Version.Should().NotBeNull("FrameworkInstallation.Version is null");
}
actual.FrameworkInstallation.Version.Should().NotBeNull("FrameworkInstallation.Version is null");
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I was fixing this for Win64 anyway, so we can finally remove the todo from the v6 release.

}
else
{
Expand Down
Loading