File tree Expand file tree Collapse file tree 7 files changed +28
-15
lines changed
src/Sentry/PlatformAbstractions
test/Sentry.Tests/PlatformAbstractions Expand file tree Collapse file tree 7 files changed +28
-15
lines changed Original file line number Diff line number Diff line change @@ -302,7 +302,7 @@ jobs:
302302 ms-build :
303303 needs : build-sentry-native
304304 name : MSBuild
305- runs-on : windows-latest
305+ runs-on : windows-2025-vs2026
306306
307307 steps :
308308 - name : Checkout
Original file line number Diff line number Diff line change 11{
22 "omnisharp.useModernNet" : true ,
3- "dotnet.defaultSolution" : " Sentry.slnx"
3+ "dotnet.defaultSolution" : " Sentry.slnx" ,
4+ "java.configuration.updateBuildConfiguration" : " interactive"
45}
Original file line number Diff line number Diff line change 11{
22 "sdk" : {
3- "version" : " 10.0.102 " ,
4- "workloadVersion" : " 10.0.102 " ,
3+ "version" : " 10.0.201 " ,
4+ "workloadVersion" : " 10.0.201 " ,
55 "rollForward" : " disable" ,
66 "allowPrerelease" : false
77 }
Original file line number Diff line number Diff line change @@ -127,10 +127,18 @@ Describe 'MAUI (<framework>)' -ForEach @(
127127 $tfs = $IsMacos ? " $framework -android$androidTpv ;$framework -ios$iosTpv ;$framework -maccatalyst$iosTpv " : " $framework -android$androidTpv "
128128 (Get-Content $name / $name.csproj ) -replace ' <TargetFrameworks>[^<]+</TargetFrameworks>' , " <TargetFrameworks>$tfs </TargetFrameworks>" | Set-Content $name / $name.csproj
129129
130- dotnet remove $name / $name .csproj package ' Microsoft.Extensions.Logging.Debug ' | ForEach-Object { Write-Host $_ }
131- if ( $LASTEXITCODE -ne 0 )
130+ Push-Location $name
131+ try
132132 {
133- throw " Failed to remove package"
133+ dotnet remove " ${name} .csproj" package ' Microsoft.Extensions.Logging.Debug' | ForEach-Object { Write-Host $_ }
134+ if ($LASTEXITCODE -ne 0 )
135+ {
136+ throw " Failed to remove package"
137+ }
138+ }
139+ finally
140+ {
141+ Pop-Location
134142 }
135143
136144 if (Test-Path env:CI)
Original file line number Diff line number Diff line change @@ -190,7 +190,15 @@ Describe 'Console app regression (missing System.Reflection.Metadata)' {
190190 }
191191
192192 AfterAll {
193- dotnet remove ./ net4- console/ console- app.csproj package Sentry
193+ Push-Location ./ net4- console
194+ try
195+ {
196+ dotnet remove console- app.csproj package Sentry
197+ }
198+ finally
199+ {
200+ Pop-Location
201+ }
194202 }
195203
196204 It ' Ensure System.Reflection.Metadata is not missing' - Skip:(! $IsWindows ) {
Original file line number Diff line number Diff line change @@ -36,6 +36,7 @@ public static partial class FrameworkInfo
3636 { 528372 , "4.8" } ,
3737 { 528449 , "4.8" } ,
3838 { 533320 , "4.8.1" } ,
39- { 533325 , "4.8.1" }
39+ { 533325 , "4.8.1" } ,
40+ { 533509 , "4.8.1" }
4041 } ;
4142}
Original file line number Diff line number Diff line change @@ -24,12 +24,7 @@ public void GetRuntime_AllProperties()
2424 {
2525 Assert . Equal ( ".NET Framework" , actual . Name ) ;
2626 actual . FrameworkInstallation . Should ( ) . NotBeNull ( "FrameworkInstallation is null" ) ;
27- // TODO: Windows ARM64 broke in CI... the timing wasn't very good (same day .NET 10 was announced) and I
28- // don't have a Windows ARM64 device to test on. Will need to debug in CI when we've released V6.
29- if ( RuntimeInformation . ProcessArchitecture != Architecture . Arm64 )
30- {
31- actual . FrameworkInstallation . Version . Should ( ) . NotBeNull ( "FrameworkInstallation.Version is null" ) ;
32- }
27+ actual . FrameworkInstallation . Version . Should ( ) . NotBeNull ( "FrameworkInstallation.Version is null" ) ;
3328 }
3429 else
3530 {
You can’t perform that action at this time.
0 commit comments