WinUI

.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets

@@ -29,15 +29,15 @@
     <Compile Remove="**\Standard\*.cs" />
     <None Include="**\Standard\*.cs" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp')) != true ">
-    <Compile Remove="**\*.Win32.cs" />
-    <None Include="**\*.Win32.cs" />
+  <ItemGroup Condition="$(TargetFramework.Contains('-windows')) != true ">
+    <Compile Remove="**\*.Windows.cs" />
+    <None Include="**\*.Windows.cs" />
     <Compile Remove="**\*.xaml.cs" />
     <None Include="**\*.xaml.cs" />
     <Compile Remove="**\*.xaml" />
     <None Include="**\*.xaml" />
-    <Compile Remove="**\Win32\*.cs" />
-    <None Include="**\Win32\*.cs" />
+    <Compile Remove="**\Windows\*.cs" />
+    <None Include="**\Windows\*.cs" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -65,10 +65,8 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0-maccatalyst' ">
     <DefineConstants>$(DefineConstants);MACCATALYST;IOS</DefineConstants>
   </PropertyGroup>
-
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp')) == true ">
-    <UseWpf>true</UseWpf>
-  </PropertyGroup>
+
+
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
@@ -78,13 +76,18 @@
     <PackageReference Include="Xamarin.Google.Android.Material" />
     <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" />
   </ItemGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net5.0-windows')) == true">
-    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
+  <PropertyGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;UWP_16299;UWP_18362;UWP_17134</DefineConstants>
-    <NoWarn>$(NoWarn);NU5104</NoWarn>
   </PropertyGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net5.0-windows')) == true">
-    <PackageReference Include="Microsoft.WinUI" Version="3.0.0-preview3.201113.0" />
+  <ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
+    <PackageReference Include="Microsoft.ProjectReunion" Version="0.5.0-prerelease" />
+    <PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.5.0-prerelease" />
+    <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.5.0-prerelease" />
   </ItemGroup>
+  <Target Name="Net6WinUIWorkaround" BeforeTargets="_GetSdkToolsPathsFromSdk" Condition="$(TargetFramework.Contains('-windows')) == true ">
+    <PropertyGroup>
+      <TargetPlatformIdentifierAdjusted>UAP</TargetPlatformIdentifierAdjusted>
+    </PropertyGroup>
+  </Target>
 </Project>

.nuspec/Microsoft.Maui.Controls.targets

@@ -43,7 +43,7 @@
 
 	<Target Name="_ValidateNETFrameworkVersion"
 			BeforeTargets="_CheckForInvalidConfigurationAndPlatform"
-			Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' AND '$(TargetFrameworkVersion.Substring(1))' &lt; '4.6.1' AND '$(MauiDisableFrameworkVersionValidation)' != 'True'">
+			Condition="'$(ProjectExt)' != '.wapproj' AND '$(TargetFrameworkIdentifier)' == '.NETFramework' AND '$(TargetFrameworkVersion.Substring(1))' &lt; '4.6.1' AND '$(MauiDisableFrameworkVersionValidation)' != 'True'">
 		<Error Code="XF004"
 			Text="Microsoft.Maui requires .NETFramework >= v4.6.1. You have '$(TargetFrameworkVersion)'" />
 	</Target>

.nuspec/Microsoft.Maui.Core.props

@@ -0,0 +1,6 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="$(TargetFramework.Contains('-windows')) == true AND OutputType == 'WinExe'">
+    <!-- This tells Maui.Controls to not process the WinUI Xaml files -->
+    <EnableDefaultXamlItems>false</EnableDefaultXamlItems>
+  </PropertyGroup>
+</Project>

.nuspec/Microsoft.Maui.Core.targets

@@ -0,0 +1,9 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="Net6WinUIWorkaround" 
+          BeforeTargets="_GetSdkToolsPathsFromSdk"
+          Condition="$(TargetFramework.Contains('-windows')) == true ">
+    <PropertyGroup>
+      <TargetPlatformIdentifierAdjusted>UAP</TargetPlatformIdentifierAdjusted>
+    </PropertyGroup>
+  </Target>
+</Project>

Directory.Build.props

@@ -1,6 +1,10 @@
 <Project>
   <Import Project="eng\Version.props" />
   <PropertyGroup>
+    <BuildForWinUI>false</BuildForWinUI>
+    <BuildForWinUI Condition="'$(SolutionFileName)' == 'Microsoft.Maui.WinUI.sln'">true</BuildForWinUI>
+    <MauiPlatforms>net6.0-android;net6.0-ios;net6.0-maccatalyst</MauiPlatforms>
+    <MauiPlatforms Condition="'$(BuildForWinUI)' == 'true'">net6.0-windows10.0.19041.0</MauiPlatforms>
     <_MauiBuildTasksLocation>$(_MauiBuildTasksLocation)</_MauiBuildTasksLocation>
     <_MauiBuildTasksLocation Condition="'$(_MauiBuildTasksLocation)' == ''">$(MSBuildThisFileDirectory).nuspec\</_MauiBuildTasksLocation>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>