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 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" } 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 } diff --git a/integration-test/cli.Tests.ps1 b/integration-test/cli.Tests.ps1 index d44e2ed8f8..d03d5c235a 100644 --- a/integration-test/cli.Tests.ps1 +++ b/integration-test/cli.Tests.ps1 @@ -127,10 +127,18 @@ 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 $_ } - 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) 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) { 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..66ba53cef2 100644 --- a/test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs +++ b/test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs @@ -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"); } else {