Facebook SDK upgrade

CrossGeeks · Nov 7, 2018 · 97e06cc · 97e06cc
1 parent 2ed9e0c
commit 97e06cc
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 42 deletions.
diff --git a/nuget/Plugin.nuspec b/nuget/Plugin.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata minClientVersion="2.8.1">
     <id>Plugin.FacebookClient</id>
-    <version>1.4.0</version>
+    <version>1.5.1-pre</version>
     <title>Facebook Client Plugin for Xamarin</title>
     <authors>Rendy Del Rosario</authors>
     <owners>crossgeeks</owners>
@@ -12,18 +12,18 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Facebook login, sharing, facebook graph requests and permissions handling across Xamarin.iOS and Xamarin.Android</description>
     <summary>Facebook login, sharing, facebook graph requests and permissions handling across Xamarin.iOS and Xamarin.Android</summary>
-    <releaseNotes>Use of sharing dialogs instead of sharing api because of deprecation of publish_actions permission</releaseNotes>
+    <releaseNotes>Updated Facebook SDKs</releaseNotes>
     <copyright>Copyright 2017</copyright>
     <tags>iOS,Android,facebook,login,share,xamarin,plugins</tags>
     <dependencies>
         <group targetFramework="netstandard1.0">
           <dependency id="NETStandard.Library" version="1.6.1" />
         </group>
         <group targetFramework="MonoAndroid81">
-            <dependency id="Xamarin.Facebook.Android" version="4.33.0" />
+            <dependency id="Xamarin.Facebook.Android" version="4.38.0" />
         </group>
         <group targetFramework="Xamarin.iOS10">
-            <dependency id="Xamarin.Facebook.iOS" version="4.33.0" />
+            <dependency id="Xamarin.Facebook.iOS" version="4.38.0" />
         </group>
     </dependencies>
   </metadata>

diff --git a/src/FacebookClient.sln b/src/FacebookClient.sln
@@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.FacebookClient.iOS",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.FacebookClient.Android", "Plugin.FacebookClient.Android\Plugin.FacebookClient.Android.csproj", "{56A56F17-7DE1-4CA1-9617-BF32E971AC84}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.FacebookClient.UWP", "Plugin.FacebookClient.UWP\Plugin.FacebookClient.UWP.csproj", "{E34B516D-C0D8-450F-9DB0-BB6A5B04AEF1}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Plugin.FacebookClient.Shared", "Plugin.FacebookClient.Shared\Plugin.FacebookClient.Shared.shproj", "{CDE01928-7412-479B-9760-EAC724FCF02D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AD531F23-B6B7-4003-BD21-623683BE59CE}"
@@ -109,22 +107,6 @@ Global
 		{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|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|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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/Plugin.FacebookClient.Android/Plugin.FacebookClient.Android.csproj b/src/Plugin.FacebookClient.Android/Plugin.FacebookClient.Android.csproj
@@ -101,28 +101,28 @@
       <HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.27.0.2\lib\MonoAndroid81\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Facebook.Android, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Facebook.Android.4.33.0\lib\monoandroid81\Xamarin.Facebook.Android.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Facebook.Android.4.38.0\lib\monoandroid81\Xamarin.Facebook.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Facebook.AppLinks.Android, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Facebook.AppLinks.Android.4.33.0\lib\monoandroid81\Xamarin.Facebook.AppLinks.Android.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Facebook.AppLinks.Android.4.38.0\lib\monoandroid81\Xamarin.Facebook.AppLinks.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Facebook.Common.Android, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Facebook.Common.Android.4.33.0\lib\monoandroid81\Xamarin.Facebook.Common.Android.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Facebook.Common.Android.4.38.0\lib\monoandroid81\Xamarin.Facebook.Common.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Facebook.Core.Android, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Facebook.Core.Android.4.33.0\lib\monoandroid81\Xamarin.Facebook.Core.Android.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Facebook.Core.Android.4.38.0\lib\monoandroid81\Xamarin.Facebook.Core.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Facebook.Login.Android, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Facebook.Login.Android.4.33.0\lib\monoandroid81\Xamarin.Facebook.Login.Android.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Facebook.Login.Android.4.38.0\lib\monoandroid81\Xamarin.Facebook.Login.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Facebook.Messenger.Android, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Facebook.Messenger.Android.4.33.0\lib\monoandroid81\Xamarin.Facebook.Messenger.Android.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Facebook.Messenger.Android.4.38.0\lib\monoandroid81\Xamarin.Facebook.Messenger.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Facebook.Places.Android, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Facebook.Places.Android.4.33.0\lib\monoandroid81\Xamarin.Facebook.Places.Android.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Facebook.Places.Android.4.38.0\lib\monoandroid81\Xamarin.Facebook.Places.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Facebook.Share.Android, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Facebook.Share.Android.4.33.0\lib\monoandroid81\Xamarin.Facebook.Share.Android.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Facebook.Share.Android.4.38.0\lib\monoandroid81\Xamarin.Facebook.Share.Android.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Plugin.FacebookClient.Android/packages.config b/src/Plugin.FacebookClient.Android/packages.config
@@ -16,13 +16,13 @@
   <package id="Xamarin.Android.Support.v7.AppCompat" version="27.0.2" targetFramework="monoandroid81" />
   <package id="Xamarin.Android.Support.v7.CardView" version="27.0.2" targetFramework="monoandroid81" />
   <package id="Xamarin.Android.Support.Vector.Drawable" version="27.0.2" targetFramework="monoandroid81" />
-  <package id="Xamarin.Facebook.Android" version="4.33.0" targetFramework="monoandroid81" />
-  <package id="Xamarin.Facebook.AppLinks.Android" version="4.33.0" targetFramework="monoandroid81" />
-  <package id="Xamarin.Facebook.Common.Android" version="4.33.0" targetFramework="monoandroid81" />
-  <package id="Xamarin.Facebook.Core.Android" version="4.33.0" targetFramework="monoandroid81" />
-  <package id="Xamarin.Facebook.Login.Android" version="4.33.0" targetFramework="monoandroid81" />
-  <package id="Xamarin.Facebook.Messenger.Android" version="4.33.0" targetFramework="monoandroid81" />
-  <package id="Xamarin.Facebook.Places.Android" version="4.33.0" targetFramework="monoandroid81" />
-  <package id="Xamarin.Facebook.Share.Android" version="4.33.0" targetFramework="monoandroid81" />
+  <package id="Xamarin.Facebook.Android" version="4.38.0" targetFramework="monoandroid81" />
+  <package id="Xamarin.Facebook.AppLinks.Android" version="4.38.0" targetFramework="monoandroid81" />
+  <package id="Xamarin.Facebook.Common.Android" version="4.38.0" targetFramework="monoandroid81" />
+  <package id="Xamarin.Facebook.Core.Android" version="4.38.0" targetFramework="monoandroid81" />
+  <package id="Xamarin.Facebook.Login.Android" version="4.38.0" targetFramework="monoandroid81" />
+  <package id="Xamarin.Facebook.Messenger.Android" version="4.38.0" targetFramework="monoandroid81" />
+  <package id="Xamarin.Facebook.Places.Android" version="4.38.0" targetFramework="monoandroid81" />
+  <package id="Xamarin.Facebook.Share.Android" version="4.38.0" targetFramework="monoandroid81" />
   <package id="Xamarin.Google.ZXing.Core" version="3.3.0" targetFramework="monoandroid81" />
 </packages>
diff --git a/src/Plugin.FacebookClient.iOS/FacebookClientManager.cs b/src/Plugin.FacebookClient.iOS/FacebookClientManager.cs
@@ -190,7 +190,7 @@ public async Task<FacebookResponse<bool>> LoginAsync(string[] permissions, Faceb
 
                     NSUserDefaults.StandardUserDefaults.SetString(result.Token.TokenString, FBAccessTokenKey);
                     NSUserDefaults.StandardUserDefaults.SetValueForKey(result.Token.ExpirationDate, FBAccessTokenExpirationDateKey);
-                    NSUserDefaults.StandardUserDefaults.SetString(result.Token.UserID, FBUserIdKey);
+                    NSUserDefaults.StandardUserDefaults.SetString(result.Token.UserId, FBUserIdKey);
                     NSUserDefaults.StandardUserDefaults.Synchronize();
 
                     status = retVal ? FacebookActionStatus.Completed : FacebookActionStatus.Unauthorized;

diff --git a/src/Plugin.FacebookClient.iOS/Plugin.FacebookClient.iOS.csproj b/src/Plugin.FacebookClient.iOS/Plugin.FacebookClient.iOS.csproj
@@ -46,8 +46,23 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Facebook, Version=4.10.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Facebook.iOS.4.33.0\lib\Xamarin.iOS10\Facebook.dll</HintPath>
+    <Reference Include="Facebook.CoreKit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xamarin.Facebook.CoreKit.iOS.4.35.0\lib\Xamarin.iOS10\Facebook.CoreKit.dll</HintPath>
+    </Reference>
+    <Reference Include="Facebook.LoginKit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xamarin.Facebook.LoginKit.iOS.4.35.0\lib\Xamarin.iOS10\Facebook.LoginKit.dll</HintPath>
+    </Reference>
+    <Reference Include="Facebook.MarketingKit, Version=1.0.6799.27988, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xamarin.Facebook.MarketingKit.iOS.4.35.0\lib\Xamarin.iOS10\Facebook.MarketingKit.dll</HintPath>
+    </Reference>
+    <Reference Include="Facebook.MessengerShareKit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xamarin.Facebook.MessengerShareKit.iOS.1.3.2\lib\Xamarin.iOS10\Facebook.MessengerShareKit.dll</HintPath>
+    </Reference>
+    <Reference Include="Facebook.PlacesKit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xamarin.Facebook.PlacesKit.iOS.4.35.0\lib\Xamarin.iOS10\Facebook.PlacesKit.dll</HintPath>
+    </Reference>
+    <Reference Include="Facebook.ShareKit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xamarin.Facebook.ShareKit.iOS.4.35.0\lib\Xamarin.iOS10\Facebook.ShareKit.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />

diff --git a/src/Plugin.FacebookClient.iOS/packages.config b/src/Plugin.FacebookClient.iOS/packages.config
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Facebook.iOS" version="4.33.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Facebook.CoreKit.iOS" version="4.35.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Facebook.iOS" version="4.38.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Facebook.LoginKit.iOS" version="4.35.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Facebook.MarketingKit.iOS" version="4.35.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Facebook.MessengerShareKit.iOS" version="1.3.2" targetFramework="xamarinios10" />
+  <package id="Xamarin.Facebook.PlacesKit.iOS" version="4.35.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Facebook.ShareKit.iOS" version="4.35.0" targetFramework="xamarinios10" />
 </packages>