Uno 5.1 update

.vscode/extensions.json

@@ -4,6 +4,7 @@
     "ms-vscode.powershell",
     "editorconfig.editorconfig",
     "shd101wyy.markdown-preview-enhanced",
-    "streetsidesoftware.code-spell-checker"
+    "streetsidesoftware.code-spell-checker",
+    "unoplatform.vscode"
   ]
 }

.vscode/launch.json

@@ -18,13 +18,14 @@
       "name": "Debug (Chrome, WebAssembly)",
       "type": "chrome",
       "request": "launch",
-      "url": "http://localhost:5000",
+      "url": "http://localhost:5001",
       "webRoot": "${workspaceFolder}/e2e/Uno/HelloWorld.Wasm",
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "timeout": 30000,
       "server": {
         "runtimeExecutable": "dotnet",
         "program": "run",
+        "args": ["--no-build"],
         "outputCapture": "std",
         "timeout": 30000,
         "cwd": "${workspaceFolder}/e2e/Uno/HelloWorld.Wasm"
@@ -39,7 +40,7 @@
       "request": "launch",
       "preLaunchTask": "build-skia-gtk",
       // If you have changed target frameworks, make sure to update the program path.
-      "program": "${workspaceFolder}/e2e/Uno/HelloWorld.Skia.Gtk/bin/Debug/net7.0/HelloWorld.Skia.Gtk.dll",
+      "program": "${workspaceFolder}/e2e/Uno/HelloWorld.Skia.Gtk/bin/Debug/net8.0/HelloWorld.Skia.Gtk.dll",
       "args": [],
       "env": {
         "DOTNET_MODIFIABLE_ASSEMBLIES": "debug"

.vscode/tasks.json

@@ -7,7 +7,7 @@
       "type": "process",
       "args": [
         "build",
-        "${workspaceFolder}/HelloWorld.Wasm/HelloWorld.Wasm.csproj",
+        "${workspaceFolder}/e2e/Uno/HelloWorld.Wasm/HelloWorld.Wasm.csproj",
         "/property:GenerateFullPaths=true",
         "/consoleloggerparameters:NoSummary"
       ],
@@ -19,7 +19,7 @@
       "type": "process",
       "args": [
         "publish",
-        "${workspaceFolder}/HelloWorld.Wasm/HelloWorld.Wasm.csproj",
+        "${workspaceFolder}/e2e/Uno/HelloWorld.Wasm/HelloWorld.Wasm.csproj",
         "/property:GenerateFullPaths=true",
         "/consoleloggerparameters:NoSummary"
       ],
@@ -31,7 +31,7 @@
       "type": "process",
       "args": [
         "build",
-        "${workspaceFolder}/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj",
+        "${workspaceFolder}/e2e/Uno/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj",
         "/property:GenerateFullPaths=true",
         "/consoleloggerparameters:NoSummary"
       ],
@@ -43,7 +43,7 @@
       "type": "process",
       "args": [
         "publish",
-        "${workspaceFolder}/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj",
+        "${workspaceFolder}/e2e/Uno/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj",
         "/property:GenerateFullPaths=true",
         "/consoleloggerparameters:NoSummary"
       ],

Directory.Packages.props

@@ -1,13 +1,11 @@
 <Project>
   <ItemGroup>
     <PackageVersion Include="PolySharp" Version="1.14.1" />
-    <PackageVersion Include="Prism.Container.Abstractions" Version="9.0.84-pre" />
-    <PackageVersion Include="Prism.Container.DryIoc" Version="9.0.84-pre" />
-    <PackageVersion Include="Prism.Container.Unity" Version="9.0.84-pre" />
+    <PackageVersion Include="Prism.Container.Abstractions" Version="9.0.88" />
+    <PackageVersion Include="Prism.Container.DryIoc" Version="9.0.88" />
+    <PackageVersion Include="Prism.Container.Unity" Version="9.0.88" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="System.Reactive" Version="6.0.0" />
-    <PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.0.13" />
-    <PackageVersion Include="Uno.WinUI.Markup" Version="5.0.13" />
     <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2401" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
   </ItemGroup>
@@ -16,38 +14,45 @@
     <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
     <PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
   </ItemGroup>
-  <!-- Uno -->
+  <!-- Uno
+    Note that the $(UnoVersion) comes from the Uno.Sdk. You should not update it manually. To update the version of Uno,
+    you should instead update the Sdk version in the global.json file.
+
+    See https://aka.platform.uno/upgrade-uno-packages for more information.
+  -->
   <ItemGroup Condition=" $(IsUnoProject) == 'true' ">
-    <PackageVersion Include="Uno.WinUI" Version="5.0.48" />
-    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.0.48" />
-    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="5.0.48" />
-    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="5.0.48" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.4" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.4" />
-    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.0.48" />
-    <PackageVersion Include="Uno.WinUI.DevServer" Version="5.0.48" />
-    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.48" />
+    <PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.1.5" />
+    <PackageVersion Include="Uno.WinUI.Markup" Version="5.1.5" />
+    <PackageVersion Include="Uno.WinUI" Version="$(UnoVersion)" />
+    <PackageVersion Include="Uno.WinUI.Lottie" Version="$(UnoVersion)" />
+    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="$(UnoVersion)" />
+    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="$(UnoVersion)" />
+    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="$(UnoVersion)" />
+    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.8" />
+    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.8" />
+    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="$(UnoVersion)" />
+    <PackageVersion Include="Uno.WinUI.DevServer" Version="$(UnoVersion)" />
+    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="$(UnoVersion)" />
     <PackageVersion Include="Uno.Core" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
     <PackageVersion Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.4.2" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" Condition="$(MSBuildProjectName.Contains('Prism'))" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" Condition="!$(MSBuildProjectName.Contains('Prism'))" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" Condition="!$(MSBuildProjectName.Contains('Prism'))" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
-    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.6" />
-    <PackageVersion Include="Uno.Resizetizer" Version="1.2.1" />
-    <PackageVersion Include="Uno.Extensions.Core" Version="3.0.10" />
+    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
+    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.7" />
+    <PackageVersion Include="Uno.Resizetizer" Version="1.3.0" />
     <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
-    <PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="3.0.11" />
-    <PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="3.0.11" />
+    <PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="4.0.0" />
+    <PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="4.0.0" />
     <PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
-    <PackageVersion Include="Uno.Material.WinUI" Version="4.0.6" />
-    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.0.17" />
-    <PackageVersion Include="Uno.Toolkit.WinUI" Version="5.0.17" />
-    <PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="3.0.11" />
+    <PackageVersion Include="Uno.Material.WinUI" Version="4.1.1" />
+    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.1.7" />
+    <PackageVersion Include="Uno.Toolkit.WinUI" Version="5.1.7" />
+    <PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="4.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.1" />
+    <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.3" />
     <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.0" />
   </ItemGroup>
@@ -82,4 +87,4 @@
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
-</Project>
+</Project>

e2e/Uno/Directory.Build.props

@@ -1,65 +1,20 @@
-<Project ToolsVersion="15.0">
+<Project>
   <PropertyGroup>
-    <LangVersion>11</LangVersion>
+    <DotNetVersion>net8.0</DotNetVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-
-    <DebugType>portable</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <SynthesizeLinkMetadata>true</SynthesizeLinkMetadata>
-
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <NoWarn>$(NoWarn);Uno0001;CS1998;CA1416;NU1507</NoWarn>
-
-    <DefaultLanguage>en</DefaultLanguage>
-
-    <IsAndroid>false</IsAndroid>
-    <IsIOS>false</IsIOS>
-    <IsMac>false</IsMac>
-    <IsMacCatalyst>false</IsMacCatalyst>
-    <IsWinAppSdk>false</IsWinAppSdk>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <NoWarn>$(NoWarn);NU5104;NU5100;NU5118;NU5123;NU1603;CS1701;CS1702;XA0101;MSB3277;CS8785;CS8669;CS1998</NoWarn>
     <IsUnoProject>true</IsUnoProject>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 
-    <DotNetVersion>net8.0</DotNetVersion>
-  </PropertyGroup>
+    <!--
+      Adding NoWarn to remove build warnings
+      NU1507: Warning when there are multiple package sources when using CPM with no source mapping
+      NETSDK1201: Warning that specifying RID won't create self containing app
+      PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
+    -->
+    <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
 
-  <Choose>
-    <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-      <PropertyGroup>
-        <IsAndroid>true</IsAndroid>
-        <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
-      </PropertyGroup>
-    </When>
-    <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
-      <PropertyGroup>
-        <IsIOS>true</IsIOS>
-        <SupportedOSPlatformVersion>14.2</SupportedOSPlatformVersion>
-        <RuntimeIdentifier Condition="'$(RuntimeIdentifier)'==''">iossimulator-x64</RuntimeIdentifier>
-      </PropertyGroup>
-    </When>
-    <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">
-      <PropertyGroup>
-        <IsMac>true</IsMac>
-        <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
-        <RuntimeIdentifier Condition="'$(RuntimeIdentifier)'==''">osx-x64</RuntimeIdentifier>
-      </PropertyGroup>
-    </When>
-    <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
-      <PropertyGroup>
-        <IsMacCatalyst>true</IsMacCatalyst>
-        <SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
-        <RuntimeIdentifier Condition="'$(RuntimeIdentifier)'==''">maccatalyst-x64</RuntimeIdentifier>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(TargetFramework.Contains('windows10'))">
-      <PropertyGroup>
-        <IsWinAppSdk>true</IsWinAppSdk>
-        <UseRidGraph>true</UseRidGraph>
-        <SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
-        <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-      </PropertyGroup>
-    </When>
-  </Choose>
+    <!-- Required for Hot Reload (See https://github.com/dotnet/sdk/issues/36666) -->
+    <IncludeSourceRevisionInInformationalVersion Condition="'$(Configuration)'=='Debug'">false</IncludeSourceRevisionInInformationalVersion>
+  </PropertyGroup>
 </Project>

e2e/Uno/HelloWorld.Mobile/Android/Main.Android.cs

@@ -14,30 +14,30 @@
 namespace HelloWorld.Droid;
 
 [global::Android.App.ApplicationAttribute(
-	Label = "@string/ApplicationName",
-	Icon = "@mipmap/iconapp",
-	LargeHeap = true,
-	HardwareAccelerated = true,
-	Theme = "@style/AppTheme"
+    Label = "@string/ApplicationName",
+    Icon = "@mipmap/icon",
+    LargeHeap = true,
+    HardwareAccelerated = true,
+    Theme = "@style/AppTheme"
 )]
 public class Application : Microsoft.UI.Xaml.NativeApplication
 {
-	public Application(IntPtr javaReference, JniHandleOwnership transfer)
-		: base(() => new AppHead(), javaReference, transfer)
-	{
-		ConfigureUniversalImageLoader();
-	}
+    public Application(IntPtr javaReference, JniHandleOwnership transfer)
+        : base(() => new AppHead(), javaReference, transfer)
+    {
+        ConfigureUniversalImageLoader();
+    }
 
-	private static void ConfigureUniversalImageLoader()
-	{
-		// Create global configuration and initialize ImageLoader with this config
-		ImageLoaderConfiguration config = new ImageLoaderConfiguration
-			.Builder(Context)
-			.Build();
+    private static void ConfigureUniversalImageLoader()
+    {
+        // Create global configuration and initialize ImageLoader with this config
+        ImageLoaderConfiguration config = new ImageLoaderConfiguration
+            .Builder(Context)
+            .Build();
 
-		ImageLoader.Instance.Init(config);
+        ImageLoader.Instance.Init(config);
 
-		ImageSource.DefaultImageLoader = ImageLoader.Instance.LoadImageAsync;
-	}
+        ImageSource.DefaultImageLoader = ImageLoader.Instance.LoadImageAsync;
+    }
 }
 

e2e/Uno/HelloWorld.Mobile/Android/MainActivity.Android.cs

@@ -1,15 +1,15 @@
 using Android.App;
-using Android.Widget;
-using Android.OS;
 using Android.Content.PM;
+using Android.OS;
 using Android.Views;
+using Android.Widget;
 
 namespace HelloWorld.Droid;
 
 [Activity(
-	MainLauncher = true,
-	ConfigurationChanges = global::Uno.UI.ActivityHelper.AllConfigChanges,
-	WindowSoftInputMode = SoftInput.AdjustNothing | SoftInput.StateHidden
+    MainLauncher = true,
+    ConfigurationChanges = global::Uno.UI.ActivityHelper.AllConfigChanges,
+    WindowSoftInputMode = SoftInput.AdjustNothing | SoftInput.StateHidden
 )]
 public class MainActivity : Microsoft.UI.Xaml.ApplicationActivity
 {

e2e/Uno/HelloWorld.Mobile/Android/Resources/values/Styles.xml

@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <resources>
-	<style name="AppTheme" parent="Theme.AppCompat.Light">
+	<style name="AppTheme" parent="Theme.MaterialComponents.Light">
 
 		<!-- This removes the ActionBar -->
 		<item name="windowActionBar">false</item>
 		<item name="android:windowActionBar">false</item>
 		<item name="windowNoTitle">true</item>
 		<item name="android:windowNoTitle">true</item>
 
+		<!-- uno_splash_color and uno_splash_image are generated by Uno.Resizetizer -->
 		<!-- This property is used for the splash screen -->
-		<item name="android:windowSplashScreenBackground">#FFFFFF</item>
-		<item name="android:windowBackground">@drawable/splash_screen</item>
-		<item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_screen</item>
-		<!--<item name="android:windowSplashScreenBehavior">1</item>-->
-
+		<item name="android:windowSplashScreenBackground">@color/uno_splash_color</item>
+		<item name="android:windowBackground">@drawable/uno_splash_image</item>
+		<item name="android:windowSplashScreenAnimatedIcon">@drawable/uno_splash_image</item>
 	</style>
 	<style name="Theme.AppCompat.Translucent">
 		<item name="android:windowIsTranslucent">true</item>