- fix NET6 targets

dotnet · May 27, 2021 · b65a3a6 · b65a3a6
1 parent 1ea5496
commit b65a3a6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/Compatibility/Core/src/Compatibility-net6.csproj b/src/Compatibility/Core/src/Compatibility-net6.csproj
@@ -78,6 +78,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Include="RendererToHandlerShim.cs" />
     <Compile Include="AppHostBuilderExtensions.cs" />
     <Compile Include="MauiHandlersCollectionExtensions.cs" />
     <Compile Include="Forms.cs" />

diff --git a/src/Compatibility/Core/src/RendererToHandlerShim.Windows.cs b/src/Compatibility/Core/src/RendererToHandlerShim.Windows.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using NativeView = Microsoft.UI.Xaml.FrameworkElement;
-using Microsoft.Maui.Controls.Compatibility.Platform.UWP
+using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility

diff --git a/src/Compatibility/Core/src/RendererToHandlerShim.cs b/src/Compatibility/Core/src/RendererToHandlerShim.cs
@@ -16,10 +16,9 @@
 #elif WINDOWS
 using ViewHandler = Microsoft.Maui.Handlers.ViewHandler<Microsoft.Maui.IView, Microsoft.UI.Xaml.FrameworkElement>;
 using NativeView = Microsoft.UI.Xaml.FrameworkElement;
-using static Microsoft.Maui.Controls.Compatibility.Platform.UWP;
-using Microsoft.UI.Xaml;
-using Microsoft.Maui.Graphics;
+using static Microsoft.Maui.Controls.Compatibility.Platform.UWP.Platform;
 using Microsoft.Maui.Controls.Platform;
+using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 #endif
 
 namespace Microsoft.Maui.Controls.Compatibility

diff --git a/src/Controls/samples/Controls.Sample/Startup.cs b/src/Controls/samples/Controls.Sample/Startup.cs
@@ -52,6 +52,9 @@ public void Configure(IAppHostBuilder appBuilder)
 #elif __IOS__
 					handlers.AddCompatibilityRenderer(typeof(CustomButton),
 						typeof(Microsoft.Maui.Controls.Compatibility.Platform.iOS.ButtonRenderer));
+#elif WINDOWS
+					handlers.AddCompatibilityRenderer(typeof(CustomButton),
+						typeof(Microsoft.Maui.Controls.Compatibility.Platform.UWP.ButtonRenderer));
 #endif
 				});