Updated GraphicsControls to use P11

dotnet · Dec 15, 2021 · 5239722 · 5239722
1 parent 0ef88ab
commit 5239722
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 5 deletions.
diff --git a/Microsoft.Maui.Graphics.Controls.MultiTargeting.targets b/Microsoft.Maui.Graphics.Controls.MultiTargeting.targets
@@ -83,8 +83,8 @@
   </PropertyGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
-    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.29-preview3" />
-    <PackageReference Include="Microsoft.Maui.Graphics.Win2D.WinUI.Desktop" Version="6.0.101-preview.11.679" />
+    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.30" />
+    <PackageReference Include="Microsoft.Maui.Graphics.Win2D.WinUI.Desktop" Version="6.0.101-preview.11.758" />
   </ItemGroup>
 
 </Project>
diff --git a/src/GraphicsControls/GraphicsControls.csproj b/src/GraphicsControls/GraphicsControls.csproj
@@ -12,7 +12,7 @@
 	   <PackageId>Microsoft.Maui.Graphics.Controls</PackageId>
 	</PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Graphics" Version="6.0.101-preview.11.679" />
+    <PackageReference Include="Microsoft.Maui.Graphics" Version="6.0.101-preview.11.758" />
   </ItemGroup>
   <Import Project="..\..\Microsoft.Maui.Graphics.Controls.MultiTargeting.targets" />
 </Project>
diff --git a/src/GraphicsControls/Handlers/DatePicker/GraphicsDatePicker.iOS.cs b/src/GraphicsControls/Handlers/DatePicker/GraphicsDatePicker.iOS.cs
@@ -3,6 +3,7 @@
 using CoreGraphics;
 using Foundation;
 using Microsoft.Maui.Graphics.Native;
+using Microsoft.Maui.Platform;
 using UIKit;
 
 namespace Microsoft.Maui.Graphics.Controls

diff --git a/src/GraphicsControls/Handlers/Editor/EditorHandler.Android.cs b/src/GraphicsControls/Handlers/Editor/EditorHandler.Android.cs
@@ -2,6 +2,7 @@
 using Android.Text;
 using Android.Views;
 using Android.Views.InputMethods;
+using Microsoft.Maui.Platform;
 using static Android.Views.View;
 using ATextAlignment = Android.Views.TextAlignment;
 

diff --git a/src/GraphicsControls/Handlers/Editor/EditorHandler.iOS.cs b/src/GraphicsControls/Handlers/Editor/EditorHandler.iOS.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Maui.Platform;
+using System;
 using UIKit;
 
 namespace Microsoft.Maui.Graphics.Controls

diff --git a/src/GraphicsControls/Handlers/Entry/EntryHandler.Android.cs b/src/GraphicsControls/Handlers/Entry/EntryHandler.Android.cs
@@ -4,6 +4,7 @@
 using Android.Views;
 using Android.Views.InputMethods;
 using Android.Widget;
+using Microsoft.Maui.Platform;
 using static Android.Views.View;
 using static Android.Widget.TextView;
 

diff --git a/src/GraphicsControls/Handlers/Entry/EntryHandler.iOS.cs b/src/GraphicsControls/Handlers/Entry/EntryHandler.iOS.cs
@@ -1,5 +1,6 @@
 using System;
 using Foundation;
+using Microsoft.Maui.Platform;
 using UIKit;
 
 namespace Microsoft.Maui.Graphics.Controls

diff --git a/src/GraphicsControls/Handlers/TimePicker/GraphicsTimePicker.iOS.cs b/src/GraphicsControls/Handlers/TimePicker/GraphicsTimePicker.iOS.cs
@@ -3,6 +3,7 @@
 using CoreGraphics;
 using Foundation;
 using Microsoft.Maui.Graphics.Native;
+using Microsoft.Maui.Platform;
 using UIKit;
 
 namespace Microsoft.Maui.Graphics.Controls

diff --git a/src/GraphicsControls/Handlers/View/ViewHandler.cs b/src/GraphicsControls/Handlers/View/ViewHandler.cs
@@ -1,4 +1,6 @@
-#if __IOS__ || MACCATALYST
+using Microsoft.Maui.Platform;
+
+#if __IOS__ || MACCATALYST
 using NativeView = UIKit.UIView;
 #elif MONOANDROID
 using NativeView = Android.Views.View;