Add windows and mac back in

Baseflow · Jan 12, 2023 · 4baed78 · 4baed78
1 parent e11514c
commit 4baed78
Show file tree

Hide file tree

Showing 30 changed files with 86 additions and 305 deletions.
diff --git a/MediaManager.AzureMediaServices/MediaManager.AzureMediaServices.csproj b/MediaManager.AzureMediaServices/MediaManager.AzureMediaServices.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/MediaManager.FFmpegMediaMetadataRetriever/MediaManager.FFmpegMediaMetadataRetriever.csproj b/MediaManager.FFmpegMediaMetadataRetriever/MediaManager.FFmpegMediaMetadataRetriever.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-android33.0</TargetFrameworks>
+    <TargetFrameworks>net7.0-android33.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/MediaManager.Forms/MediaManager.Forms.csproj b/MediaManager.Forms/MediaManager.Forms.csproj
@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net6.0-ios;net6.0-android33.0</TargetFrameworks>
-    <!--
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>-->
+    <TargetFrameworks>net7.0;net7.0-android33.0;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
 
-    <!--
-    <TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;monoandroid12.0;tizen40</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.18362;net472;netcoreapp3.1;$(TargetFrameworks)</TargetFrameworks>-->
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
+    <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
@@ -29,27 +31,26 @@
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' And $([MSBuild]::IsOSPlatform('windows'))">
     <Compile Include="Platforms\Uap\**\*.cs" />
-    <Page Include="Platforms\Uap\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
+    <!--<Page Include="Platforms\Uap\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />-->
     <None Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
     <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
-    <None Remove="Platforms\Apple\**\*.cs" />
     <None Remove="Platforms\Ios\**\*.cs" />
     <Compile Include="Platforms\Apple\**\*.cs" />
     <Compile Include="Platforms\Ios\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
-    <None Remove="Platforms\Apple\**\*.cs" />
-    <None Remove="Platforms\Mac\**\*.cs" />
+    <None Remove="Platforms\Ios\**\*.cs" />
     <Compile Include="Platforms\Apple\**\*.cs" />
-    <Compile Include="Platforms\Mac\**\*.cs" />
+    <Compile Include="Platforms\Ios\**\*.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tvos'" >
-    <None Remove="Platforms\Apple\**\*.cs" />
+  <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tvos'">
     <None Remove="Platforms\Ios\**\*.cs" />
     <None Remove="Platforms\Tvos\**\*.cs" />
     <Compile Include="Platforms\Apple\**\*.cs" />
@@ -58,7 +59,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'watchos'">
-    <None Remove="Platforms\Apple\**\*.cs" />
     <None Remove="Platforms\Watchos\**\*.cs" />
     <Compile Include="Platforms\Apple\**\*.cs" />
     <Compile Include="Platforms\Watchos\**\*.cs" />
@@ -67,6 +67,7 @@
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
     <None Remove="Platforms\Android\**\*.cs" />
     <Compile Include="Platforms\Android\**\*.cs" />
+    <AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">

diff --git a/MediaManager.Forms/Platforms/Mac/ImageSourceExtensions.cs b/MediaManager.Forms/Platforms/Mac/ImageSourceExtensions.cs
diff --git a/MediaManager.Forms/Platforms/Mac/VideoViewRenderer.cs b/MediaManager.Forms/Platforms/Mac/VideoViewRenderer.cs
diff --git a/MediaManager.Forms/VideoView.cs b/MediaManager.Forms/VideoView.cs
@@ -308,7 +308,8 @@ private static void OnAutoPlayPropertyChanged(BindableObject bindable, object ol
 
         private static async void OnVideoPlaceholderPropertyChanged(BindableObject bindable, object oldValue, object newValue)
         {
-#if !NET6
+            //TODO: Add mac and Windows
+#if ANDROID || IOS
             if (newValue is ImageSource imageSource)
                 MediaManager.MediaPlayer.VideoPlaceholder = await imageSource.ToNative().ConfigureAwait(false);
 #endif

diff --git a/MediaManager.Reactive/MediaManager.Reactive.csproj b/MediaManager.Reactive/MediaManager.Reactive.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/MediaManager.UnitTest/MediaManager.UnitTest.csproj b/MediaManager.UnitTest/MediaManager.UnitTest.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>

diff --git a/MediaManager/CrossMediaManager.cs b/MediaManager/CrossMediaManager.cs
@@ -33,8 +33,10 @@ public static IMediaManager Current
 
 #if ANDROID
         public static MediaManagerImplementation Android => (MediaManagerImplementation)Current;
-#elif APPLE
-        public static MediaManagerImplementation Apple => (MediaManagerImplementation)Current;
+#elif IOS
+        public static MediaManagerImplementation Ios => (MediaManagerImplementation)Current;
+#elif MACCATALYST
+        public static MediaManagerImplementation Ios => (MediaManagerImplementation)Current;
 #elif UWP
         public static MediaManagerImplementation Windows => (MediaManagerImplementation)Current;
 #elif TIZEN
@@ -45,7 +47,7 @@ public static IMediaManager Current
 
         private static IMediaManager CreateMediaManager()
         {
-#if NET6
+#if NET7
             return null;
 #else
 #pragma warning disable IDE0022 // Use expression body for methods

diff --git a/MediaManager/MediaManager.csproj b/MediaManager/MediaManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net6.0-ios;net6.0-android33.0</TargetFrameworks>
-    <!--<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>-->
+    <TargetFrameworks>net7.0;net7.0-android33.0;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
 
     <!--
     <TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;monoandroid12.0;tizen40</TargetFrameworks>
@@ -41,28 +41,26 @@
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' And $([MSBuild]::IsOSPlatform('windows'))">
     <Compile Include="Platforms\Uap\**\*.cs" />
-    <Page Include="Platforms\Uap\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
+    <!--<Page Include="Platforms\Uap\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />-->
     <None Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
     <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
-    <None Remove="Platforms\Apple\**\*.cs" />
     <None Remove="Platforms\Ios\**\*.cs" />
     <Compile Include="Platforms\Apple\**\*.cs" />
     <Compile Include="Platforms\Ios\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
-    <None Remove="Platforms\Apple\**\*.cs" />
-    <None Remove="Platforms\Mac\**\*.cs" />
+    <None Remove="Platforms\Ios\**\*.cs" />
     <Compile Include="Platforms\Apple\**\*.cs" />
-    <Compile Include="Platforms\Mac\**\*.cs" />
+    <Compile Include="Platforms\Ios\**\*.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tvos'" >
-    <None Remove="Platforms\Apple\**\*.cs" />
+  <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tvos'">
     <None Remove="Platforms\Ios\**\*.cs" />
     <None Remove="Platforms\Tvos\**\*.cs" />
     <Compile Include="Platforms\Apple\**\*.cs" />
@@ -71,7 +69,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'watchos'">
-    <None Remove="Platforms\Apple\**\*.cs" />
     <None Remove="Platforms\Watchos\**\*.cs" />
     <Compile Include="Platforms\Apple\**\*.cs" />
     <Compile Include="Platforms\Watchos\**\*.cs" />

diff --git a/.../Platforms/Apple/AppleMediaManagerBase.cs → ...er/Platforms/Ios/AppleMediaManagerBase.cs b/.../Platforms/Apple/AppleMediaManagerBase.cs → ...er/Platforms/Ios/AppleMediaManagerBase.cs
@@ -1,10 +1,10 @@
 using AVFoundation;
 using MediaManager.Media;
 using MediaManager.Notifications;
-using MediaManager.Platforms.Apple.Media;
-using MediaManager.Platforms.Apple.Notifications;
-using MediaManager.Platforms.Apple.Player;
-using MediaManager.Platforms.Apple.Volume;
+using MediaManager.Platforms.Ios.Media;
+using MediaManager.Platforms.Ios.Notifications;
+using MediaManager.Platforms.Ios.Player;
+using MediaManager.Platforms.Ios.Volume;
 using MediaManager.Player;
 using MediaManager.Volume;
 

diff --git a/MediaManager/Platforms/Ios/Media/AVAssetImageProvider.cs b/MediaManager/Platforms/Ios/Media/AVAssetImageProvider.cs
@@ -2,14 +2,14 @@
 using Foundation;
 using MediaManager.Library;
 using MediaManager.Media;
-using MediaManager.Platforms.Apple.Media;
+using MediaManager.Platforms.Ios.Media;
 using UIKit;
 
 namespace MediaManager.Platforms.Ios.Media
 {
     public class AVAssetImageProvider : MediaExtractorProviderBase, IMediaItemImageProvider
     {
-        protected MediaManagerImplementation MediaManager = CrossMediaManager.Apple;
+        protected MediaManagerImplementation MediaManager = CrossMediaManager.Ios;
 
         public async Task<object> ProvideImage(IMediaItem mediaItem)
         {

diff --git a/.../Platforms/Apple/Media/AVAssetProvider.cs → ...er/Platforms/Ios/Media/AVAssetProvider.cs b/.../Platforms/Apple/Media/AVAssetProvider.cs → ...er/Platforms/Ios/Media/AVAssetProvider.cs
@@ -3,7 +3,7 @@
 using MediaManager.Library;
 using MediaManager.Media;
 
-namespace MediaManager.Platforms.Apple.Media
+namespace MediaManager.Platforms.Ios.Media
 {
     public class AVAssetProvider : MediaExtractorProviderBase, IMediaItemMetadataProvider, IMediaItemVideoFrameProvider
     {

diff --git a/...tforms/Apple/Media/AppleMediaExtractor.cs → ...latforms/Ios/Media/AppleMediaExtractor.cs b/...tforms/Apple/Media/AppleMediaExtractor.cs → ...latforms/Ios/Media/AppleMediaExtractor.cs
@@ -1,7 +1,7 @@
 using Foundation;
 using MediaManager.Media;
 
-namespace MediaManager.Platforms.Apple.Media
+namespace MediaManager.Platforms.Ios.Media
 {
     public class AppleMediaExtractor : MediaExtractorBase, IMediaExtractor
     {

diff --git a/MediaManager/Platforms/Ios/Media/MPMediaItemExtensions.cs b/MediaManager/Platforms/Ios/Media/MPMediaItemExtensions.cs
@@ -10,7 +10,7 @@ public static IMediaItem ToMediaItem(this MPMediaItem item)
         {
             if (item == null)
                 return null;
-#if IOS
+#if IOS || MACCATALYST
             var output = new MediaItem
             {
                 MediaType = item.MediaType.ToMediaType(),
@@ -62,7 +62,7 @@ public static IMediaItem ToMediaItem(this MPMediaItem item)
 
         public static IEnumerable<IMediaItem> ToMediaItems(this IEnumerable<MPMediaItem> items)
         {
-#if IOS
+#if IOS || MACCATALYST
             return items
                 .Where(i => i.AssetURL != null && i.IsCloudItem == false && i.HasProtectedAsset == false)
                 .Select(i => i.ToMediaItem());

diff --git a/...tforms/Apple/Media/MediaItemExtensions.cs → ...latforms/Ios/Media/MediaItemExtensions.cs b/...tforms/Apple/Media/MediaItemExtensions.cs → ...latforms/Ios/Media/MediaItemExtensions.cs
@@ -3,10 +3,10 @@
 using Foundation;
 using MediaManager.Library;
 using MediaManager.Media;
-using MediaManager.Platforms.Apple.Player;
+using MediaManager.Platforms.Ios.Player;
 using UniformTypeIdentifiers;
 
-namespace MediaManager.Platforms.Apple.Media
+namespace MediaManager.Platforms.Ios.Media
 {
     public static class MediaItemExtensions
     {

diff --git a/...pple/Notifications/NotificationManager.cs → .../Ios/Notifications/NotificationManager.cs b/...pple/Notifications/NotificationManager.cs → .../Ios/Notifications/NotificationManager.cs
@@ -1,7 +1,7 @@
 using MediaManager.Notifications;
 using MediaPlayer;
 
-namespace MediaManager.Platforms.Apple.Notifications
+namespace MediaManager.Platforms.Ios.Notifications
 {
     public class NotificationManager : NotificationManagerBase
     {
@@ -10,7 +10,7 @@ public NotificationManager()
             Enabled = true;
         }
 
-        protected MediaManagerImplementation MediaManager = CrossMediaManager.Apple;
+        protected MediaManagerImplementation MediaManager = CrossMediaManager.Ios;
         protected MPRemoteCommandCenter CommandCenter = MPRemoteCommandCenter.Shared;
 
         public override bool Enabled

diff --git a/...le/Playback/MediaPlayerStateExtensions.cs → ...os/Playback/MediaPlayerStateExtensions.cs b/...le/Playback/MediaPlayerStateExtensions.cs → ...os/Playback/MediaPlayerStateExtensions.cs
@@ -1,7 +1,7 @@
 using AVFoundation;
 using MediaManager.Player;
 
-namespace MediaManager.Platforms.Apple.Playback
+namespace MediaManager.Platforms.Ios.Playback
 {
     public static class MediaPlayerStateExtensions
     {