From 358c56aac536889c183b5fa727802e4eea611a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Su=C3=A1rez=20Ruiz?= Date: Sat, 6 Nov 2021 11:41:59 +0100 Subject: [PATCH] Updated project to use the latest Maui and Maui Graphics version --- Microsoft.Maui.Graphics.Controls.MultiTargeting.targets | 4 ++-- .../GraphicsControls.Sample/GraphicsControls.Sample.csproj | 2 +- src/GraphicsControls/GraphicsControls.csproj | 2 +- .../Handlers/DatePicker/GraphicsDatePicker.Windows.cs | 3 ++- .../Handlers/Editor/GraphicsEditor.Windows.cs | 3 ++- src/GraphicsControls/Handlers/Entry/GraphicsEntry.Windows.cs | 3 ++- .../Handlers/TimePicker/GraphicsTimePicker.Windows.cs | 3 ++- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Microsoft.Maui.Graphics.Controls.MultiTargeting.targets b/Microsoft.Maui.Graphics.Controls.MultiTargeting.targets index 6ffb4d7..4153d84 100644 --- a/Microsoft.Maui.Graphics.Controls.MultiTargeting.targets +++ b/Microsoft.Maui.Graphics.Controls.MultiTargeting.targets @@ -83,8 +83,8 @@ - - + + \ No newline at end of file diff --git a/src/GraphicsControls.Sample/GraphicsControls.Sample/GraphicsControls.Sample.csproj b/src/GraphicsControls.Sample/GraphicsControls.Sample/GraphicsControls.Sample.csproj index 02c27da..2275615 100644 --- a/src/GraphicsControls.Sample/GraphicsControls.Sample/GraphicsControls.Sample.csproj +++ b/src/GraphicsControls.Sample/GraphicsControls.Sample/GraphicsControls.Sample.csproj @@ -17,7 +17,7 @@ com.companyname.GraphicsControls.Sample - 1.0 + 1 1 diff --git a/src/GraphicsControls/GraphicsControls.csproj b/src/GraphicsControls/GraphicsControls.csproj index c906ce9..102bd75 100644 --- a/src/GraphicsControls/GraphicsControls.csproj +++ b/src/GraphicsControls/GraphicsControls.csproj @@ -12,7 +12,7 @@ Microsoft.Maui.Graphics.Controls - + \ No newline at end of file diff --git a/src/GraphicsControls/Handlers/DatePicker/GraphicsDatePicker.Windows.cs b/src/GraphicsControls/Handlers/DatePicker/GraphicsDatePicker.Windows.cs index 9ca9ef8..7c1b683 100644 --- a/src/GraphicsControls/Handlers/DatePicker/GraphicsDatePicker.Windows.cs +++ b/src/GraphicsControls/Handlers/DatePicker/GraphicsDatePicker.Windows.cs @@ -4,6 +4,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; using System; +using WSize = Windows.Foundation.Size; namespace Microsoft.Maui.Graphics.Controls { @@ -124,7 +125,7 @@ namespace Microsoft.Maui.Graphics.Controls W2DGraphicsService.ThreadLocalCreator = sender; _canvas.Session = args.DrawingSession; - _canvas.CanvasSize = new Windows.Foundation.Size(_dirty.Width, _dirty.Height); + _canvas.CanvasSize = new WSize(_dirty.Width, _dirty.Height); _drawable.Draw(_canvas, _dirty); W2DGraphicsService.ThreadLocalCreator = null; } diff --git a/src/GraphicsControls/Handlers/Editor/GraphicsEditor.Windows.cs b/src/GraphicsControls/Handlers/Editor/GraphicsEditor.Windows.cs index c2f0a5f..b090be8 100644 --- a/src/GraphicsControls/Handlers/Editor/GraphicsEditor.Windows.cs +++ b/src/GraphicsControls/Handlers/Editor/GraphicsEditor.Windows.cs @@ -2,6 +2,7 @@ using Microsoft.Maui.Graphics.Win2D; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; +using WSize = Windows.Foundation.Size; namespace Microsoft.Maui.Graphics.Controls { @@ -75,7 +76,7 @@ namespace Microsoft.Maui.Graphics.Controls W2DGraphicsService.ThreadLocalCreator = sender; _canvas.Session = args.DrawingSession; - _canvas.CanvasSize = new Windows.Foundation.Size(_dirty.Width, _dirty.Height); + _canvas.CanvasSize = new WSize(_dirty.Width, _dirty.Height); _drawable.Draw(_canvas, _dirty); W2DGraphicsService.ThreadLocalCreator = null; } diff --git a/src/GraphicsControls/Handlers/Entry/GraphicsEntry.Windows.cs b/src/GraphicsControls/Handlers/Entry/GraphicsEntry.Windows.cs index d2e8fd3..1c48d76 100644 --- a/src/GraphicsControls/Handlers/Entry/GraphicsEntry.Windows.cs +++ b/src/GraphicsControls/Handlers/Entry/GraphicsEntry.Windows.cs @@ -4,6 +4,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using System; using System.Diagnostics; +using WSize = Windows.Foundation.Size; namespace Microsoft.Maui.Graphics.Controls { @@ -78,7 +79,7 @@ namespace Microsoft.Maui.Graphics.Controls W2DGraphicsService.ThreadLocalCreator = sender; _canvas.Session = args.DrawingSession; - _canvas.CanvasSize = new Windows.Foundation.Size(_dirty.Width, _dirty.Height); + _canvas.CanvasSize = new WSize(_dirty.Width, _dirty.Height); _drawable.Draw(_canvas, _dirty); W2DGraphicsService.ThreadLocalCreator = null; } diff --git a/src/GraphicsControls/Handlers/TimePicker/GraphicsTimePicker.Windows.cs b/src/GraphicsControls/Handlers/TimePicker/GraphicsTimePicker.Windows.cs index e3550dc..38c12b1 100644 --- a/src/GraphicsControls/Handlers/TimePicker/GraphicsTimePicker.Windows.cs +++ b/src/GraphicsControls/Handlers/TimePicker/GraphicsTimePicker.Windows.cs @@ -4,6 +4,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; using System; +using WSize = Windows.Foundation.Size; namespace Microsoft.Maui.Graphics.Controls { @@ -98,7 +99,7 @@ namespace Microsoft.Maui.Graphics.Controls W2DGraphicsService.ThreadLocalCreator = sender; _canvas.Session = args.DrawingSession; - _canvas.CanvasSize = new Windows.Foundation.Size(_dirty.Width, _dirty.Height); + _canvas.CanvasSize = new WSize(_dirty.Width, _dirty.Height); _drawable.Draw(_canvas, _dirty); W2DGraphicsService.ThreadLocalCreator = null; }