diff --git a/samples/FormsSample/Android/Android.csproj b/samples/FormsSample/Android/Android.csproj index a7bba622..2a45f512 100644 --- a/samples/FormsSample/Android/Android.csproj +++ b/samples/FormsSample/Android/Android.csproj @@ -51,7 +51,7 @@ - ..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\FormsViewGroup.dll + ..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\FormsViewGroup.dll True @@ -117,19 +117,19 @@ True - ..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Core.dll True - ..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.dll True - ..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + ..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll True - ..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll True @@ -220,7 +220,7 @@ 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/samples/FormsSample/Android/Resources/Resource.Designer.cs b/samples/FormsSample/Android/Resources/Resource.Designer.cs index 1a70320c..f800916c 100644 --- a/samples/FormsSample/Android/Resources/Resource.Designer.cs +++ b/samples/FormsSample/Android/Resources/Resource.Designer.cs @@ -1,15 +1,15 @@ #pragma warning disable 1591 -// ------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Mono Runtime Version: 4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -// ------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ -[assembly: Android.Runtime.ResourceDesignerAttribute("SkiaSharpSample.FormsSample.Platform.Resource", IsApplication=true)] +[assembly: global::Android.Runtime.ResourceDesignerAttribute("SkiaSharpSample.FormsSample.Platform.Resource", IsApplication=true)] namespace SkiaSharpSample.FormsSample.Platform { @@ -4219,8 +4219,7 @@ namespace SkiaSharpSample.FormsSample.Platform public partial class Styleable { - public static int[] ActionBar = new int[] - { + public static int[] ActionBar = new int[] { 2130772007, 2130772009, 2130772010, @@ -4330,15 +4329,13 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 5 public const int ActionBar_titleTextStyle = 5; - public static int[] ActionBarLayout = new int[] - { + public static int[] ActionBarLayout = new int[] { 16842931}; // aapt resource value: 0 public const int ActionBarLayout_android_layout_gravity = 0; - public static int[] ActionMenuItemView = new int[] - { + public static int[] ActionMenuItemView = new int[] { 16843071}; // aapt resource value: 0 @@ -4346,8 +4343,7 @@ namespace SkiaSharpSample.FormsSample.Platform public static int[] ActionMenuView; - public static int[] ActionMode = new int[] - { + public static int[] ActionMode = new int[] { 2130772007, 2130772013, 2130772014, @@ -4373,8 +4369,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 1 public const int ActionMode_titleTextStyle = 1; - public static int[] ActivityChooserView = new int[] - { + public static int[] ActivityChooserView = new int[] { 2130772035, 2130772036}; @@ -4384,8 +4379,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 0 public const int ActivityChooserView_initialActivityCount = 0; - public static int[] AlertDialog = new int[] - { + public static int[] AlertDialog = new int[] { 16842994, 2130772037, 2130772038, @@ -4411,8 +4405,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 4 public const int AlertDialog_singleChoiceItemLayout = 4; - public static int[] AppBarLayout = new int[] - { + public static int[] AppBarLayout = new int[] { 16842964, 2130772032, 2130772215}; @@ -4426,8 +4419,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 2 public const int AppBarLayout_expanded = 2; - public static int[] AppBarLayout_LayoutParams = new int[] - { + public static int[] AppBarLayout_LayoutParams = new int[] { 2130772216, 2130772217}; @@ -4437,8 +4429,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 1 public const int AppBarLayout_LayoutParams_layout_scrollInterpolator = 1; - public static int[] AppCompatImageView = new int[] - { + public static int[] AppCompatImageView = new int[] { 16843033, 2130772042}; @@ -4448,8 +4439,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 1 public const int AppCompatImageView_srcCompat = 1; - public static int[] AppCompatTextView = new int[] - { + public static int[] AppCompatTextView = new int[] { 16842804, 2130772043}; @@ -4459,8 +4449,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 1 public const int AppCompatTextView_textAllCaps = 1; - public static int[] AppCompatTheme = new int[] - { + public static int[] AppCompatTheme = new int[] { 16842839, 16842926, 2130772044, @@ -4910,8 +4899,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 3 public const int AppCompatTheme_windowNoTitle = 3; - public static int[] BottomSheetBehavior_Params = new int[] - { + public static int[] BottomSheetBehavior_Params = new int[] { 2130772218, 2130772219}; @@ -4921,15 +4909,13 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 0 public const int BottomSheetBehavior_Params_behavior_peekHeight = 0; - public static int[] ButtonBarLayout = new int[] - { + public static int[] ButtonBarLayout = new int[] { 2130772154}; // aapt resource value: 0 public const int ButtonBarLayout_allowStacking = 0; - public static int[] CardView = new int[] - { + public static int[] CardView = new int[] { 16843071, 16843072, 2130771995, @@ -4983,8 +4969,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 11 public const int CardView_contentPaddingTop = 11; - public static int[] CollapsingAppBarLayout_LayoutParams = new int[] - { + public static int[] CollapsingAppBarLayout_LayoutParams = new int[] { 2130772220, 2130772221}; @@ -4994,8 +4979,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 1 public const int CollapsingAppBarLayout_LayoutParams_layout_collapseParallaxMultiplier = 1; - public static int[] CollapsingToolbarLayout = new int[] - { + public static int[] CollapsingToolbarLayout = new int[] { 2130772009, 2130772222, 2130772223, @@ -5053,8 +5037,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 10 public const int CollapsingToolbarLayout_toolbarId = 10; - public static int[] CompoundButton = new int[] - { + public static int[] CompoundButton = new int[] { 16843015, 2130772155, 2130772156}; @@ -5068,8 +5051,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 2 public const int CompoundButton_buttonTintMode = 2; - public static int[] CoordinatorLayout = new int[] - { + public static int[] CoordinatorLayout = new int[] { 2130772235, 2130772236}; @@ -5079,8 +5061,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 1 public const int CoordinatorLayout_statusBarBackground = 1; - public static int[] CoordinatorLayout_LayoutParams = new int[] - { + public static int[] CoordinatorLayout_LayoutParams = new int[] { 16842931, 2130772237, 2130772238, @@ -5102,8 +5083,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 3 public const int CoordinatorLayout_LayoutParams_layout_keyline = 3; - public static int[] DesignTheme = new int[] - { + public static int[] DesignTheme = new int[] { 2130772241, 2130772242, 2130772243}; @@ -5117,8 +5097,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 2 public const int DesignTheme_textColorError = 2; - public static int[] DrawerArrowToggle = new int[] - { + public static int[] DrawerArrowToggle = new int[] { 2130772157, 2130772158, 2130772159, @@ -5152,8 +5131,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 7 public const int DrawerArrowToggle_thickness = 7; - public static int[] FloatingActionButton = new int[] - { + public static int[] FloatingActionButton = new int[] { 2130772032, 2130772213, 2130772214, @@ -5187,8 +5165,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 7 public const int FloatingActionButton_useCompatPadding = 7; - public static int[] ForegroundLinearLayout = new int[] - { + public static int[] ForegroundLinearLayout = new int[] { 16843017, 16843264, 2130772249}; @@ -5202,8 +5179,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 2 public const int ForegroundLinearLayout_foregroundInsidePadding = 2; - public static int[] LinearLayoutCompat = new int[] - { + public static int[] LinearLayoutCompat = new int[] { 16842927, 16842948, 16843046, @@ -5241,8 +5217,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 7 public const int LinearLayoutCompat_showDividers = 7; - public static int[] LinearLayoutCompat_Layout = new int[] - { + public static int[] LinearLayoutCompat_Layout = new int[] { 16842931, 16842996, 16842997, @@ -5260,8 +5235,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 1 public const int LinearLayoutCompat_Layout_android_layout_width = 1; - public static int[] ListPopupWindow = new int[] - { + public static int[] ListPopupWindow = new int[] { 16843436, 16843437}; @@ -5271,8 +5245,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 1 public const int ListPopupWindow_android_dropDownVerticalOffset = 1; - public static int[] MediaRouteButton = new int[] - { + public static int[] MediaRouteButton = new int[] { 16843071, 16843072, 2130771994}; @@ -5286,8 +5259,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 2 public const int MediaRouteButton_externalRouteEnabledDrawable = 2; - public static int[] MenuGroup = new int[] - { + public static int[] MenuGroup = new int[] { 16842766, 16842960, 16843156, @@ -5313,8 +5285,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 2 public const int MenuGroup_android_visible = 2; - public static int[] MenuItem = new int[] - { + public static int[] MenuItem = new int[] { 16842754, 16842766, 16842960, @@ -5384,8 +5355,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 13 public const int MenuItem_showAsAction = 13; - public static int[] MenuView = new int[] - { + public static int[] MenuView = new int[] { 16842926, 16843052, 16843053, @@ -5419,8 +5389,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 7 public const int MenuView_preserveIconSpacing = 7; - public static int[] NavigationView = new int[] - { + public static int[] NavigationView = new int[] { 16842964, 16842973, 16843039, @@ -5462,8 +5431,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 4 public const int NavigationView_menu = 4; - public static int[] PopupWindow = new int[] - { + public static int[] PopupWindow = new int[] { 16843126, 2130772173}; @@ -5473,15 +5441,13 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 1 public const int PopupWindow_overlapAnchor = 1; - public static int[] PopupWindowBackgroundState = new int[] - { + public static int[] PopupWindowBackgroundState = new int[] { 2130772174}; // aapt resource value: 0 public const int PopupWindowBackgroundState_state_above_anchor = 0; - public static int[] RecyclerView = new int[] - { + public static int[] RecyclerView = new int[] { 16842948, 2130771968, 2130771969, @@ -5503,22 +5469,19 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 4 public const int RecyclerView_stackFromEnd = 4; - public static int[] ScrimInsetsFrameLayout = new int[] - { + public static int[] ScrimInsetsFrameLayout = new int[] { 2130772256}; // aapt resource value: 0 public const int ScrimInsetsFrameLayout_insetForeground = 0; - public static int[] ScrollingViewBehavior_Params = new int[] - { + public static int[] ScrollingViewBehavior_Params = new int[] { 2130772257}; // aapt resource value: 0 public const int ScrollingViewBehavior_Params_behavior_overlapTop = 0; - public static int[] SearchView = new int[] - { + public static int[] SearchView = new int[] { 16842970, 16843039, 16843296, @@ -5588,8 +5551,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 12 public const int SearchView_voiceIcon = 12; - public static int[] SnackbarLayout = new int[] - { + public static int[] SnackbarLayout = new int[] { 16843039, 2130772032, 2130772258}; @@ -5603,8 +5565,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 2 public const int SnackbarLayout_maxActionInlineWidth = 2; - public static int[] Spinner = new int[] - { + public static int[] Spinner = new int[] { 16842930, 16843126, 16843131, @@ -5626,8 +5587,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 4 public const int Spinner_popupTheme = 4; - public static int[] SwitchCompat = new int[] - { + public static int[] SwitchCompat = new int[] { 16843044, 16843045, 16843074, @@ -5669,8 +5629,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 3 public const int SwitchCompat_track = 3; - public static int[] TabItem = new int[] - { + public static int[] TabItem = new int[] { 16842754, 16842994, 16843087}; @@ -5684,8 +5643,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 2 public const int TabItem_android_text = 2; - public static int[] TabLayout = new int[] - { + public static int[] TabLayout = new int[] { 2130772259, 2130772260, 2130772261, @@ -5751,8 +5709,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 9 public const int TabLayout_tabTextColor = 9; - public static int[] TextAppearance = new int[] - { + public static int[] TextAppearance = new int[] { 16842901, 16842902, 16842903, @@ -5790,8 +5747,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 8 public const int TextAppearance_textAllCaps = 8; - public static int[] TextInputLayout = new int[] - { + public static int[] TextInputLayout = new int[] { 16842906, 16843088, 2130772275, @@ -5837,8 +5793,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 2 public const int TextInputLayout_hintTextAppearance = 2; - public static int[] Toolbar = new int[] - { + public static int[] Toolbar = new int[] { 16842927, 16843072, 2130772009, @@ -5940,8 +5895,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 23 public const int Toolbar_titleTextColor = 23; - public static int[] View = new int[] - { + public static int[] View = new int[] { 16842752, 16842970, 2130772210, @@ -5963,8 +5917,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 4 public const int View_theme = 4; - public static int[] ViewBackgroundHelper = new int[] - { + public static int[] ViewBackgroundHelper = new int[] { 16842964, 2130772213, 2130772214}; @@ -5978,8 +5931,7 @@ namespace SkiaSharpSample.FormsSample.Platform // aapt resource value: 2 public const int ViewBackgroundHelper_backgroundTintMode = 2; - public static int[] ViewStubCompat = new int[] - { + public static int[] ViewStubCompat = new int[] { 16842960, 16842994, 16842995}; diff --git a/samples/FormsSample/Android/packages.config b/samples/FormsSample/Android/packages.config index 0e56f4c1..f2e98881 100644 --- a/samples/FormsSample/Android/packages.config +++ b/samples/FormsSample/Android/packages.config @@ -13,5 +13,5 @@ - + \ No newline at end of file diff --git a/samples/FormsSample/Core/Core.csproj b/samples/FormsSample/Core/Core.csproj index 1167ee0a..1278fa23 100644 --- a/samples/FormsSample/Core/Core.csproj +++ b/samples/FormsSample/Core/Core.csproj @@ -86,15 +86,15 @@ True - ..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll True - ..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll True - ..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll True @@ -118,11 +118,11 @@ - + 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/samples/FormsSample/Core/packages.config b/samples/FormsSample/Core/packages.config index 1727d938..aff7610c 100644 --- a/samples/FormsSample/Core/packages.config +++ b/samples/FormsSample/Core/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/samples/FormsSample/UWP/UWP.nuget.targets b/samples/FormsSample/UWP/UWP.nuget.targets index 4e37f358..e492f78b 100644 --- a/samples/FormsSample/UWP/UWP.nuget.targets +++ b/samples/FormsSample/UWP/UWP.nuget.targets @@ -1,9 +1,18 @@  - - $(UserProfile)\.nuget\packages\ + + True + NuGet + C:\Projects\SkiaSharp\samples\FormsSample\UWP\project.lock.json + $(UserProfile)\.nuget\packages\ + C:\Users\mattl\.nuget\packages\ + ProjectJson + 4.1.0 - - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + \ No newline at end of file diff --git a/samples/FormsSample/UWP/project.json b/samples/FormsSample/UWP/project.json index 6ceb2dfa..577e1aee 100644 --- a/samples/FormsSample/UWP/project.json +++ b/samples/FormsSample/UWP/project.json @@ -6,7 +6,7 @@ "SkiaSharp.Svg": "1.57.1", "SkiaSharp.Views": "1.57.1", "SkiaSharp.Views.Forms": "1.57.1", - "Xamarin.Forms": "2.3.3.193" + "Xamarin.Forms": "2.3.4.231" }, "frameworks": { "uap10.0": {} diff --git a/samples/FormsSample/iOS/iOS.csproj b/samples/FormsSample/iOS/iOS.csproj index 55f0510d..e1cd5589 100644 --- a/samples/FormsSample/iOS/iOS.csproj +++ b/samples/FormsSample/iOS/iOS.csproj @@ -164,19 +164,19 @@ - ..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll True - ..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll True - ..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + ..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll True - ..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll True @@ -219,11 +219,11 @@ - + 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/samples/FormsSample/iOS/packages.config b/samples/FormsSample/iOS/packages.config index dbc07e35..16a4dd36 100644 --- a/samples/FormsSample/iOS/packages.config +++ b/samples/FormsSample/iOS/packages.config @@ -5,5 +5,5 @@ - + \ No newline at end of file diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj index c495a2b0..d685b083 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj @@ -37,6 +37,9 @@ false + + ..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\FormsViewGroup.dll + @@ -65,20 +68,17 @@ ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll - - ..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\FormsViewGroup.dll - - ..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Core.dll - - - ..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + ..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Core.dll - ..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + ..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + + + ..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - ..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll @@ -107,5 +107,11 @@ - + + + + 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/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/packages.config b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/packages.config index d0a982fb..9a8d79ba 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/packages.config +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/packages.config @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.nuget.targets b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.nuget.targets index 4e37f358..099cd039 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.nuget.targets +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.nuget.targets @@ -1,9 +1,18 @@  - - $(UserProfile)\.nuget\packages\ + + True + NuGet + C:\Projects\SkiaSharp\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.UWP\project.lock.json + $(UserProfile)\.nuget\packages\ + C:\Users\mattl\.nuget\packages\ + ProjectJson + 4.1.0 - - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + \ No newline at end of file diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/project.json b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/project.json index 7cfb0b1e..75e1d446 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/project.json +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0", - "Xamarin.Forms": "2.3.3.193" + "Xamarin.Forms": "2.3.4.231" }, "frameworks": { "uap10.0": {} diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj index a70195ef..0a2919eb 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj @@ -47,19 +47,19 @@ - - ..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + ..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - ..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + ..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - ..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + @@ -70,9 +70,6 @@ - - - {6a678cfb-21a7-4e81-8909-fd72abbfd408} @@ -85,8 +82,17 @@ false + + + - + + + + 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/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/packages.config b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/packages.config index 894c7ac8..dfb0a0c4 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/packages.config +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj index 9fe90137..583c8305 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj @@ -31,20 +31,6 @@ - - - ..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll - - - ..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll - - - ..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll - - - - - @@ -54,7 +40,27 @@ SkiaSharp.Portable + + + ..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll + + + ..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll + + + ..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll + + + + + - + + + + 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/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/packages.config b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/packages.config index 5c93b059..8cf49311 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/packages.config +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file