Skip to content

Commit c77341f

Browse files
Bump DeviceRunners from preview.1 to preview.5 (#4338)
* Bump DeviceRunners from preview.1 to preview.5 Also dropped the net8.0 targets for device tests, since preview.5 does not support net8.0 (and this is EOL now). Resolves #4337: - #4337 #skip-changelog * Update device-test.ps1 * Bump to xcode 16.4 --------- Co-authored-by: Stefan Pölz <38893694+Flash0ver@users.noreply.github.com>
1 parent 44a96b9 commit c77341f

File tree

3 files changed

+9
-21
lines changed

3 files changed

+9
-21
lines changed

.github/actions/environment/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ runs:
3535
- name: Pin the Xcode Version
3636
if: runner.os == 'macOS'
3737
shell: bash
38-
run: sudo xcode-select --switch /Applications/Xcode_16.2.app
38+
run: sudo xcode-select --switch /Applications/Xcode_16.4.app
3939

4040
# Java 17 is needed for Android SDK setup step
4141
- name: Install Java 17

.github/workflows/device-tests-android.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
tfm: [net8.0, net9.0]
19+
tfm: [net9.0]
2020
env:
2121
DOTNET_CLI_TELEMETRY_OPTOUT: 1
2222
DOTNET_NOLOGO: 1
@@ -39,14 +39,6 @@ jobs:
3939
- name: Build Android Test App
4040
run: pwsh ./scripts/device-test.ps1 android -Build -Tfm ${{ matrix.tfm }}
4141

42-
- name: Upload Android Test App (net8.0)
43-
if: matrix.tfm == 'net8.0'
44-
uses: actions/upload-artifact@v4
45-
with:
46-
name: device-test-android-net8.0
47-
if-no-files-found: error
48-
path: test/Sentry.Maui.Device.TestApp/bin/Release/net8.0-android/android-x64/io.sentry.dotnet.maui.device.testapp-Signed.apk
49-
5042
- name: Upload Android Test App (net9.0)
5143
if: matrix.tfm == 'net9.0'
5244
uses: actions/upload-artifact@v4
@@ -65,7 +57,7 @@ jobs:
6557
strategy:
6658
fail-fast: false
6759
matrix:
68-
tfm: [net8.0, net9.0]
60+
tfm: [net9.0]
6961
# We run against both an older and a newer API
7062
api-level: [27, 33]
7163
env:

test/Sentry.Maui.Device.TestApp/Sentry.Maui.Device.TestApp.csproj

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(TargetFrameworks);net8.0-android;net9.0-android</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net8.0-ios;net9.0-ios</TargetFrameworks>
4+
<TargetFrameworks>$(TargetFrameworks);net9.0-android</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net9.0-ios</TargetFrameworks>
66
<DefineConstants Condition="'$(EnableMauiDeviceTestVisualRunner)' == 'true'">$(DefineConstants);VISUAL_RUNNER</DefineConstants>
77
</PropertyGroup>
88

@@ -85,17 +85,13 @@
8585
</ItemGroup>
8686

8787
<ItemGroup>
88-
<PackageReference Include="DeviceRunners.XHarness.Maui" Version="0.1.0-preview.1"/>
89-
<PackageReference Include="DeviceRunners.XHarness.Xunit" Version="0.1.0-preview.1"/>
90-
91-
<!-- Prevent downgrade of these packages for DeviceRunners.XHarness.Xunit 0.1.0-preview.1 -->
92-
<PackageReference Include="System.Net.Primitives" Version="4.3.0"/>
93-
<PackageReference Include="System.IO.FileSystem" Version="4.3.0"/>
88+
<PackageReference Include="DeviceRunners.XHarness.Maui" Version="0.1.0-preview.5"/>
89+
<PackageReference Include="DeviceRunners.XHarness.Xunit" Version="0.1.0-preview.5"/>
9490
</ItemGroup>
9591

9692
<ItemGroup Condition="'$(EnableMauiDeviceTestVisualRunner)' == 'true'">
97-
<PackageReference Include="DeviceRunners.VisualRunners.Maui" Version="0.1.0-preview.1"/>
98-
<PackageReference Include="DeviceRunners.VisualRunners.Xunit" Version="0.1.0-preview.1"/>
93+
<PackageReference Include="DeviceRunners.VisualRunners.Maui" Version="0.1.0-preview.5"/>
94+
<PackageReference Include="DeviceRunners.VisualRunners.Xunit" Version="0.1.0-preview.5"/>
9995
</ItemGroup>
10096

10197
<ItemGroup>

0 commit comments

Comments
 (0)