Updated Uno packages

.vscode/launch.json

@@ -14,9 +14,7 @@
         "/p:UnoSourceGeneratorUseGenerationHost=true",
         "/p:UnoSourceGeneratorUseGenerationController=false",
         "/p:UnoRemoteControlPort=443",
-        "--project=${workspaceFolder}/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj",
-        "-p:TargetFrameworks=netstandard2.0",
-        "-p:TargetFramework=net5.0"
+        "--project=${workspaceFolder}/platforms/CommunityToolkit.Labs.Wasm/CommunityToolkit.Labs.Wasm.csproj"
       ],
       "presentation": {
         "group": "1",

DiscoverSamples.ps1

@@ -24,9 +24,7 @@ function CreateVsCodeLaunchConfigJson {
       `"/p:UnoSourceGeneratorUseGenerationHost=true`",
       `"/p:UnoSourceGeneratorUseGenerationController=false`",
       `"/p:UnoRemoteControlPort=443`",
-      `"--project=`$`{workspaceFolder`}/labs/$projectName/samples/$projectName.Wasm/$projectName.Wasm.csproj`",
-      `"-p:TargetFrameworks=netstandard2.0`",
-      `"-p:TargetFramework=net5.0`"
+      `"--project=`$`{workspaceFolder`}/labs/$projectName/samples/$projectName.Wasm/$projectName.Wasm.csproj`"
     ],
     `"presentation`": {
       `"group`": `"2`"

common/Labs.Head.Wasm.props

@@ -40,8 +40,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.0.1" />
     <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.9" />
-    <PackageReference Include="Uno.Wasm.Bootstrap" Version="3.1.2" />
-    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.1.2" />
+    <PackageReference Include="Uno.Wasm.Bootstrap" Version="3.3.1" />
+    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.3.1" />
   </ItemGroup>
 
   <ItemGroup>

common/Labs.MultiTarget.props

@@ -15,6 +15,7 @@
       $(AndroidLibTargetFramework);
     </TargetFrameworks>
 
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
     <EnableDefaultPageItems>false</EnableDefaultPageItems>
     <DefineConstants Condition="'$(TargetFramework)' == '$(WinAppSdkTargetFramework)'">$(DefineConstants);WINAPPSDK</DefineConstants>

common/Labs.TargetFrameworks.All.props

@@ -7,7 +7,7 @@
         <LinuxHeadTargetFramework>net5.0</LinuxHeadTargetFramework>
         <WpfHeadTargetFramework>netcoreapp3.1</WpfHeadTargetFramework>
 
-        <AndroidLibTargetFramework>monoandroid11.0</AndroidLibTargetFramework>
+        <AndroidLibTargetFramework>monoandroid12.0</AndroidLibTargetFramework>
         <MacOSLibTargetFramework>xamarinmac20</MacOSLibTargetFramework>
         <iOSLibTargetFramework>xamarinios10</iOSLibTargetFramework>
 

common/Labs.Uno.props

@@ -2,27 +2,27 @@
     <!-- This file is modified by common/Scripts/UseUnoWinUI.ps1 to switch between WinUI 2 and 3 under Uno Platform -->
     <!-- All Uno-based heads and multitargeted library projects reference this file, while native (UWP/WinAppSdk) heads don't and shouldn't need to. -->
     <ItemGroup Condition="'$(IsUno)' == 'true'">
-        <PackageReference Include="Uno.UI" Version="4.4.13" />
+        <PackageReference Include="Uno.UI" Version="4.6.18" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(IsWasm)' == 'true' OR '$(IsWpf)' == 'true' OR '$(IsGtk)' == 'true'">
-        <PackageReference Include="Uno.UI.RemoteControl" Version="4.4.13" Condition="'$(Configuration)'=='Debug'" />
+        <PackageReference Include="Uno.UI.RemoteControl" Version="4.6.18" Condition="'$(Configuration)'=='Debug'" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(IsGtkHead)' == 'true'">
-        <PackageReference Include="Uno.UI.Skia.Gtk" Version="4.4.13" />
+        <PackageReference Include="Uno.UI.Skia.Gtk" Version="4.6.18" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(IsWpfHead)' == 'true'">
-        <PackageReference Include="Uno.UI.Skia.Wpf" Version="4.4.13" />
+        <PackageReference Include="Uno.UI.Skia.Wpf" Version="4.6.18" />
     </ItemGroup>
     <PropertyGroup Condition="'$(IsWpfHead)' == 'true'">
         <!-- Ignorable issue from SkiaSharp package, see: https://github.com/CommunityToolkit/Labs-Windows/pull/119#issuecomment-1125373091 -->
         <NoWarn>NU1701</NoWarn>
     </PropertyGroup>
 
     <ItemGroup Condition="'$(IsWasmHead)' == 'true'">
-        <PackageReference Include="Uno.UI.WebAssembly" Version="4.4.13" />
+        <PackageReference Include="Uno.UI.WebAssembly" Version="4.6.18" />
     </ItemGroup>
 
     <!-- Import Uno and native dependencies for all multitargeted library projects. -->

platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj

@@ -49,7 +49,7 @@
     <AndroidUseAapt2>true</AndroidUseAapt2>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
     <ResourcesDirectory>..\CommunityToolkit.Labs.Shared\Strings</ResourcesDirectory>

platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetPathOfFileAbove(directory.build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(directory.build.props))')" />
 
@@ -202,4 +202,9 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
+
+  <!-- Workaround for https://github.com/unoplatform/uno/issues/9430 -->
+  <PropertyGroup>
+    <MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
+  </PropertyGroup>
+</Project>