diff --git a/MediaGallery/MediaGallery.csproj b/MediaGallery/MediaGallery.csproj index f80654f..2fff0b3 100644 --- a/MediaGallery/MediaGallery.csproj +++ b/MediaGallery/MediaGallery.csproj @@ -1,12 +1,13 @@ - + - net6.0;netstandard2.0;net6.0-ios;Xamarin.iOS10;net6.0-android;MonoAndroid10.0;MonoAndroid11.0; + netstandard2.0;Xamarin.iOS10;MonoAndroid10.0;MonoAndroid11.0;MonoAndroid12.0; + $(TargetFrameworks)net6.0-android;net6.0-ios NativeMedia $(AssemblyName) Xamarin.MediaGallery maui, xamarin, .net6, ios, android, toolkit, xamarin.forms, media, picker, photos, videos, mediapicker This plugin is designed for picking and saving photos and video files from the native gallery of Android and iOS devices - 2.1.0 + 2.1.2 dimonovdd dimonovdd https://github.com/dimonovdd/Xamarin.MediaGallery @@ -17,7 +18,7 @@ true false false - Release;Debug + Debug;Release 10.0 <_IsSample>false @@ -30,13 +31,10 @@ bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml - true - true - snupkg + true + true + snupkg - - - <_Net6 Condition=" $(TargetFramework.Contains('net6')) ">true <_Droid Condition=" $(TargetFramework.Contains('droid')) ">true @@ -48,12 +46,17 @@ $(DefineConstants);__NET6__; - true + true + true + enable 11.0 21.0 + + 4 + - + @@ -61,8 +64,9 @@ + - + diff --git a/MediaGallery/MediaGallery/PickMedia.android.cs b/MediaGallery/MediaGallery/PickMedia.android.cs index a517794..505baab 100644 --- a/MediaGallery/MediaGallery/PickMedia.android.cs +++ b/MediaGallery/MediaGallery/PickMedia.android.cs @@ -79,7 +79,7 @@ static async Task PlatformCapturePhotoAsync(CancellationToken token) var fileName = $"{GetNewImageName()}.jpg"; var tempFilePath = GetFilePath(fileName); - using var file = new File(tempFilePath); + using var file = new Java.IO.File(tempFilePath); if (!file.Exists()) file.CreateNewFile(); outputUri = MediaFileProvider.GetUriForFile(Platform.AppActivity, file); diff --git a/MediaGallery/MediaGallery/PickMedia.ios.cs b/MediaGallery/MediaGallery/PickMedia.ios.cs index b27dca7..6a11ae0 100644 --- a/MediaGallery/MediaGallery/PickMedia.ios.cs +++ b/MediaGallery/MediaGallery/PickMedia.ios.cs @@ -66,12 +66,15 @@ await MainThread.InvokeOnMainThreadAsync(() => { SourceType = sourceType, AllowsEditing = false, +#if !__NET6__ AllowsImageEditing = false, +#endif Delegate = new PhotoPickerDelegate(tcs), MediaTypes = isVideo && isImage ? new string[] { UTType.Movie, UTType.Image } : new string[] { isVideo ? UTType.Movie : UTType.Image } }; + } CancelTaskIfRequested(token, tcs); @@ -124,7 +127,9 @@ await MainThread.InvokeOnMainThreadAsync(() => { SourceType = UIImagePickerControllerSourceType.Camera, AllowsEditing = false, - AllowsImageEditing = false, +#if !__NET6__ + AllowsImageEditing = false, +#endif Delegate = new PhotoPickerDelegate(tcs), CameraCaptureMode = UIImagePickerControllerCameraCaptureMode.Photo }; diff --git a/MediaGallery/MediaPickRequest/MediaPickRequest.shared.cs b/MediaGallery/MediaPickRequest/MediaPickRequest.shared.cs index b3a8a3f..19cc47a 100644 --- a/MediaGallery/MediaPickRequest/MediaPickRequest.shared.cs +++ b/MediaGallery/MediaPickRequest/MediaPickRequest.shared.cs @@ -26,8 +26,7 @@ public MediaPickRequest(int selectionLimit = 1, params MediaFileType[] types) public string Title { get; set; } /// Gets or sets the source rectangle to display the Picker UI from. This is only used on iPad currently. - /// Xamarin - System.Drawing.Rectangle;   - /// .net6(MAUI) - Microsoft.Maui.Graphics.Rectangle; + /// Xamarin - System.Drawing.Rectangle; .net6(MAUI) - Microsoft.Maui.Graphics.Rectangle; public object PresentationSourceBounds { get; set; } = default; /// Gets or sets whether to use Intent.CreateChooser. Currently used only for Android. diff --git a/MediaGallery/Platform/Platform.android.cs b/MediaGallery/Platform/Platform.android.cs index 5d54c7e..68a3d1d 100644 --- a/MediaGallery/Platform/Platform.android.cs +++ b/MediaGallery/Platform/Platform.android.cs @@ -42,7 +42,7 @@ internal static bool IsIntentSupported(Intent intent) } - [ContentProvider(new[] { "${applicationId}" + Authority },Name = "haraba.fileProvider", Exported = false, GrantUriPermissions = true)] + [ContentProvider(new[] { "${applicationId}" + Authority },Name = "nativeMedia.fileProvider", Exported = false, GrantUriPermissions = true)] [MetaData("android.support.FILE_PROVIDER_PATHS", Resource = "@xml/file_provider_paths")] public class MediaFileProvider : ContentFileProvider { diff --git a/MediaGallery/Usings/GlobalUsings.shared.cs b/MediaGallery/Usings/GlobalUsings.shared.cs index 23406f6..697f0c9 100644 --- a/MediaGallery/Usings/GlobalUsings.shared.cs +++ b/MediaGallery/Usings/GlobalUsings.shared.cs @@ -1,15 +1,15 @@ -#if NET6_0_ANDROID || NET6_0_IOS -global using EssentialsEx = Microsoft.Maui.Essentials; -global using Microsoft.Maui.Essentials; -global using Rectangle = Microsoft.Maui.Graphics.Rectangle; +#if __NET6__ +global using EssentialsEx = Microsoft.Maui.ApplicationModel; +global using Microsoft.Maui.ApplicationModel; +global using Rectangle = Microsoft.Maui.Graphics.Rect; #elif __MOBILE__ global using EssentialsEx = Xamarin.Essentials; global using Xamarin.Essentials; #endif -#if XAMARIN_IOS +#if __IOS__ && !__NET6__ global using Rectangle = System.Drawing.Rectangle; #endif -#if MONOANDROID11_0 || NET6_0_ANDROID +#if MONOANDROID12_0 || MONOANDROID11_0 || (__NET6__ && __DROID__) global using MediaColumns = Android.Provider.MediaStore.IMediaColumns; #elif MONOANDROID10_0 global using MediaColumns = Android.Provider.MediaStore.MediaColumns; diff --git a/MediaGallery/Usings/UsingsHelper.ios.cs b/MediaGallery/Usings/UsingsHelper.ios.cs index 58b29cc..9efc021 100644 --- a/MediaGallery/Usings/UsingsHelper.ios.cs +++ b/MediaGallery/Usings/UsingsHelper.ios.cs @@ -4,15 +4,15 @@ static class UsingsHelper { public static Rectangle EmptyRectangle => -#if NET6_0_IOS +#if __NET6__ Rectangle.Zero; #else Rectangle.Empty; #endif public static CGRect AsCGRect(this Rectangle rect) => -#if NET6_0_IOS - new CGRect((nfloat)rect.X, (nfloat)rect.Y, (nfloat)rect.Width, (nfloat)rect.Height); +#if __NET6__ + new CGRect((float)rect.X, (float)rect.Y, (float)rect.Width, (float)rect.Height); #else rect.ToPlatformRectangle(); #endif diff --git a/Permission/Maui/Permission.Maui.csproj b/Permission/Maui/Permission.Maui.csproj index 09a7776..ca33cb4 100644 --- a/Permission/Maui/Permission.Maui.csproj +++ b/Permission/Maui/Permission.Maui.csproj @@ -1,6 +1,6 @@ - + - net6.0;net6.0-ios;net6.0-android; + net6.0-ios;net6.0-android;Xamarin.iOS10;MonoAndroid10.0;MonoAndroid11.0;MonoAndroid12.0; NativeMedia.Permision.Maui $(AssemblyName) Xamarin.MediaGallery.Permision.Maui @@ -8,8 +8,10 @@ Release;Debug 10.0 - - true + + true + true + enable 11.0 21.0 diff --git a/Permission/Xamarim.MediaGallery.Permission.targets b/Permission/Xamarim.MediaGallery.Permission.targets index 9312618..974d69a 100644 --- a/Permission/Xamarim.MediaGallery.Permission.targets +++ b/Permission/Xamarim.MediaGallery.Permission.targets @@ -3,7 +3,7 @@ maui, xamarin, .net6, ios, android, toolkit, xamarin.forms, media, picker, photos, videos, mediapicker This plugin is designed for picking and saving photos and video files from the native gallery of Android and iOS devices - 2.0.0 + 2.1.2 dimonovdd dimonovdd https://github.com/dimonovdd/Xamarin.MediaGallery @@ -30,6 +30,9 @@ + + + @@ -37,7 +40,7 @@ - + diff --git a/Permission/Xamarin/Permission.csproj b/Permission/Xamarin/Permission.csproj index f400fde..dbfeaae 100644 --- a/Permission/Xamarin/Permission.csproj +++ b/Permission/Xamarin/Permission.csproj @@ -1,6 +1,6 @@ - + - netstandard2.0;Xamarin.iOS10;MonoAndroid10.0;MonoAndroid11.0; + netstandard2.0;Xamarin.iOS10;MonoAndroid10.0;MonoAndroid11.0;MonoAndroid12.0; NativeMedia.Permision $(AssemblyName) Xamarin.MediaGallery.Permision @@ -8,9 +8,6 @@ Release;Debug 10.0 - - - diff --git a/Permission/src/Usings/GlobalUsings.shared.cs b/Permission/src/Usings/GlobalUsings.shared.cs index 5a84f42..ca587b4 100644 --- a/Permission/src/Usings/GlobalUsings.shared.cs +++ b/Permission/src/Usings/GlobalUsings.shared.cs @@ -1,6 +1,6 @@ #if NET6_0 || NET6_0_ANDROID || NET6_0_IOS -global using EssentialsEx = Microsoft.Maui.Essentials; -global using Microsoft.Maui.Essentials; +global using EssentialsEx = Microsoft.Maui.ApplicationModel; +global using Microsoft.Maui.ApplicationModel; #else global using EssentialsEx = Xamarin.Essentials; global using Xamarin.Essentials; diff --git a/Sample/Common/GlobalUsings.cs b/Sample/Common/GlobalUsings.cs deleted file mode 100644 index de24534..0000000 --- a/Sample/Common/GlobalUsings.cs +++ /dev/null @@ -1,16 +0,0 @@ -#if NET6_0_ANDROID || NET6_0_IOS -global using Microsoft.Maui.Essentials; -global using Microsoft.Maui.Controls; -global using Microsoft.Maui; -global using Rectangle = Microsoft.Maui.Graphics.Rectangle; -global using ViewRectangle = Microsoft.Maui.Graphics.Rectangle; -global using BasePermission = Microsoft.Maui.Essentials.Permissions.BasePermission; -#else -global using Xamarin.Essentials; -global using Xamarin.Forms; -global using Xamarin.Forms.Internals; -global using Rectangle = System.Drawing.Rectangle; -global using ViewRectangle = Xamarin.Forms.Rectangle; -global using BasePermission = Xamarin.Essentials.Permissions.BasePermission; -global using DeviceInfo = Xamarin.Essentials.DeviceInfo; -#endif \ No newline at end of file diff --git a/Sample/Common/Maui/FodyWeavers.xml b/Sample/Common/Maui/FodyWeavers.xml new file mode 100644 index 0000000..d5abfed --- /dev/null +++ b/Sample/Common/Maui/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Sample/Common/FodyWeavers.xsd b/Sample/Common/Maui/FodyWeavers.xsd similarity index 100% rename from Sample/Common/FodyWeavers.xsd rename to Sample/Common/Maui/FodyWeavers.xsd diff --git a/Sample/Common/Maui/Sample.Common.Maui.csproj b/Sample/Common/Maui/Sample.Common.Maui.csproj new file mode 100644 index 0000000..eb0530b --- /dev/null +++ b/Sample/Common/Maui/Sample.Common.Maui.csproj @@ -0,0 +1,17 @@ + + + + net6.0-android;net6.0-ios; + + + + true + true + enable + 11.0 + 21.0 + + + + + \ No newline at end of file diff --git a/Sample/Common/Sample.Common.csproj b/Sample/Common/Sample.Common.csproj deleted file mode 100644 index 3eb4b55..0000000 --- a/Sample/Common/Sample.Common.csproj +++ /dev/null @@ -1,43 +0,0 @@ - - - - net6.0-ios;net6.0-android;netstandard2.1 - true - true - 10.0 - - - - portable - true - - - - true - - - - - - - - - - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sample/Common/Sample.Common.targets b/Sample/Common/Sample.Common.targets new file mode 100644 index 0000000..0f0086e --- /dev/null +++ b/Sample/Common/Sample.Common.targets @@ -0,0 +1,34 @@ + + + + + Sample.Common + true + true + 10.0 + $(DefineConstants);__NET6__; + + + + portable + true + + + + + + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + + \ No newline at end of file diff --git a/Sample/Common/Xamarin/FodyWeavers.xml b/Sample/Common/Xamarin/FodyWeavers.xml new file mode 100644 index 0000000..d5abfed --- /dev/null +++ b/Sample/Common/Xamarin/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Sample/Common/Xamarin/FodyWeavers.xsd b/Sample/Common/Xamarin/FodyWeavers.xsd new file mode 100644 index 0000000..69dbe48 --- /dev/null +++ b/Sample/Common/Xamarin/FodyWeavers.xsd @@ -0,0 +1,74 @@ + + + + + + + + + + + Used to control if the On_PropertyName_Changed feature is enabled. + + + + + Used to control if the Dependent properties feature is enabled. + + + + + Used to control if the IsChanged property feature is enabled. + + + + + Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form. + + + + + Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project. + + + + + Used to control if equality checks should use the Equals method resolved from the base class. + + + + + Used to control if equality checks should use the static Equals method resolved from the base class. + + + + + Used to turn off build warnings from this weaver. + + + + + Used to turn off build warnings about mismatched On_PropertyName_Changed methods. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/Sample/Common/Xamarin/Sample.Common.csproj b/Sample/Common/Xamarin/Sample.Common.csproj new file mode 100644 index 0000000..a4f6fc8 --- /dev/null +++ b/Sample/Common/Xamarin/Sample.Common.csproj @@ -0,0 +1,14 @@ + + + + netstandard2.1 + + + + + + + + + + \ No newline at end of file diff --git a/Sample/Common/FodyWeavers.xml b/Sample/Common/src/FodyWeavers.xml similarity index 100% rename from Sample/Common/FodyWeavers.xml rename to Sample/Common/src/FodyWeavers.xml diff --git a/Sample/Common/src/FodyWeavers.xsd b/Sample/Common/src/FodyWeavers.xsd new file mode 100644 index 0000000..69dbe48 --- /dev/null +++ b/Sample/Common/src/FodyWeavers.xsd @@ -0,0 +1,74 @@ + + + + + + + + + + + Used to control if the On_PropertyName_Changed feature is enabled. + + + + + Used to control if the Dependent properties feature is enabled. + + + + + Used to control if the IsChanged property feature is enabled. + + + + + Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form. + + + + + Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project. + + + + + Used to control if equality checks should use the Equals method resolved from the base class. + + + + + Used to control if equality checks should use the static Equals method resolved from the base class. + + + + + Used to turn off build warnings from this weaver. + + + + + Used to turn off build warnings about mismatched On_PropertyName_Changed methods. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/Sample/Common/src/GlobalUsings.cs b/Sample/Common/src/GlobalUsings.cs new file mode 100644 index 0000000..ef4f4e4 --- /dev/null +++ b/Sample/Common/src/GlobalUsings.cs @@ -0,0 +1,22 @@ +#if __NET6__ +global using Microsoft.Maui.ApplicationModel; +global using Microsoft.Maui.Controls; +global using Microsoft.Maui; +global using Rectangle = Microsoft.Maui.Graphics.Rect; +global using ViewRectangle = Microsoft.Maui.Graphics.Rect; +global using BasePermission = Microsoft.Maui.ApplicationModel.Permissions.BasePermission; +global using DeviceInfo = Microsoft.Maui.Devices.DeviceInfo; +global using DevicePlatform = Microsoft.Maui.Devices.DevicePlatform; +global using FileSystem = Microsoft.Maui.Storage.FileSystem; +global using Share = Microsoft.Maui.ApplicationModel.DataTransfer.Share; +global using ShareFile = Microsoft.Maui.ApplicationModel.DataTransfer.ShareFile; +global using ShareFileRequest = Microsoft.Maui.ApplicationModel.DataTransfer.ShareFileRequest; +#else +global using Xamarin.Essentials; +global using Xamarin.Forms; +global using Xamarin.Forms.Internals; +global using Rectangle = System.Drawing.Rectangle; +global using ViewRectangle = Xamarin.Forms.Rectangle; +global using BasePermission = Xamarin.Essentials.Permissions.BasePermission; +global using DeviceInfo = Xamarin.Essentials.DeviceInfo; +#endif \ No newline at end of file diff --git a/Sample/Common/Helpers/BaseNotifier.cs b/Sample/Common/src/Helpers/BaseNotifier.cs similarity index 100% rename from Sample/Common/Helpers/BaseNotifier.cs rename to Sample/Common/src/Helpers/BaseNotifier.cs diff --git a/Sample/Common/Helpers/EmbeddedResourceProvider.cs b/Sample/Common/src/Helpers/EmbeddedResourceProvider.cs similarity index 100% rename from Sample/Common/Helpers/EmbeddedResourceProvider.cs rename to Sample/Common/src/Helpers/EmbeddedResourceProvider.cs diff --git a/Sample/Common/Helpers/FilesHelper.cs b/Sample/Common/src/Helpers/FilesHelper.cs similarity index 100% rename from Sample/Common/Helpers/FilesHelper.cs rename to Sample/Common/src/Helpers/FilesHelper.cs diff --git a/Sample/Common/Helpers/PermissionHelper.cs b/Sample/Common/src/Helpers/PermissionHelper.cs similarity index 100% rename from Sample/Common/Helpers/PermissionHelper.cs rename to Sample/Common/src/Helpers/PermissionHelper.cs diff --git a/Sample/Common/Helpers/ViewHelpers.cs b/Sample/Common/src/Helpers/ViewHelpers.cs similarity index 100% rename from Sample/Common/Helpers/ViewHelpers.cs rename to Sample/Common/src/Helpers/ViewHelpers.cs diff --git a/Sample/Common/ViewModels/BaseVM.cs b/Sample/Common/src/ViewModels/BaseVM.cs similarity index 100% rename from Sample/Common/ViewModels/BaseVM.cs rename to Sample/Common/src/ViewModels/BaseVM.cs diff --git a/Sample/Common/ViewModels/HomeVM.cs b/Sample/Common/src/ViewModels/HomeVM.cs similarity index 100% rename from Sample/Common/ViewModels/HomeVM.cs rename to Sample/Common/src/ViewModels/HomeVM.cs diff --git a/Sample/Common/ViewModels/MediaFileInfoVM.cs b/Sample/Common/src/ViewModels/MediaFileInfoVM.cs similarity index 100% rename from Sample/Common/ViewModels/MediaFileInfoVM.cs rename to Sample/Common/src/ViewModels/MediaFileInfoVM.cs diff --git a/Sample/Common/ViewModels/PickVM.cs b/Sample/Common/src/ViewModels/PickVM.cs similarity index 100% rename from Sample/Common/ViewModels/PickVM.cs rename to Sample/Common/src/ViewModels/PickVM.cs diff --git a/Sample/Common/ViewModels/SaveVM.cs b/Sample/Common/src/ViewModels/SaveVM.cs similarity index 100% rename from Sample/Common/ViewModels/SaveVM.cs rename to Sample/Common/src/ViewModels/SaveVM.cs diff --git a/Sample/MAUI/Platforms/Android/AndroidManifest.xml b/Sample/MAUI/Platforms/Android/AndroidManifest.xml index 222b322..64599e0 100644 --- a/Sample/MAUI/Platforms/Android/AndroidManifest.xml +++ b/Sample/MAUI/Platforms/Android/AndroidManifest.xml @@ -1,7 +1,6 @@  - - + diff --git a/Sample/MAUI/Platforms/Android/MainActivity.cs b/Sample/MAUI/Platforms/Android/MainActivity.cs index c6cff51..ab19e55 100644 --- a/Sample/MAUI/Platforms/Android/MainActivity.cs +++ b/Sample/MAUI/Platforms/Android/MainActivity.cs @@ -12,7 +12,7 @@ public class MainActivity : MauiAppCompatActivity protected override void OnCreate(Bundle savedInstanceState) { base.OnCreate(savedInstanceState); - Microsoft.Maui.Essentials.Platform.Init(this, savedInstanceState); + NativeMedia.Platform.Init(this, savedInstanceState); } protected override void OnActivityResult(int requestCode, Result resultCode, Intent intent) diff --git a/Sample/MAUI/Resources/appiconforeground.svg b/Sample/MAUI/Resources/appiconforeground.svg new file mode 100644 index 0000000..ca208e7 --- /dev/null +++ b/Sample/MAUI/Resources/appiconforeground.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Sample/MAUI/Sample.Maui.csproj b/Sample/MAUI/Sample.Maui.csproj index 429639d..cda6360 100644 --- a/Sample/MAUI/Sample.Maui.csproj +++ b/Sample/MAUI/Sample.Maui.csproj @@ -6,28 +6,38 @@ Sample.Maui true true - true + enable - MediaGallery.Maui + MediaGallery.Maui com.dimonovdd.sample - 1 - True + 94cc9d86-07a2-445b-98ca-2c1202f25c07 + + 1.0 + 1 + + + 14.2 + 21.0 - 14.2 - 21.0 - CA1416 - + - + - + + + + + + + + diff --git a/Sample/MAUI/Views/BasePage.cs b/Sample/MAUI/Views/BasePage.cs index 209aa45..ec2b417 100644 --- a/Sample/MAUI/Views/BasePage.cs +++ b/Sample/MAUI/Views/BasePage.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; using Microsoft.Maui.Controls; -using Microsoft.Maui.Essentials; +using Microsoft.Maui.ApplicationModel; using Sample.Common.ViewModels; namespace Sample.Maui diff --git a/Sample/MAUI/Views/MediaFileInfoPage.xaml.cs b/Sample/MAUI/Views/MediaFileInfoPage.xaml.cs index f5d7738..0b58d7d 100644 --- a/Sample/MAUI/Views/MediaFileInfoPage.xaml.cs +++ b/Sample/MAUI/Views/MediaFileInfoPage.xaml.cs @@ -1,5 +1,5 @@ using Microsoft.Maui.Controls; -using Microsoft.Maui.Essentials; +using Microsoft.Maui.ApplicationModel; namespace Sample.Maui { diff --git a/Sample/Xamarin/Sample.Android/Properties/AndroidManifest.xml b/Sample/Xamarin/Sample.Android/Properties/AndroidManifest.xml index aa6100c..5da2e4d 100644 --- a/Sample/Xamarin/Sample.Android/Properties/AndroidManifest.xml +++ b/Sample/Xamarin/Sample.Android/Properties/AndroidManifest.xml @@ -1,6 +1,6 @@  - + diff --git a/Sample/Xamarin/Sample.Android/Sample.Android.csproj b/Sample/Xamarin/Sample.Android/Sample.Android.csproj index b89237e..80cf81c 100644 --- a/Sample/Xamarin/Sample.Android/Sample.Android.csproj +++ b/Sample/Xamarin/Sample.Android/Sample.Android.csproj @@ -16,7 +16,7 @@ Resources true Assets - v11.0 + v12.0 true true Xamarin.Android.Net.AndroidClientHandler @@ -61,7 +61,7 @@ - + diff --git a/Sample/Xamarin/Sample.iOS/Sample.iOS.csproj b/Sample/Xamarin/Sample.iOS/Sample.iOS.csproj index 59c9ba2..366e6f6 100644 --- a/Sample/Xamarin/Sample.iOS/Sample.iOS.csproj +++ b/Sample/Xamarin/Sample.iOS/Sample.iOS.csproj @@ -84,7 +84,7 @@ - + diff --git a/Sample/Xamarin/Sample/Sample.csproj b/Sample/Xamarin/Sample/Sample.csproj index 3a0ef62..34301ca 100644 --- a/Sample/Xamarin/Sample/Sample.csproj +++ b/Sample/Xamarin/Sample/Sample.csproj @@ -12,15 +12,15 @@ - + + - + - + - \ No newline at end of file diff --git a/Xamarim.MediaGallery.Sample.Maui.sln b/Xamarim.MediaGallery.Sample.Maui.sln new file mode 100644 index 0000000..228fadb --- /dev/null +++ b/Xamarim.MediaGallery.Sample.Maui.sln @@ -0,0 +1,67 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33110.190 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D150415D-5689-4878-8A96-1E0F7C2A16B7}" + ProjectSection(SolutionItems) = preProject + Xamarim.MediaGallery.targets = Xamarim.MediaGallery.targets + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Maui", "Sample\MAUI\Sample.Maui.csproj", "{32C691A8-7133-4D26-B4B7-B8C8792F238C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{9835A4AC-1599-4533-864A-EF857D8B5EED}" + ProjectSection(SolutionItems) = preProject + Sample\Common\Sample.Common.targets = Sample\Common\Sample.Common.targets + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Common.Maui", "Sample\Common\Maui\Sample.Common.Maui.csproj", "{BE3E54D1-E21F-4F45-98EA-B87480C7DB49}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|iPhone = Debug|iPhone + Debug|iPhoneSimulator = Debug|iPhoneSimulator + Release|Any CPU = Release|Any CPU + Release|iPhone = Release|iPhone + Release|iPhoneSimulator = Release|iPhoneSimulator + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Debug|iPhone.Build.0 = Debug|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Debug|iPhone.Deploy.0 = Debug|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Release|Any CPU.Build.0 = Release|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Release|iPhone.ActiveCfg = Release|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Release|iPhone.Build.0 = Release|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {32C691A8-7133-4D26-B4B7-B8C8792F238C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {BE3E54D1-E21F-4F45-98EA-B87480C7DB49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE3E54D1-E21F-4F45-98EA-B87480C7DB49}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE3E54D1-E21F-4F45-98EA-B87480C7DB49}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {BE3E54D1-E21F-4F45-98EA-B87480C7DB49}.Debug|iPhone.Build.0 = Debug|Any CPU + {BE3E54D1-E21F-4F45-98EA-B87480C7DB49}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {BE3E54D1-E21F-4F45-98EA-B87480C7DB49}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {BE3E54D1-E21F-4F45-98EA-B87480C7DB49}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE3E54D1-E21F-4F45-98EA-B87480C7DB49}.Release|Any CPU.Build.0 = Release|Any CPU + {BE3E54D1-E21F-4F45-98EA-B87480C7DB49}.Release|iPhone.ActiveCfg = Release|Any CPU + {BE3E54D1-E21F-4F45-98EA-B87480C7DB49}.Release|iPhone.Build.0 = Release|Any CPU + {BE3E54D1-E21F-4F45-98EA-B87480C7DB49}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {BE3E54D1-E21F-4F45-98EA-B87480C7DB49}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {BE3E54D1-E21F-4F45-98EA-B87480C7DB49} = {9835A4AC-1599-4533-864A-EF857D8B5EED} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E6708EF0-B64B-42D8-904E-42A8868BD884} + EndGlobalSection +EndGlobal diff --git a/Xamarim.MediaGallery.Sample.sln b/Xamarim.MediaGallery.Sample.sln index 789c258..86e1189 100644 --- a/Xamarim.MediaGallery.Sample.sln +++ b/Xamarim.MediaGallery.Sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.808.6 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33110.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D150415D-5689-4878-8A96-1E0F7C2A16B7}" ProjectSection(SolutionItems) = preProject @@ -10,15 +10,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin", "Xamarin", "{A71B42A2-3366-4ECF-9552-81D615A3147B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "Sample\Xamarin\Sample\Sample.csproj", "{B1BFA4A1-18CA-4FA3-B8C7-DDBF015D2FE4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "Sample\Xamarin\Sample\Sample.csproj", "{B1BFA4A1-18CA-4FA3-B8C7-DDBF015D2FE4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.iOS", "Sample\Xamarin\Sample.iOS\Sample.iOS.csproj", "{BBDC8652-7409-412A-A89E-2B73AE30BE3F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Android", "Sample\Xamarin\Sample.Android\Sample.Android.csproj", "{BCD673BA-76A4-4140-AE17-32F3CBD1F245}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Common", "Sample\Common\Sample.Common.csproj", "{AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{A6634239-EF41-487C-B2AC-BFF05694E067}" + ProjectSection(SolutionItems) = preProject + Sample\Common\Sample.Common.targets = Sample\Common\Sample.Common.targets + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Maui", "Sample\MAUI\Sample.Maui.csproj", "{12B47F68-62AC-4A60-BCBE-ECFEEECC785C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Common", "Sample\Common\Xamarin\Sample.Common.csproj", "{167A2155-4D54-4C50-BF39-B3667AC3DCE7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -56,6 +59,7 @@ Global {BBDC8652-7409-412A-A89E-2B73AE30BE3F}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Debug|Any CPU.Deploy.0 = Debug|Any CPU {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Debug|iPhone.ActiveCfg = Debug|Any CPU {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Debug|iPhone.Build.0 = Debug|Any CPU {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU @@ -66,30 +70,18 @@ Global {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Release|iPhone.Build.0 = Release|Any CPU {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Debug|iPhone.Build.0 = Debug|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Release|Any CPU.Build.0 = Release|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Release|iPhone.ActiveCfg = Release|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Release|iPhone.Build.0 = Release|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {12B47F68-62AC-4A60-BCBE-ECFEEECC785C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {12B47F68-62AC-4A60-BCBE-ECFEEECC785C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {12B47F68-62AC-4A60-BCBE-ECFEEECC785C}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {12B47F68-62AC-4A60-BCBE-ECFEEECC785C}.Debug|iPhone.Build.0 = Debug|Any CPU - {12B47F68-62AC-4A60-BCBE-ECFEEECC785C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {12B47F68-62AC-4A60-BCBE-ECFEEECC785C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {12B47F68-62AC-4A60-BCBE-ECFEEECC785C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12B47F68-62AC-4A60-BCBE-ECFEEECC785C}.Release|Any CPU.Build.0 = Release|Any CPU - {12B47F68-62AC-4A60-BCBE-ECFEEECC785C}.Release|iPhone.ActiveCfg = Release|Any CPU - {12B47F68-62AC-4A60-BCBE-ECFEEECC785C}.Release|iPhone.Build.0 = Release|Any CPU - {12B47F68-62AC-4A60-BCBE-ECFEEECC785C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {12B47F68-62AC-4A60-BCBE-ECFEEECC785C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {167A2155-4D54-4C50-BF39-B3667AC3DCE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {167A2155-4D54-4C50-BF39-B3667AC3DCE7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {167A2155-4D54-4C50-BF39-B3667AC3DCE7}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {167A2155-4D54-4C50-BF39-B3667AC3DCE7}.Debug|iPhone.Build.0 = Debug|Any CPU + {167A2155-4D54-4C50-BF39-B3667AC3DCE7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {167A2155-4D54-4C50-BF39-B3667AC3DCE7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {167A2155-4D54-4C50-BF39-B3667AC3DCE7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {167A2155-4D54-4C50-BF39-B3667AC3DCE7}.Release|Any CPU.Build.0 = Release|Any CPU + {167A2155-4D54-4C50-BF39-B3667AC3DCE7}.Release|iPhone.ActiveCfg = Release|Any CPU + {167A2155-4D54-4C50-BF39-B3667AC3DCE7}.Release|iPhone.Build.0 = Release|Any CPU + {167A2155-4D54-4C50-BF39-B3667AC3DCE7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {167A2155-4D54-4C50-BF39-B3667AC3DCE7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -98,6 +90,7 @@ Global {B1BFA4A1-18CA-4FA3-B8C7-DDBF015D2FE4} = {A71B42A2-3366-4ECF-9552-81D615A3147B} {BBDC8652-7409-412A-A89E-2B73AE30BE3F} = {A71B42A2-3366-4ECF-9552-81D615A3147B} {BCD673BA-76A4-4140-AE17-32F3CBD1F245} = {A71B42A2-3366-4ECF-9552-81D615A3147B} + {167A2155-4D54-4C50-BF39-B3667AC3DCE7} = {A6634239-EF41-487C-B2AC-BFF05694E067} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E6708EF0-B64B-42D8-904E-42A8868BD884} diff --git a/Xamarim.MediaGallery.sln b/Xamarim.MediaGallery.sln index 8680edd..634003c 100644 --- a/Xamarim.MediaGallery.sln +++ b/Xamarim.MediaGallery.sln @@ -1,35 +1,44 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.808.6 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33110.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{BE068687-B9EA-47AC-9D85-6E863B63C0D1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaGallery", "MediaGallery\MediaGallery.csproj", "{7159996A-4248-436D-9111-49DABB895B90}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediaGallery", "MediaGallery\MediaGallery.csproj", "{7159996A-4248-436D-9111-49DABB895B90}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Permission", "Permission", "{F72A7CFF-50F9-4C9F-881A-6612BD1195AD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Permission.Maui", "Permission\Maui\Permission.Maui.csproj", "{4901C8AC-333B-4B7E-945F-D399AD80D330}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Permission", "Permission\Xamarin\Permission.csproj", "{51308857-DA73-4827-A8CD-3AA5243D85A1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D150415D-5689-4878-8A96-1E0F7C2A16B7}" ProjectSection(SolutionItems) = preProject - Xamarim.MediaGallery.targets = Xamarim.MediaGallery.targets Permission\Xamarim.MediaGallery.Permission.targets = Permission\Xamarim.MediaGallery.Permission.targets EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Permission.Maui", "Permission\Maui\Permission.Maui.csproj", "{4901C8AC-333B-4B7E-945F-D399AD80D330}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Permission", "Permission\Xamarin\Permission.csproj", "{51308857-DA73-4827-A8CD-3AA5243D85A1}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin", "Xamarin", "{A71B42A2-3366-4ECF-9552-81D615A3147B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "Sample\Xamarin\Sample\Sample.csproj", "{B1BFA4A1-18CA-4FA3-B8C7-DDBF015D2FE4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "Sample\Xamarin\Sample\Sample.csproj", "{B1BFA4A1-18CA-4FA3-B8C7-DDBF015D2FE4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.iOS", "Sample\Xamarin\Sample.iOS\Sample.iOS.csproj", "{BBDC8652-7409-412A-A89E-2B73AE30BE3F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Android", "Sample\Xamarin\Sample.Android\Sample.Android.csproj", "{BCD673BA-76A4-4140-AE17-32F3CBD1F245}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Common", "Sample\Common\Sample.Common.csproj", "{AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Maui", "Sample\MAUI\Sample.Maui.csproj", "{05CBE373-2670-43A5-BD9A-0428057D04C9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{8A7E842F-FB58-4BAB-953B-592AD6183F88}" + ProjectSection(SolutionItems) = preProject + Sample\Common\Sample.Common.targets = Sample\Common\Sample.Common.targets + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Common.Maui", "Sample\Common\Maui\Sample.Common.Maui.csproj", "{D93BB07D-3588-4655-BCA5-B7ACA17A7AFD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Common", "Sample\Common\Xamarin\Sample.Common.csproj", "{05397A28-7CAE-4AE8-8946-CEBF822F7B91}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Maui", "Sample\MAUI\Sample.Maui.csproj", "{05CBE373-2670-43A5-BD9A-0428057D04C9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F337CBA8-48D0-4AAA-96A7-A149DB693136}" + ProjectSection(SolutionItems) = preProject + Xamarim.MediaGallery.targets = Xamarim.MediaGallery.targets + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -103,6 +112,7 @@ Global {BBDC8652-7409-412A-A89E-2B73AE30BE3F}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Debug|Any CPU.Deploy.0 = Debug|Any CPU {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Debug|iPhone.ActiveCfg = Debug|Any CPU {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Debug|iPhone.Build.0 = Debug|Any CPU {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU @@ -113,30 +123,45 @@ Global {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Release|iPhone.Build.0 = Release|Any CPU {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {BCD673BA-76A4-4140-AE17-32F3CBD1F245}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Debug|iPhone.Build.0 = Debug|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Release|Any CPU.Build.0 = Release|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Release|iPhone.ActiveCfg = Release|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Release|iPhone.Build.0 = Release|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {05CBE373-2670-43A5-BD9A-0428057D04C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {05CBE373-2670-43A5-BD9A-0428057D04C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {05CBE373-2670-43A5-BD9A-0428057D04C9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU {05CBE373-2670-43A5-BD9A-0428057D04C9}.Debug|iPhone.ActiveCfg = Debug|Any CPU {05CBE373-2670-43A5-BD9A-0428057D04C9}.Debug|iPhone.Build.0 = Debug|Any CPU + {05CBE373-2670-43A5-BD9A-0428057D04C9}.Debug|iPhone.Deploy.0 = Debug|Any CPU {05CBE373-2670-43A5-BD9A-0428057D04C9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {05CBE373-2670-43A5-BD9A-0428057D04C9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {05CBE373-2670-43A5-BD9A-0428057D04C9}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU {05CBE373-2670-43A5-BD9A-0428057D04C9}.Release|Any CPU.ActiveCfg = Release|Any CPU {05CBE373-2670-43A5-BD9A-0428057D04C9}.Release|Any CPU.Build.0 = Release|Any CPU {05CBE373-2670-43A5-BD9A-0428057D04C9}.Release|iPhone.ActiveCfg = Release|Any CPU {05CBE373-2670-43A5-BD9A-0428057D04C9}.Release|iPhone.Build.0 = Release|Any CPU {05CBE373-2670-43A5-BD9A-0428057D04C9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {05CBE373-2670-43A5-BD9A-0428057D04C9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {D93BB07D-3588-4655-BCA5-B7ACA17A7AFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D93BB07D-3588-4655-BCA5-B7ACA17A7AFD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D93BB07D-3588-4655-BCA5-B7ACA17A7AFD}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {D93BB07D-3588-4655-BCA5-B7ACA17A7AFD}.Debug|iPhone.Build.0 = Debug|Any CPU + {D93BB07D-3588-4655-BCA5-B7ACA17A7AFD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {D93BB07D-3588-4655-BCA5-B7ACA17A7AFD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {D93BB07D-3588-4655-BCA5-B7ACA17A7AFD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D93BB07D-3588-4655-BCA5-B7ACA17A7AFD}.Release|Any CPU.Build.0 = Release|Any CPU + {D93BB07D-3588-4655-BCA5-B7ACA17A7AFD}.Release|iPhone.ActiveCfg = Release|Any CPU + {D93BB07D-3588-4655-BCA5-B7ACA17A7AFD}.Release|iPhone.Build.0 = Release|Any CPU + {D93BB07D-3588-4655-BCA5-B7ACA17A7AFD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {D93BB07D-3588-4655-BCA5-B7ACA17A7AFD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {05397A28-7CAE-4AE8-8946-CEBF822F7B91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {05397A28-7CAE-4AE8-8946-CEBF822F7B91}.Debug|Any CPU.Build.0 = Debug|Any CPU + {05397A28-7CAE-4AE8-8946-CEBF822F7B91}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {05397A28-7CAE-4AE8-8946-CEBF822F7B91}.Debug|iPhone.Build.0 = Debug|Any CPU + {05397A28-7CAE-4AE8-8946-CEBF822F7B91}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {05397A28-7CAE-4AE8-8946-CEBF822F7B91}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {05397A28-7CAE-4AE8-8946-CEBF822F7B91}.Release|Any CPU.ActiveCfg = Release|Any CPU + {05397A28-7CAE-4AE8-8946-CEBF822F7B91}.Release|Any CPU.Build.0 = Release|Any CPU + {05397A28-7CAE-4AE8-8946-CEBF822F7B91}.Release|iPhone.ActiveCfg = Release|Any CPU + {05397A28-7CAE-4AE8-8946-CEBF822F7B91}.Release|iPhone.Build.0 = Release|Any CPU + {05397A28-7CAE-4AE8-8946-CEBF822F7B91}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {05397A28-7CAE-4AE8-8946-CEBF822F7B91}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -148,8 +173,10 @@ Global {B1BFA4A1-18CA-4FA3-B8C7-DDBF015D2FE4} = {A71B42A2-3366-4ECF-9552-81D615A3147B} {BBDC8652-7409-412A-A89E-2B73AE30BE3F} = {A71B42A2-3366-4ECF-9552-81D615A3147B} {BCD673BA-76A4-4140-AE17-32F3CBD1F245} = {A71B42A2-3366-4ECF-9552-81D615A3147B} - {AB354AD9-A1C5-4FA5-B511-D561DEA1B54A} = {BE068687-B9EA-47AC-9D85-6E863B63C0D1} {05CBE373-2670-43A5-BD9A-0428057D04C9} = {BE068687-B9EA-47AC-9D85-6E863B63C0D1} + {8A7E842F-FB58-4BAB-953B-592AD6183F88} = {BE068687-B9EA-47AC-9D85-6E863B63C0D1} + {D93BB07D-3588-4655-BCA5-B7ACA17A7AFD} = {8A7E842F-FB58-4BAB-953B-592AD6183F88} + {05397A28-7CAE-4AE8-8946-CEBF822F7B91} = {8A7E842F-FB58-4BAB-953B-592AD6183F88} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E6708EF0-B64B-42D8-904E-42A8868BD884} diff --git a/Xamarim.MediaGallery.targets b/Xamarim.MediaGallery.targets index ff5d7cb..098bd60 100644 --- a/Xamarim.MediaGallery.targets +++ b/Xamarim.MediaGallery.targets @@ -3,8 +3,8 @@ <_UseNuget>true <_UseNuget Condition="'$(Configuration)'=='Release'">true - <_LibVersion>2.1.1 - <_PermissionLibVersion>2.0.0 + <_LibVersion>2.1.2 + <_PermissionLibVersion>2.1.2 <_IsSample Condition="'$(_IsSample)'!='false'">true <_NET6 Condition=" $(TargetFramework.StartsWith('net6')) ">true <_IsMobele Condition=" $(TargetFramework.Contains('droid')) OR $(TargetFramework.ToLowerInvariant().Contains('ios')) ">true