Skip to content

Commit bf7784c

Browse files
committed
Fix CICD
1 parent 921b8c3 commit bf7784c

File tree

7 files changed

+19
-9
lines changed

7 files changed

+19
-9
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
build:
13-
runs-on: ubuntu-latest
13+
runs-on: windows-latest
1414

1515
steps:
1616
- name: Checkout code
@@ -21,6 +21,9 @@ jobs:
2121
with:
2222
dotnet-version: '10.0.x'
2323

24+
- name: Restore workloads
25+
run: dotnet workload restore --project src/Bible.Alarm/Bible.Alarm.csproj
26+
2427
- name: Restore dependencies
2528
run: dotnet restore src/Bible.Alarm.sln
2629

.github/workflows/deploy-android.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ jobs:
2424
with:
2525
dotnet-version: '10.0.x'
2626

27+
- name: Restore workloads
28+
run: dotnet workload restore --project src/Bible.Alarm/Bible.Alarm.csproj
29+
2730
- name: Setup Android SDK
2831
uses: android-actions/setup-android@v3
2932

.github/workflows/deploy-ios.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ jobs:
2424
with:
2525
dotnet-version: '10.0.x'
2626

27+
- name: Restore workloads
28+
run: dotnet workload restore --project src/Bible.Alarm/Bible.Alarm.csproj
29+
2730
- name: Select Xcode version
2831
run: sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
2932

.github/workflows/deploy-windows.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
uses: actions/setup-dotnet@v4
2424
with:
2525
dotnet-version: '10.0.x'
26+
27+
- name: Restore workloads
28+
run: dotnet workload restore --project src/Bible.Alarm/Bible.Alarm.csproj
2629

2730
# Decode and install the code signing certificate
2831
- name: Install Certificate

libraries/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net10.0;net10.0-android;net10.0-ios</TargetFrameworks>
4+
<TargetFrameworks>net10.0-android;net10.0-ios</TargetFrameworks>
55
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
66
<SingleProject>true</SingleProject>
77
<UseMaui>true</UseMaui>

libraries/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.shared.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public partial class MediaElementHandler
2121
[nameof(IMediaElement.Volume)] = MapVolume,
2222
[nameof(IMediaElement.ShouldKeepScreenOn)] = MapShouldKeepScreenOn,
2323
[nameof(IMediaElement.ShouldMute)] = MapShouldMute,
24-
#if ANDROID || WINDOWS || TIZEN
24+
#if ANDROID || WINDOWS
2525
[nameof(IMediaElement.ShouldLoopPlayback)] = ShouldLoopPlayback
2626
#endif
2727
};
@@ -57,7 +57,7 @@ public MediaElementHandler(IPropertyMapper? mapper, CommandMapper? commandMapper
5757

5858
}
5959

60-
#if ANDROID || IOS || MACCATALYST || WINDOWS || TIZEN
60+
#if ANDROID || IOS || MACCATALYST || WINDOWS
6161
/// <summary>
6262
/// The <see cref="Views.MediaManager"/> that is managing the <see cref="IMediaElement"/> instance.
6363
/// </summary>

libraries/CommunityToolkit.Maui.MediaElement/Views/MediaManager.shared.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
#if !(ANDROID || IOS || WINDOWS || MACCATALYST || TIZEN)
1+
#if !(ANDROID || IOS || WINDOWS || MACCATALYST)
22
global using PlatformMediaElement = System.Object;
33
#elif ANDROID
44
global using PlatformMediaElement = AndroidX.Media3.ExoPlayer.IExoPlayer;
55
#elif IOS || MACCATALYST
66
global using PlatformMediaElement = AVFoundation.AVPlayer;
77
#elif WINDOWS
88
global using PlatformMediaElement = Microsoft.UI.Xaml.Controls.MediaPlayerElement;
9-
#elif TIZEN
10-
global using PlatformMediaElement = CommunityToolkit.Maui.Core.Views.TizenPlayer;
119
#endif
1210

1311
using CommunityToolkit.Maui.Interfaces;
@@ -60,7 +58,7 @@ public MediaManager(IMauiContext context, IMediaElement mediaElement, IDispatche
6058
protected ILogger Logger { get; }
6159

6260

63-
#if ANDROID || IOS || MACCATALYST || WINDOWS || TIZEN
61+
#if ANDROID || IOS || MACCATALYST || WINDOWS
6462
/// <summary>
6563
/// The platform-specific media player.
6664
/// </summary>
@@ -255,7 +253,7 @@ public void UpdateVolume()
255253
protected virtual partial void PlatformUpdateVolume();
256254
}
257255

258-
#if !(WINDOWS || ANDROID || IOS || MACCATALYST || TIZEN)
256+
#if !(WINDOWS || ANDROID || IOS || MACCATALYST)
259257
partial class MediaManager
260258
{
261259
protected virtual partial Task PlatformSeek(TimeSpan position, CancellationToken token)

0 commit comments

Comments
 (0)