Update default WinUIMajorVersion to 3 in build scripts

Build-Toolkit-Components.ps1

@@ -85,7 +85,7 @@ Param (
     [hashtable]$AdditionalProperties,
 
     [Alias("winui")]
-    [int]$WinUIMajorVersion = 2,
+    [int]$WinUIMajorVersion = 3,
 
     [string]$ComponentDir = "src",
 

Build-Toolkit-Gallery.ps1

@@ -69,7 +69,7 @@ Param (
   [hashtable]$AdditionalProperties,
 
   [Alias("winui")]
-  [int]$WinUIMajorVersion = 2,
+  [int]$WinUIMajorVersion = 3,
 
   [Alias("c")]
   [string[]]$Components = @("all"),

GenerateAllSolution.ps1

@@ -46,7 +46,7 @@ Param (
     [string[]]$Components = @('all'),
 
     [Alias("winui")]
-    [int]$WinUIMajorVersion = 2,
+    [int]$WinUIMajorVersion = 3,
 
     [string[]]$ExcludeComponents,
 

MultiTarget/PackageReferences/Uno.props

@@ -6,7 +6,7 @@
     <!-- This file is modified by UseUnoWinUI.ps1 to switch between WinUI 2 and 3 under Uno Platform -->
     <!-- All Uno-based project heads and MultiTarget-enabled library projects need to reference this file, while native (UWP/WinAppSdk) heads don't. -->
     <ItemGroup Condition="'$(IsUno)' == 'true'">
-        <PackageReference Include="Uno.UI" Version="$(CommonUnoPackageVersion)" />
+        <PackageReference Include="Uno.WinUI" Version="$(CommonUnoPackageVersion)" />
         <PackageReference Include="Uno.Fonts.Fluent" Version="2.4.5" />    
     </ItemGroup>
 
@@ -15,15 +15,15 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(IsWasm)' == 'true' OR '$(IsWpf)' == 'true' OR '$(IsGtk)' == 'true'">
-        <PackageReference Include="Uno.UI.RemoteControl" Version="$(CommonUnoPackageVersion)" Condition="'$(Configuration)'=='Debug'" />
+        <PackageReference Include="Uno.WinUI.RemoteControl" Version="$(CommonUnoPackageVersion)" Condition="'$(Configuration)'=='Debug'" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(IsGtkHead)' == 'true'">
-        <PackageReference Include="Uno.UI.Skia.Gtk" Version="$(CommonUnoPackageVersion)" />
+        <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="$(CommonUnoPackageVersion)" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(IsWpfHead)' == 'true'">
-        <PackageReference Include="Uno.UI.Skia.Wpf" Version="$(CommonUnoPackageVersion)" />
+        <PackageReference Include="Uno.WinUI.Skia.Wpf" Version="$(CommonUnoPackageVersion)" />
     </ItemGroup>
 
     <PropertyGroup Condition="'$(IsWpfHead)' == 'true'">
@@ -46,6 +46,6 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(IsWasmHead)' == 'true'">
-        <PackageReference Include="Uno.UI.WebAssembly" Version="$(CommonUnoPackageVersion)" />
+        <PackageReference Include="Uno.WinUI.WebAssembly" Version="$(CommonUnoPackageVersion)" />
     </ItemGroup>
 </Project>

MultiTarget/WinUI.TargetVersion.props

@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <!-- THIS AREA MODIFIED BY SCRIPTS -->
-    <PackageIdVariant>Uwp</PackageIdVariant>
-    <WinUIMajorVersion>2</WinUIMajorVersion>
+    <PackageIdVariant>WinUI</PackageIdVariant>
+    <WinUIMajorVersion>3</WinUIMajorVersion>
     <!-- END SCRIPT AREA -->
   </PropertyGroup>
 </Project>

ProjectHeads/App.Head.Uno.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <DependencyVariant>Uwp</DependencyVariant>
+    <DependencyVariant>WinUI</DependencyVariant>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)\App.Head.props" />
@@ -9,7 +9,7 @@
   <Import Project="$(MSBuildThisFileDirectory)\..\MultiTarget\NoWarn.props" />
 
   <PropertyGroup Condition="'$(IsUno)' == 'true'">
-    <!-- Code generated by Uno.UI.SourceGenerators creates AoT-unsafe code when Behaviors are used.  -->
+    <!-- Code generated by Uno.WinUI.SourceGenerators creates AoT-unsafe code when Behaviors are used.  -->
     <NoWarn>$(NoWarn);IL2026</NoWarn>
 
     <!--
@@ -28,5 +28,5 @@
       This import must be inside THIS file to allow swapping between Uno.​UI and Uno.​WinUI via pwsh.
       Changes to this file are suppressed by git when switching to avoid changing the default for all users.
   -->
-  <Import Project="$(MSBuildThisFileDirectory)\App.Head.Uno.UI.Dependencies.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\App.Head.Uno.WinUI.Dependencies.props" />
 </Project>

ProjectHeads/GenerateSingleSampleHeads.ps1

@@ -37,7 +37,7 @@ Param (
     [string[]]$ExcludeMultiTargets,
 
     [Alias("winui")]
-    [int]$WinUIMajorVersion = 2,
+    [int]$WinUIMajorVersion = 3,
 
     [Parameter(HelpMessage = "The path to the containing folder for a component where sample heads should be generated.")] 
     [string]$componentPath,