diff --git a/Xamarin.Auth b/Xamarin.Auth index ea5965b..f3222ca 160000 --- a/Xamarin.Auth +++ b/Xamarin.Auth @@ -1 +1 @@ -Subproject commit ea5965b3fe2df33e59bcd85ff95f6f7898fc28e1 +Subproject commit f3222ca9fd850c55e1fe4179908c4768f1666085 diff --git a/component.yaml b/component.yaml index 0c20af0..347e5f0 100644 --- a/component.yaml +++ b/component.yaml @@ -1,30 +1,28 @@ -version: 1.1.5 +version: 1.1.3 +id: xamarin.social name: Xamarin.Social publisher: Xamarin -id: xamarin.social publisher-url: http://xamarin.com/ summary: Share statuses, links, and images on Facebook, Flickr, Twitter and more. -monodoc: source/docs/ +details: component/Details.md +license: License.md +getting-started: component/GettingStarted.md +monodocs: docs/ +no_build: true libraries: - ios: - - src/Xamarin.Social.iOS/bin/classic/AnyCPU/Release/Xamarin.Social.iOS.dll - - src/Xamarin.Social.iOS/bin/classic/AnyCPU/Release/Xamarin.Auth.iOS.dll - ios-unified: - - src/Xamarin.Social.iOS/bin/unified/AnyCPU/Release/Xamarin.Social.iOS.dll - - src/Xamarin.Social.iOS/bin/unified/AnyCPU/Release/Xamarin.Auth.iOS.dll - android: + ios: + - src/Xamarin.Social.iOS/bin/Release/Xamarin.Social.iOS.dll + - src/Xamarin.Social.iOS/bin/Release/Xamarin.Auth.iOS.dll + android: - src/Xamarin.Social.Android/bin/Release/Xamarin.Social.Android.dll - src/Xamarin.Social.Android/bin/Release/Xamarin.Auth.Android.dll samples: - - name: "Android Sample" - path: samples-for-component-binary-references/Xamarin.Social.Sample.Android/Xamarin.Social.Sample.Android.sln - nobuild: true - - name: "iOS Classic Sample" - path: samples-for-component-binary-references/Xamarin.Social.Sample.iOS/Xamarin.Social.Sample.iOS-Classic.sln - nobuild: true - - name: "iOS Unified Sample" - path: samples-for-component-binary-references/Xamarin.Social.Sample.iOS/Xamarin.Social.Sample.iOS.sln + "Android Sample": samples/Xamarin.Social.Sample.Android/Xamarin.Social.Sample.Android.sln + "iOS Sample": samples/Xamarin.Social.Sample.iOS/Xamarin.Social.Sample.iOS.sln +screenshots: + - component/screenshots/00.jpg +icons: + - component/icons/xamarin.social_128x128.png + - component/icons/xamarin.social_512x512.png build: - - src/Xamarin.Social.iOS/Xamarin.Social.iOS.sln - - src/Xamarin.Social.iOS/Xamarin.Social.iOS-Classic.sln - - src/Xamarin.Social.Android/Xamarin.Social.Android.sln + - src/Xamarin.Social.sln \ No newline at end of file diff --git a/samples/Xamarin.Social.Sample.Android/Xamarin.Social.Sample.Android.csproj b/samples/Xamarin.Social.Sample.Android/Xamarin.Social.Sample.Android.csproj index 4a80c0d..35f29bf 100644 --- a/samples/Xamarin.Social.Sample.Android/Xamarin.Social.Sample.Android.csproj +++ b/samples/Xamarin.Social.Sample.Android/Xamarin.Social.Sample.Android.csproj @@ -46,7 +46,7 @@ - ..\..\src\Components\xamarin.mobile-0.7.4\lib\android\Xamarin.Mobile.dll + Components\xamarin.mobile-0.7.1\lib\android\Xamarin.Mobile.dll @@ -72,13 +72,13 @@ Xamarin.Auth.Android - - - - 0.7.4 + 0.7.1 False + + + diff --git a/samples/Xamarin.Social.Sample.iOS/AppDelegate.cs b/samples/Xamarin.Social.Sample.iOS/AppDelegate.cs index 82dc1dd..273d998 100644 --- a/samples/Xamarin.Social.Sample.iOS/AppDelegate.cs +++ b/samples/Xamarin.Social.Sample.iOS/AppDelegate.cs @@ -1,13 +1,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -#if ! __UNIFIED__ using MonoTouch.Foundation; using MonoTouch.UIKit; -#else -using Foundation; -using UIKit; -#endif using MonoTouch.Dialog; using Xamarin.Media; using Xamarin.Social.Services; diff --git a/samples/Xamarin.Social.Sample.iOS/Xamarin.Social.Sample.iOS.csproj b/samples/Xamarin.Social.Sample.iOS/Xamarin.Social.Sample.iOS.csproj index c791e1b..31ca2e9 100644 --- a/samples/Xamarin.Social.Sample.iOS/Xamarin.Social.Sample.iOS.csproj +++ b/samples/Xamarin.Social.Sample.iOS/Xamarin.Social.Sample.iOS.csproj @@ -1,12 +1,12 @@ - + Debug iPhoneSimulator 8.0.30703 2.0 - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F} + {6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe Xamarin.Social.Sample.iOS Resources @@ -16,59 +16,53 @@ True full False - DEBUG;__UNIFIED__; + bin\iPhoneSimulator\Debug + DEBUG; prompt 4 False None True - obj\unified\iPhoneSimulator\Debug\ - bin\unified\iPhoneSimulator\Debug\ none True + bin\iPhoneSimulator\Release prompt 4 False None - __UNIFIED__; - obj\unified\iPhoneSimulator\Release\ - bin\unified\iPhoneSimulator\Release\ True full False + bin\iPhone\Debug DEBUG; prompt 4 False True iPhone Developer - obj\unified\iPhone\Debug\ - bin\unified\iPhone\Debug\ none True + bin\iPhone\Release prompt 4 False iPhone Developer - __UNIFIED__; - obj\unified\iPhone\Release\ - bin\unified\iPhone\Release\ - + + - ..\..\src\Components\xamarin.mobile-0.7.4\lib\ios-unified\Xamarin.Mobile.dll + Components\xamarin.mobile-0.7.1\lib\ios\Xamarin.Mobile.dll - @@ -82,14 +76,14 @@ - + - {6D2E4130-354F-4F59-ADCA-701C7E4A0437} + {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5} Xamarin.Social.iOS - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3} + {9309BCCC-AA7B-4195-A130-D4572FA9488D} Xamarin.Auth.iOS diff --git a/src/Xamarin.Social.Android/Xamarin.Social.Android.csproj b/src/Xamarin.Social.Android/Xamarin.Social.Android.csproj index 4ff63b8..0dc16a9 100644 --- a/src/Xamarin.Social.Android/Xamarin.Social.Android.csproj +++ b/src/Xamarin.Social.Android/Xamarin.Social.Android.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 8.0.30703 + 10.0.0 2.0 {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C} {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -32,6 +32,7 @@ 4 False False + SdkOnly PLATFORM_ANDROID diff --git a/src/Xamarin.Social.iOS/CheckedPickerView.cs b/src/Xamarin.Social.iOS/CheckedPickerView.cs index a66e24b..2bc3822 100644 --- a/src/Xamarin.Social.iOS/CheckedPickerView.cs +++ b/src/Xamarin.Social.iOS/CheckedPickerView.cs @@ -16,30 +16,11 @@ using System; using System.Collections.ObjectModel; using System.Collections.Specialized; +using MonoTouch.UIKit; using System.Drawing; using System.Collections.Generic; using System.Linq; -#if __UNIFIED__ -using UIKit; -using Foundation; -using CoreAnimation; -using CoreGraphics; -#else -using MonoTouch.UIKit; -using MonoTouch.Foundation; -using MonoTouch.CoreAnimation; -using MonoTouch.CoreGraphics; - -using System.Drawing; -using CGRect = global::System.Drawing.RectangleF; -using CGPoint = global::System.Drawing.PointF; -using CGSize = global::System.Drawing.SizeF; -using nfloat = global::System.Single; -using nint = global::System.Int32; -using nuint = global::System.UInt32; -#endif - namespace Xamarin.Social { class CheckedPickerView : UIPickerView @@ -97,20 +78,12 @@ public CheckedPickerView (RectangleF frame) class PickerDelegate : UIPickerViewDelegate { - #if ! __UNIFIED__ public override UIView GetView (UIPickerView pickerView, int row, int component, UIView view) - #else - public UIView GetView (UIPickerView pickerView, int row, int component, UIView view) - #endif { var label = view as PickerLabel; if (label == null) { - #if ! __UNIFIED__ label = new PickerLabel (new RectangleF (16, 0, pickerView.Bounds.Width - 32, 44)); - #else - label = new PickerLabel (new RectangleF ((float)16, (float)0, (float)(pickerView.Bounds.Width - 32), (float)44)); - #endif } var cpv = (CheckedPickerView)pickerView; @@ -121,12 +94,8 @@ public UIView GetView (UIPickerView pickerView, int row, int component, UIView return label; } - - #if ! __UNIFIED__ + public override void Selected (UIPickerView pickerView, int row, int component) - #else - public void Selected (UIPickerView pickerView, int row, int component) - #endif { var n = pickerView.RowsInComponent (0); @@ -143,21 +112,13 @@ public void Selected (UIPickerView pickerView, int row, int component) class PickerDataSource : UIPickerViewDataSource { - #if ! __UNIFIED__ public override int GetRowsInComponent (UIPickerView pickerView, int component) - #else - public override nint GetRowsInComponent (UIPickerView pickerView, nint component) - #endif { var cpv = (CheckedPickerView)pickerView; return cpv.Items.Count; } - #if ! __UNIFIED__ public override int GetComponentCount (UIPickerView pickerView) - #else - public override nint GetComponentCount (UIPickerView pickerView) - #endif { return 1; } diff --git a/src/Xamarin.Social.iOS/FoundationResponse.cs b/src/Xamarin.Social.iOS/FoundationResponse.cs index 2594cbd..7de94e1 100644 --- a/src/Xamarin.Social.iOS/FoundationResponse.cs +++ b/src/Xamarin.Social.iOS/FoundationResponse.cs @@ -17,25 +17,7 @@ using System.Collections.Generic; using System.IO; using System.Net; -#if __UNIFIED__ -using UIKit; -using Foundation; -using CoreAnimation; -using CoreGraphics; -#else -using MonoTouch.UIKit; using MonoTouch.Foundation; -using MonoTouch.CoreAnimation; -using MonoTouch.CoreGraphics; - -using System.Drawing; -using CGRect = global::System.Drawing.RectangleF; -using CGPoint = global::System.Drawing.PointF; -using CGSize = global::System.Drawing.SizeF; -using nfloat = global::System.Single; -using nint = global::System.Int32; -using nuint = global::System.UInt32; -#endif using Xamarin.Auth; namespace Xamarin.Social @@ -44,20 +26,11 @@ class FoundationResponse : Response { NSData data; Dictionary headers; - - #if ! __UNIFIED__ int statusCode; - #else - nint statusCode; - #endif public override HttpStatusCode StatusCode { get { - #if ! __UNIFIED__ return (HttpStatusCode)statusCode; - #else - return (HttpStatusCode) (int)statusCode; - #endif } } @@ -84,11 +57,7 @@ public override Stream GetResponseStream () var mutableData = data as NSMutableData; if (mutableData != null) { unsafe { - #if ! __UNIFIED__ return new UnmanagedMemoryStream ((byte*)mutableData.Bytes, mutableData.Length); - #else - return new UnmanagedMemoryStream ((byte*)mutableData.Bytes, (long) mutableData.Length); - #endif } } else { return data.AsStream (); diff --git a/src/Xamarin.Social.iOS/NSDataStream.cs b/src/Xamarin.Social.iOS/NSDataStream.cs index 4d066ed..67ee86f 100644 --- a/src/Xamarin.Social.iOS/NSDataStream.cs +++ b/src/Xamarin.Social.iOS/NSDataStream.cs @@ -14,14 +14,9 @@ // limitations under the License. using System; -using System.IO; -#if ! __UNIFIED__ using MonoTouch.UIKit; +using System.IO; using MonoTouch.Foundation; -#else -using UIKit; -using Foundation; -#endif using System.Runtime.InteropServices; namespace Xamarin.Social @@ -54,12 +49,7 @@ public override int Read (byte[] buffer, int offset, int count) return 0; } else { - #if ! __UNIFIED__ var len = (int)Math.Min (count, data.Length - pos); - #else - var len = (int)Math.Min (count, (double)(data.Length - pos)); - #endif - Marshal.Copy (new IntPtr (data.Bytes.ToInt64 () + pos), buffer, offset, len); pos += (uint)len; return len; @@ -101,12 +91,7 @@ public override bool CanWrite { public override long Length { get { - // override does not allow nint - #if ! __UNIFIED__ return data.Length; - #else - return (long) data.Length; - #endif } } diff --git a/src/Xamarin.Social.iOS/ProgressLabel.cs b/src/Xamarin.Social.iOS/ProgressLabel.cs index 7d8c089..0d0b586 100644 --- a/src/Xamarin.Social.iOS/ProgressLabel.cs +++ b/src/Xamarin.Social.iOS/ProgressLabel.cs @@ -1,26 +1,6 @@ using System; - -#if __UNIFIED__ -using UIKit; -using Foundation; -using CoreAnimation; -using CoreGraphics; - -using System.Drawing; -#else using MonoTouch.UIKit; -using MonoTouch.Foundation; -using MonoTouch.CoreAnimation; -using MonoTouch.CoreGraphics; - using System.Drawing; -using CGRect = global::System.Drawing.RectangleF; -using CGPoint = global::System.Drawing.PointF; -using CGSize = global::System.Drawing.SizeF; -using nfloat = global::System.Single; -using nint = global::System.Int32; -using nuint = global::System.UInt32; -#endif namespace Xamarin.Social { @@ -45,11 +25,7 @@ public ProgressLabel (string text) TextColor = UIColor.White, Font = UIFont.BoldSystemFontOfSize (20), BackgroundColor = UIColor.Clear, - #if ! __UNIFIED__ - Frame = new RectangleF (25f, 0f, Frame.Width - 25, 44f), - #else - Frame = new RectangleF (25f, 0f, (float)(Frame.Width - 25), 44f), - #endif + Frame = new RectangleF (25, 0, Frame.Width - 25, 44), }; AddSubview (label); diff --git a/src/Xamarin.Social.iOS/Services/Twitter5Service.cs b/src/Xamarin.Social.iOS/Services/Twitter5Service.cs index fe4ac7b..e682f51 100644 --- a/src/Xamarin.Social.iOS/Services/Twitter5Service.cs +++ b/src/Xamarin.Social.iOS/Services/Twitter5Service.cs @@ -4,33 +4,10 @@ using System.Linq; using System.Threading.Tasks; using System.Threading; - - -#if __UNIFIED__ -using UIKit; -using Foundation; -using CoreAnimation; -using CoreGraphics; - -using Accounts; -using Twitter; -#else -using MonoTouch.UIKit; -using MonoTouch.Foundation; -using MonoTouch.CoreAnimation; -using MonoTouch.CoreGraphics; - -using System.Drawing; -using CGRect = global::System.Drawing.RectangleF; -using CGPoint = global::System.Drawing.PointF; -using CGSize = global::System.Drawing.SizeF; -using nfloat = global::System.Single; -using nint = global::System.Int32; -using nuint = global::System.UInt32; - using MonoTouch.Accounts; +using MonoTouch.Foundation; using MonoTouch.Twitter; -#endif +using MonoTouch.UIKit; using Xamarin.Auth; namespace Xamarin.Social.Services diff --git a/src/Xamarin.Social.iOS/ShareViewController.cs b/src/Xamarin.Social.iOS/ShareViewController.cs index 5dbe7b9..d6816a6 100644 --- a/src/Xamarin.Social.iOS/ShareViewController.cs +++ b/src/Xamarin.Social.iOS/ShareViewController.cs @@ -19,27 +19,9 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -#if __UNIFIED__ -using UIKit; -using Foundation; -using CoreAnimation; -using CoreGraphics; - -using CGRect = global::System.Drawing.RectangleF; -#else -using MonoTouch.UIKit; -using MonoTouch.Foundation; -using MonoTouch.CoreAnimation; using MonoTouch.CoreGraphics; - -using System.Drawing; -using CGRect = global::System.Drawing.RectangleF; -using CGPoint = global::System.Drawing.PointF; -using CGSize = global::System.Drawing.SizeF; -using nfloat = global::System.Single; -using nint = global::System.Int32; -using nuint = global::System.UInt32; -#endif +using MonoTouch.Foundation; +using MonoTouch.UIKit; using Xamarin.Auth; using Xamarin.Utilities.iOS; @@ -170,11 +152,7 @@ void BuildUI () var fieldHeight = 33; accountField = new ChoiceField ( - #if ! __UNIFIED__ new RectangleF (0, b.Y, b.Width, 33), - #else - new RectangleF (0, (float)b.Y, (float)b.Width, 33), - #endif this, NSBundle.MainBundle.LocalizedString ("From", "From title when sharing")); View.AddSubview (accountField); @@ -188,13 +166,7 @@ void BuildUI () if (service.HasMaxTextLength || item.Links.Count > 0) { editorHeight -= statusHeight; } - textEditor = new UITextView ( - #if ! __UNIFIED__ - new RectangleF (0, b.Y, b.Width, editorHeight)) - #else - new RectangleF (0, (float) b.Y, (float) b.Width, (float)editorHeight)) - #endif - { + textEditor = new UITextView (new RectangleF (0, b.Y, b.Width, editorHeight)) { Font = TextEditorFont, AutoresizingMask = UIViewAutoresizing.FlexibleWidth | UIViewAutoresizing.FlexibleHeight, Text = item.Text, @@ -211,26 +183,17 @@ void BuildUI () RectangleF f; var x = b.Right - AttachmentIcon.Size - 8 - rem*(item.Images.Count - 1); var y = textEditor.Frame.Y + 8; - #if ! __UNIFIED__ + f = textEditor.Frame; f.Width = x - 8 - f.X; - #else - f = (RectangleF)textEditor.Frame; - f.Width = (float)x - 8 - f.X; - #endif textEditor.Frame = f; foreach (var i in item.Images) { var icon = new ImageIcon (i.Image); - #if ! __UNIFIED__ + f = icon.Frame; f.X = x; f.Y = y; - #else - f = (RectangleF) icon.Frame; - f.X = (float)x; - f.Y = (float)y; - #endif icon.Frame = f; View.AddSubview (icon); @@ -245,11 +208,7 @@ void BuildUI () // if (service.HasMaxTextLength) { textLengthLabel = new TextLengthLabel ( - #if ! __UNIFIED__ new RectangleF (4, b.Bottom - statusHeight, textEditor.Frame.Width - 8, statusHeight), - #else - new RectangleF (4, (float)(b.Bottom - statusHeight), (float)(textEditor.Frame.Width - 8), statusHeight), - #endif service.MaxTextLength) { TextLength = service.GetTextLength (item), }; @@ -261,11 +220,7 @@ void BuildUI () // if (item.Links.Count > 0) { linksLabel = new UILabel ( - #if ! __UNIFIED__ new RectangleF (4, b.Bottom - statusHeight, textEditor.Frame.Width - 66, statusHeight)) { - #else - new RectangleF (4, (float)(b.Bottom - statusHeight), (float)(textEditor.Frame.Width - 66), statusHeight)) { - #endif TextColor = UIColor.FromRGB (124, 124, 124), AutoresizingMask = UIViewAutoresizing.FlexibleTopMargin | @@ -541,19 +496,12 @@ public Field (RectangleF frame, ShareViewController controller, string title) }; var w = TitleLabel.StringSize (TitleLabel.Text, TextEditorFont).Width + 8; - #if ! __UNIFIED__ TitleLabel.Frame = new RectangleF (8, 0, w, frame.Height - 1); - #else - TitleLabel.Frame = new RectangleF (8, 0, (float)w, frame.Height - 1); - #endif + AddSubview (TitleLabel); } - #if ! __UNIFIED__ public override void Draw (RectangleF rect) - #else - public void Draw (RectangleF rect) - #endif { var b = Bounds; using (var c = UIGraphics.GetCurrentContext ()) { @@ -590,11 +538,8 @@ public ChoiceField (RectangleF frame, ShareViewController controller, string tit AutoresizingMask = UIViewAutoresizing.FlexibleWidth, }; var tf = TitleLabel.Frame; - #if ! __UNIFIED__ ValueLabel.Frame = new RectangleF (tf.Right, 0, frame.Width - tf.Right, frame.Height - 1); - #else - ValueLabel.Frame = new RectangleF ((float)tf.Right, 0, (float)((nfloat)frame.Width - tf.Right), (float)(frame.Height - 1)); - #endif + ValueLabel.TouchUpInside += HandleTouchUpInside; AddSubview (ValueLabel); @@ -617,11 +562,7 @@ void HandleTouchUpInside (object sender, EventArgs e) var v = Controller.View; Picker.Hidden = false; - #if ! __UNIFIED__ Picker.Frame = new RectangleF (0, v.Bounds.Bottom - 216, 320, 216); - #else - Picker.Frame = new RectangleF (0, (float)(v.Bounds.Bottom - 216), 320, 216); - #endif v.BringSubviewToFront (Picker); } } diff --git a/src/Xamarin.Social.iOS/Xamarin.Social.iOS-Classic.csproj b/src/Xamarin.Social.iOS/Xamarin.Social.iOS-Classic.csproj deleted file mode 100644 index 45298db..0000000 --- a/src/Xamarin.Social.iOS/Xamarin.Social.iOS-Classic.csproj +++ /dev/null @@ -1,109 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5} - {6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Xamarin.Social - Xamarin.Social.iOS - - - True - full - False - DEBUG;PLATFORM_IOS - prompt - 4 - False - True - True - obj\classic\AnyCPU\Debug\ - bin\classic\AnyCPU\Debug\ - - - none - True - prompt - 4 - False - PLATFORM_IOS - True - True - obj\classic\AnyCPU\Release\ - bin\classic\AnyCPU\Release\ - - - - - - - - - ..\..\lib\ios\Xamarin.Auth.iOS.dll - - - - - - AssemblyInfo.cs - - - Item.cs - - - Service.cs - - - ShareResult.cs - - - - Services\FacebookService.cs - - - Services\TwitterService.cs - - - ImageData.cs - - - FileData.cs - - - - - Services\FlickrService.cs - - - OAuth1Service.cs - - - SocialException.cs - - - OAuth2Service.cs - - - - - Services\AppDotNetService.cs - - - - UIViewControllerEx.cs - - - ExceptionEx.cs - - - WebEx.cs - - - - - - \ No newline at end of file diff --git a/src/Xamarin.Social.iOS/Xamarin.Social.iOS.csproj b/src/Xamarin.Social.iOS/Xamarin.Social.iOS.csproj index c02deae..841f42b 100644 --- a/src/Xamarin.Social.iOS/Xamarin.Social.iOS.csproj +++ b/src/Xamarin.Social.iOS/Xamarin.Social.iOS.csproj @@ -1,12 +1,12 @@ - + Debug AnyCPU - 8.0.30703 + 10.0.0 2.0 - {6D2E4130-354F-4F59-ADCA-701C7E4A0437} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5} + {6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library Xamarin.Social Xamarin.Social.iOS @@ -16,14 +16,12 @@ full False bin\Debug - DEBUG;PLATFORM_IOS;__UNIFIED__; + DEBUG;PLATFORM_IOS prompt 4 False True True - obj\unified\AnyCPU\Debug\ - bin\unified\AnyCPU\Debug\ none @@ -35,21 +33,15 @@ PLATFORM_IOS True True - PLATFORM_IOS;__UNIFIED__; - obj\unified\AnyCPU\Release\ - bin\unified\AnyCPU\Release\ - - - ..\..\lib\ios-unified\Xamarin.Auth.iOS.dll - + - + AssemblyInfo.cs @@ -109,4 +101,10 @@ + + + {9309BCCC-AA7B-4195-A130-D4572FA9488D} + Xamarin.Auth.iOS + + \ No newline at end of file diff --git a/src/Xamarin.Social.iOS/Xamarin.Social.iOS.sln b/src/Xamarin.Social.iOS/Xamarin.Social.iOS.sln index 973dddc..55a301b 100644 --- a/src/Xamarin.Social.iOS/Xamarin.Social.iOS.sln +++ b/src/Xamarin.Social.iOS/Xamarin.Social.iOS.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Social.iOS", "Xamarin.Social.iOS.csproj", "{6D2E4130-354F-4F59-ADCA-701C7E4A0437}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Social.iOS", "Xamarin.Social.iOS.csproj", "{C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Auth.iOS", "..\..\Xamarin.Auth\src\Xamarin.Auth.iOS\Xamarin.Auth.iOS.csproj", "{19A091BD-B0E7-49FC-BF83-4118D91A7DC3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Auth.iOS", "..\..\Xamarin.Auth\src\Xamarin.Auth.iOS\Xamarin.Auth.iOS.csproj", "{9309BCCC-AA7B-4195-A130-D4572FA9488D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,14 +11,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Release|Any CPU.Build.0 = Release|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Release|Any CPU.Build.0 = Release|Any CPU + {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Release|Any CPU.Build.0 = Release|Any CPU + {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Xamarin.Social.iOS.csproj diff --git a/src/Xamarin.Social.sln b/src/Xamarin.Social.sln index a534b7b..c624da4 100644 --- a/src/Xamarin.Social.sln +++ b/src/Xamarin.Social.sln @@ -3,6 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Social", "Xamarin.Social\Xamarin.Social.csproj", "{2CAFD7AE-C52F-4F01-9E25-58656DD8476D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Social.Android", "Xamarin.Social.Android\Xamarin.Social.Android.csproj", "{BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Social.iOS", "Xamarin.Social.iOS\Xamarin.Social.iOS.csproj", "{C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{00795B5D-4D2C-4792-84D6-510141000CD9}" ProjectSection(SolutionItems) = preProject ..\component.yaml = ..\component.yaml @@ -14,27 +18,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Auth", "..\Xamarin.Auth\src\Xamarin.Auth\Xamarin.Auth.csproj", "{C9FF1919-78DD-4084-976D-BDABC0A7E80B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Android", "Android", "{280D7EB6-A56E-4E43-8C03-65D0565A7EDA}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Social.Android", "Xamarin.Social.Android\Xamarin.Social.Android.csproj", "{BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Auth.Android", "..\Xamarin.Auth\src\Xamarin.Auth.Android\Xamarin.Auth.Android.csproj", "{FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Social.Sample.Android", "..\samples\Xamarin.Social.Sample.Android\Xamarin.Social.Sample.Android.csproj", "{02315614-C71C-4877-917C-6DB21FD9CC95}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "iOS", "iOS", "{6568F577-13F1-4E07-B934-9983BA15D23C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Social.iOS", "Xamarin.Social.iOS\Xamarin.Social.iOS.csproj", "{6D2E4130-354F-4F59-ADCA-701C7E4A0437}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Auth.iOS", "..\Xamarin.Auth\src\Xamarin.Auth.iOS\Xamarin.Auth.iOS.csproj", "{19A091BD-B0E7-49FC-BF83-4118D91A7DC3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Auth.iOS", "..\Xamarin.Auth\src\Xamarin.Auth.iOS\Xamarin.Auth.iOS.csproj", "{9309BCCC-AA7B-4195-A130-D4572FA9488D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Social.Sample.iOS", "..\samples\Xamarin.Social.Sample.iOS\Xamarin.Social.Sample.iOS.csproj", "{60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Android", "Android", "{280D7EB6-A56E-4E43-8C03-65D0565A7EDA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Social.iOS-Classic", "Xamarin.Social.iOS\Xamarin.Social.iOS-Classic.csproj", "{C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "iOS", "iOS", "{6568F577-13F1-4E07-B934-9983BA15D23C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Auth.iOS-Classic", "..\Xamarin.Auth\src\Xamarin.Auth.iOS\Xamarin.Auth.iOS-Classic.csproj", "{9309BCCC-AA7B-4195-A130-D4572FA9488D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Social.Sample.Android", "..\samples\Xamarin.Social.Sample.Android\Xamarin.Social.Sample.Android.csproj", "{02315614-C71C-4877-917C-6DB21FD9CC95}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Social.Sample.iOS-Classic", "..\samples\Xamarin.Social.Sample.iOS\Xamarin.Social.Sample.iOS-Classic.csproj", "{E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Social.Sample.iOS", "..\samples\Xamarin.Social.Sample.iOS\Xamarin.Social.Sample.iOS.csproj", "{E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{0B878D11-E3C0-4C06-91BA-EE37A52AF8A0}" ProjectSection(SolutionItems) = preProject @@ -69,164 +63,83 @@ Global Debug|iPhone = Debug|iPhone Release|Any CPU = Release|Any CPU Release|iPhone = Release|iPhone - Debug|iPhoneSimulator = Debug|iPhoneSimulator - Release|iPhoneSimulator = Release|iPhoneSimulator EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {02315614-C71C-4877-917C-6DB21FD9CC95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {02315614-C71C-4877-917C-6DB21FD9CC95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {02315614-C71C-4877-917C-6DB21FD9CC95}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {02315614-C71C-4877-917C-6DB21FD9CC95}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {02315614-C71C-4877-917C-6DB21FD9CC95}.Debug|iPhone.Build.0 = Debug|Any CPU - {02315614-C71C-4877-917C-6DB21FD9CC95}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {02315614-C71C-4877-917C-6DB21FD9CC95}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {02315614-C71C-4877-917C-6DB21FD9CC95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {02315614-C71C-4877-917C-6DB21FD9CC95}.Release|Any CPU.Build.0 = Release|Any CPU - {02315614-C71C-4877-917C-6DB21FD9CC95}.Release|Any CPU.Deploy.0 = Release|Any CPU - {02315614-C71C-4877-917C-6DB21FD9CC95}.Release|iPhone.ActiveCfg = Release|Any CPU - {02315614-C71C-4877-917C-6DB21FD9CC95}.Release|iPhone.Build.0 = Release|Any CPU - {02315614-C71C-4877-917C-6DB21FD9CC95}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {02315614-C71C-4877-917C-6DB21FD9CC95}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Debug|iPhone.Build.0 = Debug|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Release|Any CPU.Build.0 = Release|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Release|iPhone.ActiveCfg = Release|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Release|iPhone.Build.0 = Release|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {2CAFD7AE-C52F-4F01-9E25-58656DD8476D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2CAFD7AE-C52F-4F01-9E25-58656DD8476D}.Debug|Any CPU.Build.0 = Debug|Any CPU {2CAFD7AE-C52F-4F01-9E25-58656DD8476D}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {2CAFD7AE-C52F-4F01-9E25-58656DD8476D}.Debug|iPhone.Build.0 = Debug|Any CPU - {2CAFD7AE-C52F-4F01-9E25-58656DD8476D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {2CAFD7AE-C52F-4F01-9E25-58656DD8476D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {2CAFD7AE-C52F-4F01-9E25-58656DD8476D}.Release|Any CPU.ActiveCfg = Release|Any CPU {2CAFD7AE-C52F-4F01-9E25-58656DD8476D}.Release|Any CPU.Build.0 = Release|Any CPU {2CAFD7AE-C52F-4F01-9E25-58656DD8476D}.Release|iPhone.ActiveCfg = Release|Any CPU - {2CAFD7AE-C52F-4F01-9E25-58656DD8476D}.Release|iPhone.Build.0 = Release|Any CPU - {2CAFD7AE-C52F-4F01-9E25-58656DD8476D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {2CAFD7AE-C52F-4F01-9E25-58656DD8476D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Debug|Any CPU.Deploy.0 = Debug|iPhoneSimulator - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Debug|iPhone.ActiveCfg = Debug|iPhone - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Debug|iPhone.Build.0 = Debug|iPhone - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Debug|iPhone.Deploy.0 = Debug|iPhone - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Release|Any CPU.Build.0 = Release|iPhoneSimulator - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Release|Any CPU.Deploy.0 = Release|iPhoneSimulator - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Release|iPhone.ActiveCfg = Release|iPhone - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Release|iPhone.Build.0 = Release|iPhone - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Release|iPhone.Deploy.0 = Release|iPhone - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Debug|iPhone.Build.0 = Debug|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Release|Any CPU.Build.0 = Release|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Release|iPhone.ActiveCfg = Release|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Release|iPhone.Build.0 = Release|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6D2E4130-354F-4F59-ADCA-701C7E4A0437}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Debug|iPhone.Build.0 = Debug|Any CPU - {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Release|Any CPU.Build.0 = Release|Any CPU - {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Release|iPhone.ActiveCfg = Release|Any CPU - {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Release|iPhone.Build.0 = Release|Any CPU - {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}.Debug|Any CPU.Build.0 = Debug|Any CPU {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}.Debug|iPhone.Build.0 = Debug|Any CPU - {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}.Release|Any CPU.ActiveCfg = Release|Any CPU {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}.Release|Any CPU.Build.0 = Release|Any CPU {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}.Release|iPhone.ActiveCfg = Release|Any CPU - {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}.Release|iPhone.Build.0 = Release|Any CPU - {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Debug|Any CPU.Build.0 = Debug|Any CPU {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Debug|iPhone.ActiveCfg = Debug|Any CPU {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Debug|iPhone.Build.0 = Debug|Any CPU - {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Release|Any CPU.ActiveCfg = Release|Any CPU {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Release|Any CPU.Build.0 = Release|Any CPU {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Release|iPhone.ActiveCfg = Release|Any CPU {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Release|iPhone.Build.0 = Release|Any CPU - {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {C9FF1919-78DD-4084-976D-BDABC0A7E80B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C9FF1919-78DD-4084-976D-BDABC0A7E80B}.Debug|Any CPU.Build.0 = Debug|Any CPU {C9FF1919-78DD-4084-976D-BDABC0A7E80B}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {C9FF1919-78DD-4084-976D-BDABC0A7E80B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {C9FF1919-78DD-4084-976D-BDABC0A7E80B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {C9FF1919-78DD-4084-976D-BDABC0A7E80B}.Release|Any CPU.ActiveCfg = Release|Any CPU {C9FF1919-78DD-4084-976D-BDABC0A7E80B}.Release|Any CPU.Build.0 = Release|Any CPU {C9FF1919-78DD-4084-976D-BDABC0A7E80B}.Release|iPhone.ActiveCfg = Release|Any CPU - {C9FF1919-78DD-4084-976D-BDABC0A7E80B}.Release|iPhone.Build.0 = Release|Any CPU - {C9FF1919-78DD-4084-976D-BDABC0A7E80B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {C9FF1919-78DD-4084-976D-BDABC0A7E80B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Release|Any CPU.Build.0 = Release|Any CPU + {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Release|iPhone.ActiveCfg = Release|Any CPU + {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Debug|iPhone.Build.0 = Debug|Any CPU + {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Release|Any CPU.Build.0 = Release|Any CPU + {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Release|iPhone.ActiveCfg = Release|Any CPU + {9309BCCC-AA7B-4195-A130-D4572FA9488D}.Release|iPhone.Build.0 = Release|Any CPU + {02315614-C71C-4877-917C-6DB21FD9CC95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {02315614-C71C-4877-917C-6DB21FD9CC95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {02315614-C71C-4877-917C-6DB21FD9CC95}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {02315614-C71C-4877-917C-6DB21FD9CC95}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {02315614-C71C-4877-917C-6DB21FD9CC95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {02315614-C71C-4877-917C-6DB21FD9CC95}.Release|Any CPU.Build.0 = Release|Any CPU + {02315614-C71C-4877-917C-6DB21FD9CC95}.Release|Any CPU.Deploy.0 = Release|Any CPU + {02315614-C71C-4877-917C-6DB21FD9CC95}.Release|iPhone.ActiveCfg = Release|Any CPU {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator + {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Debug|Any CPU.Deploy.0 = Debug|iPhoneSimulator {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Debug|iPhone.ActiveCfg = Debug|iPhone {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Debug|iPhone.Build.0 = Debug|iPhone - {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator + {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Debug|iPhone.Deploy.0 = Debug|iPhone {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Release|Any CPU.Build.0 = Release|iPhoneSimulator + {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Release|Any CPU.Deploy.0 = Release|iPhoneSimulator {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Release|iPhone.ActiveCfg = Release|iPhone {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Release|iPhone.Build.0 = Release|iPhone - {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Release|Any CPU.Build.0 = Release|Any CPU - {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Release|iPhone.ActiveCfg = Release|Any CPU - {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Release|iPhone.Build.0 = Release|Any CPU - {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}.Release|iPhone.Deploy.0 = Release|iPhone + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {BA8CBA8B-7F55-4167-B872-0BBF09F08B8C} = {280D7EB6-A56E-4E43-8C03-65D0565A7EDA} - {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21} = {280D7EB6-A56E-4E43-8C03-65D0565A7EDA} - {02315614-C71C-4877-917C-6DB21FD9CC95} = {280D7EB6-A56E-4E43-8C03-65D0565A7EDA} - {6D2E4130-354F-4F59-ADCA-701C7E4A0437} = {6568F577-13F1-4E07-B934-9983BA15D23C} - {19A091BD-B0E7-49FC-BF83-4118D91A7DC3} = {6568F577-13F1-4E07-B934-9983BA15D23C} - {60BE34F8-EDDE-4AF9-96C6-485E08F3ED17} = {6568F577-13F1-4E07-B934-9983BA15D23C} {C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5} = {6568F577-13F1-4E07-B934-9983BA15D23C} + {FCF02C8C-6DD3-4C59-A8A2-58BC01A4BB21} = {280D7EB6-A56E-4E43-8C03-65D0565A7EDA} {9309BCCC-AA7B-4195-A130-D4572FA9488D} = {6568F577-13F1-4E07-B934-9983BA15D23C} + {02315614-C71C-4877-917C-6DB21FD9CC95} = {280D7EB6-A56E-4E43-8C03-65D0565A7EDA} {E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F} = {6568F577-13F1-4E07-B934-9983BA15D23C} {7F8E56DF-5351-4417-B6C6-09DF3570EA3E} = {0B878D11-E3C0-4C06-91BA-EE37A52AF8A0} {4192965C-1716-41E0-AE18-D599C1FBD51C} = {0B878D11-E3C0-4C06-91BA-EE37A52AF8A0} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = ..\samples\Xamarin.Social.Sample.iOS\Xamarin.Social.Sample.iOS.csproj - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE + StartupItem = Xamarin.Social.iOS\Xamarin.Social.iOS.csproj EndGlobalSection EndGlobal diff --git a/src/Xamarin.Social/ImageData.cs b/src/Xamarin.Social/ImageData.cs index 67d2573..044ffa0 100644 --- a/src/Xamarin.Social/ImageData.cs +++ b/src/Xamarin.Social/ImageData.cs @@ -17,10 +17,8 @@ using System.IO; using System.Linq; -#if PLATFORM_IOS && ! __UNIFIED__ +#if PLATFORM_IOS using MonoTouch.UIKit; -#elif PLATFORM_IOS && __UNIFIED__ -using UIKit; #elif PLATFORM_ANDROID using Android.Graphics; #else @@ -28,7 +26,6 @@ using System.Drawing.Imaging; #endif - namespace Xamarin.Social { public class ImageData : FileData diff --git a/src/Xamarin.Social/Service.cs b/src/Xamarin.Social/Service.cs index f42c716..1348ff4 100644 --- a/src/Xamarin.Social/Service.cs +++ b/src/Xamarin.Social/Service.cs @@ -23,12 +23,9 @@ using System.Threading; using Xamarin.Auth; -#if PLATFORM_IOS && ! __UNIFIED__ +#if PLATFORM_IOS using ShareUIType = MonoTouch.UIKit.UIViewController; using AuthenticateUIType = MonoTouch.UIKit.UIViewController; -#elif PLATFORM_IOS && __UNIFIED__ -using ShareUIType = UIKit.UIViewController; -using AuthenticateUIType = UIKit.UIViewController; #elif PLATFORM_ANDROID using ShareUIType = Android.Content.Intent; using AuthenticateUIType = Android.Content.Intent; @@ -310,11 +307,7 @@ public virtual int GetTextLength (Item item) /// public virtual ShareUIType GetShareUI (Item item, Action completionHandler) { - #if ! __UNIFIED__ return new MonoTouch.UIKit.UINavigationController (new ShareViewController (this, item, completionHandler)); - #else - return new UIKit.UINavigationController (new ShareViewController (this, item, completionHandler)); - #endif } #elif PLATFORM_ANDROID /// diff --git a/src/Xamarin.Social/Xamarin.Social.csproj b/src/Xamarin.Social/Xamarin.Social.csproj index 68aa7e3..ef2cf64 100644 --- a/src/Xamarin.Social/Xamarin.Social.csproj +++ b/src/Xamarin.Social/Xamarin.Social.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 8.0.30703 + 9.0.21022 2.0 {2CAFD7AE-C52F-4F01-9E25-58656DD8476D} Library @@ -19,7 +19,7 @@ prompt 4 False - bin\Debug\Xamarin.Social.xml + True none @@ -28,12 +28,18 @@ prompt 4 False - bin\Release\Xamarin.Social.xml + True - - - + + 4.0 + + + 4.0 + + + 4.0 +