From 4af54f13eed2ae2e0336137f30b6322f94fb4090 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 8 Mar 2020 18:01:51 -0700
Subject: [PATCH] Update to Forms 4.5.0.356

---
 Ooui.Forms/Ooui.Forms.csproj                       | 2 +-
 Ooui.Forms/Renderers/ButtonRenderer.cs             | 4 ++--
 Ooui.Forms/Renderers/LabelRenderer.cs              | 8 +++-----
 Ooui.Forms/Renderers/LinkLabelRenderer.cs          | 8 +++-----
 PlatformSamples/AspNetCoreMvc/AspNetCoreMvc.csproj | 7 +++++--
 Samples/Samples.csproj                             | 2 +-
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Ooui.Forms/Ooui.Forms.csproj b/Ooui.Forms/Ooui.Forms.csproj
index 7908af0..7921eaf 100644
--- a/Ooui.Forms/Ooui.Forms.csproj
+++ b/Ooui.Forms/Ooui.Forms.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.6.0.264807" />
+    <PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Extensions\" />
diff --git a/Ooui.Forms/Renderers/ButtonRenderer.cs b/Ooui.Forms/Renderers/ButtonRenderer.cs
index d4c9857..a185aa5 100644
--- a/Ooui.Forms/Renderers/ButtonRenderer.cs
+++ b/Ooui.Forms/Renderers/ButtonRenderer.cs
@@ -67,7 +67,7 @@ namespace Ooui.Forms.Renderers
                 UpdateFont ();
             else if (e.PropertyName == Xamarin.Forms.Button.BorderWidthProperty.PropertyName || e.PropertyName == Xamarin.Forms.Button.CornerRadiusProperty.PropertyName || e.PropertyName == Xamarin.Forms.Button.BorderColorProperty.PropertyName)
                 UpdateBorder ();
-            else if (e.PropertyName == Xamarin.Forms.Button.ImageProperty.PropertyName)
+            else if (e.PropertyName == Xamarin.Forms.Button.ImageSourceProperty.PropertyName)
                 UpdateImage ();
         }
 
@@ -113,7 +113,7 @@ namespace Ooui.Forms.Renderers
         async void UpdateImage ()
         {
             IImageSourceHandler handler;
-            FileImageSource source = Element.Image;
+            ImageSource source = Element.ImageSource;
 
             if (source != null &&
                 (handler = Xamarin.Forms.Internals.Registrar.Registered.GetHandler<IImageSourceHandler>(source.GetType())) != null)
diff --git a/Ooui.Forms/Renderers/LabelRenderer.cs b/Ooui.Forms/Renderers/LabelRenderer.cs
index 43f9377..cb8ffe2 100644
--- a/Ooui.Forms/Renderers/LabelRenderer.cs
+++ b/Ooui.Forms/Renderers/LabelRenderer.cs
@@ -145,14 +145,12 @@ namespace Ooui.Forms.Renderers
         {
             _perfectSizeValid = false;
 
-            var values = Element.GetValues (Xamarin.Forms.Label.FormattedTextProperty, Xamarin.Forms.Label.TextProperty, Xamarin.Forms.Label.TextColorProperty);
-            var formatted = values[0] as FormattedString;
-            if (formatted != null) {
-                Control.Text = (string)values[1];
+            if (Element.FormattedText != null) {
+                Control.Text = Element.Text;
                 isTextFormatted = true;
             }
             else {
-                Control.Text = (string)values[1];
+                Control.Text = Element.Text;
                 isTextFormatted = false;
             }
         }
diff --git a/Ooui.Forms/Renderers/LinkLabelRenderer.cs b/Ooui.Forms/Renderers/LinkLabelRenderer.cs
index cc5b5ce..9d8d3f0 100644
--- a/Ooui.Forms/Renderers/LinkLabelRenderer.cs
+++ b/Ooui.Forms/Renderers/LinkLabelRenderer.cs
@@ -131,14 +131,12 @@ namespace Ooui.Forms.Renderers
         {
             _perfectSizeValid = false;
 
-            var values = Element.GetValues (Xamarin.Forms.Label.FormattedTextProperty, Xamarin.Forms.Label.TextProperty, Xamarin.Forms.Label.TextColorProperty);
-            var formatted = values[0] as FormattedString;
-            if (formatted != null) {
-                Control.Text = (string)values[1];
+            if (Element.FormattedText != null) {
+                Control.Text = Element.Text;
                 isTextFormatted = true;
             }
             else {
-                Control.Text = (string)values[1];
+                Control.Text = Element.Text;
                 isTextFormatted = false;
             }
         }
diff --git a/PlatformSamples/AspNetCoreMvc/AspNetCoreMvc.csproj b/PlatformSamples/AspNetCoreMvc/AspNetCoreMvc.csproj
index 1a51803..152cbbc 100644
--- a/PlatformSamples/AspNetCoreMvc/AspNetCoreMvc.csproj
+++ b/PlatformSamples/AspNetCoreMvc/AspNetCoreMvc.csproj
@@ -9,8 +9,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.3" />
-    <PackageReference Include="Xamarin.Forms" Version="3.6.0.264807" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.3">
+      <PrivateAssets Condition="'%(PackageReference.Version)' == ''">all</PrivateAssets>
+      <Publish Condition="'%(PackageReference.Version)' == ''">true</Publish>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Samples/Samples.csproj b/Samples/Samples.csproj
index 37a96c8..facce0f 100644
--- a/Samples/Samples.csproj
+++ b/Samples/Samples.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.6.0.264807" />
+    <PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
   </ItemGroup>
 	
   <ItemGroup>