From 38382368b746828d2bea8804d073e3964d711cde Mon Sep 17 00:00:00 2001 From: "Chris W. Rea" Date: Thu, 22 Feb 2018 11:54:04 -0500 Subject: [PATCH] Updated XF project to netstandard2.0 and EF Core 1.1.5 --- Todo.Android/LinkDescription.xml | 36 +++++++ Todo.Android/Todo.Android.csproj | 159 ++++++++----------------------- Todo.Android/packages.config | 80 ---------------- Todo.UWP/Todo.UWP.csproj | 27 +++--- Todo.UWP/project.json | 18 ---- Todo.iOS/Info.plist | 15 ++- Todo.iOS/Todo.iOS.csproj | 155 +++++++++--------------------- Todo.iOS/packages.config | 72 -------------- Todo/Todo.csproj | 22 ++--- TodoNETStd.sln | 2 +- 10 files changed, 152 insertions(+), 434 deletions(-) create mode 100644 Todo.Android/LinkDescription.xml delete mode 100644 Todo.Android/packages.config delete mode 100644 Todo.UWP/project.json delete mode 100644 Todo.iOS/packages.config diff --git a/Todo.Android/LinkDescription.xml b/Todo.Android/LinkDescription.xml new file mode 100644 index 0000000..1f03cc0 --- /dev/null +++ b/Todo.Android/LinkDescription.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + diff --git a/Todo.Android/Todo.Android.csproj b/Todo.Android/Todo.Android.csproj index b013074..bf3447a 100644 --- a/Todo.Android/Todo.Android.csproj +++ b/Todo.Android/Todo.Android.csproj @@ -7,16 +7,17 @@ {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library Todo + QuickTodo.Android + v7.1 True Resources\Resource.designer.cs Resource + Properties\AndroidManifest.xml Resources Assets - False - QuickTodo.Android - Properties\AndroidManifest.xml - v6.0 - + true + + false 1G @@ -28,119 +29,49 @@ DEBUG;__MOBILE__;__ANDROID__; prompt 4 - None - false - 1G - True - armeabi;armeabi-v7a;x86 + SdkOnly + false + false + false + false + true - full + true + pdbonly true bin\Release __MOBILE__;__ANDROID__; prompt 4 - false + true + false + false + false + false - - ..\packages\Xamarin.Forms.2.3.4.247\lib\MonoAndroid10\FormsViewGroup.dll - - - - ..\packages\Microsoft.Data.Sqlite.1.1.0\lib\netstandard1.3\Microsoft.Data.Sqlite.dll - - - ..\packages\Microsoft.EntityFrameworkCore.1.1.2\lib\netstandard1.3\Microsoft.EntityFrameworkCore.dll - - - ..\packages\Microsoft.EntityFrameworkCore.Relational.1.1.2\lib\netstandard1.3\Microsoft.EntityFrameworkCore.Relational.dll - - - ..\packages\Microsoft.EntityFrameworkCore.Sqlite.1.1.2\lib\netstandard1.3\Microsoft.EntityFrameworkCore.Sqlite.dll - - - ..\packages\Microsoft.Extensions.Caching.Abstractions.1.1.1\lib\netstandard1.0\Microsoft.Extensions.Caching.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Caching.Memory.1.1.1\lib\netstandard1.3\Microsoft.Extensions.Caching.Memory.dll - - - ..\packages\Microsoft.Extensions.DependencyInjection.1.1.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll - - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Logging.1.1.1\lib\netstandard1.1\Microsoft.Extensions.Logging.dll - - - ..\packages\Microsoft.Extensions.Logging.Abstractions.1.1.1\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Options.1.1.1\lib\netstandard1.0\Microsoft.Extensions.Options.dll - - - ..\packages\Microsoft.Extensions.Primitives.1.1.0\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll - - - ..\packages\Remotion.Linq.2.1.1\lib\portable-net45+win+wpa81+wp80\Remotion.Linq.dll - + - - ..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - - ..\packages\System.Diagnostics.DiagnosticSource.4.3.1\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll - - - ..\packages\System.Interactive.Async.3.0.0\lib\netstandard1.0\System.Interactive.Async.dll - - - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.3.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll - - - ..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll - - - ..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - - ..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll - - - ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll - - - ..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll - - - ..\packages\Xamarin.Forms.2.3.4.247\lib\MonoAndroid10\Xamarin.Forms.Core.dll - - - ..\packages\Xamarin.Forms.2.3.4.247\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - - - ..\packages\Xamarin.Forms.2.3.4.247\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - - - ..\packages\Xamarin.Forms.2.3.4.247\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll - + + + + + + 1.1.5 + + + 1.1.5 + + + + + + + + 2.5.0.280555 + @@ -153,7 +84,6 @@ - @@ -170,15 +100,8 @@ Todo - - - - 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/Todo.Android/packages.config b/Todo.Android/packages.config deleted file mode 100644 index 379dd80..0000000 --- a/Todo.Android/packages.config +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Todo.UWP/Todo.UWP.csproj b/Todo.UWP/Todo.UWP.csproj index 09f5667..446a0b7 100644 --- a/Todo.UWP/Todo.UWP.csproj +++ b/Todo.UWP/Todo.UWP.csproj @@ -11,8 +11,8 @@ Todo.UWP en-US UAP - 10.0.15063.0 - 10.0.10240.0 + 10.0.16299.0 + 10.0.16299.0 14 true 512 @@ -88,10 +88,6 @@ true true - - - - App.xaml @@ -130,6 +126,18 @@ Designer + + + 1.1.5 + + + 1.1.5 + + + + 2.5.0.280555 + + {b308723f-fd48-46fa-bbdd-a84709d406b3} @@ -140,11 +148,4 @@ 14.0 - \ No newline at end of file diff --git a/Todo.UWP/project.json b/Todo.UWP/project.json deleted file mode 100644 index 0592e46..0000000 --- a/Todo.UWP/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite": "1.1.2", - "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3", - "Xamarin.Forms": "2.3.4.247" - }, - "frameworks": { - "uap10.0": {} - }, - "runtimes": { - "win10-arm": {}, - "win10-arm-aot": {}, - "win10-x86": {}, - "win10-x86-aot": {}, - "win10-x64": {}, - "win10-x64-aot": {} - } -} \ No newline at end of file diff --git a/Todo.iOS/Info.plist b/Todo.iOS/Info.plist index 2065e92..4d50643 100644 --- a/Todo.iOS/Info.plist +++ b/Todo.iOS/Info.plist @@ -10,22 +10,27 @@ 1.0 CFBundleVersion 1.0 - LSRequiresIPhoneOS - MinimumOSVersion 7.0 UIDeviceFamily 1 + 2 - UIRequiredDeviceCapabilities + UISupportedInterfaceOrientations - armv7 + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight - UISupportedInterfaceOrientations + UISupportedInterfaceOrientations~ipad UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + CFBundleIconFiles Icon-60@2x diff --git a/Todo.iOS/Todo.iOS.csproj b/Todo.iOS/Todo.iOS.csproj index dc8c7c9..1746077 100644 --- a/Todo.iOS/Todo.iOS.csproj +++ b/Todo.iOS/Todo.iOS.csproj @@ -1,16 +1,18 @@  - + Debug iPhoneSimulator + 8.0.30703 + 2.0 {1902913C-BB6F-4CCB-9B90-1D0CAEECAF12} {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe Todo.iOS Resources - - Xamarin.iOS TodoiOS + + true @@ -21,11 +23,9 @@ prompt 4 false + x86_64 SdkOnly true - x86_64 - TodoiOS - iPhone Developer --xml=${ProjectDir}/LinkDescription.xml @@ -36,10 +36,8 @@ prompt 4 SdkOnly - false - - TodoiOS x86_64 + false --xml=${ProjectDir}/LinkDescription.xml @@ -51,12 +49,10 @@ prompt 4 false - Entitlements.plist - true + ARM64 iPhone Developer - - QuickTodoiOS - ARMv7, ARM64 + true + Entitlements.plist SdkOnly --xml=${ProjectDir}/LinkDescription.xml @@ -67,11 +63,10 @@ __MOBILE__;__IOS__; prompt 4 - Entitlements.plist + ARM64 false iPhone Developer - QuickTodoiOS - ARMv7, ARM64 + Entitlements.plist SdkOnly --xml=${ProjectDir}/LinkDescription.xml @@ -83,12 +78,11 @@ prompt 4 false - Entitlements.plist + ARM64 true Automatic:AdHoc iPhone Distribution - QuickTodoiOS - ARMv7, ARM64 + Entitlements.plist SdkOnly --xml=${ProjectDir}/LinkDescription.xml @@ -100,86 +94,26 @@ prompt 4 false - Entitlements.plist + ARM64 Automatic:AppStore iPhone Distribution - QuickTodoiOS - ARMv7, ARM64 + Entitlements.plist SdkOnly --xml=${ProjectDir}/LinkDescription.xml + + + - - - ..\packages\Microsoft.Data.Sqlite.1.1.0\lib\netstandard1.3\Microsoft.Data.Sqlite.dll - - - ..\packages\Microsoft.EntityFrameworkCore.1.1.2\lib\netstandard1.3\Microsoft.EntityFrameworkCore.dll - - - ..\packages\Microsoft.EntityFrameworkCore.Relational.1.1.2\lib\netstandard1.3\Microsoft.EntityFrameworkCore.Relational.dll - - - ..\packages\Microsoft.EntityFrameworkCore.Sqlite.1.1.2\lib\netstandard1.3\Microsoft.EntityFrameworkCore.Sqlite.dll - - - ..\packages\Microsoft.Extensions.Caching.Abstractions.1.1.1\lib\netstandard1.0\Microsoft.Extensions.Caching.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Caching.Memory.1.1.1\lib\netstandard1.3\Microsoft.Extensions.Caching.Memory.dll - - - ..\packages\Microsoft.Extensions.DependencyInjection.1.1.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll - - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Logging.1.1.1\lib\netstandard1.1\Microsoft.Extensions.Logging.dll - - - ..\packages\Microsoft.Extensions.Logging.Abstractions.1.1.1\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Options.1.1.1\lib\netstandard1.0\Microsoft.Extensions.Options.dll - - - ..\packages\Microsoft.Extensions.Primitives.1.1.0\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll - - - ..\packages\Remotion.Linq.2.1.1\lib\portable-net45+win+wpa81+wp80\Remotion.Linq.dll - - - - ..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - - - - ..\packages\System.Diagnostics.DiagnosticSource.4.3.1\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll - - - ..\packages\System.Interactive.Async.3.0.0\lib\netstandard1.0\System.Interactive.Async.dll - - - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.3.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\Xamarin.Forms.2.3.4.247\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - - - ..\packages\Xamarin.Forms.2.3.4.247\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - - - ..\packages\Xamarin.Forms.2.3.4.247\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - - - ..\packages\Xamarin.Forms.2.3.4.247\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - - + + + + + + + @@ -191,22 +125,15 @@ + - - - - - - - - - + + + + - - - {b308723f-fd48-46fa-bbdd-a84709d406b3} @@ -214,13 +141,17 @@ - + + 1.1.5 + + + 1.1.5 + + + 2.5.0.280555 + + + + - - - - 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/Todo.iOS/packages.config b/Todo.iOS/packages.config deleted file mode 100644 index e598627..0000000 --- a/Todo.iOS/packages.config +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Todo/Todo.csproj b/Todo/Todo.csproj index f8f408d..6504f3b 100644 --- a/Todo/Todo.csproj +++ b/Todo/Todo.csproj @@ -1,8 +1,7 @@  - netstandard1.4 - portable-win+net45+wp8+win81+wpa8 + netstandard2.0 Todo craigdunn QuickTodo @@ -10,21 +9,14 @@ - 19-May-2017: This is an adaptation of Xamarin's original Todo PCL sample from https://developer.xamarin.com/samples/xamarin-forms/Todo/. This version is built on .NET Standard 1.4 and uses Entity Framework Core to manage the SQLite data instead of sqlite-net-pcl. This builds and runs on Android, iOS, and UWP devices. Adaptation work by Chris W. Rea (twitter: @cwrea). + 22-Feb-2018: This is an adaptation of Xamarin's original Todo PCL sample from https://developer.xamarin.com/samples/xamarin-forms/Todo/. This version is built on .NET Standard 2.0 and uses Entity Framework Core 1.1.5 to manage the SQLite data instead of sqlite-net-pcl. This builds and runs on Android, iOS, and UWP devices. Adaptation work by Chris W. Rea (twitter: @cwrea). + 1.0.1 - - - + + + - - - - - - - - - + \ No newline at end of file diff --git a/TodoNETStd.sln b/TodoNETStd.sln index a11bbd8..0aead88 100644 --- a/TodoNETStd.sln +++ b/TodoNETStd.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.6 +VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{205F34F1-DBEC-46B8-A6E5-7C2BAB70DD0C}" EndProject