From dc54f1b269ffc98a517956c39522a38f75248da7 Mon Sep 17 00:00:00 2001 From: Benoit Jadinon Date: Thu, 1 Jan 2015 12:08:34 +0100 Subject: [PATCH 1/6] Android+iOS only : updated to XF 1.3 fixed missing BindableProperty.Create overload --- NuGetPackage/NuGetPackage.nuspec | Bin 4926 -> 4932 bytes .../Resources/Resource.Designer.cs | 20 +++++------ .../SolTech.Xamarin.Forms.Android.csproj | 31 +++++++++--------- SolTech.Xamarin.Forms.Android/packages.config | 8 ++--- .../Controls/LimitedEntryRenderer.cs | 5 +++ .../SolTech.Xamarin.Forms.iOS.csproj | 24 +++++++------- SolTech.Xamarin.Forms.iOS/packages.config | 6 ++-- .../Soltech.Xamarin.Forms.WinPhone.csproj | 2 -- Soltech.Xamarin.Forms.userprefs | 11 +++++++ .../Controls/LimitedEntry.cs | 2 +- .../Controls/StatefulButton.cs | 7 ++-- .../SolTech.Xamarin.Forms.csproj | 27 ++++++++------- Soltech.Xamarin.Forms/packages.config | 6 ++-- 13 files changed, 80 insertions(+), 69 deletions(-) create mode 100644 Soltech.Xamarin.Forms.userprefs diff --git a/NuGetPackage/NuGetPackage.nuspec b/NuGetPackage/NuGetPackage.nuspec index 1b5a4d537a53e20caf8f98645a981e127e329c18..53284c5e735954d59dd3b7d13478141c25f39d43 100644 GIT binary patch delta 28 icmdm|c0_H%8BTs<20aD?AU0z#Vz6W|+I*EWlM?`OP6qe@ delta 22 bcmX@2woh%t8BR_k20aE4HrRZdGm{elQUV56 diff --git a/SolTech.Xamarin.Forms.Android/Resources/Resource.Designer.cs b/SolTech.Xamarin.Forms.Android/Resources/Resource.Designer.cs index ee8a36d..3bd1231 100644 --- a/SolTech.Xamarin.Forms.Android/Resources/Resource.Designer.cs +++ b/SolTech.Xamarin.Forms.Android/Resources/Resource.Designer.cs @@ -1,15 +1,15 @@ #pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.34014 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Mono Runtime Version: 4.0.30319.17020 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +// ------------------------------------------------------------------------------ -[assembly: global::Android.Runtime.ResourceDesignerAttribute("SolTech.Xamarin.Forms.Android.Resource", IsApplication=false)] +[assembly: Android.Runtime.ResourceDesignerAttribute("SolTech.Xamarin.Forms.Android.Resource", IsApplication=false)] namespace SolTech.Xamarin.Forms.Android { diff --git a/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj b/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj index 117ebae..83eed2e 100644 --- a/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj +++ b/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj @@ -3,8 +3,6 @@ Debug AnyCPU - 8.0.30703 - 2.0 {A7135FD6-C10D-446E-AFAF-32ED0D50A46C} {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library @@ -16,6 +14,7 @@ Off True 1c898bc0 + v5.0 true @@ -25,6 +24,7 @@ DEBUG;TRACE prompt 4 + None pdbonly @@ -33,29 +33,29 @@ TRACE prompt 4 + false - - ..\packages\Xamarin.Forms.1.2.3.6257\lib\MonoAndroid10\FormsViewGroup.dll - - - False - ..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll - - - ..\packages\Xamarin.Forms.1.2.3.6257\lib\MonoAndroid10\Xamarin.Forms.Core.dll + + ..\..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Forms.1.2.3.6257\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + + + ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\FormsViewGroup.dll + + + ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.1.2.3.6257\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll @@ -76,17 +76,16 @@ - {ece6750d-6d1e-449d-8da9-59031fa5d924} + {ECE6750D-6D1E-449D-8DA9-59031FA5D924} SolTech.Xamarin.Forms - + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + + ..\packages\Xamarin.Forms.1.3.0.6292\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll + + + ..\packages\Xamarin.Forms.1.3.0.6292\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll + + + + + \ No newline at end of file diff --git a/Soltech.Xamarin.Forms/packages.config b/Soltech.Xamarin.Forms/packages.config index 56bba31..373c8aa 100644 --- a/Soltech.Xamarin.Forms/packages.config +++ b/Soltech.Xamarin.Forms/packages.config @@ -1,4 +1,4 @@ - - - + + + \ No newline at end of file From 39e564b96c3b9a84b5924a5c44841041eb32aa02 Mon Sep 17 00:00:00 2001 From: Anthony Janssens Date: Mon, 23 Feb 2015 16:49:29 +0100 Subject: [PATCH 2/6] fixing iOS compilation --- .../SolTech.Xamarin.Forms.Android.csproj | 11 +++++++---- SolTech.Xamarin.Forms.Android/packages.config | 2 +- .../SolTech.Xamarin.Forms.iOS.csproj | 9 ++++++--- SolTech.Xamarin.Forms.iOS/packages.config | 2 +- Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj | 7 +++++-- Soltech.Xamarin.Forms/packages.config | 2 +- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj b/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj index 83eed2e..9087a56 100644 --- a/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj +++ b/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj @@ -15,6 +15,8 @@ True 1c898bc0 v5.0 + + true @@ -46,16 +48,16 @@ ..\..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\FormsViewGroup.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoAndroid10\FormsViewGroup.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoAndroid10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll @@ -82,6 +84,7 @@ + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. diff --git a/SolTech.Xamarin.Forms.Android/packages.config b/SolTech.Xamarin.Forms.Android/packages.config index 2d95bbc..9c6a1f3 100644 --- a/SolTech.Xamarin.Forms.Android/packages.config +++ b/SolTech.Xamarin.Forms.Android/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj b/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj index e606bc9..6ba44ca 100644 --- a/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj +++ b/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj @@ -10,6 +10,8 @@ Resources SolTech.Xamarin.Forms.iOS 777766b9 + + true @@ -46,13 +48,13 @@ - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoTouch10\Xamarin.Forms.Platform.iOS.Classic.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoTouch10\Xamarin.Forms.Platform.iOS.Classic.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoTouch10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoTouch10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoTouch10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoTouch10\Xamarin.Forms.Xaml.dll @@ -63,6 +65,7 @@ + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. diff --git a/SolTech.Xamarin.Forms.iOS/packages.config b/SolTech.Xamarin.Forms.iOS/packages.config index b239ed5..e919991 100644 --- a/SolTech.Xamarin.Forms.iOS/packages.config +++ b/SolTech.Xamarin.Forms.iOS/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj b/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj index 284fdfa..9fe9800 100644 --- a/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj +++ b/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj @@ -16,6 +16,8 @@ Profile78 v4.5 109141f9 + + true @@ -54,6 +56,7 @@ + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -68,10 +71,10 @@ --> - ..\packages\Xamarin.Forms.1.3.0.6292\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll diff --git a/Soltech.Xamarin.Forms/packages.config b/Soltech.Xamarin.Forms/packages.config index 373c8aa..d3043e7 100644 --- a/Soltech.Xamarin.Forms/packages.config +++ b/Soltech.Xamarin.Forms/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file From ec3245b89d69122f33471f55d0547ac3452d80ba Mon Sep 17 00:00:00 2001 From: Benoit Jadinon Date: Mon, 23 Feb 2015 21:29:50 +0100 Subject: [PATCH 3/6] updates ben --- .../SolTech.Xamarin.Forms.Android.csproj | 11 +++++++---- SolTech.Xamarin.Forms.Android/packages.config | 2 +- .../SolTech.Xamarin.Forms.iOS.csproj | 9 ++++++--- SolTech.Xamarin.Forms.iOS/packages.config | 2 +- .../MarkupExtensions/LocalizationExtension.cs | 2 +- Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj | 7 +++++-- Soltech.Xamarin.Forms/packages.config | 2 +- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj b/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj index 83eed2e..9087a56 100644 --- a/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj +++ b/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj @@ -15,6 +15,8 @@ True 1c898bc0 v5.0 + + true @@ -46,16 +48,16 @@ ..\..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\FormsViewGroup.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoAndroid10\FormsViewGroup.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoAndroid10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll @@ -82,6 +84,7 @@ + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. diff --git a/SolTech.Xamarin.Forms.Android/packages.config b/SolTech.Xamarin.Forms.Android/packages.config index 2d95bbc..9c6a1f3 100644 --- a/SolTech.Xamarin.Forms.Android/packages.config +++ b/SolTech.Xamarin.Forms.Android/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj b/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj index e606bc9..6ba44ca 100644 --- a/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj +++ b/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj @@ -10,6 +10,8 @@ Resources SolTech.Xamarin.Forms.iOS 777766b9 + + true @@ -46,13 +48,13 @@ - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoTouch10\Xamarin.Forms.Platform.iOS.Classic.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoTouch10\Xamarin.Forms.Platform.iOS.Classic.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoTouch10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoTouch10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\MonoTouch10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoTouch10\Xamarin.Forms.Xaml.dll @@ -63,6 +65,7 @@ + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. diff --git a/SolTech.Xamarin.Forms.iOS/packages.config b/SolTech.Xamarin.Forms.iOS/packages.config index b239ed5..e919991 100644 --- a/SolTech.Xamarin.Forms.iOS/packages.config +++ b/SolTech.Xamarin.Forms.iOS/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Soltech.Xamarin.Forms/MarkupExtensions/LocalizationExtension.cs b/Soltech.Xamarin.Forms/MarkupExtensions/LocalizationExtension.cs index 87b7d7e..c4d42e7 100644 --- a/Soltech.Xamarin.Forms/MarkupExtensions/LocalizationExtension.cs +++ b/Soltech.Xamarin.Forms/MarkupExtensions/LocalizationExtension.cs @@ -86,4 +86,4 @@ private ILocalizer GetLocalizer(Assembly assembly) return _localizer; } } -} +} \ No newline at end of file diff --git a/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj b/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj index 284fdfa..9fe9800 100644 --- a/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj +++ b/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj @@ -16,6 +16,8 @@ Profile78 v4.5 109141f9 + + true @@ -54,6 +56,7 @@ + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -68,10 +71,10 @@ --> - ..\packages\Xamarin.Forms.1.3.0.6292\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.1.3.0.6292\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll diff --git a/Soltech.Xamarin.Forms/packages.config b/Soltech.Xamarin.Forms/packages.config index 373c8aa..d3043e7 100644 --- a/Soltech.Xamarin.Forms/packages.config +++ b/Soltech.Xamarin.Forms/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file From 72dcea55d4c5327194f4aab351d4481ad4cee7eb Mon Sep 17 00:00:00 2001 From: Benoit Jadinon Date: Tue, 24 Feb 2015 14:14:05 +0100 Subject: [PATCH 4/6] unified --- .../Controls/LimitedEntryRenderer.cs | 4 ++-- .../Controls/ToggleSelectorRenderer.cs | 5 +++-- .../Properties/AssemblyInfo.cs | 2 +- .../SolTech.Xamarin.Forms.iOS.csproj | 16 +++++++++------- SolTech.Xamarin.Forms.iOS/packages.config | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/SolTech.Xamarin.Forms.iOS/Controls/LimitedEntryRenderer.cs b/SolTech.Xamarin.Forms.iOS/Controls/LimitedEntryRenderer.cs index 36b582b..9be6a30 100644 --- a/SolTech.Xamarin.Forms.iOS/Controls/LimitedEntryRenderer.cs +++ b/SolTech.Xamarin.Forms.iOS/Controls/LimitedEntryRenderer.cs @@ -1,9 +1,9 @@ -using MonoTouch.UIKit; +using UIKit; using SolTech.Forms; using Xamarin.Forms; using Xamarin.Forms.Platform.iOS; -using MonoTouch.CoreText; +using CoreText; [assembly: ExportRenderer(typeof(LimitedEntry), typeof(SolTech.Forms.iOS.LimitedEntryRenderer))] diff --git a/SolTech.Xamarin.Forms.iOS/Controls/ToggleSelectorRenderer.cs b/SolTech.Xamarin.Forms.iOS/Controls/ToggleSelectorRenderer.cs index 4a86e74..1c72b93 100644 --- a/SolTech.Xamarin.Forms.iOS/Controls/ToggleSelectorRenderer.cs +++ b/SolTech.Xamarin.Forms.iOS/Controls/ToggleSelectorRenderer.cs @@ -1,7 +1,8 @@ -using MonoTouch.UIKit; +using UIKit; using SolTech.Forms; using Xamarin.Forms; using Xamarin.Forms.Platform.iOS; +using System; [assembly: ExportRenderer(typeof(ToggleSelector), typeof(SolTech.Forms.iOS.ToggleSelectorRenderer))] @@ -46,7 +47,7 @@ private void ValueChangedListener(object sender, System.EventArgs args) var nativeSegmentedControl = sender as UISegmentedControl; if (nativeSegmentedControl == null) return; - this.Element.SelectedItem = (ToggleSelectorItem)nativeSegmentedControl.SelectedSegment; + this.Element.SelectedItem = (ToggleSelectorItem)(int)nativeSegmentedControl.SelectedSegment; } protected override void OnElementPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) diff --git a/SolTech.Xamarin.Forms.iOS/Properties/AssemblyInfo.cs b/SolTech.Xamarin.Forms.iOS/Properties/AssemblyInfo.cs index 99aa55e..14ce759 100644 --- a/SolTech.Xamarin.Forms.iOS/Properties/AssemblyInfo.cs +++ b/SolTech.Xamarin.Forms.iOS/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information diff --git a/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj b/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj index 6ba44ca..458a10b 100644 --- a/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj +++ b/SolTech.Xamarin.Forms.iOS/SolTech.Xamarin.Forms.iOS.csproj @@ -4,7 +4,7 @@ Debug AnyCPU {5939F192-6E02-4AFA-9929-8566E172C94C} - {6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library SolTech.Xamarin.Forms.iOS Resources @@ -12,6 +12,8 @@ 777766b9 + Xamarin.iOS + v1.0 true @@ -46,15 +48,15 @@ - - - ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoTouch10\Xamarin.Forms.Platform.iOS.Classic.dll + + + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoTouch10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\MonoTouch10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll @@ -63,8 +65,8 @@ SolTech.Xamarin.Forms - + diff --git a/SolTech.Xamarin.Forms.iOS/packages.config b/SolTech.Xamarin.Forms.iOS/packages.config index e919991..96a09c6 100644 --- a/SolTech.Xamarin.Forms.iOS/packages.config +++ b/SolTech.Xamarin.Forms.iOS/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file From 6ca4c42aa3aa89b4ab7ab3b546b1587b0ed64722 Mon Sep 17 00:00:00 2001 From: Benoit Jadinon Date: Sun, 7 Jun 2015 14:14:09 +0200 Subject: [PATCH 5/6] updated forms to 1.4.2.6359 --- Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj | 9 ++++++--- Soltech.Xamarin.Forms/packages.config | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj b/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj index 9fe9800..8f0c264 100644 --- a/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj +++ b/Soltech.Xamarin.Forms/SolTech.Xamarin.Forms.csproj @@ -56,7 +56,7 @@ - + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -71,10 +71,13 @@ --> - ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.1.4.2.6359\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\..\packages\Xamarin.Forms.1.3.4.6332\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.1.4.2.6359\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll + + + ..\..\packages\Xamarin.Forms.1.4.2.6359\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll diff --git a/Soltech.Xamarin.Forms/packages.config b/Soltech.Xamarin.Forms/packages.config index d3043e7..596cc49 100644 --- a/Soltech.Xamarin.Forms/packages.config +++ b/Soltech.Xamarin.Forms/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file From 9bc50d8d1ec52fb2c5c4e454820b84b05dba221b Mon Sep 17 00:00:00 2001 From: Benoit Jadinon Date: Sun, 20 May 2018 17:36:33 +0200 Subject: [PATCH 6/6] update --- .../SolTech.Xamarin.Forms.Android.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj b/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj index 9087a56..08888b5 100644 --- a/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj +++ b/SolTech.Xamarin.Forms.Android/SolTech.Xamarin.Forms.Android.csproj @@ -14,7 +14,7 @@ Off True 1c898bc0 - v5.0 + v8.1