From 816aad6bfa6ee0b7fcd9c1eb0fa72a026f0881ec Mon Sep 17 00:00:00 2001 From: Felix Schoeler Date: Wed, 15 Mar 2017 15:47:51 +0100 Subject: [PATCH 1/7] Updated Xamarin.Android support libraries. --- .../Plugin.MediaManager.Android.csproj | 35 ++++++++++++++++--- .../packages.config | 14 +++++--- .../MediaSample.Droid.csproj | 30 ++++++++++------ .../Simple/MediaSample.Droid/packages.config | 19 +++++----- 4 files changed, 70 insertions(+), 28 deletions(-) diff --git a/MediaManager/Plugin.MediaManager.Android/Plugin.MediaManager.Android.csproj b/MediaManager/Plugin.MediaManager.Android/Plugin.MediaManager.Android.csproj index 4386e240..bb2d7d3f 100644 --- a/MediaManager/Plugin.MediaManager.Android/Plugin.MediaManager.Android.csproj +++ b/MediaManager/Plugin.MediaManager.Android/Plugin.MediaManager.Android.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -45,17 +46,32 @@ + + ..\..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + + + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + + + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + + + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + + + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + - ..\..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - ..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll + ..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll + ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll - ..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + ..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll @@ -99,5 +115,14 @@ --> - + + + + + + + + + + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.Android/packages.config b/MediaManager/Plugin.MediaManager.Android/packages.config index 11f8d74e..449d4542 100644 --- a/MediaManager/Plugin.MediaManager.Android/packages.config +++ b/MediaManager/Plugin.MediaManager.Android/packages.config @@ -1,7 +1,13 @@  - - - - + + + + + + + + + + \ No newline at end of file diff --git a/Samples/Simple/MediaSample.Droid/MediaSample.Droid.csproj b/Samples/Simple/MediaSample.Droid/MediaSample.Droid.csproj index 6d0972d8..f12ffc34 100644 --- a/Samples/Simple/MediaSample.Droid/MediaSample.Droid.csproj +++ b/Samples/Simple/MediaSample.Droid/MediaSample.Droid.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -53,31 +54,31 @@ - ..\..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\..\packages\Xamarin.Android.Support.Core.UI.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\..\packages\Xamarin.Android.Support.Fragment.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\..\packages\Xamarin.Android.Support.v4.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - ..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll + ..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll - ..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll @@ -223,5 +224,14 @@ - + + + + + + + + + + \ No newline at end of file diff --git a/Samples/Simple/MediaSample.Droid/packages.config b/Samples/Simple/MediaSample.Droid/packages.config index 8e138cf7..f0876b4a 100644 --- a/Samples/Simple/MediaSample.Droid/packages.config +++ b/Samples/Simple/MediaSample.Droid/packages.config @@ -1,13 +1,14 @@  - - - - - - - - - + + + + + + + + + + \ No newline at end of file From 1a56582812870764b03d9f8955d141aac202e90b Mon Sep 17 00:00:00 2001 From: Felix Schoeler Date: Wed, 15 Mar 2017 16:11:58 +0100 Subject: [PATCH 2/7] Updated nuspec file --- nuspec/Plugin.MediaManager.nuspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nuspec/Plugin.MediaManager.nuspec b/nuspec/Plugin.MediaManager.nuspec index 3c093d32..2f41dc56 100644 --- a/nuspec/Plugin.MediaManager.nuspec +++ b/nuspec/Plugin.MediaManager.nuspec @@ -15,8 +15,8 @@ xamarin, monodroid, C#, xamarin.android, android, ios, uwp, Windows, tvOS, Mac, MacOS, mediaplayer, audio, video, streaming, background, media - - + + From 4872ef0ab526f4bf9e985d1df220216912f13e22 Mon Sep 17 00:00:00 2001 From: Felix Schoeler Date: Wed, 15 Mar 2017 16:12:24 +0100 Subject: [PATCH 3/7] Updated support libraries for remaining libraries and Xamarin.Forms. --- .../Plugin.MediaManager.ExoPlayer.csproj | 8 +- .../packages.config | 5 +- .../Plugin.MediaManager.Forms.Android.csproj | 97 ++++++++++++------- .../packages.config | 26 +++-- .../project.json | 2 +- .../Plugin.MediaManager.Forms.iOS.csproj | 26 ++--- .../packages.config | 2 +- .../Plugin.MediaManager.Forms.csproj | 20 ++-- .../Plugin.MediaManager.Forms/packages.config | 2 +- Samples/Forms/Droid/MediaForms.Android.csproj | 89 +++++++++++------ Samples/Forms/Droid/packages.config | 26 +++-- Samples/Forms/MediaForms.UWP/project.json | 2 +- Samples/Forms/MediaForms/MediaForms.csproj | 20 ++-- Samples/Forms/MediaForms/packages.config | 2 +- Samples/Forms/iOS/MediaForms.iOS.csproj | 26 ++--- Samples/Forms/iOS/packages.config | 2 +- .../MyMediaPlayer.Droid.csproj | 77 +++++++++------ .../MyMediaPlayer.Droid/packages.config | 22 +++-- 18 files changed, 261 insertions(+), 193 deletions(-) diff --git a/MediaManager/Plugin.MediaManager.ExoPlayer/Plugin.MediaManager.ExoPlayer.csproj b/MediaManager/Plugin.MediaManager.ExoPlayer/Plugin.MediaManager.ExoPlayer.csproj index 807fd002..1c9ea5bb 100644 --- a/MediaManager/Plugin.MediaManager.ExoPlayer/Plugin.MediaManager.ExoPlayer.csproj +++ b/MediaManager/Plugin.MediaManager.ExoPlayer/Plugin.MediaManager.ExoPlayer.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -48,10 +49,10 @@ ..\..\packages\Xam.Plugins.Android.ExoPlayer.2.0.4.1\lib\MonoAndroid\ExoPlayer.dll - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll @@ -79,4 +80,7 @@ + + + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.ExoPlayer/packages.config b/MediaManager/Plugin.MediaManager.ExoPlayer/packages.config index c43adb6e..50cf7a55 100644 --- a/MediaManager/Plugin.MediaManager.ExoPlayer/packages.config +++ b/MediaManager/Plugin.MediaManager.ExoPlayer/packages.config @@ -1,6 +1,7 @@  - - + + + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj index 479acca1..5f84595f 100644 --- a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj +++ b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -40,50 +41,71 @@ 4 - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\FormsViewGroup.dll - - - ..\..\..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + + ..\..\..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - - ..\..\..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll + + ..\..\..\packages\Xamarin.Android.Support.Core.UI.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + + + ..\..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + + + ..\..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + + + ..\..\..\packages\Xamarin.Android.Support.Fragment.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + + + ..\..\..\packages\Xamarin.Android.Support.Transition.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll + + + ..\..\..\packages\Xamarin.Android.Support.v7.Palette.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll - ..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + ..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll - ..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll + ..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll + ..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll - ..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + ..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - ..\..\..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll + ..\..\..\packages\Xamarin.Android.Support.Design.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll - ..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll + + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\FormsViewGroup.dll + + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Core.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Core.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + + ..\..\..\packages\Xamarin.Android.Support.v7.CardView.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.CardView.dll + + + ..\..\..\packages\Xamarin.Android.Support.v4.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -113,21 +135,22 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/packages.config b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/packages.config index 9a9115c6..e8f41451 100644 --- a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/packages.config +++ b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/packages.config @@ -1,12 +1,20 @@  - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/project.json b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/project.json index 9e9183b9..5eb3a6ac 100644 --- a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/project.json +++ b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2", - "Xamarin.Forms": "2.3.3.175" + "Xamarin.Forms": "2.3.3.193" }, "frameworks": { "uap10.0": {} diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj index c3aa8c87..6161a254 100644 --- a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj +++ b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj @@ -37,19 +37,19 @@ - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - @@ -78,11 +78,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/packages.config b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/packages.config index e960b05f..894c7ac8 100644 --- a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/packages.config +++ b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj index a5a2d150..75986e30 100644 --- a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj +++ b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj @@ -50,25 +50,19 @@ - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/packages.config b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/packages.config index 5f2f179a..7648377f 100644 --- a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/packages.config +++ b/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Samples/Forms/Droid/MediaForms.Android.csproj b/Samples/Forms/Droid/MediaForms.Android.csproj index 78491aab..6ac43e8b 100644 --- a/Samples/Forms/Droid/MediaForms.Android.csproj +++ b/Samples/Forms/Droid/MediaForms.Android.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -43,48 +44,69 @@ false - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\FormsViewGroup.dll - - - ..\..\..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + + ..\..\..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - - ..\..\..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll + + ..\..\..\packages\Xamarin.Android.Support.Core.UI.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + + + ..\..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + + + ..\..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + + + ..\..\..\packages\Xamarin.Android.Support.Fragment.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + + + ..\..\..\packages\Xamarin.Android.Support.Transition.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll + + + ..\..\..\packages\Xamarin.Android.Support.v7.Palette.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll - ..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + ..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll - ..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll + ..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll + ..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll - ..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + ..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - ..\..\..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll + ..\..\..\packages\Xamarin.Android.Support.Design.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll - ..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll + + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\FormsViewGroup.dll + + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Core.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Core.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + + ..\..\..\packages\Xamarin.Android.Support.v7.CardView.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.CardView.dll + + + ..\..\..\packages\Xamarin.Android.Support.v4.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -126,12 +148,21 @@ - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Samples/Forms/Droid/packages.config b/Samples/Forms/Droid/packages.config index 9a9115c6..e8f41451 100644 --- a/Samples/Forms/Droid/packages.config +++ b/Samples/Forms/Droid/packages.config @@ -1,12 +1,20 @@  - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Samples/Forms/MediaForms.UWP/project.json b/Samples/Forms/MediaForms.UWP/project.json index 9e9183b9..5eb3a6ac 100644 --- a/Samples/Forms/MediaForms.UWP/project.json +++ b/Samples/Forms/MediaForms.UWP/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2", - "Xamarin.Forms": "2.3.3.175" + "Xamarin.Forms": "2.3.3.193" }, "frameworks": { "uap10.0": {} diff --git a/Samples/Forms/MediaForms/MediaForms.csproj b/Samples/Forms/MediaForms/MediaForms.csproj index f1d3fff0..4baffd5d 100644 --- a/Samples/Forms/MediaForms/MediaForms.csproj +++ b/Samples/Forms/MediaForms/MediaForms.csproj @@ -58,25 +58,19 @@ - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + \ No newline at end of file diff --git a/Samples/Forms/MediaForms/packages.config b/Samples/Forms/MediaForms/packages.config index 5f2f179a..7648377f 100644 --- a/Samples/Forms/MediaForms/packages.config +++ b/Samples/Forms/MediaForms/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Samples/Forms/iOS/MediaForms.iOS.csproj b/Samples/Forms/iOS/MediaForms.iOS.csproj index dd10aa08..2e08de9b 100644 --- a/Samples/Forms/iOS/MediaForms.iOS.csproj +++ b/Samples/Forms/iOS/MediaForms.iOS.csproj @@ -97,19 +97,19 @@ - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - - ..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + + ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - @@ -157,11 +157,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + \ No newline at end of file diff --git a/Samples/Forms/iOS/packages.config b/Samples/Forms/iOS/packages.config index e960b05f..894c7ac8 100644 --- a/Samples/Forms/iOS/packages.config +++ b/Samples/Forms/iOS/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Samples/MvvmCross/MyMediaPlayer.Droid/MyMediaPlayer.Droid.csproj b/Samples/MvvmCross/MyMediaPlayer.Droid/MyMediaPlayer.Droid.csproj index 47ce8954..1ac6cf00 100644 --- a/Samples/MvvmCross/MyMediaPlayer.Droid/MyMediaPlayer.Droid.csproj +++ b/Samples/MvvmCross/MyMediaPlayer.Droid/MyMediaPlayer.Droid.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -77,42 +78,15 @@ ..\..\..\packages\MvvmCross.Droid.Shared.4.4.0\lib\MonoAndroid\MvvmCross.Droid.Shared.dll - - ..\..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - - - ..\..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\..\packages\MvvmCross.Droid.Support.Core.UI.4.4.0\lib\MonoAndroid70\MvvmCross.Droid.Support.Core.UI.dll - - ..\..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - - - ..\..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - - - ..\..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\..\packages\MvvmCross.Droid.Support.Fragment.4.4.0\lib\MonoAndroid70\MvvmCross.Droid.Support.Fragment.dll - - ..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - - - ..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll - - - ..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - ..\..\..\packages\MvvmCross.Droid.Support.V7.AppCompat.4.4.0\lib\MonoAndroid70\MvvmCross.Droid.Support.V7.AppCompat.dll - - ..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll - ..\..\..\packages\MvvmCross.Droid.Support.V7.RecyclerView.4.4.0\lib\MonoAndroid70\MvvmCross.Droid.Support.V7.RecyclerView.dll @@ -122,9 +96,6 @@ ..\..\..\packages\MvvmCross.Plugin.Json.4.4.0\lib\MonoAndroid\MvvmCross.Plugins.Json.dll - - ..\..\..\packages\Xamarin.Android.Support.Design.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll - ..\..\..\packages\MvvmCross.Droid.Support.Design.4.4.0\lib\MonoAndroid70\MvvmCross.Droid.Support.Design.dll @@ -143,6 +114,39 @@ ..\..\..\packages\MvvmCross.Plugin.JsonLocalization.4.4.0\lib\MonoAndroid\MvvmCross.Plugins.JsonLocalization.dll + + ..\..\..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + + + ..\..\..\packages\Xamarin.Android.Support.Core.UI.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + + + ..\..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + + + ..\..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + + + ..\..\..\packages\Xamarin.Android.Support.Fragment.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + + + ..\..\..\packages\Xamarin.Android.Support.Transition.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll + + + ..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll + + + ..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + + + ..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll + + + ..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + + + ..\..\..\packages\Xamarin.Android.Support.Design.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll + @@ -310,5 +314,16 @@ - + + + + + + + + + + + + \ No newline at end of file diff --git a/Samples/MvvmCross/MyMediaPlayer.Droid/packages.config b/Samples/MvvmCross/MyMediaPlayer.Droid/packages.config index 6591da7c..b32d5660 100644 --- a/Samples/MvvmCross/MyMediaPlayer.Droid/packages.config +++ b/Samples/MvvmCross/MyMediaPlayer.Droid/packages.config @@ -15,14 +15,16 @@ - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file From a5f13316bab269296a16c3bed85f7412fc045c4b Mon Sep 17 00:00:00 2001 From: Martijn van Dijk Date: Fri, 17 Mar 2017 10:38:42 +0100 Subject: [PATCH 4/7] Move files --- .../Enums/MediaFileType.cs | 0 .../Enums/MediaPlayerStatus.cs | 0 .../Enums/RepeatType.cs | 0 .../Enums/ResourceAvailability.cs | 0 .../Enums/VideoAspectMode.cs | 0 .../BufferingChangedEventArgs.cs | 0 .../EventArguments/MediaFailedEventArgs.cs | 0 .../MediaFileChangedEventArgs.cs | 0 .../MediaFileFailedEventArgs.cs | 0 .../EventArguments/MediaFinishedEventArgs.cs | 0 .../MetadataChangedEventArgs.cs | 0 .../EventArguments/PlayingChangedEventArgs.cs | 0 .../EventArguments/QueueEndedEventArgs.cs | 0 .../QueueMediaChangedEventArgs.cs | 0 .../EventArguments/StatusChangedEventArgs.cs | 0 .../EventArguments/VolumeChangedEventArgs.cs | 0 .../IAudioPlayer.cs | 0 .../IMediaExtractor.cs | 0 .../IMediaFile.cs | 0 .../IMediaFileMetadata.cs | 0 .../IMediaManager.cs | 214 +++++----- .../IMediaNotificationManager.cs | 0 .../IMediaQueue.cs | 0 .../IPlaybackController.cs | 0 .../IPlaybackManager.cs | 0 .../IVideoPlayer.cs | 0 .../IVideoSurface.cs | 0 .../IVolumeManager.cs | 0 .../Implementations/Helpers.cs | 0 .../Implementations/MediaFile.cs | 0 .../Implementations/MediaFileMetadata.cs | 0 .../Implementations/MediaManagerBase.cs | 0 .../Implementations/MediaQueue.cs | 0 .../Implementations/PlaybackController.cs | 0 .../Plugin.MediaManager.Abstractions.csproj | 172 ++++---- .../Properties/AssemblyInfo.cs | 60 +-- .../Audio/AudioPlayerBase.cs | 0 .../Audio/AudioPlayerBroadcastReceiver.cs | 0 .../Audio/AudioPlayerImplementation.cs | 0 .../Audio/RemoteControlBroadcastReceiver.cs | 0 .../AudioPlayerImplementation.cs | 0 .../MediaExtractorImplementation.cs | 0 .../MediaManagerImplementation.cs | 152 +++---- .../MediaNotificationManagerImplementation.cs | 0 .../MediaPlayerService/MediaPlayerService.cs | 0 .../MediaPlayerServiceBinder.cs | 0 .../MediaPlayerServiceConnection.cs | 0 .../MediaPlayerService/MediaServiceBase.cs | 0 .../MediaPlayerService/MediaServiceBinder.cs | 0 .../MediaServiceConnection.cs | 0 .../MediaNotificationManagerImplementation.cs | 0 .../MediaSession/MediaSessionCallback.cs | 0 .../MediaSession/MediaSessionManager.cs | 0 .../Plugin.MediaManager.Android.csproj | 254 +++++------ .../Plugin.MediaManager.Android.csproj.bak | 140 +++---- .../Properties/AssemblyInfo.cs | 68 +-- .../Resources/AboutResources.txt | 98 ++--- .../Video/VideoPlayerImplementation.cs | 0 .../Video/VideoSurface.cs | 0 .../VolumeManagerImplementation.cs | 0 .../packages.config | 0 .../ExoPlayerAudioImplementation.cs | 0 .../ExoPlayerAudioService.cs | 0 .../ExoPlayerVideoImplementation.cs | 0 .../Plugin.MediaManager.ExoPlayer.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../Resources/AboutResources.txt | 0 .../Resources/values/Strings.xml | 0 .../packages.config | 0 .../Plugin.MediaManager.Forms.Android.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../Resources/AboutResources.txt | 0 .../Resources/Values/Strings.xml | 0 .../VideoViewRenderer.cs | 0 .../packages.config | 0 .../Plugin.MediaManager.Forms.UWP.csproj | 0 ...lugin.MediaManager.Forms.UWP.nuget.targets | 0 ...ediaManager.XamarinForms.UWP.nuget.targets | 0 .../Properties/AssemblyInfo.cs | 0 ...lugin.MediaManager.XamarinForms.UWP.rd.xml | 0 .../VideoViewRenderer.cs | 0 .../project.json | 0 .../Plugin.MediaManager.Forms.iOS.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../VideoViewRenderer.cs | 0 .../packages.config | 0 .../Plugin.MediaManager.Forms.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../Plugin.MediaManager.Forms/VideoView.cs | 0 .../Plugin.MediaManager.Forms/packages.config | 0 .../MediaManagerImplementation.cs | 0 .../Plugin.MediaManager.MacOS.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../VersionHelper.cs | 0 .../VideoSurface.cs | 0 .../Plugin.MediaManager.Reactive.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../ReactiveMediaManager.cs | 0 .../packages.config | 0 .../MediaFile.cs | 0 .../Plugin.MediaManager.Tests.csproj | 0 .../Unit/MediaQueueTests.cs | 0 .../Unit/PlaybackControllerTests.cs | 0 .../packages.config | 0 .../AudioPlayerImplementation.cs | 0 .../ImageAsset.cs | 0 .../MediaExtractorImplementation.cs | 0 .../MediaManagerImplementation.cs | 58 +-- .../MediaNotificationManagerImplementation.cs | 0 .../Plugin.MediaManager.UWP.csproj | 296 ++++++------- .../Properties/AssemblyInfo.cs | 56 +-- .../Properties/Plugin.MediaManager.UWP.rd.xml | 66 +-- .../VideoPlayerImplementation.cs | 0 .../VideoSurface.cs | 0 .../VolumeManagerImplementation.cs | 0 .../project.json | 30 +- .../AudioPlayerImplementation.cs | 0 .../IMediaRemoteControl.cs | 0 .../IVersionHelper.cs | 0 .../MediaExtractorImplementation.cs | 0 .../MediaFileUrlHelper.cs | 0 .../MediaManagerAppleBase.cs | 56 +-- .../MediaManagerImplementation.cs | 0 .../MediaNotificationManagerImplementation.cs | 0 .../MediaRemoteControl.cs | 0 .../Plugin.MediaManager.iOS.csproj | 142 +++---- .../Properties/AssemblyInfo.cs | 72 ++-- .../RemoteControlNotificationManager.cs | 0 .../VersionHelper.cs | 0 .../VideoPlayerImplementation.cs | 0 .../VideoSurface.cs | 0 .../VolumeManagerImplementation.cs | 0 MediaManager.sln | 28 +- .../MediaManagerImplementation.cs | 0 .../Plugin.MediaManager.tvOS.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../VideoSurface.cs | 0 .../CrossMediaManager.cs | 92 ++-- .../Resources/Resource.Designer.cs | 0 .../Plugin.MediaManager.csproj | 114 ++--- .../Properties/AssemblyInfo.cs | 60 +-- MediaManagerLibs.sln | 396 ------------------ 142 files changed, 1114 insertions(+), 1510 deletions(-) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/Enums/MediaFileType.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/Enums/MediaPlayerStatus.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/Enums/RepeatType.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/Enums/ResourceAvailability.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/Enums/VideoAspectMode.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/EventArguments/BufferingChangedEventArgs.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/EventArguments/MediaFailedEventArgs.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/EventArguments/MediaFileChangedEventArgs.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/EventArguments/MediaFileFailedEventArgs.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/EventArguments/MediaFinishedEventArgs.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/EventArguments/MetadataChangedEventArgs.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/EventArguments/PlayingChangedEventArgs.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/EventArguments/QueueEndedEventArgs.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/EventArguments/QueueMediaChangedEventArgs.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/EventArguments/StatusChangedEventArgs.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/EventArguments/VolumeChangedEventArgs.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/IAudioPlayer.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/IMediaExtractor.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/IMediaFile.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/IMediaFileMetadata.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/IMediaManager.cs (97%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/IMediaNotificationManager.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/IMediaQueue.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/IPlaybackController.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/IPlaybackManager.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/IVideoPlayer.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/IVideoSurface.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/IVolumeManager.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/Implementations/Helpers.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/Implementations/MediaFile.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/Implementations/MediaFileMetadata.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/Implementations/MediaManagerBase.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/Implementations/MediaQueue.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/Implementations/PlaybackController.cs (100%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/Plugin.MediaManager.Abstractions.csproj (98%) rename {MediaManager/Plugin.MediaManager.Abstractions => MediaManager.Abstractions}/Properties/AssemblyInfo.cs (97%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/Audio/AudioPlayerBase.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/Audio/AudioPlayerBroadcastReceiver.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/Audio/AudioPlayerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/Audio/RemoteControlBroadcastReceiver.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/AudioPlayerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/MediaExtractorImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/MediaManagerImplementation.cs (97%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/MediaNotificationManagerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/MediaPlayerService/MediaPlayerService.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/MediaPlayerService/MediaPlayerServiceBinder.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/MediaPlayerService/MediaPlayerServiceConnection.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/MediaPlayerService/MediaServiceBase.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/MediaPlayerService/MediaServiceBinder.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/MediaPlayerService/MediaServiceConnection.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/MediaSession/MediaNotificationManagerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/MediaSession/MediaSessionCallback.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/MediaSession/MediaSessionManager.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/Plugin.MediaManager.Android.csproj (98%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/Plugin.MediaManager.Android.csproj.bak (97%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/Properties/AssemblyInfo.cs (97%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/Resources/AboutResources.txt (97%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/Video/VideoPlayerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/Video/VideoSurface.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/VolumeManagerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.Android => MediaManager.Android}/packages.config (100%) rename {MediaManager/Plugin.MediaManager.ExoPlayer => MediaManager.ExoPlayer}/ExoPlayerAudioImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.ExoPlayer => MediaManager.ExoPlayer}/ExoPlayerAudioService.cs (100%) rename {MediaManager/Plugin.MediaManager.ExoPlayer => MediaManager.ExoPlayer}/ExoPlayerVideoImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.ExoPlayer => MediaManager.ExoPlayer}/Plugin.MediaManager.ExoPlayer.csproj (100%) rename {MediaManager/Plugin.MediaManager.ExoPlayer => MediaManager.ExoPlayer}/Properties/AssemblyInfo.cs (100%) rename {MediaManager/Plugin.MediaManager.ExoPlayer => MediaManager.ExoPlayer}/Resources/AboutResources.txt (100%) rename {MediaManager/Plugin.MediaManager.ExoPlayer => MediaManager.ExoPlayer}/Resources/values/Strings.xml (100%) rename {MediaManager/Plugin.MediaManager.ExoPlayer => MediaManager.ExoPlayer}/packages.config (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.Android/Properties/AssemblyInfo.cs (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.Android/Resources/AboutResources.txt (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.Android/Resources/Values/Strings.xml (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.Android/VideoViewRenderer.cs (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.Android/packages.config (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.XamarinForms.UWP.nuget.targets (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.UWP/Properties/AssemblyInfo.cs (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.UWP/Properties/Plugin.MediaManager.XamarinForms.UWP.rd.xml (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.UWP/VideoViewRenderer.cs (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.UWP/project.json (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.iOS/Properties/AssemblyInfo.cs (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.iOS/VideoViewRenderer.cs (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.iOS/packages.config (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms/Properties/AssemblyInfo.cs (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms/VideoView.cs (100%) rename {MediaManager/Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms/packages.config (100%) rename {MediaManager/Plugin.MediaManager.MacOS => MediaManager.MacOS}/MediaManagerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.MacOS => MediaManager.MacOS}/Plugin.MediaManager.MacOS.csproj (100%) rename {MediaManager/Plugin.MediaManager.MacOS => MediaManager.MacOS}/Properties/AssemblyInfo.cs (100%) rename {MediaManager/Plugin.MediaManager.MacOS => MediaManager.MacOS}/VersionHelper.cs (100%) rename {MediaManager/Plugin.MediaManager.MacOS => MediaManager.MacOS}/VideoSurface.cs (100%) rename {MediaManager/Plugin.MediaManager.Reactive => MediaManager.Reactive}/Plugin.MediaManager.Reactive.csproj (100%) rename {MediaManager/Plugin.MediaManager.Reactive => MediaManager.Reactive}/Properties/AssemblyInfo.cs (100%) rename {MediaManager/Plugin.MediaManager.Reactive => MediaManager.Reactive}/ReactiveMediaManager.cs (100%) rename {MediaManager/Plugin.MediaManager.Reactive => MediaManager.Reactive}/packages.config (100%) rename {MediaManager/Plugin.MediaManager.Tests => MediaManager.Tests}/MediaFile.cs (100%) rename {MediaManager/Plugin.MediaManager.Tests => MediaManager.Tests}/Plugin.MediaManager.Tests.csproj (100%) rename {MediaManager/Plugin.MediaManager.Tests => MediaManager.Tests}/Unit/MediaQueueTests.cs (100%) rename {MediaManager/Plugin.MediaManager.Tests => MediaManager.Tests}/Unit/PlaybackControllerTests.cs (100%) rename {MediaManager/Plugin.MediaManager.Tests => MediaManager.Tests}/packages.config (100%) rename {MediaManager/Plugin.MediaManager.UWP => MediaManager.UWP}/AudioPlayerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.UWP => MediaManager.UWP}/ImageAsset.cs (100%) rename {MediaManager/Plugin.MediaManager.UWP => MediaManager.UWP}/MediaExtractorImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.UWP => MediaManager.UWP}/MediaManagerImplementation.cs (97%) rename {MediaManager/Plugin.MediaManager.UWP => MediaManager.UWP}/MediaNotificationManagerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.UWP => MediaManager.UWP}/Plugin.MediaManager.UWP.csproj (97%) rename {MediaManager/Plugin.MediaManager.UWP => MediaManager.UWP}/Properties/AssemblyInfo.cs (97%) rename {MediaManager/Plugin.MediaManager.UWP => MediaManager.UWP}/Properties/Plugin.MediaManager.UWP.rd.xml (97%) rename {MediaManager/Plugin.MediaManager.UWP => MediaManager.UWP}/VideoPlayerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.UWP => MediaManager.UWP}/VideoSurface.cs (100%) rename {MediaManager/Plugin.MediaManager.UWP => MediaManager.UWP}/VolumeManagerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.UWP => MediaManager.UWP}/project.json (95%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/AudioPlayerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/IMediaRemoteControl.cs (100%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/IVersionHelper.cs (100%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/MediaExtractorImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/MediaFileUrlHelper.cs (100%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/MediaManagerAppleBase.cs (97%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/MediaManagerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/MediaNotificationManagerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/MediaRemoteControl.cs (100%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/Plugin.MediaManager.iOS.csproj (97%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/Properties/AssemblyInfo.cs (97%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/RemoteControlNotificationManager.cs (100%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/VersionHelper.cs (100%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/VideoPlayerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/VideoSurface.cs (100%) rename {MediaManager/Plugin.MediaManager.iOS => MediaManager.iOS}/VolumeManagerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.tvOS => MediaManager.tvOS}/MediaManagerImplementation.cs (100%) rename {MediaManager/Plugin.MediaManager.tvOS => MediaManager.tvOS}/Plugin.MediaManager.tvOS.csproj (100%) rename {MediaManager/Plugin.MediaManager.tvOS => MediaManager.tvOS}/Properties/AssemblyInfo.cs (100%) rename {MediaManager/Plugin.MediaManager.tvOS => MediaManager.tvOS}/VideoSurface.cs (100%) rename MediaManager/{Plugin.MediaManager => }/CrossMediaManager.cs (96%) delete mode 100644 MediaManager/Plugin.MediaManager.Android/Resources/Resource.Designer.cs rename MediaManager/{Plugin.MediaManager => }/Plugin.MediaManager.csproj (98%) rename MediaManager/{Plugin.MediaManager => }/Properties/AssemblyInfo.cs (97%) delete mode 100644 MediaManagerLibs.sln diff --git a/MediaManager/Plugin.MediaManager.Abstractions/Enums/MediaFileType.cs b/MediaManager.Abstractions/Enums/MediaFileType.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/Enums/MediaFileType.cs rename to MediaManager.Abstractions/Enums/MediaFileType.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/Enums/MediaPlayerStatus.cs b/MediaManager.Abstractions/Enums/MediaPlayerStatus.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/Enums/MediaPlayerStatus.cs rename to MediaManager.Abstractions/Enums/MediaPlayerStatus.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/Enums/RepeatType.cs b/MediaManager.Abstractions/Enums/RepeatType.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/Enums/RepeatType.cs rename to MediaManager.Abstractions/Enums/RepeatType.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/Enums/ResourceAvailability.cs b/MediaManager.Abstractions/Enums/ResourceAvailability.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/Enums/ResourceAvailability.cs rename to MediaManager.Abstractions/Enums/ResourceAvailability.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/Enums/VideoAspectMode.cs b/MediaManager.Abstractions/Enums/VideoAspectMode.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/Enums/VideoAspectMode.cs rename to MediaManager.Abstractions/Enums/VideoAspectMode.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/EventArguments/BufferingChangedEventArgs.cs b/MediaManager.Abstractions/EventArguments/BufferingChangedEventArgs.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/EventArguments/BufferingChangedEventArgs.cs rename to MediaManager.Abstractions/EventArguments/BufferingChangedEventArgs.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/EventArguments/MediaFailedEventArgs.cs b/MediaManager.Abstractions/EventArguments/MediaFailedEventArgs.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/EventArguments/MediaFailedEventArgs.cs rename to MediaManager.Abstractions/EventArguments/MediaFailedEventArgs.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/EventArguments/MediaFileChangedEventArgs.cs b/MediaManager.Abstractions/EventArguments/MediaFileChangedEventArgs.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/EventArguments/MediaFileChangedEventArgs.cs rename to MediaManager.Abstractions/EventArguments/MediaFileChangedEventArgs.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/EventArguments/MediaFileFailedEventArgs.cs b/MediaManager.Abstractions/EventArguments/MediaFileFailedEventArgs.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/EventArguments/MediaFileFailedEventArgs.cs rename to MediaManager.Abstractions/EventArguments/MediaFileFailedEventArgs.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/EventArguments/MediaFinishedEventArgs.cs b/MediaManager.Abstractions/EventArguments/MediaFinishedEventArgs.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/EventArguments/MediaFinishedEventArgs.cs rename to MediaManager.Abstractions/EventArguments/MediaFinishedEventArgs.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/EventArguments/MetadataChangedEventArgs.cs b/MediaManager.Abstractions/EventArguments/MetadataChangedEventArgs.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/EventArguments/MetadataChangedEventArgs.cs rename to MediaManager.Abstractions/EventArguments/MetadataChangedEventArgs.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/EventArguments/PlayingChangedEventArgs.cs b/MediaManager.Abstractions/EventArguments/PlayingChangedEventArgs.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/EventArguments/PlayingChangedEventArgs.cs rename to MediaManager.Abstractions/EventArguments/PlayingChangedEventArgs.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/EventArguments/QueueEndedEventArgs.cs b/MediaManager.Abstractions/EventArguments/QueueEndedEventArgs.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/EventArguments/QueueEndedEventArgs.cs rename to MediaManager.Abstractions/EventArguments/QueueEndedEventArgs.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/EventArguments/QueueMediaChangedEventArgs.cs b/MediaManager.Abstractions/EventArguments/QueueMediaChangedEventArgs.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/EventArguments/QueueMediaChangedEventArgs.cs rename to MediaManager.Abstractions/EventArguments/QueueMediaChangedEventArgs.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/EventArguments/StatusChangedEventArgs.cs b/MediaManager.Abstractions/EventArguments/StatusChangedEventArgs.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/EventArguments/StatusChangedEventArgs.cs rename to MediaManager.Abstractions/EventArguments/StatusChangedEventArgs.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/EventArguments/VolumeChangedEventArgs.cs b/MediaManager.Abstractions/EventArguments/VolumeChangedEventArgs.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/EventArguments/VolumeChangedEventArgs.cs rename to MediaManager.Abstractions/EventArguments/VolumeChangedEventArgs.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/IAudioPlayer.cs b/MediaManager.Abstractions/IAudioPlayer.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/IAudioPlayer.cs rename to MediaManager.Abstractions/IAudioPlayer.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/IMediaExtractor.cs b/MediaManager.Abstractions/IMediaExtractor.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/IMediaExtractor.cs rename to MediaManager.Abstractions/IMediaExtractor.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/IMediaFile.cs b/MediaManager.Abstractions/IMediaFile.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/IMediaFile.cs rename to MediaManager.Abstractions/IMediaFile.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/IMediaFileMetadata.cs b/MediaManager.Abstractions/IMediaFileMetadata.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/IMediaFileMetadata.cs rename to MediaManager.Abstractions/IMediaFileMetadata.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/IMediaManager.cs b/MediaManager.Abstractions/IMediaManager.cs similarity index 97% rename from MediaManager/Plugin.MediaManager.Abstractions/IMediaManager.cs rename to MediaManager.Abstractions/IMediaManager.cs index c647a584..30a0e860 100644 --- a/MediaManager/Plugin.MediaManager.Abstractions/IMediaManager.cs +++ b/MediaManager.Abstractions/IMediaManager.cs @@ -1,107 +1,107 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Plugin.MediaManager.Abstractions.Enums; -using Plugin.MediaManager.Abstractions.EventArguments; - -namespace Plugin.MediaManager.Abstractions -{ - public delegate void MediaFileChangedEventHandler(object sender, MediaFileChangedEventArgs e); - - public delegate void MediaFileFailedEventHandler(object sender, MediaFileFailedEventArgs e); - - /// - /// The main purpose of this class is to be a controlling unit for all the single MediaItem implementations, who - /// in themselve can play their media, but need a central controling unit, surrounding them - /// - /// - public interface IMediaManager : IPlaybackManager - { - /// - /// Player responsible for audio playback - /// - IAudioPlayer AudioPlayer { get; set; } - - /// - /// Player responsible for video playback - /// - IVideoPlayer VideoPlayer { get; set; } - - /// - /// Queue to play media in sequences - /// - IMediaQueue MediaQueue { get; set; } - - /// - /// Manages notifications to the native system - /// - IMediaNotificationManager MediaNotificationManager { get; set; } - - /// - /// Extracts media information to put it into an IMediaFile - /// - IMediaExtractor MediaExtractor { get; set; } - - /// - /// Used to manage the volume - /// - IVolumeManager VolumeManager { get; set; } - - /// - /// Used in various views to control the playback - /// - IPlaybackController PlaybackController { get; set; } - - /// - /// Raised when the media information of the track has changed. - /// - event MediaFileChangedEventHandler MediaFileChanged; - - /// - /// Raised when mediadata of MediaFile failed to update - /// - event MediaFileFailedEventHandler MediaFileFailed; - - /// - /// Creates new MediaFile object, adds it to the queue and starts playing - /// - Task Play(string url); - - /// - /// Creates new MediaFile object, adds it to the queue and starts playing - /// - Task Play(string url, MediaFileType fileType); - - /// - /// Creates new MediaFile object, adds it to the queue and starts playing - /// - Task Play(string url, MediaFileType fileType, ResourceAvailability availability); - - /// - /// Adds all MediaFiles to the Queue and starts playing the first one - /// - Task Play(IEnumerable mediaFiles); - - /// - /// Plays the next MediaFile in the Queue - /// - Task PlayNext(); - - /// - /// Plays the previous MediaFile in the Queue - /// - Task PlayPrevious(); - - /// - /// Plays a MediaFile by its position in the Queue - /// - Task PlayByPosition(int index); - - /// - /// Sets a function which gets called before the MediaFile is played - /// - /// The before play. - void SetOnBeforePlay(Func beforePlay); - - } -} +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Plugin.MediaManager.Abstractions.Enums; +using Plugin.MediaManager.Abstractions.EventArguments; + +namespace Plugin.MediaManager.Abstractions +{ + public delegate void MediaFileChangedEventHandler(object sender, MediaFileChangedEventArgs e); + + public delegate void MediaFileFailedEventHandler(object sender, MediaFileFailedEventArgs e); + + /// + /// The main purpose of this class is to be a controlling unit for all the single MediaItem implementations, who + /// in themselve can play their media, but need a central controling unit, surrounding them + /// + /// + public interface IMediaManager : IPlaybackManager + { + /// + /// Player responsible for audio playback + /// + IAudioPlayer AudioPlayer { get; set; } + + /// + /// Player responsible for video playback + /// + IVideoPlayer VideoPlayer { get; set; } + + /// + /// Queue to play media in sequences + /// + IMediaQueue MediaQueue { get; set; } + + /// + /// Manages notifications to the native system + /// + IMediaNotificationManager MediaNotificationManager { get; set; } + + /// + /// Extracts media information to put it into an IMediaFile + /// + IMediaExtractor MediaExtractor { get; set; } + + /// + /// Used to manage the volume + /// + IVolumeManager VolumeManager { get; set; } + + /// + /// Used in various views to control the playback + /// + IPlaybackController PlaybackController { get; set; } + + /// + /// Raised when the media information of the track has changed. + /// + event MediaFileChangedEventHandler MediaFileChanged; + + /// + /// Raised when mediadata of MediaFile failed to update + /// + event MediaFileFailedEventHandler MediaFileFailed; + + /// + /// Creates new MediaFile object, adds it to the queue and starts playing + /// + Task Play(string url); + + /// + /// Creates new MediaFile object, adds it to the queue and starts playing + /// + Task Play(string url, MediaFileType fileType); + + /// + /// Creates new MediaFile object, adds it to the queue and starts playing + /// + Task Play(string url, MediaFileType fileType, ResourceAvailability availability); + + /// + /// Adds all MediaFiles to the Queue and starts playing the first one + /// + Task Play(IEnumerable mediaFiles); + + /// + /// Plays the next MediaFile in the Queue + /// + Task PlayNext(); + + /// + /// Plays the previous MediaFile in the Queue + /// + Task PlayPrevious(); + + /// + /// Plays a MediaFile by its position in the Queue + /// + Task PlayByPosition(int index); + + /// + /// Sets a function which gets called before the MediaFile is played + /// + /// The before play. + void SetOnBeforePlay(Func beforePlay); + + } +} diff --git a/MediaManager/Plugin.MediaManager.Abstractions/IMediaNotificationManager.cs b/MediaManager.Abstractions/IMediaNotificationManager.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/IMediaNotificationManager.cs rename to MediaManager.Abstractions/IMediaNotificationManager.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/IMediaQueue.cs b/MediaManager.Abstractions/IMediaQueue.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/IMediaQueue.cs rename to MediaManager.Abstractions/IMediaQueue.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/IPlaybackController.cs b/MediaManager.Abstractions/IPlaybackController.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/IPlaybackController.cs rename to MediaManager.Abstractions/IPlaybackController.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/IPlaybackManager.cs b/MediaManager.Abstractions/IPlaybackManager.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/IPlaybackManager.cs rename to MediaManager.Abstractions/IPlaybackManager.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/IVideoPlayer.cs b/MediaManager.Abstractions/IVideoPlayer.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/IVideoPlayer.cs rename to MediaManager.Abstractions/IVideoPlayer.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/IVideoSurface.cs b/MediaManager.Abstractions/IVideoSurface.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/IVideoSurface.cs rename to MediaManager.Abstractions/IVideoSurface.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/IVolumeManager.cs b/MediaManager.Abstractions/IVolumeManager.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/IVolumeManager.cs rename to MediaManager.Abstractions/IVolumeManager.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/Implementations/Helpers.cs b/MediaManager.Abstractions/Implementations/Helpers.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/Implementations/Helpers.cs rename to MediaManager.Abstractions/Implementations/Helpers.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/Implementations/MediaFile.cs b/MediaManager.Abstractions/Implementations/MediaFile.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/Implementations/MediaFile.cs rename to MediaManager.Abstractions/Implementations/MediaFile.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/Implementations/MediaFileMetadata.cs b/MediaManager.Abstractions/Implementations/MediaFileMetadata.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/Implementations/MediaFileMetadata.cs rename to MediaManager.Abstractions/Implementations/MediaFileMetadata.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/Implementations/MediaManagerBase.cs b/MediaManager.Abstractions/Implementations/MediaManagerBase.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/Implementations/MediaManagerBase.cs rename to MediaManager.Abstractions/Implementations/MediaManagerBase.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/Implementations/MediaQueue.cs b/MediaManager.Abstractions/Implementations/MediaQueue.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/Implementations/MediaQueue.cs rename to MediaManager.Abstractions/Implementations/MediaQueue.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/Implementations/PlaybackController.cs b/MediaManager.Abstractions/Implementations/PlaybackController.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Abstractions/Implementations/PlaybackController.cs rename to MediaManager.Abstractions/Implementations/PlaybackController.cs diff --git a/MediaManager/Plugin.MediaManager.Abstractions/Plugin.MediaManager.Abstractions.csproj b/MediaManager.Abstractions/Plugin.MediaManager.Abstractions.csproj similarity index 98% rename from MediaManager/Plugin.MediaManager.Abstractions/Plugin.MediaManager.Abstractions.csproj rename to MediaManager.Abstractions/Plugin.MediaManager.Abstractions.csproj index e5a1780e..c0f73c25 100644 --- a/MediaManager/Plugin.MediaManager.Abstractions/Plugin.MediaManager.Abstractions.csproj +++ b/MediaManager.Abstractions/Plugin.MediaManager.Abstractions.csproj @@ -1,87 +1,87 @@ - - - - - 10.0 - Debug - AnyCPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} - Library - Properties - Plugin.MediaManager.Abstractions - Plugin.MediaManager.Abstractions - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - 1591 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Plugin.MediaManager.Abstractions.XML - 1591 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + 10.0 + Debug + AnyCPU + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} + Library + Properties + Plugin.MediaManager.Abstractions + Plugin.MediaManager.Abstractions + en-US + 512 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Profile7 + v4.5 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + 1591 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + bin\Release\Plugin.MediaManager.Abstractions.XML + 1591 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.Abstractions/Properties/AssemblyInfo.cs b/MediaManager.Abstractions/Properties/AssemblyInfo.cs similarity index 97% rename from MediaManager/Plugin.MediaManager.Abstractions/Properties/AssemblyInfo.cs rename to MediaManager.Abstractions/Properties/AssemblyInfo.cs index 20934aac..287be2a0 100644 --- a/MediaManager/Plugin.MediaManager.Abstractions/Properties/AssemblyInfo.cs +++ b/MediaManager.Abstractions/Properties/AssemblyInfo.cs @@ -1,30 +1,30 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Plugin.MediaManager.Abstractions")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Plugin.MediaManager.Abstractions")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +using System.Resources; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Plugin.MediaManager.Abstractions")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Plugin.MediaManager.Abstractions")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: NeutralResourcesLanguage("en")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/MediaManager/Plugin.MediaManager.Android/Audio/AudioPlayerBase.cs b/MediaManager.Android/Audio/AudioPlayerBase.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/Audio/AudioPlayerBase.cs rename to MediaManager.Android/Audio/AudioPlayerBase.cs diff --git a/MediaManager/Plugin.MediaManager.Android/Audio/AudioPlayerBroadcastReceiver.cs b/MediaManager.Android/Audio/AudioPlayerBroadcastReceiver.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/Audio/AudioPlayerBroadcastReceiver.cs rename to MediaManager.Android/Audio/AudioPlayerBroadcastReceiver.cs diff --git a/MediaManager/Plugin.MediaManager.Android/Audio/AudioPlayerImplementation.cs b/MediaManager.Android/Audio/AudioPlayerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/Audio/AudioPlayerImplementation.cs rename to MediaManager.Android/Audio/AudioPlayerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.Android/Audio/RemoteControlBroadcastReceiver.cs b/MediaManager.Android/Audio/RemoteControlBroadcastReceiver.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/Audio/RemoteControlBroadcastReceiver.cs rename to MediaManager.Android/Audio/RemoteControlBroadcastReceiver.cs diff --git a/MediaManager/Plugin.MediaManager.Android/AudioPlayerImplementation.cs b/MediaManager.Android/AudioPlayerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/AudioPlayerImplementation.cs rename to MediaManager.Android/AudioPlayerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.Android/MediaExtractorImplementation.cs b/MediaManager.Android/MediaExtractorImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/MediaExtractorImplementation.cs rename to MediaManager.Android/MediaExtractorImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.Android/MediaManagerImplementation.cs b/MediaManager.Android/MediaManagerImplementation.cs similarity index 97% rename from MediaManager/Plugin.MediaManager.Android/MediaManagerImplementation.cs rename to MediaManager.Android/MediaManagerImplementation.cs index 876b7917..a0bfb800 100644 --- a/MediaManager/Plugin.MediaManager.Android/MediaManagerImplementation.cs +++ b/MediaManager.Android/MediaManagerImplementation.cs @@ -1,77 +1,77 @@ -using Android.App; -using Android.Content.Res; -using Plugin.MediaManager.Abstractions; -using Plugin.MediaManager.Abstractions.Implementations; -using Plugin.MediaManager.Audio; -using Plugin.MediaManager.MediaSession; - -namespace Plugin.MediaManager -{ - [Android.Runtime.Preserve(AllMembers = true)] - public class MediaManagerImplementation : MediaManagerBase - { - public MediaManagerImplementation() - { - MediaSessionManager.OnNotificationActionFired += HandleNotificationActions; - } - - private IAudioPlayer _audioPlayer; - private IMediaExtractor _mediaExtraxtor; - private MediaSessionManager _sessionManager; - - public override IAudioPlayer AudioPlayer - { - get {return _audioPlayer ?? (_audioPlayer = new AudioPlayerImplementation(MediaSessionManager));} - set { _audioPlayer = value; } - } - - public override IVideoPlayer VideoPlayer { get; set; } = new VideoPlayerImplementation(); - - public override IMediaNotificationManager MediaNotificationManager - { - get { return MediaSessionManager.NotificationManager; } - set { MediaSessionManager.NotificationManager = value; } - } - - public override IMediaExtractor MediaExtractor - { - get { return _mediaExtraxtor ?? (_mediaExtraxtor = new MediaExtractorImplementation(Resources.System, RequestHeaders)); } - set { _mediaExtraxtor = value; } - } - - public MediaSessionManager MediaSessionManager - { - get { return _sessionManager ?? (_sessionManager = new MediaSessionManager(Application.Context, typeof(MediaPlayerService))); } - set - { - _sessionManager = value; - _sessionManager.OnNotificationActionFired += HandleNotificationActions; - } - } - public override IVolumeManager VolumeManager { get; set; } = new VolumeManagerImplementation(); - - private async void HandleNotificationActions(object sender, string action) - { - if (action.Equals(MediaServiceBase.ActionPlay)) - { - await PlaybackController.Play(); - } - else if (action.Equals(MediaServiceBase.ActionPause)) - { - await PlaybackController.Pause(); - } - else if (action.Equals(MediaServiceBase.ActionPrevious)) - { - await PlaybackController.PlayPreviousOrSeekToStart(); - } - else if (action.Equals(MediaServiceBase.ActionNext)) - { - await PlaybackController.PlayNext(); - } - else if (action.Equals(MediaServiceBase.ActionStop)) - { - await Stop(); - } - } - } +using Android.App; +using Android.Content.Res; +using Plugin.MediaManager.Abstractions; +using Plugin.MediaManager.Abstractions.Implementations; +using Plugin.MediaManager.Audio; +using Plugin.MediaManager.MediaSession; + +namespace Plugin.MediaManager +{ + [Android.Runtime.Preserve(AllMembers = true)] + public class MediaManagerImplementation : MediaManagerBase + { + public MediaManagerImplementation() + { + MediaSessionManager.OnNotificationActionFired += HandleNotificationActions; + } + + private IAudioPlayer _audioPlayer; + private IMediaExtractor _mediaExtraxtor; + private MediaSessionManager _sessionManager; + + public override IAudioPlayer AudioPlayer + { + get {return _audioPlayer ?? (_audioPlayer = new AudioPlayerImplementation(MediaSessionManager));} + set { _audioPlayer = value; } + } + + public override IVideoPlayer VideoPlayer { get; set; } = new VideoPlayerImplementation(); + + public override IMediaNotificationManager MediaNotificationManager + { + get { return MediaSessionManager.NotificationManager; } + set { MediaSessionManager.NotificationManager = value; } + } + + public override IMediaExtractor MediaExtractor + { + get { return _mediaExtraxtor ?? (_mediaExtraxtor = new MediaExtractorImplementation(Resources.System, RequestHeaders)); } + set { _mediaExtraxtor = value; } + } + + public MediaSessionManager MediaSessionManager + { + get { return _sessionManager ?? (_sessionManager = new MediaSessionManager(Application.Context, typeof(MediaPlayerService))); } + set + { + _sessionManager = value; + _sessionManager.OnNotificationActionFired += HandleNotificationActions; + } + } + public override IVolumeManager VolumeManager { get; set; } = new VolumeManagerImplementation(); + + private async void HandleNotificationActions(object sender, string action) + { + if (action.Equals(MediaServiceBase.ActionPlay)) + { + await PlaybackController.Play(); + } + else if (action.Equals(MediaServiceBase.ActionPause)) + { + await PlaybackController.Pause(); + } + else if (action.Equals(MediaServiceBase.ActionPrevious)) + { + await PlaybackController.PlayPreviousOrSeekToStart(); + } + else if (action.Equals(MediaServiceBase.ActionNext)) + { + await PlaybackController.PlayNext(); + } + else if (action.Equals(MediaServiceBase.ActionStop)) + { + await Stop(); + } + } + } } \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.Android/MediaNotificationManagerImplementation.cs b/MediaManager.Android/MediaNotificationManagerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/MediaNotificationManagerImplementation.cs rename to MediaManager.Android/MediaNotificationManagerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.Android/MediaPlayerService/MediaPlayerService.cs b/MediaManager.Android/MediaPlayerService/MediaPlayerService.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/MediaPlayerService/MediaPlayerService.cs rename to MediaManager.Android/MediaPlayerService/MediaPlayerService.cs diff --git a/MediaManager/Plugin.MediaManager.Android/MediaPlayerService/MediaPlayerServiceBinder.cs b/MediaManager.Android/MediaPlayerService/MediaPlayerServiceBinder.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/MediaPlayerService/MediaPlayerServiceBinder.cs rename to MediaManager.Android/MediaPlayerService/MediaPlayerServiceBinder.cs diff --git a/MediaManager/Plugin.MediaManager.Android/MediaPlayerService/MediaPlayerServiceConnection.cs b/MediaManager.Android/MediaPlayerService/MediaPlayerServiceConnection.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/MediaPlayerService/MediaPlayerServiceConnection.cs rename to MediaManager.Android/MediaPlayerService/MediaPlayerServiceConnection.cs diff --git a/MediaManager/Plugin.MediaManager.Android/MediaPlayerService/MediaServiceBase.cs b/MediaManager.Android/MediaPlayerService/MediaServiceBase.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/MediaPlayerService/MediaServiceBase.cs rename to MediaManager.Android/MediaPlayerService/MediaServiceBase.cs diff --git a/MediaManager/Plugin.MediaManager.Android/MediaPlayerService/MediaServiceBinder.cs b/MediaManager.Android/MediaPlayerService/MediaServiceBinder.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/MediaPlayerService/MediaServiceBinder.cs rename to MediaManager.Android/MediaPlayerService/MediaServiceBinder.cs diff --git a/MediaManager/Plugin.MediaManager.Android/MediaPlayerService/MediaServiceConnection.cs b/MediaManager.Android/MediaPlayerService/MediaServiceConnection.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/MediaPlayerService/MediaServiceConnection.cs rename to MediaManager.Android/MediaPlayerService/MediaServiceConnection.cs diff --git a/MediaManager/Plugin.MediaManager.Android/MediaSession/MediaNotificationManagerImplementation.cs b/MediaManager.Android/MediaSession/MediaNotificationManagerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/MediaSession/MediaNotificationManagerImplementation.cs rename to MediaManager.Android/MediaSession/MediaNotificationManagerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.Android/MediaSession/MediaSessionCallback.cs b/MediaManager.Android/MediaSession/MediaSessionCallback.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/MediaSession/MediaSessionCallback.cs rename to MediaManager.Android/MediaSession/MediaSessionCallback.cs diff --git a/MediaManager/Plugin.MediaManager.Android/MediaSession/MediaSessionManager.cs b/MediaManager.Android/MediaSession/MediaSessionManager.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/MediaSession/MediaSessionManager.cs rename to MediaManager.Android/MediaSession/MediaSessionManager.cs diff --git a/MediaManager/Plugin.MediaManager.Android/Plugin.MediaManager.Android.csproj b/MediaManager.Android/Plugin.MediaManager.Android.csproj similarity index 98% rename from MediaManager/Plugin.MediaManager.Android/Plugin.MediaManager.Android.csproj rename to MediaManager.Android/Plugin.MediaManager.Android.csproj index bb2d7d3f..9d84d3d2 100644 --- a/MediaManager/Plugin.MediaManager.Android/Plugin.MediaManager.Android.csproj +++ b/MediaManager.Android/Plugin.MediaManager.Android.csproj @@ -1,128 +1,128 @@ - - - - - Debug - AnyCPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Plugin.MediaManager - Plugin.MediaManager - Resources\Resource.Designer.cs - Resource - Resources - Assets - False - v7.0 - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - arm64-v8a;armeabi;armeabi-v7a;x86 - 1591 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Plugin.MediaManager.XML - - - 1591 - - - - - - - - ..\..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - - - ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - - - ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - - - ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - - - ..\..\packages\Xamarin.Android.Support.Fragment.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - - - ..\..\packages\Xamarin.Android.Support.v4.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - - - ..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - - - ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll - - - ..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - - - - - CrossMediaManager.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} - Plugin.MediaManager.Abstractions - - - - - - - - - - - - - - + + + + + Debug + AnyCPU + {56A56F17-7DE1-4CA1-9617-BF32E971AC84} + {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Plugin.MediaManager + Plugin.MediaManager + Resources\Resource.Designer.cs + Resource + Resources + Assets + False + v7.0 + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + arm64-v8a;armeabi;armeabi-v7a;x86 + 1591 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + bin\Release\Plugin.MediaManager.XML + + + 1591 + + + + + + + + ..\..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + + + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + + + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + + + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + + + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + + + ..\..\packages\Xamarin.Android.Support.v4.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + + + ..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + + + ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll + + + ..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + + + + + CrossMediaManager.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} + Plugin.MediaManager.Abstractions + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.Android/Plugin.MediaManager.Android.csproj.bak b/MediaManager.Android/Plugin.MediaManager.Android.csproj.bak similarity index 97% rename from MediaManager/Plugin.MediaManager.Android/Plugin.MediaManager.Android.csproj.bak rename to MediaManager.Android/Plugin.MediaManager.Android.csproj.bak index 4f31cc1c..fabab32f 100644 --- a/MediaManager/Plugin.MediaManager.Android/Plugin.MediaManager.Android.csproj.bak +++ b/MediaManager.Android/Plugin.MediaManager.Android.csproj.bak @@ -1,71 +1,71 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {56A56F17-7DE1-4CA1-9617-BF32E971AC84} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - Plugin.MediaManager - Plugin.MediaManager - 512 - Resources\Resource.Designer.cs - Off - True - True - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Plugin.MediaManager.XML - - - - - - - - - - - - CrossMediaManager.cs - - - - - - - - - - - {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} - Plugin.MediaManager.Abstractions - - - - + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {56A56F17-7DE1-4CA1-9617-BF32E971AC84} + {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + Plugin.MediaManager + Plugin.MediaManager + 512 + Resources\Resource.Designer.cs + Off + True + True + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + bin\Release\Plugin.MediaManager.XML + + + + + + + + + + + + CrossMediaManager.cs + + + + + + + + + + + {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} + Plugin.MediaManager.Abstractions + + + + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.Android/Properties/AssemblyInfo.cs b/MediaManager.Android/Properties/AssemblyInfo.cs similarity index 97% rename from MediaManager/Plugin.MediaManager.Android/Properties/AssemblyInfo.cs rename to MediaManager.Android/Properties/AssemblyInfo.cs index 5f7e1cd7..726c4e3e 100644 --- a/MediaManager/Plugin.MediaManager.Android/Properties/AssemblyInfo.cs +++ b/MediaManager.Android/Properties/AssemblyInfo.cs @@ -1,35 +1,35 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Android.App; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Plugin.MediaManager.Android")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Plugin.MediaManager.Android")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] - -[assembly: UsesPermission(Android.Manifest.Permission.AccessWifiState)] -[assembly: UsesPermission(Android.Manifest.Permission.Internet)] -[assembly: UsesPermission(Android.Manifest.Permission.MediaContentControl)] +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using Android.App; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Plugin.MediaManager.Android")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Plugin.MediaManager.Android")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: ComVisible(false)] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] + +[assembly: UsesPermission(Android.Manifest.Permission.AccessWifiState)] +[assembly: UsesPermission(Android.Manifest.Permission.Internet)] +[assembly: UsesPermission(Android.Manifest.Permission.MediaContentControl)] [assembly: UsesPermission(Android.Manifest.Permission.WakeLock)] \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.Android/Resources/AboutResources.txt b/MediaManager.Android/Resources/AboutResources.txt similarity index 97% rename from MediaManager/Plugin.MediaManager.Android/Resources/AboutResources.txt rename to MediaManager.Android/Resources/AboutResources.txt index f3e286ed..194ae28a 100644 --- a/MediaManager/Plugin.MediaManager.Android/Resources/AboutResources.txt +++ b/MediaManager.Android/Resources/AboutResources.txt @@ -1,50 +1,50 @@ -Images, layout descriptions, binary blobs and string dictionaries can be included -in your application as resource files. Various Android APIs are designed to -operate on the resource IDs instead of dealing with images, strings or binary blobs -directly. - -For example, a sample Android app that contains a user interface layout (main.xml), -an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) -would keep its resources in the "Resources" directory of the application: - -Resources/ - drawable-hdpi/ - icon.png - - drawable-ldpi/ - icon.png - - drawable-mdpi/ - icon.png - - layout/ - main.xml - - values/ - strings.xml - -In order to get the build system to recognize Android resources, set the build action to -"AndroidResource". The native Android APIs do not operate directly with filenames, but -instead operate on resource IDs. When you compile an Android application that uses resources, -the build system will package the resources for distribution and generate a class called -"Resource" that contains the tokens for each one of the resources included. For example, -for the above Resources layout, this is what the Resource class would expose: - -public class Resource { - public class drawable { - public const int icon = 0x123; - } - - public class layout { - public const int main = 0x456; - } - - public class strings { - public const int first_string = 0xabc; - public const int second_string = 0xbcd; - } -} - -You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main -to reference the layout/main.xml file, or Resource.strings.first_string to reference the first +Images, layout descriptions, binary blobs and string dictionaries can be included +in your application as resource files. Various Android APIs are designed to +operate on the resource IDs instead of dealing with images, strings or binary blobs +directly. + +For example, a sample Android app that contains a user interface layout (main.xml), +an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) +would keep its resources in the "Resources" directory of the application: + +Resources/ + drawable-hdpi/ + icon.png + + drawable-ldpi/ + icon.png + + drawable-mdpi/ + icon.png + + layout/ + main.xml + + values/ + strings.xml + +In order to get the build system to recognize Android resources, set the build action to +"AndroidResource". The native Android APIs do not operate directly with filenames, but +instead operate on resource IDs. When you compile an Android application that uses resources, +the build system will package the resources for distribution and generate a class called +"Resource" that contains the tokens for each one of the resources included. For example, +for the above Resources layout, this is what the Resource class would expose: + +public class Resource { + public class drawable { + public const int icon = 0x123; + } + + public class layout { + public const int main = 0x456; + } + + public class strings { + public const int first_string = 0xabc; + public const int second_string = 0xbcd; + } +} + +You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main +to reference the layout/main.xml file, or Resource.strings.first_string to reference the first string in the dictionary file values/strings.xml. \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.Android/Video/VideoPlayerImplementation.cs b/MediaManager.Android/Video/VideoPlayerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/Video/VideoPlayerImplementation.cs rename to MediaManager.Android/Video/VideoPlayerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.Android/Video/VideoSurface.cs b/MediaManager.Android/Video/VideoSurface.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/Video/VideoSurface.cs rename to MediaManager.Android/Video/VideoSurface.cs diff --git a/MediaManager/Plugin.MediaManager.Android/VolumeManagerImplementation.cs b/MediaManager.Android/VolumeManagerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/VolumeManagerImplementation.cs rename to MediaManager.Android/VolumeManagerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.Android/packages.config b/MediaManager.Android/packages.config similarity index 100% rename from MediaManager/Plugin.MediaManager.Android/packages.config rename to MediaManager.Android/packages.config diff --git a/MediaManager/Plugin.MediaManager.ExoPlayer/ExoPlayerAudioImplementation.cs b/MediaManager.ExoPlayer/ExoPlayerAudioImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.ExoPlayer/ExoPlayerAudioImplementation.cs rename to MediaManager.ExoPlayer/ExoPlayerAudioImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.ExoPlayer/ExoPlayerAudioService.cs b/MediaManager.ExoPlayer/ExoPlayerAudioService.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.ExoPlayer/ExoPlayerAudioService.cs rename to MediaManager.ExoPlayer/ExoPlayerAudioService.cs diff --git a/MediaManager/Plugin.MediaManager.ExoPlayer/ExoPlayerVideoImplementation.cs b/MediaManager.ExoPlayer/ExoPlayerVideoImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.ExoPlayer/ExoPlayerVideoImplementation.cs rename to MediaManager.ExoPlayer/ExoPlayerVideoImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.ExoPlayer/Plugin.MediaManager.ExoPlayer.csproj b/MediaManager.ExoPlayer/Plugin.MediaManager.ExoPlayer.csproj similarity index 100% rename from MediaManager/Plugin.MediaManager.ExoPlayer/Plugin.MediaManager.ExoPlayer.csproj rename to MediaManager.ExoPlayer/Plugin.MediaManager.ExoPlayer.csproj diff --git a/MediaManager/Plugin.MediaManager.ExoPlayer/Properties/AssemblyInfo.cs b/MediaManager.ExoPlayer/Properties/AssemblyInfo.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.ExoPlayer/Properties/AssemblyInfo.cs rename to MediaManager.ExoPlayer/Properties/AssemblyInfo.cs diff --git a/MediaManager/Plugin.MediaManager.ExoPlayer/Resources/AboutResources.txt b/MediaManager.ExoPlayer/Resources/AboutResources.txt similarity index 100% rename from MediaManager/Plugin.MediaManager.ExoPlayer/Resources/AboutResources.txt rename to MediaManager.ExoPlayer/Resources/AboutResources.txt diff --git a/MediaManager/Plugin.MediaManager.ExoPlayer/Resources/values/Strings.xml b/MediaManager.ExoPlayer/Resources/values/Strings.xml similarity index 100% rename from MediaManager/Plugin.MediaManager.ExoPlayer/Resources/values/Strings.xml rename to MediaManager.ExoPlayer/Resources/values/Strings.xml diff --git a/MediaManager/Plugin.MediaManager.ExoPlayer/packages.config b/MediaManager.ExoPlayer/packages.config similarity index 100% rename from MediaManager/Plugin.MediaManager.ExoPlayer/packages.config rename to MediaManager.ExoPlayer/packages.config diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj b/MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj rename to MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/Properties/AssemblyInfo.cs b/MediaManager.Forms/Plugin.MediaManager.Forms.Android/Properties/AssemblyInfo.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/Properties/AssemblyInfo.cs rename to MediaManager.Forms/Plugin.MediaManager.Forms.Android/Properties/AssemblyInfo.cs diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/Resources/AboutResources.txt b/MediaManager.Forms/Plugin.MediaManager.Forms.Android/Resources/AboutResources.txt similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/Resources/AboutResources.txt rename to MediaManager.Forms/Plugin.MediaManager.Forms.Android/Resources/AboutResources.txt diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/Resources/Values/Strings.xml b/MediaManager.Forms/Plugin.MediaManager.Forms.Android/Resources/Values/Strings.xml similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/Resources/Values/Strings.xml rename to MediaManager.Forms/Plugin.MediaManager.Forms.Android/Resources/Values/Strings.xml diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/VideoViewRenderer.cs b/MediaManager.Forms/Plugin.MediaManager.Forms.Android/VideoViewRenderer.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/VideoViewRenderer.cs rename to MediaManager.Forms/Plugin.MediaManager.Forms.Android/VideoViewRenderer.cs diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/packages.config b/MediaManager.Forms/Plugin.MediaManager.Forms.Android/packages.config similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.Android/packages.config rename to MediaManager.Forms/Plugin.MediaManager.Forms.Android/packages.config diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj b/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj rename to MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets b/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets rename to MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.XamarinForms.UWP.nuget.targets b/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.XamarinForms.UWP.nuget.targets similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.XamarinForms.UWP.nuget.targets rename to MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.XamarinForms.UWP.nuget.targets diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Properties/AssemblyInfo.cs b/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Properties/AssemblyInfo.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Properties/AssemblyInfo.cs rename to MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Properties/AssemblyInfo.cs diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Properties/Plugin.MediaManager.XamarinForms.UWP.rd.xml b/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Properties/Plugin.MediaManager.XamarinForms.UWP.rd.xml similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Properties/Plugin.MediaManager.XamarinForms.UWP.rd.xml rename to MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Properties/Plugin.MediaManager.XamarinForms.UWP.rd.xml diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/VideoViewRenderer.cs b/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/VideoViewRenderer.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/VideoViewRenderer.cs rename to MediaManager.Forms/Plugin.MediaManager.Forms.UWP/VideoViewRenderer.cs diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/project.json b/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/project.json similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.UWP/project.json rename to MediaManager.Forms/Plugin.MediaManager.Forms.UWP/project.json diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj b/MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj rename to MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Properties/AssemblyInfo.cs b/MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Properties/AssemblyInfo.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Properties/AssemblyInfo.cs rename to MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Properties/AssemblyInfo.cs diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/VideoViewRenderer.cs b/MediaManager.Forms/Plugin.MediaManager.Forms.iOS/VideoViewRenderer.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/VideoViewRenderer.cs rename to MediaManager.Forms/Plugin.MediaManager.Forms.iOS/VideoViewRenderer.cs diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/packages.config b/MediaManager.Forms/Plugin.MediaManager.Forms.iOS/packages.config similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.iOS/packages.config rename to MediaManager.Forms/Plugin.MediaManager.Forms.iOS/packages.config diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj b/MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj rename to MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/Properties/AssemblyInfo.cs b/MediaManager.Forms/Plugin.MediaManager.Forms/Properties/AssemblyInfo.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/Properties/AssemblyInfo.cs rename to MediaManager.Forms/Plugin.MediaManager.Forms/Properties/AssemblyInfo.cs diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/VideoView.cs b/MediaManager.Forms/Plugin.MediaManager.Forms/VideoView.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/VideoView.cs rename to MediaManager.Forms/Plugin.MediaManager.Forms/VideoView.cs diff --git a/MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/packages.config b/MediaManager.Forms/Plugin.MediaManager.Forms/packages.config similarity index 100% rename from MediaManager/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms/packages.config rename to MediaManager.Forms/Plugin.MediaManager.Forms/packages.config diff --git a/MediaManager/Plugin.MediaManager.MacOS/MediaManagerImplementation.cs b/MediaManager.MacOS/MediaManagerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.MacOS/MediaManagerImplementation.cs rename to MediaManager.MacOS/MediaManagerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.MacOS/Plugin.MediaManager.MacOS.csproj b/MediaManager.MacOS/Plugin.MediaManager.MacOS.csproj similarity index 100% rename from MediaManager/Plugin.MediaManager.MacOS/Plugin.MediaManager.MacOS.csproj rename to MediaManager.MacOS/Plugin.MediaManager.MacOS.csproj diff --git a/MediaManager/Plugin.MediaManager.MacOS/Properties/AssemblyInfo.cs b/MediaManager.MacOS/Properties/AssemblyInfo.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.MacOS/Properties/AssemblyInfo.cs rename to MediaManager.MacOS/Properties/AssemblyInfo.cs diff --git a/MediaManager/Plugin.MediaManager.MacOS/VersionHelper.cs b/MediaManager.MacOS/VersionHelper.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.MacOS/VersionHelper.cs rename to MediaManager.MacOS/VersionHelper.cs diff --git a/MediaManager/Plugin.MediaManager.MacOS/VideoSurface.cs b/MediaManager.MacOS/VideoSurface.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.MacOS/VideoSurface.cs rename to MediaManager.MacOS/VideoSurface.cs diff --git a/MediaManager/Plugin.MediaManager.Reactive/Plugin.MediaManager.Reactive.csproj b/MediaManager.Reactive/Plugin.MediaManager.Reactive.csproj similarity index 100% rename from MediaManager/Plugin.MediaManager.Reactive/Plugin.MediaManager.Reactive.csproj rename to MediaManager.Reactive/Plugin.MediaManager.Reactive.csproj diff --git a/MediaManager/Plugin.MediaManager.Reactive/Properties/AssemblyInfo.cs b/MediaManager.Reactive/Properties/AssemblyInfo.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Reactive/Properties/AssemblyInfo.cs rename to MediaManager.Reactive/Properties/AssemblyInfo.cs diff --git a/MediaManager/Plugin.MediaManager.Reactive/ReactiveMediaManager.cs b/MediaManager.Reactive/ReactiveMediaManager.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Reactive/ReactiveMediaManager.cs rename to MediaManager.Reactive/ReactiveMediaManager.cs diff --git a/MediaManager/Plugin.MediaManager.Reactive/packages.config b/MediaManager.Reactive/packages.config similarity index 100% rename from MediaManager/Plugin.MediaManager.Reactive/packages.config rename to MediaManager.Reactive/packages.config diff --git a/MediaManager/Plugin.MediaManager.Tests/MediaFile.cs b/MediaManager.Tests/MediaFile.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Tests/MediaFile.cs rename to MediaManager.Tests/MediaFile.cs diff --git a/MediaManager/Plugin.MediaManager.Tests/Plugin.MediaManager.Tests.csproj b/MediaManager.Tests/Plugin.MediaManager.Tests.csproj similarity index 100% rename from MediaManager/Plugin.MediaManager.Tests/Plugin.MediaManager.Tests.csproj rename to MediaManager.Tests/Plugin.MediaManager.Tests.csproj diff --git a/MediaManager/Plugin.MediaManager.Tests/Unit/MediaQueueTests.cs b/MediaManager.Tests/Unit/MediaQueueTests.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Tests/Unit/MediaQueueTests.cs rename to MediaManager.Tests/Unit/MediaQueueTests.cs diff --git a/MediaManager/Plugin.MediaManager.Tests/Unit/PlaybackControllerTests.cs b/MediaManager.Tests/Unit/PlaybackControllerTests.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.Tests/Unit/PlaybackControllerTests.cs rename to MediaManager.Tests/Unit/PlaybackControllerTests.cs diff --git a/MediaManager/Plugin.MediaManager.Tests/packages.config b/MediaManager.Tests/packages.config similarity index 100% rename from MediaManager/Plugin.MediaManager.Tests/packages.config rename to MediaManager.Tests/packages.config diff --git a/MediaManager/Plugin.MediaManager.UWP/AudioPlayerImplementation.cs b/MediaManager.UWP/AudioPlayerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.UWP/AudioPlayerImplementation.cs rename to MediaManager.UWP/AudioPlayerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.UWP/ImageAsset.cs b/MediaManager.UWP/ImageAsset.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.UWP/ImageAsset.cs rename to MediaManager.UWP/ImageAsset.cs diff --git a/MediaManager/Plugin.MediaManager.UWP/MediaExtractorImplementation.cs b/MediaManager.UWP/MediaExtractorImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.UWP/MediaExtractorImplementation.cs rename to MediaManager.UWP/MediaExtractorImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.UWP/MediaManagerImplementation.cs b/MediaManager.UWP/MediaManagerImplementation.cs similarity index 97% rename from MediaManager/Plugin.MediaManager.UWP/MediaManagerImplementation.cs rename to MediaManager.UWP/MediaManagerImplementation.cs index b09e42df..078d20a0 100644 --- a/MediaManager/Plugin.MediaManager.UWP/MediaManagerImplementation.cs +++ b/MediaManager.UWP/MediaManagerImplementation.cs @@ -1,30 +1,30 @@ -using Plugin.MediaManager.Abstractions; -using Plugin.MediaManager.Abstractions.Implementations; - -namespace Plugin.MediaManager -{ - /// - /// Implementation for Feature - /// - public class MediaManagerImplementation : MediaManagerBase - { - private IAudioPlayer _audioPlayer; - private IVideoPlayer _videoPlayer; - - public override IAudioPlayer AudioPlayer - { - get { return _audioPlayer ?? (_audioPlayer = new AudioPlayerImplementation(VolumeManager)); } - set { _audioPlayer = value; } - } - - public override IVideoPlayer VideoPlayer - { - get { return _videoPlayer ?? (_videoPlayer = new VideoPlayerImplementation(VolumeManager)); } - set { _videoPlayer = value; } - } - public override IMediaNotificationManager MediaNotificationManager { get; set; } = new MediaNotificationManagerImplementation(); - public override IMediaExtractor MediaExtractor { get; set; } = new MediaExtractorImplementation(); - - public override IVolumeManager VolumeManager { get; set; } = new VolumeManagerImplementation(); - } +using Plugin.MediaManager.Abstractions; +using Plugin.MediaManager.Abstractions.Implementations; + +namespace Plugin.MediaManager +{ + /// + /// Implementation for Feature + /// + public class MediaManagerImplementation : MediaManagerBase + { + private IAudioPlayer _audioPlayer; + private IVideoPlayer _videoPlayer; + + public override IAudioPlayer AudioPlayer + { + get { return _audioPlayer ?? (_audioPlayer = new AudioPlayerImplementation(VolumeManager)); } + set { _audioPlayer = value; } + } + + public override IVideoPlayer VideoPlayer + { + get { return _videoPlayer ?? (_videoPlayer = new VideoPlayerImplementation(VolumeManager)); } + set { _videoPlayer = value; } + } + public override IMediaNotificationManager MediaNotificationManager { get; set; } = new MediaNotificationManagerImplementation(); + public override IMediaExtractor MediaExtractor { get; set; } = new MediaExtractorImplementation(); + + public override IVolumeManager VolumeManager { get; set; } = new VolumeManagerImplementation(); + } } \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.UWP/MediaNotificationManagerImplementation.cs b/MediaManager.UWP/MediaNotificationManagerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.UWP/MediaNotificationManagerImplementation.cs rename to MediaManager.UWP/MediaNotificationManagerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.UWP/Plugin.MediaManager.UWP.csproj b/MediaManager.UWP/Plugin.MediaManager.UWP.csproj similarity index 97% rename from MediaManager/Plugin.MediaManager.UWP/Plugin.MediaManager.UWP.csproj rename to MediaManager.UWP/Plugin.MediaManager.UWP.csproj index 06e5b406..4cd7e147 100644 --- a/MediaManager/Plugin.MediaManager.UWP/Plugin.MediaManager.UWP.csproj +++ b/MediaManager.UWP/Plugin.MediaManager.UWP.csproj @@ -1,149 +1,149 @@ - - - - - Debug - AnyCPU - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1} - Library - Properties - Plugin.MediaManager - Plugin.MediaManager - en-US - UAP - 10.0.14393.0 - 10.0.10240.0 - 14 - 512 - {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - prompt - 4 - bin\Release\Plugin.MediaManager.XML - 1591 - - - x86 - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x86 - false - prompt - - - x86 - bin\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x86 - false - prompt - bin\Release\Plugin.MediaManager.XML - - - ARM - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - - - ARM - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - - - x64 - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x64 - false - prompt - - - x64 - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x64 - false - prompt - - - - - - - - CrossMediaManager.cs - - - - - - - - - - - - - - {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} - Plugin.MediaManager.Abstractions - - - - - False - ..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\System.Drawing.dll - - - - 14.0 - - - + + + + + Debug + AnyCPU + {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1} + Library + Properties + Plugin.MediaManager + Plugin.MediaManager + en-US + UAP + 10.0.14393.0 + 10.0.10240.0 + 14 + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + bin\Release\Plugin.MediaManager.XML + 1591 + + + x86 + true + bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x86 + false + prompt + + + x86 + bin\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x86 + false + prompt + bin\Release\Plugin.MediaManager.XML + + + ARM + true + bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM + false + prompt + + + ARM + bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM + false + prompt + + + x64 + true + bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x64 + false + prompt + + + x64 + bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x64 + false + prompt + + + + + + + + CrossMediaManager.cs + + + + + + + + + + + + + + {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} + Plugin.MediaManager.Abstractions + + + + + False + ..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\System.Drawing.dll + + + + 14.0 + + + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.UWP/Properties/AssemblyInfo.cs b/MediaManager.UWP/Properties/AssemblyInfo.cs similarity index 97% rename from MediaManager/Plugin.MediaManager.UWP/Properties/AssemblyInfo.cs rename to MediaManager.UWP/Properties/AssemblyInfo.cs index 3557a091..e25667d3 100644 --- a/MediaManager/Plugin.MediaManager.UWP/Properties/AssemblyInfo.cs +++ b/MediaManager.UWP/Properties/AssemblyInfo.cs @@ -1,29 +1,29 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Plugin.MediaManager.UWP")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Plugin.MediaManager.UWP")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Plugin.MediaManager.UWP")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Plugin.MediaManager.UWP")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.UWP/Properties/Plugin.MediaManager.UWP.rd.xml b/MediaManager.UWP/Properties/Plugin.MediaManager.UWP.rd.xml similarity index 97% rename from MediaManager/Plugin.MediaManager.UWP/Properties/Plugin.MediaManager.UWP.rd.xml rename to MediaManager.UWP/Properties/Plugin.MediaManager.UWP.rd.xml index ad1af780..068e54fb 100644 --- a/MediaManager/Plugin.MediaManager.UWP/Properties/Plugin.MediaManager.UWP.rd.xml +++ b/MediaManager.UWP/Properties/Plugin.MediaManager.UWP.rd.xml @@ -1,33 +1,33 @@ - - - - - - - - - + + + + + + + + + diff --git a/MediaManager/Plugin.MediaManager.UWP/VideoPlayerImplementation.cs b/MediaManager.UWP/VideoPlayerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.UWP/VideoPlayerImplementation.cs rename to MediaManager.UWP/VideoPlayerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.UWP/VideoSurface.cs b/MediaManager.UWP/VideoSurface.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.UWP/VideoSurface.cs rename to MediaManager.UWP/VideoSurface.cs diff --git a/MediaManager/Plugin.MediaManager.UWP/VolumeManagerImplementation.cs b/MediaManager.UWP/VolumeManagerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.UWP/VolumeManagerImplementation.cs rename to MediaManager.UWP/VolumeManagerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.UWP/project.json b/MediaManager.UWP/project.json similarity index 95% rename from MediaManager/Plugin.MediaManager.UWP/project.json rename to MediaManager.UWP/project.json index 04dec5e2..32d92747 100644 --- a/MediaManager/Plugin.MediaManager.UWP/project.json +++ b/MediaManager.UWP/project.json @@ -1,16 +1,16 @@ -{ - "dependencies": { - "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2" - }, - "frameworks": { - "uap10.0": {} - }, - "runtimes": { - "win10-arm": {}, - "win10-arm-aot": {}, - "win10-x86": {}, - "win10-x86-aot": {}, - "win10-x64": {}, - "win10-x64-aot": {} - } +{ + "dependencies": { + "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2" + }, + "frameworks": { + "uap10.0": {} + }, + "runtimes": { + "win10-arm": {}, + "win10-arm-aot": {}, + "win10-x86": {}, + "win10-x86-aot": {}, + "win10-x64": {}, + "win10-x64-aot": {} + } } \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.iOS/AudioPlayerImplementation.cs b/MediaManager.iOS/AudioPlayerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.iOS/AudioPlayerImplementation.cs rename to MediaManager.iOS/AudioPlayerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.iOS/IMediaRemoteControl.cs b/MediaManager.iOS/IMediaRemoteControl.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.iOS/IMediaRemoteControl.cs rename to MediaManager.iOS/IMediaRemoteControl.cs diff --git a/MediaManager/Plugin.MediaManager.iOS/IVersionHelper.cs b/MediaManager.iOS/IVersionHelper.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.iOS/IVersionHelper.cs rename to MediaManager.iOS/IVersionHelper.cs diff --git a/MediaManager/Plugin.MediaManager.iOS/MediaExtractorImplementation.cs b/MediaManager.iOS/MediaExtractorImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.iOS/MediaExtractorImplementation.cs rename to MediaManager.iOS/MediaExtractorImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.iOS/MediaFileUrlHelper.cs b/MediaManager.iOS/MediaFileUrlHelper.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.iOS/MediaFileUrlHelper.cs rename to MediaManager.iOS/MediaFileUrlHelper.cs diff --git a/MediaManager/Plugin.MediaManager.iOS/MediaManagerAppleBase.cs b/MediaManager.iOS/MediaManagerAppleBase.cs similarity index 97% rename from MediaManager/Plugin.MediaManager.iOS/MediaManagerAppleBase.cs rename to MediaManager.iOS/MediaManagerAppleBase.cs index f40096ff..8909bf9c 100644 --- a/MediaManager/Plugin.MediaManager.iOS/MediaManagerAppleBase.cs +++ b/MediaManager.iOS/MediaManagerAppleBase.cs @@ -1,33 +1,33 @@ using System; -using Plugin.MediaManager.Abstractions; -using Plugin.MediaManager.Abstractions.Implementations; - -namespace Plugin.MediaManager -{ - /// - /// Implementation for MediaManager that is common for MacOS, tvOS and iOS. - /// - public class MediaManagerAppleBase : MediaManagerBase - { - private IAudioPlayer _audioPlayer; - private IVideoPlayer _videoPlayer; - - public override IAudioPlayer AudioPlayer - { - get { return _audioPlayer ?? (_audioPlayer = new AudioPlayerImplementation(VolumeManager)); } - set { _audioPlayer = value; } - } - - public override IVideoPlayer VideoPlayer - { - get { return _videoPlayer ?? (_videoPlayer = new VideoPlayerImplementation(VolumeManager)); } - set { _videoPlayer = value; } - } - - public override IMediaExtractor MediaExtractor { get; set; } = new MediaExtractorImplementation(); - +using Plugin.MediaManager.Abstractions; +using Plugin.MediaManager.Abstractions.Implementations; + +namespace Plugin.MediaManager +{ + /// + /// Implementation for MediaManager that is common for MacOS, tvOS and iOS. + /// + public class MediaManagerAppleBase : MediaManagerBase + { + private IAudioPlayer _audioPlayer; + private IVideoPlayer _videoPlayer; + + public override IAudioPlayer AudioPlayer + { + get { return _audioPlayer ?? (_audioPlayer = new AudioPlayerImplementation(VolumeManager)); } + set { _audioPlayer = value; } + } + + public override IVideoPlayer VideoPlayer + { + get { return _videoPlayer ?? (_videoPlayer = new VideoPlayerImplementation(VolumeManager)); } + set { _videoPlayer = value; } + } + + public override IMediaExtractor MediaExtractor { get; set; } = new MediaExtractorImplementation(); + public override IVolumeManager VolumeManager { get; set; } = new VolumeManagerImplementation(); public override IMediaNotificationManager MediaNotificationManager { get; set; } - } + } } \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.iOS/MediaManagerImplementation.cs b/MediaManager.iOS/MediaManagerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.iOS/MediaManagerImplementation.cs rename to MediaManager.iOS/MediaManagerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.iOS/MediaNotificationManagerImplementation.cs b/MediaManager.iOS/MediaNotificationManagerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.iOS/MediaNotificationManagerImplementation.cs rename to MediaManager.iOS/MediaNotificationManagerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.iOS/MediaRemoteControl.cs b/MediaManager.iOS/MediaRemoteControl.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.iOS/MediaRemoteControl.cs rename to MediaManager.iOS/MediaRemoteControl.cs diff --git a/MediaManager/Plugin.MediaManager.iOS/Plugin.MediaManager.iOS.csproj b/MediaManager.iOS/Plugin.MediaManager.iOS.csproj similarity index 97% rename from MediaManager/Plugin.MediaManager.iOS/Plugin.MediaManager.iOS.csproj rename to MediaManager.iOS/Plugin.MediaManager.iOS.csproj index 5e27a786..72bfad9c 100644 --- a/MediaManager/Plugin.MediaManager.iOS/Plugin.MediaManager.iOS.csproj +++ b/MediaManager.iOS/Plugin.MediaManager.iOS.csproj @@ -1,72 +1,72 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Plugin.MediaManager - Resources - Plugin.MediaManager - - - true - full - false - bin\iPhone\Debug - DEBUG - prompt - 4 - false - true - iPhone Developer - 1591 - - - none - true - bin\iPhone\Release - prompt - 4 - false - iPhone Developer - bin\iPhone\Release\Plugin.MediaManager.XML - 1591 - - - - CrossMediaManager.cs - - - - - - - - - - - - - - - - - - - - {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} - Plugin.MediaManager.Abstractions - - - - - - - - - + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0} + {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Plugin.MediaManager + Resources + Plugin.MediaManager + + + true + full + false + bin\iPhone\Debug + DEBUG + prompt + 4 + false + true + iPhone Developer + 1591 + + + none + true + bin\iPhone\Release + prompt + 4 + false + iPhone Developer + bin\iPhone\Release\Plugin.MediaManager.XML + 1591 + + + + CrossMediaManager.cs + + + + + + + + + + + + + + + + + + + + {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} + Plugin.MediaManager.Abstractions + + + + + + + + + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager.iOS/Properties/AssemblyInfo.cs b/MediaManager.iOS/Properties/AssemblyInfo.cs similarity index 97% rename from MediaManager/Plugin.MediaManager.iOS/Properties/AssemblyInfo.cs rename to MediaManager.iOS/Properties/AssemblyInfo.cs index a7e81aa8..2098bbf8 100644 --- a/MediaManager/Plugin.MediaManager.iOS/Properties/AssemblyInfo.cs +++ b/MediaManager.iOS/Properties/AssemblyInfo.cs @@ -1,36 +1,36 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Plugin.MediaManager.iOS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Plugin.MediaManager.iOS")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("38453772-383c-4ada-845b-100c5b84f50a")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Plugin.MediaManager.iOS")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Plugin.MediaManager.iOS")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("38453772-383c-4ada-845b-100c5b84f50a")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/MediaManager/Plugin.MediaManager.iOS/RemoteControlNotificationManager.cs b/MediaManager.iOS/RemoteControlNotificationManager.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.iOS/RemoteControlNotificationManager.cs rename to MediaManager.iOS/RemoteControlNotificationManager.cs diff --git a/MediaManager/Plugin.MediaManager.iOS/VersionHelper.cs b/MediaManager.iOS/VersionHelper.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.iOS/VersionHelper.cs rename to MediaManager.iOS/VersionHelper.cs diff --git a/MediaManager/Plugin.MediaManager.iOS/VideoPlayerImplementation.cs b/MediaManager.iOS/VideoPlayerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.iOS/VideoPlayerImplementation.cs rename to MediaManager.iOS/VideoPlayerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.iOS/VideoSurface.cs b/MediaManager.iOS/VideoSurface.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.iOS/VideoSurface.cs rename to MediaManager.iOS/VideoSurface.cs diff --git a/MediaManager/Plugin.MediaManager.iOS/VolumeManagerImplementation.cs b/MediaManager.iOS/VolumeManagerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.iOS/VolumeManagerImplementation.cs rename to MediaManager.iOS/VolumeManagerImplementation.cs diff --git a/MediaManager.sln b/MediaManager.sln index 664bc14e..44b616c4 100644 --- a/MediaManager.sln +++ b/MediaManager.sln @@ -3,37 +3,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26020.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager", "MediaManager\Plugin.MediaManager\Plugin.MediaManager.csproj", "{A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager", "MediaManager\Plugin.MediaManager.csproj", "{A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Abstractions", "MediaManager\Plugin.MediaManager.Abstractions\Plugin.MediaManager.Abstractions.csproj", "{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Abstractions", "MediaManager.Abstractions\Plugin.MediaManager.Abstractions.csproj", "{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.iOS", "MediaManager\Plugin.MediaManager.iOS\Plugin.MediaManager.iOS.csproj", "{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.iOS", "MediaManager.iOS\Plugin.MediaManager.iOS.csproj", "{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Android", "MediaManager\Plugin.MediaManager.Android\Plugin.MediaManager.Android.csproj", "{56A56F17-7DE1-4CA1-9617-BF32E971AC84}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Android", "MediaManager.Android\Plugin.MediaManager.Android.csproj", "{56A56F17-7DE1-4CA1-9617-BF32E971AC84}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.UWP", "MediaManager\Plugin.MediaManager.UWP\Plugin.MediaManager.UWP.csproj", "{E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.UWP", "MediaManager.UWP\Plugin.MediaManager.UWP.csproj", "{E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E30B6663-E909-40F4-AE0B-6A8D08BCA39F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.ExoPlayer", "MediaManager\Plugin.MediaManager.ExoPlayer\Plugin.MediaManager.ExoPlayer.csproj", "{06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.ExoPlayer", "MediaManager.ExoPlayer\Plugin.MediaManager.ExoPlayer.csproj", "{06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Reactive", "MediaManager\Plugin.MediaManager.Reactive\Plugin.MediaManager.Reactive.csproj", "{DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Reactive", "MediaManager.Reactive\Plugin.MediaManager.Reactive.csproj", "{DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forms", "Forms", "{4D6DBE82-C4E6-4FFB-9D1F-4AE23CF42435}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms", "MediaManager\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms", "MediaManager.Forms\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.Android", "MediaManager\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.Android\Plugin.MediaManager.Forms.Android.csproj", "{C8566A9E-FB6B-4459-AC87-5DB16D221D29}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.Android", "MediaManager.Forms\Plugin.MediaManager.Forms.Android\Plugin.MediaManager.Forms.Android.csproj", "{C8566A9E-FB6B-4459-AC87-5DB16D221D29}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.iOS", "MediaManager\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.iOS\Plugin.MediaManager.Forms.iOS.csproj", "{586D5119-52D8-40B1-9BB5-CC7FDB033B86}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.iOS", "MediaManager.Forms\Plugin.MediaManager.Forms.iOS\Plugin.MediaManager.Forms.iOS.csproj", "{586D5119-52D8-40B1-9BB5-CC7FDB033B86}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.UWP", "MediaManager\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.UWP\Plugin.MediaManager.Forms.UWP.csproj", "{2230DCD0-118B-4021-B0B2-71CE00111D5E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.UWP", "MediaManager.Forms\Plugin.MediaManager.Forms.UWP\Plugin.MediaManager.Forms.UWP.csproj", "{2230DCD0-118B-4021-B0B2-71CE00111D5E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extentions", "Extentions", "{D603F379-90E7-46B0-9827-306B51D82F9D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forms", "Forms", "{86F4D7EF-0D08-4967-AD8D-75E476E87EB8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Tests", "MediaManager\Plugin.MediaManager.Tests\Plugin.MediaManager.Tests.csproj", "{0E7E2F98-F621-44FE-91C3-D554749F4628}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Tests", "MediaManager.Tests\Plugin.MediaManager.Tests.csproj", "{0E7E2F98-F621-44FE-91C3-D554749F4628}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaForms", "Samples\Forms\MediaForms\MediaForms.csproj", "{7469C2C8-209A-4202-AEE9-E2B3F451BDD4}" EndProject @@ -55,9 +55,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaForms.UWP", "Samples\F EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyMediaPlayer.Core", "Samples\MvvmCross\MyMediaPlayer.Core\MyMediaPlayer.Core.csproj", "{66B081CB-DAD5-4FDF-B361-4BA85B440886}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.tvOS", "MediaManager\Plugin.MediaManager.tvOS\Plugin.MediaManager.tvOS.csproj", "{E8573584-8377-45DC-89C6-C34678DEB264}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.tvOS", "MediaManager.tvOS\Plugin.MediaManager.tvOS.csproj", "{E8573584-8377-45DC-89C6-C34678DEB264}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.MacOS", "MediaManager\Plugin.MediaManager.MacOS\Plugin.MediaManager.MacOS.csproj", "{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.MacOS", "MediaManager.MacOS\Plugin.MediaManager.MacOS.csproj", "{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyMediaPlayer.Droid", "Samples\MvvmCross\MyMediaPlayer.Droid\MyMediaPlayer.Droid.csproj", "{27557174-7B75-47F0-97A6-5924C221A86D}" EndProject diff --git a/MediaManager/Plugin.MediaManager.tvOS/MediaManagerImplementation.cs b/MediaManager.tvOS/MediaManagerImplementation.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.tvOS/MediaManagerImplementation.cs rename to MediaManager.tvOS/MediaManagerImplementation.cs diff --git a/MediaManager/Plugin.MediaManager.tvOS/Plugin.MediaManager.tvOS.csproj b/MediaManager.tvOS/Plugin.MediaManager.tvOS.csproj similarity index 100% rename from MediaManager/Plugin.MediaManager.tvOS/Plugin.MediaManager.tvOS.csproj rename to MediaManager.tvOS/Plugin.MediaManager.tvOS.csproj diff --git a/MediaManager/Plugin.MediaManager.tvOS/Properties/AssemblyInfo.cs b/MediaManager.tvOS/Properties/AssemblyInfo.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.tvOS/Properties/AssemblyInfo.cs rename to MediaManager.tvOS/Properties/AssemblyInfo.cs diff --git a/MediaManager/Plugin.MediaManager.tvOS/VideoSurface.cs b/MediaManager.tvOS/VideoSurface.cs similarity index 100% rename from MediaManager/Plugin.MediaManager.tvOS/VideoSurface.cs rename to MediaManager.tvOS/VideoSurface.cs diff --git a/MediaManager/Plugin.MediaManager/CrossMediaManager.cs b/MediaManager/CrossMediaManager.cs similarity index 96% rename from MediaManager/Plugin.MediaManager/CrossMediaManager.cs rename to MediaManager/CrossMediaManager.cs index 9220e0c3..9624eafd 100644 --- a/MediaManager/Plugin.MediaManager/CrossMediaManager.cs +++ b/MediaManager/CrossMediaManager.cs @@ -1,46 +1,46 @@ -using Plugin.MediaManager.Abstractions; -using System; -using System.Diagnostics; - -namespace Plugin.MediaManager -{ - /// - /// Cross platform MediaManager implemenations - /// - public class CrossMediaManager - { - static readonly Lazy Implementation = new Lazy(CreateMediaManager); - - /// - /// Current settings to use - /// - public static IMediaManager Current - { - get - { - - if (Implementation.Value == null) - { - throw NotImplementedInReferenceAssembly(); - } - return Implementation.Value; - } - } - - static IMediaManager CreateMediaManager() - { -#if PORTABLE - Debug.WriteLine("PORTABLE Reached"); - return null; -#else - Debug.WriteLine("Other reached"); - return new MediaManagerImplementation(); -#endif - } - - internal static Exception NotImplementedInReferenceAssembly() - { - return new NotImplementedException("This functionality is not implemented in the portable version of this assembly. You should reference the NuGet package from your main application project in order to reference the platform-specific implementation."); - } - } -} +using Plugin.MediaManager.Abstractions; +using System; +using System.Diagnostics; + +namespace Plugin.MediaManager +{ + /// + /// Cross platform MediaManager implemenations + /// + public class CrossMediaManager + { + static readonly Lazy Implementation = new Lazy(CreateMediaManager); + + /// + /// Current settings to use + /// + public static IMediaManager Current + { + get + { + + if (Implementation.Value == null) + { + throw NotImplementedInReferenceAssembly(); + } + return Implementation.Value; + } + } + + static IMediaManager CreateMediaManager() + { +#if PORTABLE + Debug.WriteLine("PORTABLE Reached"); + return null; +#else + Debug.WriteLine("Other reached"); + return new MediaManagerImplementation(); +#endif + } + + internal static Exception NotImplementedInReferenceAssembly() + { + return new NotImplementedException("This functionality is not implemented in the portable version of this assembly. You should reference the NuGet package from your main application project in order to reference the platform-specific implementation."); + } + } +} diff --git a/MediaManager/Plugin.MediaManager.Android/Resources/Resource.Designer.cs b/MediaManager/Plugin.MediaManager.Android/Resources/Resource.Designer.cs deleted file mode 100644 index e69de29b..00000000 diff --git a/MediaManager/Plugin.MediaManager/Plugin.MediaManager.csproj b/MediaManager/Plugin.MediaManager.csproj similarity index 98% rename from MediaManager/Plugin.MediaManager/Plugin.MediaManager.csproj rename to MediaManager/Plugin.MediaManager.csproj index bd6c5415..7a95edf9 100644 --- a/MediaManager/Plugin.MediaManager/Plugin.MediaManager.csproj +++ b/MediaManager/Plugin.MediaManager.csproj @@ -1,58 +1,58 @@ - - - - - 10.0 - Debug - AnyCPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54} - Library - Properties - Plugin.MediaManager - Plugin.MediaManager - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 - - - true - full - false - bin\Debug\ - TRACE;DEBUG;PORTABLE - prompt - 4 - 1591 - - - pdbonly - true - bin\Release\ - TRACE;PORTABLE - prompt - 4 - bin\Release\Plugin.MediaManager.XML - 1591 - - - - - {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} - Plugin.MediaManager.Abstractions - - - - - - - - + + + + + 10.0 + Debug + AnyCPU + {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54} + Library + Properties + Plugin.MediaManager + Plugin.MediaManager + en-US + 512 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Profile7 + v4.5 + + + true + full + false + bin\Debug\ + TRACE;DEBUG;PORTABLE + prompt + 4 + 1591 + + + pdbonly + true + bin\Release\ + TRACE;PORTABLE + prompt + 4 + bin\Release\Plugin.MediaManager.XML + 1591 + + + + + {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} + Plugin.MediaManager.Abstractions + + + + + + + + \ No newline at end of file diff --git a/MediaManager/Plugin.MediaManager/Properties/AssemblyInfo.cs b/MediaManager/Properties/AssemblyInfo.cs similarity index 97% rename from MediaManager/Plugin.MediaManager/Properties/AssemblyInfo.cs rename to MediaManager/Properties/AssemblyInfo.cs index 5a18e09c..6574ff39 100644 --- a/MediaManager/Plugin.MediaManager/Properties/AssemblyInfo.cs +++ b/MediaManager/Properties/AssemblyInfo.cs @@ -1,30 +1,30 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Plugin.MediaManager")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Plugin.MediaManager")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +using System.Resources; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Plugin.MediaManager")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Plugin.MediaManager")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: NeutralResourcesLanguage("en")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/MediaManagerLibs.sln b/MediaManagerLibs.sln deleted file mode 100644 index ba3ca143..00000000 --- a/MediaManagerLibs.sln +++ /dev/null @@ -1,396 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager", "MediaManager\Plugin.MediaManager\Plugin.MediaManager.csproj", "{A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Abstractions", "MediaManager\Plugin.MediaManager.Abstractions\Plugin.MediaManager.Abstractions.csproj", "{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.iOS", "MediaManager\Plugin.MediaManager.iOS\Plugin.MediaManager.iOS.csproj", "{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Android", "MediaManager\Plugin.MediaManager.Android\Plugin.MediaManager.Android.csproj", "{56A56F17-7DE1-4CA1-9617-BF32E971AC84}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.UWP", "MediaManager\Plugin.MediaManager.UWP\Plugin.MediaManager.UWP.csproj", "{E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.ExoPlayer", "MediaManager\Plugin.MediaManager.ExoPlayer\Plugin.MediaManager.ExoPlayer.csproj", "{06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Reactive", "MediaManager\Plugin.MediaManager.Reactive\Plugin.MediaManager.Reactive.csproj", "{DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forms", "Forms", "{4D6DBE82-C4E6-4FFB-9D1F-4AE23CF42435}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms", "MediaManager\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.Android", "MediaManager\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.Android\Plugin.MediaManager.Forms.Android.csproj", "{C8566A9E-FB6B-4459-AC87-5DB16D221D29}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.iOS", "MediaManager\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.iOS\Plugin.MediaManager.Forms.iOS.csproj", "{586D5119-52D8-40B1-9BB5-CC7FDB033B86}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.UWP", "MediaManager\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.UWP\Plugin.MediaManager.Forms.UWP.csproj", "{2230DCD0-118B-4021-B0B2-71CE00111D5E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extentions", "Extentions", "{D603F379-90E7-46B0-9827-306B51D82F9D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Tests", "MediaManager\Plugin.MediaManager.Tests\Plugin.MediaManager.Tests.csproj", "{0E7E2F98-F621-44FE-91C3-D554749F4628}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.tvOS", "MediaManager\Plugin.MediaManager.tvOS\Plugin.MediaManager.tvOS.csproj", "{E8573584-8377-45DC-89C6-C34678DEB264}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.MacOS", "MediaManager\Plugin.MediaManager.MacOS\Plugin.MediaManager.MacOS.csproj", "{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|iPhone = Debug|iPhone - Debug|iPhoneSimulator = Debug|iPhoneSimulator - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|iPhone = Release|iPhone - Release|iPhoneSimulator = Release|iPhoneSimulator - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|ARM.Build.0 = Debug|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|iPhone.Build.0 = Debug|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|x64.ActiveCfg = Debug|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|x64.Build.0 = Debug|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|x86.ActiveCfg = Debug|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|x86.Build.0 = Debug|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|Any CPU.Build.0 = Release|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|ARM.ActiveCfg = Release|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|ARM.Build.0 = Release|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|iPhone.ActiveCfg = Release|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|iPhone.Build.0 = Release|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|x64.ActiveCfg = Release|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|x64.Build.0 = Release|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|x86.ActiveCfg = Release|Any CPU - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|x86.Build.0 = Release|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|ARM.Build.0 = Debug|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|iPhone.Build.0 = Debug|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|x64.ActiveCfg = Debug|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|x64.Build.0 = Debug|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|x86.ActiveCfg = Debug|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|x86.Build.0 = Debug|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|Any CPU.Build.0 = Release|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|ARM.ActiveCfg = Release|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|ARM.Build.0 = Release|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|iPhone.ActiveCfg = Release|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|iPhone.Build.0 = Release|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|x64.ActiveCfg = Release|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|x64.Build.0 = Release|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|x86.ActiveCfg = Release|Any CPU - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|x86.Build.0 = Release|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|ARM.ActiveCfg = Debug|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|ARM.Build.0 = Debug|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|iPhone.Build.0 = Debug|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|x64.ActiveCfg = Debug|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|x64.Build.0 = Debug|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|x86.ActiveCfg = Debug|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|x86.Build.0 = Debug|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Release|Any CPU.Build.0 = Release|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Release|ARM.ActiveCfg = Release|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Release|ARM.Build.0 = Release|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Release|iPhone.ActiveCfg = Release|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Release|iPhone.Build.0 = Release|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Release|x64.ActiveCfg = Release|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Release|x64.Build.0 = Release|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Release|x86.ActiveCfg = Release|Any CPU - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Release|x86.Build.0 = Release|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Debug|ARM.ActiveCfg = Debug|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Debug|ARM.Build.0 = Debug|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Debug|iPhone.Build.0 = Debug|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Debug|x64.ActiveCfg = Debug|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Debug|x64.Build.0 = Debug|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Debug|x86.ActiveCfg = Debug|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Debug|x86.Build.0 = Debug|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Release|Any CPU.Build.0 = Release|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Release|ARM.ActiveCfg = Release|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Release|ARM.Build.0 = Release|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Release|iPhone.ActiveCfg = Release|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Release|iPhone.Build.0 = Release|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Release|x64.ActiveCfg = Release|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Release|x64.Build.0 = Release|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Release|x86.ActiveCfg = Release|Any CPU - {56A56F17-7DE1-4CA1-9617-BF32E971AC84}.Release|x86.Build.0 = Release|Any CPU - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Debug|ARM.ActiveCfg = Debug|ARM - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Debug|ARM.Build.0 = Debug|ARM - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Debug|iPhone.Build.0 = Debug|Any CPU - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Debug|x64.ActiveCfg = Debug|x64 - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Debug|x64.Build.0 = Debug|x64 - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Debug|x86.ActiveCfg = Debug|x86 - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Debug|x86.Build.0 = Debug|x86 - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Release|Any CPU.Build.0 = Release|Any CPU - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Release|ARM.ActiveCfg = Release|ARM - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Release|ARM.Build.0 = Release|ARM - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Release|iPhone.ActiveCfg = Release|Any CPU - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Release|iPhone.Build.0 = Release|Any CPU - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Release|x64.ActiveCfg = Release|x64 - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Release|x64.Build.0 = Release|x64 - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Release|x86.ActiveCfg = Release|x86 - {E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}.Release|x86.Build.0 = Release|x86 - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Debug|ARM.ActiveCfg = Debug|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Debug|ARM.Build.0 = Debug|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Debug|iPhone.Build.0 = Debug|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Debug|x64.ActiveCfg = Debug|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Debug|x64.Build.0 = Debug|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Debug|x86.ActiveCfg = Debug|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Debug|x86.Build.0 = Debug|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Release|Any CPU.Build.0 = Release|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Release|ARM.ActiveCfg = Release|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Release|ARM.Build.0 = Release|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Release|iPhone.ActiveCfg = Release|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Release|iPhone.Build.0 = Release|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Release|x64.ActiveCfg = Release|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Release|x64.Build.0 = Release|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Release|x86.ActiveCfg = Release|Any CPU - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13}.Release|x86.Build.0 = Release|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Debug|ARM.ActiveCfg = Debug|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Debug|ARM.Build.0 = Debug|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Debug|iPhone.Build.0 = Debug|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Debug|x64.ActiveCfg = Debug|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Debug|x64.Build.0 = Debug|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Debug|x86.ActiveCfg = Debug|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Debug|x86.Build.0 = Debug|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Release|Any CPU.Build.0 = Release|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Release|ARM.ActiveCfg = Release|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Release|ARM.Build.0 = Release|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Release|iPhone.ActiveCfg = Release|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Release|iPhone.Build.0 = Release|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Release|x64.ActiveCfg = Release|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Release|x64.Build.0 = Release|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Release|x86.ActiveCfg = Release|Any CPU - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84}.Release|x86.Build.0 = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|ARM.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|ARM.Build.0 = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|iPhone.Build.0 = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x64.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x64.Build.0 = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x86.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x86.Build.0 = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|Any CPU.Build.0 = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|ARM.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|ARM.Build.0 = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|iPhone.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|iPhone.Build.0 = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x64.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x64.Build.0 = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x86.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x86.Build.0 = Release|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Debug|ARM.ActiveCfg = Debug|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Debug|ARM.Build.0 = Debug|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Debug|iPhone.Build.0 = Debug|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Debug|x64.ActiveCfg = Debug|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Debug|x64.Build.0 = Debug|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Debug|x86.ActiveCfg = Debug|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Debug|x86.Build.0 = Debug|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Release|Any CPU.Build.0 = Release|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Release|ARM.ActiveCfg = Release|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Release|ARM.Build.0 = Release|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Release|iPhone.ActiveCfg = Release|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Release|iPhone.Build.0 = Release|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Release|x64.ActiveCfg = Release|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Release|x64.Build.0 = Release|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Release|x86.ActiveCfg = Release|Any CPU - {C8566A9E-FB6B-4459-AC87-5DB16D221D29}.Release|x86.Build.0 = Release|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Debug|ARM.ActiveCfg = Debug|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Debug|ARM.Build.0 = Debug|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Debug|iPhone.Build.0 = Debug|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Debug|x64.ActiveCfg = Debug|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Debug|x64.Build.0 = Debug|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Debug|x86.ActiveCfg = Debug|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Debug|x86.Build.0 = Debug|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Release|Any CPU.Build.0 = Release|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Release|ARM.ActiveCfg = Release|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Release|ARM.Build.0 = Release|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Release|iPhone.ActiveCfg = Release|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Release|iPhone.Build.0 = Release|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Release|x64.ActiveCfg = Release|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Release|x64.Build.0 = Release|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Release|x86.ActiveCfg = Release|Any CPU - {586D5119-52D8-40B1-9BB5-CC7FDB033B86}.Release|x86.Build.0 = Release|Any CPU - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Debug|ARM.ActiveCfg = Debug|ARM - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Debug|ARM.Build.0 = Debug|ARM - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Debug|iPhone.Build.0 = Debug|Any CPU - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Debug|x64.ActiveCfg = Debug|x64 - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Debug|x64.Build.0 = Debug|x64 - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Debug|x86.ActiveCfg = Debug|x86 - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Debug|x86.Build.0 = Debug|x86 - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Release|Any CPU.Build.0 = Release|Any CPU - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Release|ARM.ActiveCfg = Release|ARM - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Release|ARM.Build.0 = Release|ARM - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Release|iPhone.ActiveCfg = Release|Any CPU - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Release|iPhone.Build.0 = Release|Any CPU - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Release|x64.ActiveCfg = Release|x64 - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Release|x64.Build.0 = Release|x64 - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Release|x86.ActiveCfg = Release|x86 - {2230DCD0-118B-4021-B0B2-71CE00111D5E}.Release|x86.Build.0 = Release|x86 - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Debug|ARM.Build.0 = Debug|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Debug|iPhone.Build.0 = Debug|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Debug|x64.ActiveCfg = Debug|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Debug|x64.Build.0 = Debug|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Debug|x86.ActiveCfg = Debug|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Debug|x86.Build.0 = Debug|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Release|Any CPU.Build.0 = Release|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Release|ARM.ActiveCfg = Release|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Release|ARM.Build.0 = Release|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Release|iPhone.ActiveCfg = Release|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Release|iPhone.Build.0 = Release|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Release|x64.ActiveCfg = Release|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Release|x64.Build.0 = Release|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Release|x86.ActiveCfg = Release|Any CPU - {0E7E2F98-F621-44FE-91C3-D554749F4628}.Release|x86.Build.0 = Release|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Debug|ARM.Build.0 = Debug|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Debug|iPhone.Build.0 = Debug|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Debug|x64.ActiveCfg = Debug|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Debug|x64.Build.0 = Debug|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Debug|x86.ActiveCfg = Debug|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Debug|x86.Build.0 = Debug|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Release|Any CPU.Build.0 = Release|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Release|ARM.ActiveCfg = Release|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Release|ARM.Build.0 = Release|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Release|iPhone.ActiveCfg = Release|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Release|iPhone.Build.0 = Release|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Release|x64.ActiveCfg = Release|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Release|x64.Build.0 = Release|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Release|x86.ActiveCfg = Release|Any CPU - {E8573584-8377-45DC-89C6-C34678DEB264}.Release|x86.Build.0 = Release|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|ARM.Build.0 = Debug|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|iPhone.Build.0 = Debug|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|x64.ActiveCfg = Debug|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|x64.Build.0 = Debug|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|x86.ActiveCfg = Debug|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|x86.Build.0 = Debug|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|Any CPU.Build.0 = Release|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|ARM.ActiveCfg = Release|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|ARM.Build.0 = Release|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|iPhone.ActiveCfg = Release|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|iPhone.Build.0 = Release|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|x64.ActiveCfg = Release|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|x64.Build.0 = Release|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|x86.ActiveCfg = Release|Any CPU - {7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13} = {D603F379-90E7-46B0-9827-306B51D82F9D} - {DB2BAFBA-2A85-4E9B-8E9D-0A607A661E84} = {D603F379-90E7-46B0-9827-306B51D82F9D} - {67F9D3A8-F71E-4428-913F-C37AE82CDB24} = {4D6DBE82-C4E6-4FFB-9D1F-4AE23CF42435} - {C8566A9E-FB6B-4459-AC87-5DB16D221D29} = {4D6DBE82-C4E6-4FFB-9D1F-4AE23CF42435} - {586D5119-52D8-40B1-9BB5-CC7FDB033B86} = {4D6DBE82-C4E6-4FFB-9D1F-4AE23CF42435} - {2230DCD0-118B-4021-B0B2-71CE00111D5E} = {4D6DBE82-C4E6-4FFB-9D1F-4AE23CF42435} - EndGlobalSection -EndGlobal From 1b2b989e339491e199aaa19362d8fee9b397cac6 Mon Sep 17 00:00:00 2001 From: Martijn van Dijk Date: Fri, 17 Mar 2017 11:26:05 +0100 Subject: [PATCH 5/7] Move all folders into new structure --- .../Plugin.MediaManager.Android.csproj | 44 +++---- .../Plugin.MediaManager.ExoPlayer.csproj | 24 ++-- .../Plugin.MediaManager.Forms.Android.csproj | 115 +++++++++--------- .../Plugin.MediaManager.Forms.UWP.csproj | 4 +- ...lugin.MediaManager.Forms.UWP.nuget.targets | 17 ++- .../Plugin.MediaManager.Forms.iOS.csproj | 30 +++-- .../Plugin.MediaManager.Forms.csproj | 28 ++--- .../Plugin.MediaManager.MacOS.csproj | 18 +-- .../Plugin.MediaManager.Reactive.csproj | 28 ++--- .../Plugin.MediaManager.Tests.csproj | 26 ++-- .../Plugin.MediaManager.UWP.csproj | 4 +- .../Plugin.MediaManager.iOS.csproj | 4 +- .../Plugin.MediaManager.tvOS.csproj | 26 ++-- MediaManager/Plugin.MediaManager.csproj | 2 +- Samples/Forms/Droid/MediaForms.Android.csproj | 14 ++- .../MediaForms.UWP/MediaForms.UWP.csproj | 2 +- .../MediaForms.UWP.nuget.targets | 17 ++- Samples/Forms/MediaForms/MediaForms.csproj | 29 ++--- Samples/Forms/iOS/MediaForms.iOS.csproj | 16 ++- .../MediaSample.Core/MediaSample.Core.csproj | 12 +- .../MediaSample.Droid.csproj | 15 ++- .../Simple/MediaSample.Droid/packages.config | 1 + .../MediaSample.UWP/MediaSample.UWP.csproj | 4 +- .../MediaSample.iOS/MediaSample.iOS.csproj | 10 +- .../VideoSample.iOS/VideoSample.iOS.csproj | 6 +- 25 files changed, 257 insertions(+), 239 deletions(-) diff --git a/MediaManager.Android/Plugin.MediaManager.Android.csproj b/MediaManager.Android/Plugin.MediaManager.Android.csproj index 9d84d3d2..cf3a600e 100644 --- a/MediaManager.Android/Plugin.MediaManager.Android.csproj +++ b/MediaManager.Android/Plugin.MediaManager.Android.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -47,35 +47,35 @@ - ..\..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - ..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll - ..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - + CrossMediaManager.cs @@ -102,7 +102,7 @@ - + {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} Plugin.MediaManager.Abstractions @@ -115,14 +115,14 @@ --> - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/MediaManager.ExoPlayer/Plugin.MediaManager.ExoPlayer.csproj b/MediaManager.ExoPlayer/Plugin.MediaManager.ExoPlayer.csproj index 1c9ea5bb..a5e74ace 100644 --- a/MediaManager.ExoPlayer/Plugin.MediaManager.ExoPlayer.csproj +++ b/MediaManager.ExoPlayer/Plugin.MediaManager.ExoPlayer.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -46,13 +46,13 @@ - ..\..\packages\Xam.Plugins.Android.ExoPlayer.2.0.4.1\lib\MonoAndroid\ExoPlayer.dll + ..\packages\Xam.Plugins.Android.ExoPlayer.2.0.4.1\lib\MonoAndroid\ExoPlayer.dll - ..\..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll @@ -70,17 +70,17 @@ - - {56A56F17-7DE1-4CA1-9617-BF32E971AC84} - Plugin.MediaManager.Android - - + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} Plugin.MediaManager.Abstractions + + {56A56F17-7DE1-4CA1-9617-BF32E971AC84} + Plugin.MediaManager.Android + - - - + + + \ No newline at end of file diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj b/MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj index 5f84595f..4618ba36 100644 --- a/MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj +++ b/MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -47,65 +47,65 @@ + + ..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\FormsViewGroup.dll + + + ..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Core.dll + + + ..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + + + ..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + + + ..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + - ..\..\..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\..\packages\Xamarin.Android.Support.Core.UI.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\..\packages\Xamarin.Android.Support.Fragment.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\..\packages\Xamarin.Android.Support.Transition.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll + ..\..\packages\Xamarin.Android.Support.Transition.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll + + + ..\..\packages\Xamarin.Android.Support.v4.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + + + ..\..\packages\Xamarin.Android.Support.v7.CardView.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.CardView.dll - ..\..\..\packages\Xamarin.Android.Support.v7.Palette.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll + ..\..\packages\Xamarin.Android.Support.v7.Palette.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll - ..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll + ..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll - ..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll + ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll - ..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - ..\..\..\packages\Xamarin.Android.Support.Design.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll + ..\..\packages\Xamarin.Android.Support.Design.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll - ..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll - - - ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\FormsViewGroup.dll - - - ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Core.dll - - - ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - - - ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - - - ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll - - - ..\..\..\packages\Xamarin.Android.Support.v7.CardView.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.CardView.dll - - - ..\..\..\packages\Xamarin.Android.Support.v4.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll @@ -121,36 +121,35 @@ - - {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} + + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} Plugin.MediaManager.Abstractions - - {56a56f17-7de1-4ca1-9617-bf32e971ac84} + + {56A56F17-7DE1-4CA1-9617-BF32E971AC84} Plugin.MediaManager.Android - {67f9d3a8-f71e-4428-913f-c37ae82cdb24} + {67F9D3A8-F71E-4428-913F-C37AE82CDB24} Plugin.MediaManager.Forms - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj b/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj index 7ccaa3c4..97414935 100644 --- a/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj +++ b/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj @@ -113,11 +113,11 @@ - + {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} Plugin.MediaManager.Abstractions - + {e34b516d-c0d8-450f-9db0-bb6a5b04aef1} Plugin.MediaManager.UWP diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets b/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets index 2218e3af..9dfd06f9 100644 --- a/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets +++ b/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets @@ -1,9 +1,18 @@  - - $(UserProfile)\.nuget\packages\ + + True + NuGet + Y:\Documents\XamarinMediaManager\MediaManager.Forms\Plugin.MediaManager.Forms.UWP\project.lock.json + $(UserProfile)\.nuget\packages\ + C:\Users\Martijn\.nuget\packages\ + ProjectJson + 4.0.0 - - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + \ No newline at end of file diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj b/MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj index 6161a254..6e8ef3a6 100644 --- a/MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj +++ b/MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj @@ -39,16 +39,16 @@ - ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + ..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + ..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll @@ -59,24 +59,22 @@ - - {2882aeeb-d4cd-4eb9-8a6c-6653b33681f0} - Plugin.MediaManager.iOS - false - false + + + + + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} + Plugin.MediaManager.Abstractions {67F9D3A8-F71E-4428-913F-C37AE82CDB24} Plugin.MediaManager.Forms - - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} - Plugin.MediaManager.Abstractions + + {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0} + Plugin.MediaManager.iOS - - - - + \ No newline at end of file diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj b/MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj index 75986e30..630fd6a5 100644 --- a/MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj +++ b/MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj @@ -39,30 +39,30 @@ - - - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} - Plugin.MediaManager.Abstractions - - - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54} - Plugin.MediaManager - - - ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll - ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll + ..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll - ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll + + + {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54} + Plugin.MediaManager + + + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} + Plugin.MediaManager.Abstractions + + - + \ No newline at end of file diff --git a/MediaManager.MacOS/Plugin.MediaManager.MacOS.csproj b/MediaManager.MacOS/Plugin.MediaManager.MacOS.csproj index 80da6bb5..4d6a0f79 100644 --- a/MediaManager.MacOS/Plugin.MediaManager.MacOS.csproj +++ b/MediaManager.MacOS/Plugin.MediaManager.MacOS.csproj @@ -63,37 +63,37 @@ - + AudioPlayerImplementation.cs - + MediaExtractorImplementation.cs - + VideoPlayerImplementation.cs - + VolumeManagerImplementation.cs - + CrossMediaManager.cs - + MediaManagerAppleBase.cs - + MediaFileUrlHelper.cs - + IVersionHelper.cs - + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} Plugin.MediaManager.Abstractions diff --git a/MediaManager.Reactive/Plugin.MediaManager.Reactive.csproj b/MediaManager.Reactive/Plugin.MediaManager.Reactive.csproj index 070948d9..5e506deb 100644 --- a/MediaManager.Reactive/Plugin.MediaManager.Reactive.csproj +++ b/MediaManager.Reactive/Plugin.MediaManager.Reactive.csproj @@ -32,32 +32,32 @@ - - - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} - Plugin.MediaManager.Abstractions - - - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54} - Plugin.MediaManager - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll + ..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll + ..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - ..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll + ..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll + ..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll + + + {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54} + Plugin.MediaManager + + + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} + Plugin.MediaManager.Abstractions + + \ No newline at end of file diff --git a/MediaManager.Tests/Plugin.MediaManager.Tests.csproj b/MediaManager.Tests/Plugin.MediaManager.Tests.csproj index 31cb1e56..5076c9e2 100644 --- a/MediaManager.Tests/Plugin.MediaManager.Tests.csproj +++ b/MediaManager.Tests/Plugin.MediaManager.Tests.csproj @@ -28,13 +28,13 @@ - ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll + ..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll - ..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll + ..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll - ..\..\packages\Moq.4.5.30\lib\net45\Moq.dll + ..\packages\Moq.4.5.30\lib\net45\Moq.dll @@ -43,21 +43,17 @@ - - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} - Plugin.MediaManager.Abstractions - - - {56a56f17-7de1-4ca1-9617-bf32e971ac84} - Plugin.MediaManager.Android - - + + + + {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54} Plugin.MediaManager - - - + + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} + Plugin.MediaManager.Abstractions + \ No newline at end of file diff --git a/MediaManager.UWP/Plugin.MediaManager.UWP.csproj b/MediaManager.UWP/Plugin.MediaManager.UWP.csproj index 4cd7e147..0323cb64 100644 --- a/MediaManager.UWP/Plugin.MediaManager.UWP.csproj +++ b/MediaManager.UWP/Plugin.MediaManager.UWP.csproj @@ -110,7 +110,7 @@ - + CrossMediaManager.cs @@ -124,7 +124,7 @@ - + {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} Plugin.MediaManager.Abstractions diff --git a/MediaManager.iOS/Plugin.MediaManager.iOS.csproj b/MediaManager.iOS/Plugin.MediaManager.iOS.csproj index 72bfad9c..e955e7e4 100644 --- a/MediaManager.iOS/Plugin.MediaManager.iOS.csproj +++ b/MediaManager.iOS/Plugin.MediaManager.iOS.csproj @@ -37,7 +37,7 @@ 1591 - + CrossMediaManager.cs @@ -57,7 +57,7 @@ - + {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} Plugin.MediaManager.Abstractions diff --git a/MediaManager.tvOS/Plugin.MediaManager.tvOS.csproj b/MediaManager.tvOS/Plugin.MediaManager.tvOS.csproj index 2bc89690..4b4294b5 100644 --- a/MediaManager.tvOS/Plugin.MediaManager.tvOS.csproj +++ b/MediaManager.tvOS/Plugin.MediaManager.tvOS.csproj @@ -55,48 +55,48 @@ - + AudioPlayerImplementation.cs - + MediaExtractorImplementation.cs - + VideoPlayerImplementation.cs - + VolumeManagerImplementation.cs - + CrossMediaManager.cs - + IMediaRemoteControl.cs - + MediaRemoteControl.cs - + RemoteControlNotificationManager.cs - + MediaManagerAppleBase.cs - + MediaFileUrlHelper.cs - + IVersionHelper.cs - + VersionHelper.cs - + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} Plugin.MediaManager.Abstractions diff --git a/MediaManager/Plugin.MediaManager.csproj b/MediaManager/Plugin.MediaManager.csproj index 7a95edf9..d04d1575 100644 --- a/MediaManager/Plugin.MediaManager.csproj +++ b/MediaManager/Plugin.MediaManager.csproj @@ -38,7 +38,7 @@ - + {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} Plugin.MediaManager.Abstractions diff --git a/Samples/Forms/Droid/MediaForms.Android.csproj b/Samples/Forms/Droid/MediaForms.Android.csproj index 6ac43e8b..da87cbd1 100644 --- a/Samples/Forms/Droid/MediaForms.Android.csproj +++ b/Samples/Forms/Droid/MediaForms.Android.csproj @@ -134,18 +134,22 @@ {7469C2C8-209A-4202-AEE9-E2B3F451BDD4} MediaForms - + {C8566A9E-FB6B-4459-AC87-5DB16D221D29} Plugin.MediaManager.Forms.Android - - {67F9D3A8-F71E-4428-913F-C37AE82CDB24} - Plugin.MediaManager.Forms + + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} + Plugin.MediaManager.Abstractions - + {56A56F17-7DE1-4CA1-9617-BF32E971AC84} Plugin.MediaManager.Android + + {67F9D3A8-F71E-4428-913F-C37AE82CDB24} + Plugin.MediaManager.Forms + diff --git a/Samples/Forms/MediaForms.UWP/MediaForms.UWP.csproj b/Samples/Forms/MediaForms.UWP/MediaForms.UWP.csproj index 6e816618..cfa129b8 100644 --- a/Samples/Forms/MediaForms.UWP/MediaForms.UWP.csproj +++ b/Samples/Forms/MediaForms.UWP/MediaForms.UWP.csproj @@ -127,7 +127,7 @@ - + {2230dcd0-118b-4021-b0b2-71ce00111d5e} Plugin.MediaManager.Forms.UWP diff --git a/Samples/Forms/MediaForms.UWP/MediaForms.UWP.nuget.targets b/Samples/Forms/MediaForms.UWP/MediaForms.UWP.nuget.targets index 2218e3af..fe5b12a1 100644 --- a/Samples/Forms/MediaForms.UWP/MediaForms.UWP.nuget.targets +++ b/Samples/Forms/MediaForms.UWP/MediaForms.UWP.nuget.targets @@ -1,9 +1,18 @@  - - $(UserProfile)\.nuget\packages\ + + True + NuGet + Y:\Documents\XamarinMediaManager\Samples\Forms\MediaForms.UWP\project.lock.json + $(UserProfile)\.nuget\packages\ + C:\Users\Martijn\.nuget\packages\ + ProjectJson + 4.0.0 - - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + \ No newline at end of file diff --git a/Samples/Forms/MediaForms/MediaForms.csproj b/Samples/Forms/MediaForms/MediaForms.csproj index 4baffd5d..d2c90a3f 100644 --- a/Samples/Forms/MediaForms/MediaForms.csproj +++ b/Samples/Forms/MediaForms/MediaForms.csproj @@ -43,20 +43,6 @@ - - - {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} - Plugin.MediaManager.Abstractions - - - {67f9d3a8-f71e-4428-913f-c37ae82cdb24} - Plugin.MediaManager.Forms - - - {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54} - Plugin.MediaManager - - ..\..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll @@ -71,6 +57,21 @@ + + + {67F9D3A8-F71E-4428-913F-C37AE82CDB24} + Plugin.MediaManager.Forms + + + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} + Plugin.MediaManager.Abstractions + + + {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54} + Plugin.MediaManager + + + \ No newline at end of file diff --git a/Samples/Forms/iOS/MediaForms.iOS.csproj b/Samples/Forms/iOS/MediaForms.iOS.csproj index 2e08de9b..f6d8bb4d 100644 --- a/Samples/Forms/iOS/MediaForms.iOS.csproj +++ b/Samples/Forms/iOS/MediaForms.iOS.csproj @@ -30,7 +30,7 @@ i386, x86_64 HttpClientHandler Default - 10.1 + False False False @@ -137,21 +137,19 @@ - - {586d5119-52d8-40b1-9bb5-cc7fdb033b86} - Plugin.MediaManager.Forms.iOS - false - false - {7469C2C8-209A-4202-AEE9-E2B3F451BDD4} MediaForms - + {67F9D3A8-F71E-4428-913F-C37AE82CDB24} Plugin.MediaManager.Forms - + + {586D5119-52D8-40B1-9BB5-CC7FDB033B86} + Plugin.MediaManager.Forms.iOS + + {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0} Plugin.MediaManager.iOS diff --git a/Samples/Simple/MediaSample.Core/MediaSample.Core.csproj b/Samples/Simple/MediaSample.Core/MediaSample.Core.csproj index 3e46123b..acfcb4b5 100644 --- a/Samples/Simple/MediaSample.Core/MediaSample.Core.csproj +++ b/Samples/Simple/MediaSample.Core/MediaSample.Core.csproj @@ -35,14 +35,14 @@ - - {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} - Plugin.MediaManager.Abstractions - - - {a6fcef44-d2ba-42c7-b3cb-13667bcd7b54} + + {A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54} Plugin.MediaManager + + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} + Plugin.MediaManager.Abstractions + \ No newline at end of file diff --git a/Samples/Simple/MediaSample.Droid/MediaSample.Droid.csproj b/Samples/Simple/MediaSample.Droid/MediaSample.Droid.csproj index f12ffc34..87040f35 100644 --- a/Samples/Simple/MediaSample.Droid/MediaSample.Droid.csproj +++ b/Samples/Simple/MediaSample.Droid/MediaSample.Droid.csproj @@ -80,6 +80,9 @@ ..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + + ..\..\..\packages\Xam.Plugins.Android.ExoPlayer.2.0.4.1\lib\MonoAndroid\ExoPlayer.dll + @@ -97,18 +100,18 @@ {19955052-96FC-4149-84DD-C95A4C846C87} MediaSample.Core - + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} Plugin.MediaManager.Abstractions - - {56A56F17-7DE1-4CA1-9617-BF32E971AC84} - Plugin.MediaManager.Android - - + {06EF2F1F-8A8E-47D6-9FC8-BBC521783F13} Plugin.MediaManager.ExoPlayer + + {56A56F17-7DE1-4CA1-9617-BF32E971AC84} + Plugin.MediaManager.Android + diff --git a/Samples/Simple/MediaSample.Droid/packages.config b/Samples/Simple/MediaSample.Droid/packages.config index f0876b4a..b4e47384 100644 --- a/Samples/Simple/MediaSample.Droid/packages.config +++ b/Samples/Simple/MediaSample.Droid/packages.config @@ -1,6 +1,7 @@  + diff --git a/Samples/Simple/MediaSample.UWP/MediaSample.UWP.csproj b/Samples/Simple/MediaSample.UWP/MediaSample.UWP.csproj index 7cf621cb..ed1e6abc 100644 --- a/Samples/Simple/MediaSample.UWP/MediaSample.UWP.csproj +++ b/Samples/Simple/MediaSample.UWP/MediaSample.UWP.csproj @@ -129,11 +129,11 @@ - + {6edb0588-ffc5-4ef5-8a99-9e241d0f878d} Plugin.MediaManager.Abstractions - + {e34b516d-c0d8-450f-9db0-bb6a5b04aef1} Plugin.MediaManager.UWP diff --git a/Samples/Simple/MediaSample.iOS/MediaSample.iOS.csproj b/Samples/Simple/MediaSample.iOS/MediaSample.iOS.csproj index 417787e5..8baf8982 100644 --- a/Samples/Simple/MediaSample.iOS/MediaSample.iOS.csproj +++ b/Samples/Simple/MediaSample.iOS/MediaSample.iOS.csproj @@ -124,14 +124,14 @@ {19955052-96FC-4149-84DD-C95A4C846C87} MediaSample.Core - - {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0} - Plugin.MediaManager.iOS - - + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} Plugin.MediaManager.Abstractions + + {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0} + Plugin.MediaManager.iOS + diff --git a/Samples/Video/VideoSample.iOS/VideoSample.iOS.csproj b/Samples/Video/VideoSample.iOS/VideoSample.iOS.csproj index dd2fee45..29df555a 100644 --- a/Samples/Video/VideoSample.iOS/VideoSample.iOS.csproj +++ b/Samples/Video/VideoSample.iOS/VideoSample.iOS.csproj @@ -29,7 +29,7 @@ i386, x86_64 HttpClientHandler Default - 10.1 + False False False @@ -127,11 +127,11 @@ - + {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} Plugin.MediaManager.Abstractions - + {2882AEEB-D4CD-4EB9-8A6C-6653B33681F0} Plugin.MediaManager.iOS From 6c58d3739d2d3e38a0bcfe31522b5d4e301c4f60 Mon Sep 17 00:00:00 2001 From: Martijn van Dijk Date: Fri, 17 Mar 2017 11:36:20 +0100 Subject: [PATCH 6/7] Move Forms --- .../Plugin.MediaManager.Forms.Android.csproj | 2 +- .../Properties/AssemblyInfo.cs | 0 .../Resources/AboutResources.txt | 0 .../Resources/Values/Strings.xml | 0 .../VideoViewRenderer.cs | 0 .../packages.config | 0 .../Plugin.MediaManager.Forms.UWP.csproj | 2 +- .../Plugin.MediaManager.Forms.UWP.nuget.targets | 2 +- .../Plugin.MediaManager.XamarinForms.UWP.nuget.targets | 0 .../Properties/AssemblyInfo.cs | 0 .../Plugin.MediaManager.XamarinForms.UWP.rd.xml | 0 .../VideoViewRenderer.cs | 0 .../project.json | 0 .../Plugin.MediaManager.Forms.iOS.csproj | 2 +- .../Properties/AssemblyInfo.cs | 0 .../VideoViewRenderer.cs | 0 .../packages.config | 0 .../Plugin.MediaManager.Forms.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../VideoView.cs | 0 .../packages.config | 0 MediaManager.sln | 8 ++++---- Samples/Forms/Droid/MediaForms.Android.csproj | 4 ++-- Samples/Forms/MediaForms.UWP/MediaForms.UWP.csproj | 2 +- Samples/Forms/MediaForms/MediaForms.csproj | 2 +- Samples/Forms/iOS/MediaForms.iOS.csproj | 7 ++++--- 26 files changed, 16 insertions(+), 15 deletions(-) rename MediaManager.Forms/{Plugin.MediaManager.Forms.Android => MediaManager.Forms.Android}/Plugin.MediaManager.Forms.Android.csproj (99%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.Android => MediaManager.Forms.Android}/Properties/AssemblyInfo.cs (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.Android => MediaManager.Forms.Android}/Resources/AboutResources.txt (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.Android => MediaManager.Forms.Android}/Resources/Values/Strings.xml (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.Android => MediaManager.Forms.Android}/VideoViewRenderer.cs (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.Android => MediaManager.Forms.Android}/packages.config (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.UWP => MediaManager.Forms.UWP}/Plugin.MediaManager.Forms.UWP.csproj (98%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.UWP => MediaManager.Forms.UWP}/Plugin.MediaManager.Forms.UWP.nuget.targets (92%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.UWP => MediaManager.Forms.UWP}/Plugin.MediaManager.XamarinForms.UWP.nuget.targets (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.UWP => MediaManager.Forms.UWP}/Properties/AssemblyInfo.cs (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.UWP => MediaManager.Forms.UWP}/Properties/Plugin.MediaManager.XamarinForms.UWP.rd.xml (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.UWP => MediaManager.Forms.UWP}/VideoViewRenderer.cs (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.UWP => MediaManager.Forms.UWP}/project.json (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.iOS => MediaManager.Forms.iOS}/Plugin.MediaManager.Forms.iOS.csproj (97%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.iOS => MediaManager.Forms.iOS}/Properties/AssemblyInfo.cs (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.iOS => MediaManager.Forms.iOS}/VideoViewRenderer.cs (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms.iOS => MediaManager.Forms.iOS}/packages.config (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms => MediaManager.Forms}/Plugin.MediaManager.Forms.csproj (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms => MediaManager.Forms}/Properties/AssemblyInfo.cs (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms => MediaManager.Forms}/VideoView.cs (100%) rename MediaManager.Forms/{Plugin.MediaManager.Forms => MediaManager.Forms}/packages.config (100%) diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj b/MediaManager.Forms/MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj similarity index 99% rename from MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj rename to MediaManager.Forms/MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj index 4618ba36..7d7aee9f 100644 --- a/MediaManager.Forms/Plugin.MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj +++ b/MediaManager.Forms/MediaManager.Forms.Android/Plugin.MediaManager.Forms.Android.csproj @@ -129,7 +129,7 @@ {56A56F17-7DE1-4CA1-9617-BF32E971AC84} Plugin.MediaManager.Android - + {67F9D3A8-F71E-4428-913F-C37AE82CDB24} Plugin.MediaManager.Forms diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.Android/Properties/AssemblyInfo.cs b/MediaManager.Forms/MediaManager.Forms.Android/Properties/AssemblyInfo.cs similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms.Android/Properties/AssemblyInfo.cs rename to MediaManager.Forms/MediaManager.Forms.Android/Properties/AssemblyInfo.cs diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.Android/Resources/AboutResources.txt b/MediaManager.Forms/MediaManager.Forms.Android/Resources/AboutResources.txt similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms.Android/Resources/AboutResources.txt rename to MediaManager.Forms/MediaManager.Forms.Android/Resources/AboutResources.txt diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.Android/Resources/Values/Strings.xml b/MediaManager.Forms/MediaManager.Forms.Android/Resources/Values/Strings.xml similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms.Android/Resources/Values/Strings.xml rename to MediaManager.Forms/MediaManager.Forms.Android/Resources/Values/Strings.xml diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.Android/VideoViewRenderer.cs b/MediaManager.Forms/MediaManager.Forms.Android/VideoViewRenderer.cs similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms.Android/VideoViewRenderer.cs rename to MediaManager.Forms/MediaManager.Forms.Android/VideoViewRenderer.cs diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.Android/packages.config b/MediaManager.Forms/MediaManager.Forms.Android/packages.config similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms.Android/packages.config rename to MediaManager.Forms/MediaManager.Forms.Android/packages.config diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj b/MediaManager.Forms/MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj similarity index 98% rename from MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj rename to MediaManager.Forms/MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj index 97414935..15ba013e 100644 --- a/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj +++ b/MediaManager.Forms/MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.csproj @@ -121,7 +121,7 @@ {e34b516d-c0d8-450f-9db0-bb6a5b04aef1} Plugin.MediaManager.UWP - + {67f9d3a8-f71e-4428-913f-c37ae82cdb24} Plugin.MediaManager.Forms diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets b/MediaManager.Forms/MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets similarity index 92% rename from MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets rename to MediaManager.Forms/MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets index 9dfd06f9..48bd7811 100644 --- a/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets +++ b/MediaManager.Forms/MediaManager.Forms.UWP/Plugin.MediaManager.Forms.UWP.nuget.targets @@ -3,7 +3,7 @@ True NuGet - Y:\Documents\XamarinMediaManager\MediaManager.Forms\Plugin.MediaManager.Forms.UWP\project.lock.json + Y:\Documents\XamarinMediaManager\MediaManager.Forms\MediaManager.Forms.UWP\project.lock.json $(UserProfile)\.nuget\packages\ C:\Users\Martijn\.nuget\packages\ ProjectJson diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.XamarinForms.UWP.nuget.targets b/MediaManager.Forms/MediaManager.Forms.UWP/Plugin.MediaManager.XamarinForms.UWP.nuget.targets similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Plugin.MediaManager.XamarinForms.UWP.nuget.targets rename to MediaManager.Forms/MediaManager.Forms.UWP/Plugin.MediaManager.XamarinForms.UWP.nuget.targets diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Properties/AssemblyInfo.cs b/MediaManager.Forms/MediaManager.Forms.UWP/Properties/AssemblyInfo.cs similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Properties/AssemblyInfo.cs rename to MediaManager.Forms/MediaManager.Forms.UWP/Properties/AssemblyInfo.cs diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Properties/Plugin.MediaManager.XamarinForms.UWP.rd.xml b/MediaManager.Forms/MediaManager.Forms.UWP/Properties/Plugin.MediaManager.XamarinForms.UWP.rd.xml similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms.UWP/Properties/Plugin.MediaManager.XamarinForms.UWP.rd.xml rename to MediaManager.Forms/MediaManager.Forms.UWP/Properties/Plugin.MediaManager.XamarinForms.UWP.rd.xml diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/VideoViewRenderer.cs b/MediaManager.Forms/MediaManager.Forms.UWP/VideoViewRenderer.cs similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms.UWP/VideoViewRenderer.cs rename to MediaManager.Forms/MediaManager.Forms.UWP/VideoViewRenderer.cs diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.UWP/project.json b/MediaManager.Forms/MediaManager.Forms.UWP/project.json similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms.UWP/project.json rename to MediaManager.Forms/MediaManager.Forms.UWP/project.json diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj b/MediaManager.Forms/MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj similarity index 97% rename from MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj rename to MediaManager.Forms/MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj index 6e8ef3a6..affaf375 100644 --- a/MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj +++ b/MediaManager.Forms/MediaManager.Forms.iOS/Plugin.MediaManager.Forms.iOS.csproj @@ -66,7 +66,7 @@ {6EDB0588-FFC5-4EF5-8A99-9E241D0F878D} Plugin.MediaManager.Abstractions - + {67F9D3A8-F71E-4428-913F-C37AE82CDB24} Plugin.MediaManager.Forms diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Properties/AssemblyInfo.cs b/MediaManager.Forms/MediaManager.Forms.iOS/Properties/AssemblyInfo.cs similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms.iOS/Properties/AssemblyInfo.cs rename to MediaManager.Forms/MediaManager.Forms.iOS/Properties/AssemblyInfo.cs diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.iOS/VideoViewRenderer.cs b/MediaManager.Forms/MediaManager.Forms.iOS/VideoViewRenderer.cs similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms.iOS/VideoViewRenderer.cs rename to MediaManager.Forms/MediaManager.Forms.iOS/VideoViewRenderer.cs diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms.iOS/packages.config b/MediaManager.Forms/MediaManager.Forms.iOS/packages.config similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms.iOS/packages.config rename to MediaManager.Forms/MediaManager.Forms.iOS/packages.config diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj b/MediaManager.Forms/MediaManager.Forms/Plugin.MediaManager.Forms.csproj similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms/Plugin.MediaManager.Forms.csproj rename to MediaManager.Forms/MediaManager.Forms/Plugin.MediaManager.Forms.csproj diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms/Properties/AssemblyInfo.cs b/MediaManager.Forms/MediaManager.Forms/Properties/AssemblyInfo.cs similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms/Properties/AssemblyInfo.cs rename to MediaManager.Forms/MediaManager.Forms/Properties/AssemblyInfo.cs diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms/VideoView.cs b/MediaManager.Forms/MediaManager.Forms/VideoView.cs similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms/VideoView.cs rename to MediaManager.Forms/MediaManager.Forms/VideoView.cs diff --git a/MediaManager.Forms/Plugin.MediaManager.Forms/packages.config b/MediaManager.Forms/MediaManager.Forms/packages.config similarity index 100% rename from MediaManager.Forms/Plugin.MediaManager.Forms/packages.config rename to MediaManager.Forms/MediaManager.Forms/packages.config diff --git a/MediaManager.sln b/MediaManager.sln index 44b616c4..bfbef424 100644 --- a/MediaManager.sln +++ b/MediaManager.sln @@ -21,13 +21,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Reactiv EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forms", "Forms", "{4D6DBE82-C4E6-4FFB-9D1F-4AE23CF42435}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms", "MediaManager.Forms\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms", "MediaManager.Forms\MediaManager.Forms\Plugin.MediaManager.Forms.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.Android", "MediaManager.Forms\Plugin.MediaManager.Forms.Android\Plugin.MediaManager.Forms.Android.csproj", "{C8566A9E-FB6B-4459-AC87-5DB16D221D29}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.Android", "MediaManager.Forms\MediaManager.Forms.Android\Plugin.MediaManager.Forms.Android.csproj", "{C8566A9E-FB6B-4459-AC87-5DB16D221D29}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.iOS", "MediaManager.Forms\Plugin.MediaManager.Forms.iOS\Plugin.MediaManager.Forms.iOS.csproj", "{586D5119-52D8-40B1-9BB5-CC7FDB033B86}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.iOS", "MediaManager.Forms\MediaManager.Forms.iOS\Plugin.MediaManager.Forms.iOS.csproj", "{586D5119-52D8-40B1-9BB5-CC7FDB033B86}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.UWP", "MediaManager.Forms\Plugin.MediaManager.Forms.UWP\Plugin.MediaManager.Forms.UWP.csproj", "{2230DCD0-118B-4021-B0B2-71CE00111D5E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.UWP", "MediaManager.Forms\MediaManager.Forms.UWP\Plugin.MediaManager.Forms.UWP.csproj", "{2230DCD0-118B-4021-B0B2-71CE00111D5E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extentions", "Extentions", "{D603F379-90E7-46B0-9827-306B51D82F9D}" EndProject diff --git a/Samples/Forms/Droid/MediaForms.Android.csproj b/Samples/Forms/Droid/MediaForms.Android.csproj index da87cbd1..17a48151 100644 --- a/Samples/Forms/Droid/MediaForms.Android.csproj +++ b/Samples/Forms/Droid/MediaForms.Android.csproj @@ -134,7 +134,7 @@ {7469C2C8-209A-4202-AEE9-E2B3F451BDD4} MediaForms - + {C8566A9E-FB6B-4459-AC87-5DB16D221D29} Plugin.MediaManager.Forms.Android @@ -146,7 +146,7 @@ {56A56F17-7DE1-4CA1-9617-BF32E971AC84} Plugin.MediaManager.Android - + {67F9D3A8-F71E-4428-913F-C37AE82CDB24} Plugin.MediaManager.Forms diff --git a/Samples/Forms/MediaForms.UWP/MediaForms.UWP.csproj b/Samples/Forms/MediaForms.UWP/MediaForms.UWP.csproj index cfa129b8..7d85e0a5 100644 --- a/Samples/Forms/MediaForms.UWP/MediaForms.UWP.csproj +++ b/Samples/Forms/MediaForms.UWP/MediaForms.UWP.csproj @@ -127,7 +127,7 @@ - + {2230dcd0-118b-4021-b0b2-71ce00111d5e} Plugin.MediaManager.Forms.UWP diff --git a/Samples/Forms/MediaForms/MediaForms.csproj b/Samples/Forms/MediaForms/MediaForms.csproj index d2c90a3f..a733a038 100644 --- a/Samples/Forms/MediaForms/MediaForms.csproj +++ b/Samples/Forms/MediaForms/MediaForms.csproj @@ -58,7 +58,7 @@ - + {67F9D3A8-F71E-4428-913F-C37AE82CDB24} Plugin.MediaManager.Forms diff --git a/Samples/Forms/iOS/MediaForms.iOS.csproj b/Samples/Forms/iOS/MediaForms.iOS.csproj index f6d8bb4d..f2dd0953 100644 --- a/Samples/Forms/iOS/MediaForms.iOS.csproj +++ b/Samples/Forms/iOS/MediaForms.iOS.csproj @@ -30,7 +30,8 @@ i386, x86_64 HttpClientHandler Default - + + False False False @@ -141,11 +142,11 @@ {7469C2C8-209A-4202-AEE9-E2B3F451BDD4} MediaForms - + {67F9D3A8-F71E-4428-913F-C37AE82CDB24} Plugin.MediaManager.Forms - + {586D5119-52D8-40B1-9BB5-CC7FDB033B86} Plugin.MediaManager.Forms.iOS From 00155128db15d8d8fba7a0121808a2b464847a49 Mon Sep 17 00:00:00 2001 From: Martijn van Dijk Date: Fri, 17 Mar 2017 11:36:31 +0100 Subject: [PATCH 7/7] Update nuspec --- nuspec/Plugin.MediaManager.ExoPlayer.nuspec | 2 +- nuspec/Plugin.MediaManager.Forms.nuspec | 26 +++++------ nuspec/Plugin.MediaManager.Reactive.nuspec | 2 +- nuspec/Plugin.MediaManager.nuspec | 48 ++++++++++----------- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/nuspec/Plugin.MediaManager.ExoPlayer.nuspec b/nuspec/Plugin.MediaManager.ExoPlayer.nuspec index a547d5da..abc064e5 100644 --- a/nuspec/Plugin.MediaManager.ExoPlayer.nuspec +++ b/nuspec/Plugin.MediaManager.ExoPlayer.nuspec @@ -22,6 +22,6 @@ - + \ No newline at end of file diff --git a/nuspec/Plugin.MediaManager.Forms.nuspec b/nuspec/Plugin.MediaManager.Forms.nuspec index a6bf988c..10780eee 100644 --- a/nuspec/Plugin.MediaManager.Forms.nuspec +++ b/nuspec/Plugin.MediaManager.Forms.nuspec @@ -19,18 +19,18 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuspec/Plugin.MediaManager.Reactive.nuspec b/nuspec/Plugin.MediaManager.Reactive.nuspec index 98e1252a..e6d39c83 100644 --- a/nuspec/Plugin.MediaManager.Reactive.nuspec +++ b/nuspec/Plugin.MediaManager.Reactive.nuspec @@ -19,6 +19,6 @@ - + \ No newline at end of file diff --git a/nuspec/Plugin.MediaManager.nuspec b/nuspec/Plugin.MediaManager.nuspec index 2f41dc56..b80795cd 100644 --- a/nuspec/Plugin.MediaManager.nuspec +++ b/nuspec/Plugin.MediaManager.nuspec @@ -21,29 +21,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file