Skip to content

Bump DeviceRunners from preview.1 to preview.5 #4338

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

Merged
bruno-garcia merged 4 commits into from
Jul 12, 2025
Merged

Bump DeviceRunners from preview.1 to preview.5 #4338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2adf11
Bump DeviceRunners from preview.1 to preview.5
jamescrosswell Jul 11, 2025
a367cb9
Update device-test.ps1
jamescrosswell Jul 11, 2025
9d6ed8b
Bump to xcode 16.4
jamescrosswell Jul 11, 2025
427d6b9
Merge branch 'main' into exit-code-148
Flash0ver Jul 11, 2025
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/actions/environment/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ runs:
- name: Pin the Xcode Version
if: runner.os == 'macOS'
shell: bash
run: sudo xcode-select --switch /Applications/Xcode_16.2.app
run: sudo xcode-select --switch /Applications/Xcode_16.4.app

# Java 17 is needed for Android SDK setup step
- name: Install Java 17
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/device-tests-android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
tfm: [net8.0, net9.0]
tfm: [net9.0]
env:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_NOLOGO: 1
Expand All @@ -39,14 +39,6 @@ jobs:
- name: Build Android Test App
run: pwsh ./scripts/device-test.ps1 android -Build -Tfm ${{ matrix.tfm }}

- name: Upload Android Test App (net8.0)
if: matrix.tfm == 'net8.0'
uses: actions/upload-artifact@v4
with:
name: device-test-android-net8.0
if-no-files-found: error
path: test/Sentry.Maui.Device.TestApp/bin/Release/net8.0-android/android-x64/io.sentry.dotnet.maui.device.testapp-Signed.apk

- name: Upload Android Test App (net9.0)
if: matrix.tfm == 'net9.0'
uses: actions/upload-artifact@v4
Expand All @@ -65,7 +57,7 @@ jobs:
strategy:
fail-fast: false
matrix:
tfm: [net8.0, net9.0]
tfm: [net9.0]
# We run against both an older and a newer API
api-level: [27, 33]
env:
Expand Down
16 changes: 6 additions & 10 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
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

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

Expand Down Expand Up @@ -85,17 +85,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="DeviceRunners.XHarness.Maui" Version="0.1.0-preview.1"/>
<PackageReference Include="DeviceRunners.XHarness.Xunit" Version="0.1.0-preview.1"/>

<!-- Prevent downgrade of these packages for DeviceRunners.XHarness.Xunit 0.1.0-preview.1 -->
<PackageReference Include="System.Net.Primitives" Version="4.3.0"/>
<PackageReference Include="System.IO.FileSystem" Version="4.3.0"/>
<PackageReference Include="DeviceRunners.XHarness.Maui" Version="0.1.0-preview.5"/>
<PackageReference Include="DeviceRunners.XHarness.Xunit" Version="0.1.0-preview.5"/>
</ItemGroup>

<ItemGroup Condition="'$(EnableMauiDeviceTestVisualRunner)' == 'true'">
<PackageReference Include="DeviceRunners.VisualRunners.Maui" Version="0.1.0-preview.1"/>
<PackageReference Include="DeviceRunners.VisualRunners.Xunit" Version="0.1.0-preview.1"/>
<PackageReference Include="DeviceRunners.VisualRunners.Maui" Version="0.1.0-preview.5"/>
<PackageReference Include="DeviceRunners.VisualRunners.Xunit" Version="0.1.0-preview.5"/>
</ItemGroup>

<ItemGroup>
Expand Down
Loading