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 @@
-
+
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(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 @@
-
-
+
+ all
+ true
+
+
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 @@
-
+