Merge branch 'development'

Kapusch · Mar 31, 2023 · ae2646e · ae2646e
2 parents 4659d86 + 804d0ce
commit ae2646e
Show file tree

Hide file tree

Showing 20 changed files with 91 additions and 194 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ This is a wrapper library around the native Android and iOS Firebase Xamarin SDK
 | [Auth](https://firebase.google.com/docs/auth) | [Plugin.Firebase.Auth](https://github.com/TobiasBuchholz/Plugin.Firebase/blob/development/docs/auth.md) | [![NuGet](https://img.shields.io/nuget/v/plugin.firebase.auth.svg?maxAge=86400&style=flat)](https://www.nuget.org/packages/Plugin.Firebase.Auth/) |
 | [Facebook Auth](https://developers.facebook.com/docs/facebook-login/) | [Plugin.Firebase.Auth.Facebook](https://github.com/TobiasBuchholz/Plugin.Firebase/blob/development/docs/auth_facebook.md) | [![NuGet](https://img.shields.io/nuget/v/plugin.firebase.auth.facebook.svg?maxAge=86400&style=flat)](https://www.nuget.org/packages/Plugin.Firebase.Auth.Facebook/) |
 | [Cloud Messaging](https://firebase.google.com/docs/cloud-messaging) | [Plugin.Firebase.CloudMessaging](https://github.com/TobiasBuchholz/Plugin.Firebase/blob/development/docs/cloud_messaging.md) | [![NuGet](https://img.shields.io/nuget/v/plugin.firebase.cloudmessaging.svg?maxAge=86400&style=flat)](https://www.nuget.org/packages/Plugin.Firebase.CloudMessaging/)
-| [Crashlytics](https://firebase.google.com/docs/crashlytics) | [Plugin.Firebase.CloudMessaging](https://github.com/TobiasBuchholz/Plugin.Firebase/blob/development/docs/crashlytics.md) | [![NuGet](https://img.shields.io/nuget/v/plugin.firebase.crashlytics.svg?maxAge=86400&style=flat)](https://www.nuget.org/packages/Plugin.Firebase.Crashlytics/)
+| [Crashlytics](https://firebase.google.com/docs/crashlytics) | [Plugin.Firebase.Crashlytics](https://github.com/TobiasBuchholz/Plugin.Firebase/blob/development/docs/crashlytics.md) | [![NuGet](https://img.shields.io/nuget/v/plugin.firebase.crashlytics.svg?maxAge=86400&style=flat)](https://www.nuget.org/packages/Plugin.Firebase.Crashlytics/)
 | [Dynamic Links](https://firebase.google.com/docs/dynamic-links) | [Plugin.Firebase.DynamicLinks](https://github.com/TobiasBuchholz/Plugin.Firebase/blob/development/docs/dynamic_links.md) | [![NuGet](https://img.shields.io/nuget/v/plugin.firebase.dynamiclinks.svg?maxAge=86400&style=flat)](https://www.nuget.org/packages/Plugin.jirebase.DynamicLinks/)
 | [Firestore](https://firebase.google.com/docs/firestore) | [Plugin.Firebase.Firestore](https://github.com/TobiasBuchholz/Plugin.Firebase/blob/development/docs/firestore.md) | [![NuGet](https://img.shields.io/nuget/v/plugin.firebase.firestore.svg?maxAge=86400&style=flat)](https://www.nuget.org/packages/Plugin.Firebase.Firestore/)
 | [Cloud Functions](https://firebase.google.com/docs/functions) | [Plugin.Firebase.Functions](https://github.com/TobiasBuchholz/Plugin.Firebase/blob/development/docs/functions.md) | [![NuGet](https://img.shields.io/nuget/v/plugin.firebase.functions.svg?maxAge=86400&style=flat)](https://www.nuget.org/packages/Plugin.Firebase.Functions/)

diff --git a/src/Analytics/Analytics.csproj b/src/Analytics/Analytics.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
-        <UseMaui>true</UseMaui>
+        <TargetFrameworks>net6.0;net6.0-android;net6.0-ios</TargetFrameworks>
         <SingleProject>true</SingleProject>
         <ImplicitUsings>enable</ImplicitUsings>
 
@@ -11,9 +10,6 @@
         <RootNamespace>Plugin.Firebase.Analytics</RootNamespace>
 
         <Product>$(AssemblyName) ($(TargetFramework))</Product>
-        <AssemblyVersion>2.0.0</AssemblyVersion>
-        <AssemblyFileVersion>2.0.0</AssemblyFileVersion>
-        <Version>2.0.0</Version>
         <NeutralLanguage>en</NeutralLanguage>
 
         <!--Don't auto add files for me, I will tell you -->
@@ -24,7 +20,6 @@
 
         <!--Assembly and Namespace info -->
         <PackageId>Plugin.Firebase.Analytics</PackageId>
-        <PackageVersion>2.0.0</PackageVersion>
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/TobiasBuchholz/Plugin.Firebase</PackageProjectUrl>
@@ -54,7 +49,6 @@
     <PropertyGroup Condition=" '$(Configuration)'=='Release' ">
         <DebugType>pdbonly</DebugType>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Auth.Facebook/Auth.Facebook.csproj b/src/Auth.Facebook/Auth.Facebook.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
-        <UseMaui>true</UseMaui>
+        <TargetFrameworks>net6.0;net6.0-android;net6.0-ios</TargetFrameworks>
+        <UseMauiEssentials>true</UseMauiEssentials>
         <SingleProject>true</SingleProject>
         <ImplicitUsings>enable</ImplicitUsings>
 
@@ -11,9 +11,6 @@
         <RootNamespace>Plugin.Firebase.Auth.Facebook</RootNamespace>
 
         <Product>$(AssemblyName) ($(TargetFramework))</Product>
-        <AssemblyVersion>2.0.0</AssemblyVersion>
-        <AssemblyFileVersion>2.0.0</AssemblyFileVersion>
-        <Version>2.0.0</Version>
         <NeutralLanguage>en</NeutralLanguage>
 
         <!--Don't auto add files for me, I will tell you -->
@@ -24,7 +21,6 @@
 
         <!--Assembly and Namespace info -->
         <PackageId>Plugin.Firebase.Auth.Facebook</PackageId>
-        <PackageVersion>2.0.0</PackageVersion>
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/TobiasBuchholz/Plugin.Firebase</PackageProjectUrl>
@@ -54,7 +50,6 @@
     <PropertyGroup Condition=" '$(Configuration)'=='Release' ">
         <DebugType>pdbonly</DebugType>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Auth.Facebook/Platforms/Android/FirebaseAuthFacebookImplementation.cs b/src/Auth.Facebook/Platforms/Android/FirebaseAuthFacebookImplementation.cs
@@ -1,6 +1,6 @@
-using Android.App;
 using Android.Content;
 using Firebase.Auth;
+using Microsoft.Maui.ApplicationModel;
 using Plugin.Firebase.Core;
 using Plugin.Firebase.Auth.Facebook.Platforms.Android;
 using Plugin.Firebase.Auth.Platforms.Android.Extensions;

diff --git a/src/Auth/Auth.csproj b/src/Auth/Auth.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
-        <UseMaui>true</UseMaui>
+        <TargetFrameworks>net6.0;net6.0-android;net6.0-ios</TargetFrameworks>
+        <UseMauiEssentials>true</UseMauiEssentials>
         <SingleProject>true</SingleProject>
         <ImplicitUsings>enable</ImplicitUsings>
 
@@ -11,9 +11,6 @@
         <RootNamespace>Plugin.Firebase.Auth</RootNamespace>
 
         <Product>$(AssemblyName) ($(TargetFramework))</Product>
-        <AssemblyVersion>2.0.0</AssemblyVersion>
-        <AssemblyFileVersion>2.0.0</AssemblyFileVersion>
-        <Version>2.0.0</Version>
         <NeutralLanguage>en</NeutralLanguage>
 
         <!--Don't auto add files for me, I will tell you -->
@@ -24,7 +21,6 @@
 
         <!--Assembly and Namespace info -->
         <PackageId>Plugin.Firebase.Auth</PackageId>
-        <PackageVersion>2.0.0</PackageVersion>
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/TobiasBuchholz/Plugin.Firebase</PackageProjectUrl>
@@ -54,7 +50,6 @@
     <PropertyGroup Condition=" '$(Configuration)'=='Release' ">
         <DebugType>pdbonly</DebugType>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Auth/Platforms/Android/FirebaseAuthImplementation.cs b/src/Auth/Platforms/Android/FirebaseAuthImplementation.cs
@@ -1,8 +1,8 @@
-using Android.App;
 using Android.Content;
 using Android.Gms.Extensions;
 using AndroidX.Fragment.App;
 using Firebase.Auth;
+using Microsoft.Maui.ApplicationModel;
 using Plugin.Firebase.Auth.Platforms.Android.Email;
 using Plugin.Firebase.Auth.Platforms.Android.Google;
 using Plugin.Firebase.Auth.Platforms.Android.PhoneNumber;

diff --git a/src/Auth/Platforms/iOS/FirebaseAuthImplementation.cs b/src/Auth/Platforms/iOS/FirebaseAuthImplementation.cs
@@ -1,13 +1,13 @@
 using Firebase.Auth;
-using Foundation;
 using Google.SignIn;
+using Microsoft.Maui.Authentication;
+using Microsoft.Maui.Devices;
 using Plugin.Firebase.Auth.Platforms.iOS.Email;
 using Plugin.Firebase.Auth.Platforms.iOS.Extensions;
 using Plugin.Firebase.Auth.Platforms.iOS.Google;
 using Plugin.Firebase.Auth.Platforms.iOS.PhoneNumber;
 using Plugin.Firebase.Core;
 using Plugin.Firebase.Core.Exceptions;
-using UIKit;
 using FirebaseAuth = Firebase.Auth.Auth;
 using Task = System.Threading.Tasks.Task;
 using CrossActionCodeSettings = Plugin.Firebase.Auth.ActionCodeSettings;

diff --git a/src/Bundled/Bundled.csproj b/src/Bundled/Bundled.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
-        <UseMaui>true</UseMaui>
+        <TargetFrameworks>net6.0;net6.0-android;net6.0-ios</TargetFrameworks>
         <SingleProject>true</SingleProject>
         <ImplicitUsings>enable</ImplicitUsings>
 
@@ -11,9 +10,6 @@
         <RootNamespace>Plugin.Firebase</RootNamespace>
 
         <Product>$(AssemblyName) ($(TargetFramework))</Product>
-        <AssemblyVersion>2.0.0</AssemblyVersion>
-        <AssemblyFileVersion>2.0.0</AssemblyFileVersion>
-        <Version>2.0.0</Version>
         <NeutralLanguage>en</NeutralLanguage>
 
         <!--Don't auto add files for me, I will tell you -->
@@ -24,7 +20,6 @@
 
         <!--Assembly and Namespace info -->
         <PackageId>Plugin.Firebase</PackageId>
-        <PackageVersion>2.0.0</PackageVersion>
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/TobiasBuchholz/Plugin.Firebase</PackageProjectUrl>
@@ -54,7 +49,6 @@
     <PropertyGroup Condition=" '$(Configuration)'=='Release' ">
         <DebugType>pdbonly</DebugType>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/CloudMessaging/CloudMessaging.csproj b/src/CloudMessaging/CloudMessaging.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
-        <UseMaui>true</UseMaui>
+        <TargetFrameworks>net6.0;net6.0-android;net6.0-ios</TargetFrameworks>
         <SingleProject>true</SingleProject>
         <ImplicitUsings>enable</ImplicitUsings>
 
@@ -11,9 +10,6 @@
         <RootNamespace>Plugin.Firebase.CloudMessaging</RootNamespace>
 
         <Product>$(AssemblyName) ($(TargetFramework))</Product>
-        <AssemblyVersion>2.0.0</AssemblyVersion>
-        <AssemblyFileVersion>2.0.0</AssemblyFileVersion>
-        <Version>2.0.0</Version>
         <NeutralLanguage>en</NeutralLanguage>
 
         <!--Don't auto add files for me, I will tell you -->
@@ -24,7 +20,6 @@
 
         <!--Assembly and Namespace info -->
         <PackageId>Plugin.Firebase.CloudMessaging</PackageId>
-        <PackageVersion>2.0.0</PackageVersion>
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/TobiasBuchholz/Plugin.Firebase</PackageProjectUrl>
@@ -54,7 +49,6 @@
     <PropertyGroup Condition=" '$(Configuration)'=='Release' ">
         <DebugType>pdbonly</DebugType>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     </PropertyGroup>
 
     <ItemGroup>