Skip to content

Commit 904ae95

Browse files
authored
Merge branch 'main' into MediaElementOptionService
2 parents 5a3c0fe + 966943e commit 904ae95

26 files changed

+142
-174
lines changed

.github/workflows/dotnet-build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -290,23 +290,23 @@ jobs:
290290
- name: Remove MediaElement package if that is not being released
291291
if: startsWith(github.ref, 'refs/tags/') && !endsWith(github.ref, '-mediaelement')
292292
run: |
293-
${{ github.workspace }}/packages/**/*.nupkg | Where-Object { $_ -notmatch "CommunityToolkit.Maui.MediaElement" } | Remove-Item -Force
293+
Get-ChildItem -Path "${{ github.workspace }}/packages" -Recurse -Filter "*.nupkg" | Where-Object { $_ -notmatch "CommunityToolkit.Maui.MediaElement" } | Remove-Item -Force
294294
295295
- name: Remove Camera package if that is not being released
296296
if: startsWith(github.ref, 'refs/tags/') && !endsWith(github.ref, '-camera')
297297
run: |
298-
${{ github.workspace }}/packages/**/*.nupkg | Where-Object { $_ -notmatch "CommunityToolkit.Maui.Camera" } | Remove-Item -Force
298+
Get-ChildItem -Path "${{ github.workspace }}/packages" -Recurse -Filter "*.nupkg" | Where-Object { $_ -notmatch "CommunityToolkit.Maui.Camera" } | Remove-Item -Force
299299
300300
- name: Remove Maps package if that is not being released
301301
if: startsWith(github.ref, 'refs/tags/') && !endsWith(github.ref, '-maps')
302302
run: |
303-
${{ github.workspace }}/packages/**/*.nupkg | Where-Object { $_ -notmatch "CommunityToolkit.Maui.Maps" } | Remove-Item -Force
303+
Get-ChildItem -Path "${{ github.workspace }}/packages" -Recurse -Filter "*.nupkg" | Where-Object { $_ -notmatch "CommunityToolkit.Maui.Maps" } | Remove-Item -Force
304304
305305
- name: Remove Core & Main package if that is not being released
306306
if: startsWith(github.ref, 'refs/tags/') && (!endsWith(github.ref, '-mediaelement') && !endsWith(github.ref, '-camera') && !endsWith(github.ref, '-maps'))
307307
run: |
308-
${{ github.workspace }}/packages/**/*.nupkg | Where-Object { $_ -notmatch "CommunityToolkit.Maui" } | Remove-Item -Force
309-
${{ github.workspace }}/packages/**/*.nupkg | Where-Object { $_ -notmatch "CommunityToolkit.Maui.Core" } | Remove-Item -Force
308+
Get-ChildItem -Path "${{ github.workspace }}/packages" -Recurse -Filter "*.nupkg" | Where-Object { $_ -notmatch "CommunityToolkit.Maui" } | Remove-Item -Force
309+
Get-ChildItem -Path "${{ github.workspace }}/packages" -Recurse -Filter "*.nupkg" | Where-Object { $_ -notmatch "CommunityToolkit.Maui.Core" } | Remove-Item -Force
310310
311311
- name: Install Signing Tool
312312
run: dotnet tool install --tool-path ./tools sign --version 0.9.1-beta.23356.1

samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Diagnostics;
2+
using CommunityToolkit.Maui.Core;
23
using CommunityToolkit.Maui.Sample.ViewModels.Views;
3-
using CommunityToolkit.Maui.Views;
44

55
namespace CommunityToolkit.Maui.Sample.Pages.Views;
66

src/CommunityToolkit.Maui.Camera/CameraInfo.shared.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Text;
2-
using CommunityToolkit.Maui.Core.Primitives;
32

43
#if IOS || MACCATALYST
54
using AVFoundation;

src/CommunityToolkit.Maui.Camera/CameraManager.android.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using AndroidX.Camera.Lifecycle;
88
using AndroidX.Core.Content;
99
using AndroidX.Lifecycle;
10-
using CommunityToolkit.Maui.Core.Primitives;
1110
using CommunityToolkit.Maui.Extensions;
1211
using Java.Lang;
1312
using Java.Util.Concurrent;

src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Diagnostics;
22
using AVFoundation;
3-
using CommunityToolkit.Maui.Core.Primitives;
43
using CommunityToolkit.Maui.Extensions;
54
using CoreMedia;
65
using Foundation;

src/CommunityToolkit.Maui.Camera/CameraManager.net.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using CommunityToolkit.Maui.Core.Primitives;
2-
31
namespace CommunityToolkit.Maui.Core;
42

53
partial class CameraManager

src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using CommunityToolkit.Maui.Core.Primitives;
2-
3-
namespace CommunityToolkit.Maui.Core;
1+
namespace CommunityToolkit.Maui.Core;
42

53
/// <summary>
64
/// A class that manages the camera functionality.

src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using CommunityToolkit.Maui.Core.Primitives;
2-
31
namespace CommunityToolkit.Maui.Core;
42

53
partial class CameraManager

src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System.Runtime.Versioning;
2-
using CommunityToolkit.Maui.Core.Primitives;
32
using CommunityToolkit.Maui.Extensions;
4-
using Microsoft.Maui.Controls.PlatformConfiguration;
53
using Microsoft.UI.Xaml.Controls;
64
using Windows.Media.Capture;
75
using Windows.Media.Capture.Frames;

src/CommunityToolkit.Maui.Camera/Extensions/CameraViewExtensions.android.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Android.Content.PM;
33
using AndroidX.Camera.Core;
44
using CommunityToolkit.Maui.Core;
5-
using CommunityToolkit.Maui.Core.Primitives;
65

76
namespace CommunityToolkit.Maui.Extensions;
87

0 commit comments

Comments
 (0)