From 50c033d0fdc08d8d93c1b03c2f7f83dd86f492ea Mon Sep 17 00:00:00 2001
From: workgroupengineering <workgroupengineering@users.noreply.github.com>
Date: Tue, 7 Dec 2021 04:29:01 +0100
Subject: [PATCH] =?UTF-8?q?fixes:=20warning=20MSB4011=20Microsoft.NET.Sdk.?=
 =?UTF-8?q?WindowsDesktop.props=20cannot=20=E2=80=A6=20(#6813)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fixes: warning MSB4011 Microsoft.NET.Sdk.WindowsDesktop.props cannot be imported again.

* fixes: nits

Co-authored-by: Steven Kirk <grokys@users.noreply.github.com>
---
 global.json                                                   | 2 +-
 .../Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj      | 3 ++-
 src/iOS/Avalonia.iOS/Avalonia.iOS.csproj                      | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/global.json b/global.json
index e3e652761c..b160e4561d 100644
--- a/global.json
+++ b/global.json
@@ -4,7 +4,7 @@
     },
     "msbuild-sdks": {
         "Microsoft.Build.Traversal": "1.0.43",
-        "MSBuild.Sdk.Extras": "2.0.54",
+        "MSBuild.Sdk.Extras": "3.0.22",
         "AggregatePackage.NuGet.Sdk" : "0.1.12"
     }
 }
diff --git a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
index 0e11ee3b92..9f49808422 100644
--- a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
+++ b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <UseWpf>true</UseWpf>
+    <UseWindowsForms>true</UseWindowsForms>
     <ExtrasEnableImplicitWinFormsReferences>true</ExtrasEnableImplicitWinFormsReferences>
     <UseDirect3D9>true</UseDirect3D9>
     <PackageId>Avalonia.Win32.Interoperability</PackageId>
diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
index d5b95b3151..c219e08c8b 100644
--- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
+++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
@@ -1,5 +1,4 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" />
+<Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
     <TargetFramework>xamarin.ios10</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -20,5 +19,4 @@
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
     <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" />
 </Project>