From fb2e8217a4e9ed1222a533fdb0ad42c0ce91a7c1 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Fri, 11 May 2018 16:40:30 +0300 Subject: [PATCH 1/5] Upgraded Xamarin.Forms to version 3.0. Signed-off-by: Dimitar Dobrev --- ....Forms.Plugin.Sample.DroidAppCompat.csproj | 153 ++++++------------ .../packages.config | 20 --- .../Toasts.Forms.Plugin.Sample.iOS.csproj | 16 +- .../packages.config | 2 +- .../Toasts.Forms.Plugin.Sample.csproj | 4 +- .../Toasts.Forms.Plugin.Abstractions.csproj | 2 +- 6 files changed, 62 insertions(+), 135 deletions(-) delete mode 100644 Sample/Toasts.Forms.Plugin.Sample.DroidAppCompat/packages.config diff --git a/Sample/Toasts.Forms.Plugin.Sample.DroidAppCompat/Toasts.Forms.Plugin.Sample.DroidAppCompat.csproj b/Sample/Toasts.Forms.Plugin.Sample.DroidAppCompat/Toasts.Forms.Plugin.Sample.DroidAppCompat.csproj index 8b29ba4..7e191a7 100644 --- a/Sample/Toasts.Forms.Plugin.Sample.DroidAppCompat/Toasts.Forms.Plugin.Sample.DroidAppCompat.csproj +++ b/Sample/Toasts.Forms.Plugin.Sample.DroidAppCompat/Toasts.Forms.Plugin.Sample.DroidAppCompat.csproj @@ -1,6 +1,5 @@  - 23.0.3 Debug @@ -56,75 +55,12 @@ armeabi-v7a;x86 - - ..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\FormsViewGroup.dll - - - ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll - - - ..\..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll - - - ..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - - - ..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - - - ..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - - - ..\..\packages\Xamarin.Android.Support.Design.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll - - - ..\..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - - - ..\..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - - - ..\..\packages\Xamarin.Android.Support.Transition.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll - - - ..\..\packages\Xamarin.Android.Support.v4.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - - - ..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.CardView.dll - - - ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll - - - ..\..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll - - - ..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll - - - ..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - - - ..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Core.dll - - - ..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - - - ..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - - - ..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll - @@ -132,7 +68,6 @@ - AndroidResource @@ -178,43 +113,55 @@ + + + 25.4.0.2 + + + 25.4.0.2 + + + 25.4.0.2 + + + 25.4.0.2 + + + 25.4.0.2 + + + 25.4.0.2 + + + 25.4.0.2 + + + 25.4.0.2 + + + 25.4.0.2 + + + 25.4.0.2 + + + 25.4.0.2 + + + 25.4.0.2 + + + 25.4.0.2 + + + 25.4.0.2 + + + 25.4.0.2 + + + 3.0.0.446417 + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sample/Toasts.Forms.Plugin.Sample.DroidAppCompat/packages.config b/Sample/Toasts.Forms.Plugin.Sample.DroidAppCompat/packages.config deleted file mode 100644 index 039ce19..0000000 --- a/Sample/Toasts.Forms.Plugin.Sample.DroidAppCompat/packages.config +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sample/Toasts.Forms.Plugin.Sample.iOS/Toasts.Forms.Plugin.Sample.iOS.csproj b/Sample/Toasts.Forms.Plugin.Sample.iOS/Toasts.Forms.Plugin.Sample.iOS.csproj index ef6c90f..0832e3f 100644 --- a/Sample/Toasts.Forms.Plugin.Sample.iOS/Toasts.Forms.Plugin.Sample.iOS.csproj +++ b/Sample/Toasts.Forms.Plugin.Sample.iOS/Toasts.Forms.Plugin.Sample.iOS.csproj @@ -1,6 +1,6 @@  - + Debug iPhoneSimulator @@ -151,16 +151,16 @@ - ..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + ..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - ..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + ..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - ..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll @@ -174,8 +174,8 @@ 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}. - - + + - + \ No newline at end of file diff --git a/Sample/Toasts.Forms.Plugin.Sample.iOS/packages.config b/Sample/Toasts.Forms.Plugin.Sample.iOS/packages.config index 1bb9c85..a268790 100644 --- a/Sample/Toasts.Forms.Plugin.Sample.iOS/packages.config +++ b/Sample/Toasts.Forms.Plugin.Sample.iOS/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Sample/Toasts.Forms.Plugin.Sample/Toasts.Forms.Plugin.Sample.csproj b/Sample/Toasts.Forms.Plugin.Sample/Toasts.Forms.Plugin.Sample.csproj index b276b3e..96d38a7 100644 --- a/Sample/Toasts.Forms.Plugin.Sample/Toasts.Forms.Plugin.Sample.csproj +++ b/Sample/Toasts.Forms.Plugin.Sample/Toasts.Forms.Plugin.Sample.csproj @@ -1,9 +1,9 @@  - netstandard1.1 + netstandard2.0 - + diff --git a/Toasts.Forms.Plugin.Abstractions/Toasts.Forms.Plugin.Abstractions.csproj b/Toasts.Forms.Plugin.Abstractions/Toasts.Forms.Plugin.Abstractions.csproj index f0cded3..17d3b29 100644 --- a/Toasts.Forms.Plugin.Abstractions/Toasts.Forms.Plugin.Abstractions.csproj +++ b/Toasts.Forms.Plugin.Abstractions/Toasts.Forms.Plugin.Abstractions.csproj @@ -1,5 +1,5 @@  - netstandard1.1 + netstandard2.0 \ No newline at end of file From 3827ce69f82d7cc6285de6237cc9d80f87558444 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Fri, 11 May 2018 17:01:41 +0300 Subject: [PATCH 2/5] Migrated all projects from packages.config to package references. Signed-off-by: Dimitar Dobrev --- .../Toasts.Forms.Plugin.Sample.iOS.csproj | 22 +++------- .../packages.config | 4 -- .../Toasts.Forms.Plugin.Droid.csproj | 40 ++++--------------- Toasts.Forms.Plugin.Droid/packages.config | 9 ----- .../Toasts.Forms.Plugin.iOS.csproj | 5 +++ 5 files changed, 18 insertions(+), 62 deletions(-) delete mode 100644 Sample/Toasts.Forms.Plugin.Sample.iOS/packages.config delete mode 100644 Toasts.Forms.Plugin.Droid/packages.config diff --git a/Sample/Toasts.Forms.Plugin.Sample.iOS/Toasts.Forms.Plugin.Sample.iOS.csproj b/Sample/Toasts.Forms.Plugin.Sample.iOS/Toasts.Forms.Plugin.Sample.iOS.csproj index 0832e3f..c4505e8 100644 --- a/Sample/Toasts.Forms.Plugin.Sample.iOS/Toasts.Forms.Plugin.Sample.iOS.csproj +++ b/Sample/Toasts.Forms.Plugin.Sample.iOS/Toasts.Forms.Plugin.Sample.iOS.csproj @@ -1,6 +1,5 @@  - Debug iPhoneSimulator @@ -110,7 +109,6 @@ - @@ -150,23 +148,16 @@ - - ..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - - - ..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - - - ..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - - - ..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - + + + 3.0.0.446417 + + @@ -174,8 +165,5 @@ 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}. - - - \ No newline at end of file diff --git a/Sample/Toasts.Forms.Plugin.Sample.iOS/packages.config b/Sample/Toasts.Forms.Plugin.Sample.iOS/packages.config deleted file mode 100644 index a268790..0000000 --- a/Sample/Toasts.Forms.Plugin.Sample.iOS/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Toasts.Forms.Plugin.Droid/Toasts.Forms.Plugin.Droid.csproj b/Toasts.Forms.Plugin.Droid/Toasts.Forms.Plugin.Droid.csproj index b8ea06d..e780dec 100644 --- a/Toasts.Forms.Plugin.Droid/Toasts.Forms.Plugin.Droid.csproj +++ b/Toasts.Forms.Plugin.Droid/Toasts.Forms.Plugin.Droid.csproj @@ -48,30 +48,6 @@ - - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll - True - - - ..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll - True - - - ..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - True - - - ..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - True - - - ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll - True - - - ..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll - True - @@ -94,7 +70,6 @@ - @@ -102,14 +77,15 @@ Toasts.Forms.Plugin.Abstractions + + + 23.3.0 + + + 23.3.0 + + - - - 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}. - - - -