Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update DeviceTests to net8 #2854

Draft
wants to merge 67 commits into
base: main
Choose a base branch
from
Draft

chore: update DeviceTests to net8 #2854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
ba37658
chore: update samples to net8
vaind Nov 13, 2023
419ba7e
update FakeAuthHandler to net8
vaind Nov 13, 2023
37febfd
chore: missing verified files
vaind Nov 14, 2023
7e1c06d
fix iOS min OS version
vaind Nov 14, 2023
511008c
fix device tests
vaind Nov 14, 2023
1f96bd5
eof line breaks
vaind Nov 14, 2023
7882104
speedup device tests
vaind Nov 14, 2023
c3fb0a1
fix maui deps version specification
vaind Nov 15, 2023
cb6f5da
chore: update maui device tests from upstream
vaind Nov 15, 2023
79eb4df
Merge branch 'feat/4.0.0' into chore/update-maui-devicetests
vaind Nov 16, 2023
702eed1
warnings
vaind Nov 16, 2023
bc7a2a3
fix android-tests.ps1 on windows
vaind Nov 16, 2023
1ae3f3e
cleanup
vaind Nov 16, 2023
7612ef2
roll back MauiTestUtils upstream update
vaind Nov 16, 2023
100387f
Merge branch 'feat/4.0.0' into chore/net8-devicetests
vaind Nov 22, 2023
b7c83a2
fix device-tests for local runs
vaind Nov 22, 2023
125d0c8
Merge branch 'main' into chore/net8-devicetests
vaind Dec 5, 2023
7108689
update supported iOS version
vaind Dec 5, 2023
915e8a2
tmp: native aot device tests
vaind Dec 5, 2023
adb40d1
Proguard upload test (#2947)
Giorgi Dec 5, 2023
1ce6a23
test: fix maui integration test (#2948)
vaind Dec 6, 2023
b72a502
Revert "Proguard upload test (#2947)" (#2951)
vaind Dec 6, 2023
e011c61
fix build warnings
vaind Dec 6, 2023
d0ae1e6
cleanup
vaind Dec 6, 2023
a02e7de
Merge remote-tracking branch 'origin/main' into chore/net8-devicetests
vaind Dec 6, 2023
a651aba
roll back exit-code checks
vaind Dec 6, 2023
4e84bd3
Merge branch 'main' into chore/net8-devicetests
vaind Dec 12, 2023
6e15798
Removed `alpha` suffix from `Profiling` (#2967)
bitsandfoxes Dec 12, 2023
30691ac
release: 4.0.0-beta.5
getsentry-bot Dec 12, 2023
0228a4f
bump reactivecircus/android-emulator-runner 2.28.0 to 2.29.0 (#2963)
dependabot[bot] Dec 13, 2023
d60af85
spotlight (#2961)
bruno-garcia Dec 13, 2023
c017b80
fix changelog spotlight (#2969)
bruno-garcia Dec 13, 2023
7328ab0
release: 4.0.0-beta.6
getsentry-bot Dec 13, 2023
888d68a
chore(deps): update Cocoa SDK to v8.17.2 (#2972)
github-actions[bot] Dec 16, 2023
bee7c2e
Add minimum powershell version requirements to Contributing.md (#2973)
jamescrosswell Dec 18, 2023
ced93df
build(deps): bump gradle/gradle-build-action from 2.10.0 to 2.11.0 (#…
dependabot[bot] Dec 18, 2023
a66bed7
chore: update artifact actions to v4 (#2977)
vaind Dec 18, 2023
22a82cc
chore(deps): update Java SDK to v7.1.0 (#2979)
github-actions[bot] Dec 19, 2023
cdd2c02
Default User.IpAddress to {{auto}} (#2981)
jamescrosswell Dec 20, 2023
62b2566
Set in_foreground app context (#2983)
Giorgi Dec 22, 2023
bf4e6f1
MAUI screenshot (#2965)
Giorgi Dec 22, 2023
55b4a4d
chore(deps): update CLI to v2.23.1 (#2985)
github-actions[bot] Dec 22, 2023
bc0c693
Remove Giorgi from CODEOWNERS (#2989)
Giorgi Dec 22, 2023
8c94772
chore: align LogWarning with LogError (#2987)
vaind Dec 22, 2023
f46f059
fix rider warnings (#2994)
vaind Dec 22, 2023
96fdee9
.NET profiler improvements & test fixes (#2968)
vaind Dec 22, 2023
b40cc28
build(deps): bump gradle/gradle-build-action from 2.11.0 to 2.11.1 (#…
dependabot[bot] Dec 27, 2023
adb09c3
Merge branch 'main' into chore/net8-devicetests
vaind Dec 30, 2023
21f9c91
Merge remote-tracking branch 'origin/main' into chore/net8-devicetests
vaind Jan 11, 2024
99f3593
device-test script configuration option
vaind Jan 11, 2024
a66c4aa
update tfms
vaind Jan 11, 2024
d87e5b9
fixup
vaind Jan 11, 2024
c8896ce
feat: Renamed `Sentry.Transaction` to `Sentry.SentryTransaction` (#3023)
bitsandfoxes Jan 11, 2024
789c098
fix (#3038)
bitsandfoxes Jan 11, 2024
d8a00b6
release: 4.0.0-beta.8
getsentry-bot Jan 11, 2024
a1ed6bd
add sentry to global usings (#3043)
bruno-garcia Jan 12, 2024
b181c58
chore: update internal dependencies (#3039)
vaind Jan 12, 2024
84a0768
Merge branch 'main' into chore/net8-devicetests
vaind Jan 12, 2024
94c2ccb
fix ios compilation
vaind Jan 12, 2024
c4e55f2
roll back net8 android bindings
vaind Jan 12, 2024
b81c6f0
use xcode 15 for ios device test app build
vaind Jan 12, 2024
07c4057
Merge branch 'main' into chore/net8-devicetests
vaind Mar 14, 2024
2816282
bump xcode version in device tests
vaind Mar 15, 2024
5b11e89
update ios platform in device-test.ps1
vaind Mar 15, 2024
870d08b
17.2 simulator
vaind Mar 17, 2024
ed9e215
new macos for the 17.2 simulator
vaind Mar 17, 2024
572ba22
Merge branch 'main' into chore/net8-devicetests
bitsandfoxes Apr 11, 2024
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/device-tests-android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
with:
name: device-test-android
if-no-files-found: error
path: test/Sentry.Maui.Device.TestApp/bin/Release/net7.0-android/android-x64/io.sentry.dotnet.maui.device.testapp-Signed.apk
path: test/Sentry.Maui.Device.TestApp/bin/Release/net8.0-android/android-x64/io.sentry.dotnet.maui.device.testapp-Signed.apk

android:
needs: [build]
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/device-tests-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
build:
# Pinning `macos-13` because Microsoft.iOS 16.4 requires Xcode 14.3 which is only built-in in 13
# Pinning `macos-13` because of the XCode version we need.
runs-on: macos-13
env:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
Expand All @@ -34,6 +34,8 @@ jobs:
- name: Setup Environment
uses: ./.github/actions/environment

- run: sudo xcode-select -s /Applications/Xcode_15.1.0.app

- name: Build iOS Test App
run: pwsh ./scripts/device-test.ps1 ios -Build

Expand All @@ -42,12 +44,12 @@ jobs:
with:
name: device-test-ios
if-no-files-found: error
path: test/Sentry.Maui.Device.TestApp/bin/Release/net7.0-ios/iossimulator-x64/Sentry.Maui.Device.TestApp.app
path: test/Sentry.Maui.Device.TestApp/bin/Release/net8.0-ios/iossimulator-x64/Sentry.Maui.Device.TestApp.app

ios:
needs: [build]
name: Run iOS Tests
runs-on: macos-latest
runs-on: macos-13
strategy:
fail-fast: false
env:
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
-->
<PropertyGroup>
<TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier>
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'ios'">10.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'ios'">11.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
-->
<PropertyGroup>
<TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier>
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'ios'">10.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'ios'">11.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
Expand Down
3 changes: 0 additions & 3 deletions samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@

<ItemGroup>
<ProjectReference Include="..\..\src\Sentry.Maui\Sentry.Maui.csproj" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
</ItemGroup>
Expand Down
24 changes: 18 additions & 6 deletions scripts/device-test.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ param(
[ValidateNotNullOrEmpty()]
[ValidateSet('android', 'ios')] # TODO , 'maccatalyst'
[String] $Platform,
[String] $Configuration = 'Release',

[Switch] $Build,
[Switch] $Run
[Switch] $Run,
[Switch] $NativeAot
)

Set-StrictMode -Version latest
Expand All @@ -21,13 +23,13 @@ $CI = Test-Path env:CI
Push-Location $PSScriptRoot/..
try
{
$tfm = 'net7.0-'
$tfm = 'net8.0-'
$arch = (!$IsWindows -and $(uname -m) -eq 'arm64') ? 'arm64' : 'x64'
if ($Platform -eq 'android')
{
$tfm += 'android'
$group = 'android'
$buildDir = $CI ? 'bin' : "test/Sentry.Maui.Device.TestApp/bin/Release/$tfm/android-$arch"
$buildDir = $CI ? 'bin' : "test/Sentry.Maui.Device.TestApp/bin/$Configuration/$tfm/android-$arch"
$arguments = @(
'--app', "$buildDir/io.sentry.dotnet.maui.device.testapp-Signed.apk",
'--package-name', 'io.sentry.dotnet.maui.device.testapp'
Expand All @@ -37,17 +39,27 @@ try
{
$tfm += 'ios'
$group = 'apple'
$buildDir = $CI ? 'bin' : "test/Sentry.Maui.Device.TestApp/bin/Release/$tfm/iossimulator-$arch"
$buildDir = $CI ? 'bin' : "test/Sentry.Maui.Device.TestApp/bin/$Configuration/$tfm/iossimulator-$arch"
$arguments = @(
'--app', "$buildDir/Sentry.Maui.Device.TestApp.app",
'--target', 'ios-simulator-64',
'--target', 'ios-simulator-64_17.2',
'--launch-timeout', '00:10:00'
)
}
# elseif ($Platform -eq 'maccatalyst')
# {
# $tfm += 'maccatalyst'
# $group = 'apple'
# $buildDir = $CI ? 'bin' : "test/Sentry.Maui.Device.TestApp/bin/$Configuration/$tfm/iossimulator-$arch"
# $arguments = @(
# '--app', "$buildDir/Sentry.Maui.Device.TestApp.app",
# '--launch-timeout', '00:10:00'
# )
# }

if ($Build)
{
dotnet build -f $tfm -c Release test/Sentry.Maui.Device.TestApp
dotnet build -f $tfm -c $Configuration test/Sentry.Maui.Device.TestApp -p:TestNativeAot=$NativeAot
if ($LASTEXITCODE -ne 0)
{
throw 'Failed to build Sentry.Maui.Device.TestApp'
Expand Down
6 changes: 3 additions & 3 deletions src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And '$(NO_MACCATALYST)' == ''">net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And '$(NO_MACCATALYST)' == 'true'">net7.0-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == 'true' And '$(NO_MACCATALYST)' == ''">net7.0-maccatalyst</TargetFrameworks>
<TargetFrameworks></TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == ''">$(TargetFrameworks);net7.0-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_MACCATALYST)' == ''">$(TargetFrameworks);net7.0-maccatalyst</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
<Description>.NET Bindings for the Sentry Cocoa SDK</Description>
Expand Down
10 changes: 6 additions & 4 deletions test/MauiTestUtils/DeviceTests.Runners/TestUtils.DeviceTests.Runners.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@

<PropertyGroup>
<TargetFrameworks/>
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net7.0-android</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_WINDOWS)' == '' And $([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net8.0-android</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_WINDOWS)' == '' And $([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net8.0-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net8.0-maccatalyst</TargetFrameworks>

<SingleProject>true</SingleProject>
<RootNamespace>Microsoft.Maui.TestUtils.DeviceTests.Runners</RootNamespace>
<AssemblyName>Microsoft.Maui.TestUtils.DeviceTests.Runners</AssemblyName>
<!--<Nullable>enable</Nullable>-->
<NoWarn>$(NoWarn),CA1416</NoWarn>
<UseMaui>true</UseMaui>
<IsTestProject>false</IsTestProject>
</PropertyGroup>
Expand All @@ -23,6 +24,7 @@
<PackageReference Include="xunit" Version="2.6.5" />
<PackageReference Include="xunit.runner.utility" Version="2.6.5" />
<PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.23252.4" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
17 changes: 11 additions & 6 deletions test/MauiTestUtils/DeviceTests/TestUtils.DeviceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@

<PropertyGroup>
<TargetFrameworks/>
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net7.0-android</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_WINDOWS)' == '' And $([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net8.0-android</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_WINDOWS)' == '' And $([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net8.0-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net8.0-maccatalyst</TargetFrameworks>

<SingleProject>true</SingleProject>
<RootNamespace>Microsoft.Maui.TestUtils.DeviceTests</RootNamespace>
<AssemblyName>Microsoft.Maui.TestUtils.DeviceTests</AssemblyName>
<Nullable>enable</Nullable>
<UseMauiCore>true</UseMauiCore>
<UseMauiEssentials>true</UseMauiEssentials>
<UseMaui>true</UseMaui>
<IsTestProject>false</IsTestProject>
</PropertyGroup>

Expand All @@ -22,4 +21,10 @@
<PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.23252.4" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Core" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
</ItemGroup>

</Project>
0 ...iApprovalTests.Run.DotNet7_0.verified.txt → ...iApprovalTests.Run.DotNet8_0.verified.txt
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net7.0-android</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net8.0-android</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions test/Sentry.Extensions.Logging.Tests/Sentry.Extensions.Logging.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0;net48</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net7.0-android</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net8.0-android</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net8.0-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net8.0-maccatalyst</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
12 changes: 5 additions & 7 deletions test/Sentry.Maui.Device.TestApp/Sentry.Maui.Device.TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

<PropertyGroup>
<TargetFrameworks />
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net7.0-android</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-ios</TargetFrameworks>
<!-- Currently broken on .NET 7, see
- https://github.com/dotnet/maui/issues/18573
- https://developercommunity.visualstudio.com/t/MAUI0000:-SystemMissingMethodException:/10505327?sort=newest&ftype=problem
<TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-maccatalyst</TargetFrameworks> -->
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net8.0-android</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net8.0-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net8.0-maccatalyst</TargetFrameworks>

<OutputType>Exe</OutputType>
<SingleProject>true</SingleProject>
Expand Down Expand Up @@ -36,6 +33,7 @@
<!-- https://github.com/xamarin/xamarin-android/issues/6809 -->
<NoWarn>$(NoWarn);XA4218</NoWarn>

<PublishAot Condition="'$(TestNativeAot)' == 'true'">true</PublishAot>
</PropertyGroup>

<!--
Expand Down Expand Up @@ -74,7 +72,7 @@
<ProjectReference Include="..\Sentry.Tests\Sentry.Tests.csproj" />
<ProjectReference Include="..\Sentry.Extensions.Logging.Tests\Sentry.Extensions.Logging.Tests.csproj" />
<ProjectReference Include="..\Sentry.Maui.Tests\Sentry.Maui.Tests.csproj" />
<PackageReference Condition="$(TargetFramework.StartsWith('net8'))" Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
</ItemGroup>

<!-- https://github.com/dotnet/maui/blob/main/.nuspec/Microsoft.Maui.TestUtils.DeviceTests.Runners.targets -->
Expand Down
8 changes: 4 additions & 4 deletions test/Sentry.Maui.Tests/Sentry.Maui.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net7.0-android;net8.0-android</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-ios;net8.0-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-maccatalyst;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net8.0-android</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net8.0-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net8.0-maccatalyst</TargetFrameworks>
<UseMaui>true</UseMaui>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions test/Sentry.Tests/Sentry.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0;net48</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net7.0-android;net8.0-android</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-ios;net8.0-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net7.0-maccatalyst;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_ANDROID)' == ''">$(TargetFrameworks);net8.0-android</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_IOS)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net8.0-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(NO_MACCATALYST)' == '' And $([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net8.0-maccatalyst</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading