chore: Merge master into branch

.github/labeler.yml

@@ -5,8 +5,6 @@ area/automation:
   - src/SamplesApp/**/*
   - src/Uno.UI.Tests/*
   - src/Uno.UI.Tests/**/*
-  - src/Uno.UI.Tests.Performance/*
-  - src/Uno.UI.Tests.Performance/**/*
   - src/Uno.UI.Wasm.Tests/*
   - src/Uno.UI.Wasm.Tests/**/*
 

.vsts-ci-docs.yml

@@ -17,7 +17,7 @@ pr:
       - legacy/*
 
 variables:
-  windowsScaledPool: 'Windows2022-20230918'
+  windowsScaledPool: 'Windows2022-20240421'
   linuxVMImage: 'ubuntu-latest'
 
 stages:

.vsts-ci.yml

@@ -51,7 +51,7 @@ variables:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   windows2019HostedVMImage: 'windows-2019'
   windows2022HostedVMImage: 'windows-2022'
-  windowsScaledPool: 'Windows2022-20230918'
+  windowsScaledPool: 'Windows2022-20240421'
   linuxVMImage: 'ubuntu-latest'
   linuxScaledPool: 'Ubuntu2204-20230918'
   macOSVMImage: 'macOS-13'

build/cSpell.json

@@ -188,7 +188,9 @@
 	"wapproj's",
 	"xamlmerge",
 	"xbind",
-	"xcprivacy"
+	"xcprivacy",
+	"jlaban",
+	"sasakrsmanovic"
   ],
   "patterns": [
 	{

build/test-scripts/run-netcore-mobile-template-tests.ps1

@@ -110,7 +110,7 @@ if ($IsWindows)
 
     # Build with msbuild because of https://github.com/microsoft/WindowsAppSDK/issues/1652
     # force targetframeworks until we can get WinAppSDK to build with `dotnet build`
-    & $msbuild $debug "/p:Platform=x86" "/p:TargetFrameworks=net7.0-windows10.0.19041;TargetFramework=net7.0-windows10.0.19041" "UnoAppWinUI.Windows\UnoAppWinUI.Windows.csproj"
+    & $msbuild $debug "/p:Platform=x86" "UnoAppWinUI.Windows\UnoAppWinUI.Windows.csproj" "/p:TargetFrameworks=net7.0-windows10.0.19041;TargetFramework=net7.0-windows10.0.19041"
     Assert-ExitCodeIsZero
 }
 
@@ -139,7 +139,15 @@ if ($IsWindows)
 
     # Uno Library
     # Mobile is removed for now, until we can get net7 supported by msbuild/VS 17.4
-    & $msbuild $debug /t:pack MyUnoLib\MyUnoLib.csproj "/p:TargetFrameworks=`"net7.0-windows10.0.19041;net7.0`""
+    $responseFile = @(
+        "$debug",
+        "/t:pack",
+        "MyUnoLib\MyUnoLib.csproj",
+        "/p:TargetFrameworks=""net7.0-windows10.0.19041;net7.0"""
+    )
+    $responseFile | Out-File -FilePath "build.rsp" -Encoding ASCII
+
+    & $msbuild "@build.rsp"
     Assert-ExitCodeIsZero
 
     # Uno Cross-Runtime Library
@@ -150,7 +158,17 @@ if ($IsWindows)
     # Uno Library with assets, Validate assets count
     #
     # Mobile is removed for now, until we can get net7 supported by msbuild/VS 17.4
-    & $msbuild $debug /t:pack /p:IncludeContentInPack=false MyUnoLib2\MyUnoLib2.csproj -bl "/p:TargetFrameworks=`"net7.0-windows10.0.19041;net7.0`""
+    $responseFile = @(
+        "$debug",
+        "/t:pack",
+        "/p:IncludeContentInPack=false",
+        "MyUnoLib2\MyUnoLib2.csproj",
+        "-bl",
+        "/p:TargetFrameworks=""net7.0-windows10.0.19041;net7.0"""
+    )
+    $responseFile | Out-File -FilePath "build.rsp" -Encoding ASCII
+
+    & $msbuild "@build.rsp"
     Assert-ExitCodeIsZero
 
     mv MyUnoLib2\Bin\Debug\MyUnoLib2.1.0.0.nupkg MyUnoLib2\Bin\Debug\MyUnoLib2.1.0.0.zip
@@ -247,6 +265,9 @@ $projects =
     @("5.2/uno52Lib/uno52Lib.csproj", @("-f", "net8.0-android"), $true, $true),
     @("5.2/uno52Lib/uno52Lib.csproj", @("-f", "net8.0-maccatalyst"), $true, $true),
     @("5.2/uno52Lib/uno52Lib.csproj", @("-f", "net8.0-desktop"), $true, $true),
+
+    @("5.2/uno52Lib/uno52Lib.csproj", @("-f", "net8.0-browserwasm", "-p:ImplicitUsings=disable"), $true, $true),
+    @("5.2/uno52Lib/uno52Lib.csproj", @("-f", "net8.0-desktop", "-p:ImplicitUsings=disable"), $true, $true),
 
     # Default mode for the template is WindowsAppSDKSelfContained=true, which requires specifying a target platform.
     @("5.2/uno52Lib/uno52Lib.csproj", @("-p:Platform=x86" , "-p:TargetFramework=net8.0-windows10.0.19041"), $false, $true),

doc/articles/feature-flags.md

@@ -87,7 +87,7 @@ WinRTFeatureConfiguration.MessageDialog.StyleOverride = "CustomMessageDialogStyl
 
 ## ToolTips
 
-By default, `ToolTips` are disabled on all platforms except for WebAssembly (see [#10791](https://github.com/unoplatform/uno/issues/10791)). To enable them on a specific platform, set the `UseToolTips` configuration flag to `true`. You can add the following in the end of the `App` constructor:
+By default, `ToolTips` are disabled on all platforms except for WebAssembly and Skia (see [#10791](https://github.com/unoplatform/uno/issues/10791)). To enable them on a specific platform, set the `UseToolTips` configuration flag to `true`. You can add the following in the end of the `App` constructor:
 
 ```csharp
 Uno.UI.FeatureConfiguration.ToolTip.UseToolTips = true;

doc/articles/features/shapes-and-brushes.md

@@ -106,7 +106,22 @@ Where you can use which brushes
 | Usage                                        | SolidColorBrush | ImageBrush           | GradientBrush   |
 | -------------------------------------------- | --------------- | -------------------- | --------------- |
 | `Background` property (many controls/panels) | Yes             | Yes (except on Wasm) | Yes             |
-| `BorderBrush` (`Border`, `Panel`)            | Yes             | No                   | Yes (Wasm only) |
+| `BorderBrush` (`Border`, `Panel`)            | Yes             | No                   | Yes (Skia, Android), partial (iOS, WASM) [see below] |
 | `Foreground` (`TextBlock`)                   | Yes             | No                   | Yes (Wasm only) |
 | `Fill` (Shapes)                              | Yes             | Yes (except on Wasm) | Yes             |
 | `Stroke` (Shapes)                            | Yes             | No                   | Yes (Wasm only) |
+
+## Gradient border brush limitations on WASM and iOS
+
+There are limitations to support for gradient border brushes on some targets. Currently these are:
+
+- WebAssembly - gradient borders cannot be applied properly on an element which uses `CornerRadius`
+- iOS/macOS - gradient borders cannot be applied reliably when `RelativeTransform` is applied on it
+
+If these conditions apply, the border will instead be rendered using `SolidColorBrush` provided by the `FallbackColor` property.
+
+As default WinUI Fluent styles are using `ElevationBorder` brushes in many places, so we created a presenter that provides a "fake" gradient for these cases - `Uno.UI.Controls.FauxGradientBorderPresenter`. For custom styles we suggest you provide a custom "layered" approach that simulates the border, as this presenter is specifically built to support WinUI style-specific scenarios where:
+
+- Exactly two gradient stops are present
+- `FallbackColor` of the brush is equal to the "major" gradient stop
+- The brush is applied "vertical" - so the "minor" stop is either on top or on the bottom of the control

doc/articles/migrating-before-you-start.md

@@ -56,5 +56,3 @@ On certain target platforms, support for some .NET functionality is limited or u
 Currently, WebAssembly code in the browser executes on a single thread (much like JavaScript code in the browser). This limitation is expected to be lifted in the future, but for now, code that expects additional threads to be available may not function as expected.
 
 [This issue](https://github.com/unoplatform/uno/issues/2302) tracks support for multi-threading on WebAssembly in Uno Platform.
-
-Additionally, if you're using full AOT compilation on WASM, the same API restrictions will apply as for AOT compilation on iOS.

doc/articles/uno-development/ways-to-contribute.md

@@ -68,7 +68,7 @@ Whatever you do, let us know [through Twitter](https://twitter.com/unoplatform)
 
 ## Contributing code
 
-The UWP framework and WinUI are pretty big, but many hands make light work. We welcome code and content contributions from the community, and the core team is more than happy to help new contributors ramp up and familiarize themselves with Uno's codebase.
+The WinUI framework is pretty big, but many hands make light work. We welcome code and content contributions from the community, and the core team is more than happy to help new contributors ramp up and familiarize themselves with Uno Platform's codebase.
 
 ### Diving into the code
 
@@ -97,3 +97,13 @@ Once you're ready to create a PR, check out the [Guidelines for pull requests](.
 ### Need help?
 
 If there's anything you need, [ping us on our Discord Server](https://platform.uno/discord).
+
+## Sponsors & Grants
+
+Please consider sponsoring Uno Platform development, especially if your company benefits from this library.
+
+Your contribution will go towards adding new features and closing issues raised by the community at Uno Platform backlog on GitHub ([Issues · unoplatform/uno (github.com)](https://github.com/unoplatform/uno/issues)) and making sure all functionality continues to meet our high-quality standards.
+
+A grant for continuous full-time development has the biggest impact on progress. Periods of 2 to 5 days allow a contributor to tackle substantial complex issues that are otherwise left to linger until somebody can’t afford to not fix them.
+
+Contact [@jlaban](https://github.com/jeromelaban) or [@sasakrsmanovic](https://github.com/sasakrsmanovic) to arrange a grant to Uno Platform and its core contributors.

doc/import_external_docs.ps1

@@ -7,7 +7,7 @@ Set-PSDebug -Trace 1
 
 $external_docs = @{
     # use either commit, or branch name to use its latest commit
-    "uno.wasm.bootstrap" = "9b559fc9a8b5e939fd99fa119a243e760ae3770d" #latest main commit
+    "uno.wasm.bootstrap" = "0a56349323e4aa03b004cd11292f7d441458783b" #latest main commit
     "uno.themes"         = "722dd3386d16523d1e1139d916aa89610f7118ac" #latest release branch commit
     "uno.toolkit.ui"     = "e8821e38a8a0fe8225211a80fd5c74481b9243d1" #latest release branch commit
     "uno.check"          = "4a7dd7290daf0aabfbb8efabcd2b067898b7f45e" #latest main commit
@@ -17,7 +17,7 @@ $external_docs = @{
     "uno.uitest"         = "9669fd2783187d06c36dd6a717c1b9f08d1fa29c" #latest master commit
     "uno.extensions"     = "30b86afe55fab1f964bbe30c594cf9c7ea72d7a3" #latest release branch commit
     "workshops"          = "f87cb67d9fd9cb3e78c740b62d40fe8d3201182a" #latest master commit
-    "uno.samples"        = "4599f4e09d12cfef46f5f70e65347e93600af499" #latest master commit
+    "uno.samples"        = "ad049bef2e55a485df23d8e38c40aea903aa5cf1" #latest master commit
 }
 
 $uno_git_url = "https://github.com/unoplatform/"

src/AddIns/Uno.UI.MediaPlayer.Skia.Gtk/MediaPlayerPresenterExtension.cs

@@ -28,7 +28,7 @@ namespace Uno.UI.Media;
 
 public class MediaPlayerPresenterExtension : IMediaPlayerPresenterExtension
 {
-	private MediaPlayerPresenter? _owner;
+	private MediaPlayerPresenter _owner;
 	private GtkMediaPlayer _player;
 
 	public uint NaturalVideoHeight => _player.NaturalVideoHeight;

src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerPresenterExtension.cs

@@ -33,7 +33,6 @@ public MediaPlayerPresenterExtension(object owner)
 		_owner.Child = _htmlPlayer = new HtmlMediaPlayer();
 	}
 
-
 	public void MediaPlayerChanged()
 	{
 		if (this.Log().IsEnabled(LogLevel.Debug))

src/Directory.Build.targets

@@ -78,8 +78,10 @@
 		<PackageReference Update="Uno.Diagnostics.Eventing" Version="2.0.1" />
 		<PackageReference Update="Uno.Wasm.Bootstrap" Version="8.0.0-dev.252" />
 		<PackageReference Update="Uno.Wasm.Bootstrap.DevServer" Version="8.0.0-dev.252" />
-		<PackageReference Update="MSTest.TestAdapter" Version="2.2.10" />
-		<PackageReference Update="MSTest.TestFramework" Version="2.2.8" />
+		<PackageReference Update="MSTest" Version="3.3.1" />
+		<PackageReference Update="MSTest.TestFramework" Version="3.3.1" />
+		<PackageReference Update="MSTest.TestAdapter" Version="3.3.1" />
+		<PackageReference Update="MSTest.Analyzers" Version="3.3.1" />
 		<PackageReference Update="Uno.MonoAnalyzers" Version="1.0.0" PrivateAssets="all" />
 		<PackageReference Update="Uno.Wasm.WebSockets" Version="1.1.0" />
 		<PackageReference Update="Microsoft.TypeScript.MSBuild" Version="4.3.5" />

src/SamplesApp/SamplesApp.Shared/MainPage.xaml.cs

@@ -14,5 +14,20 @@ public MainPage()
 
 			sampleControl.DataContext = new SampleChooserViewModel(sampleControl);
 		}
+
+#if UNO_HAS_ENHANCED_LIFECYCLE || !HAS_UNO
+		protected
+#if HAS_UNO
+			internal
+#endif
+			override void OnNavigatedTo(NavigationEventArgs e)
+		{
+			if (this.IsLoaded)
+			{
+				// https://github.com/unoplatform/uno/issues/1478
+				throw new System.Exception("OnNavigatedTo should happen before Loaded.");
+			}
+		}
+#endif
 	}
 }

src/SamplesApp/SamplesApp.Skia/SamplesApp.Skia.csproj

@@ -43,7 +43,8 @@
 		<PackageReference Include="IdentityModel.OidcClient" Version="3.1.2" />
 		<PackageReference Include="Microsoft.Graph" Version="3.12.0" />
 		<PackageReference Include="Microsoft.Identity.Client" Version="4.47.0" />
-		<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
+		<PackageReference Include="MSTest.TestFramework" />
+		<PackageReference Include="MSTest.Analyzers" />
 		<!-- TODO: Use version 8 when compiling against .NET 8? -->
 		<PackageReference Include="System.Management" Version="8.0.0" />
 		<PackageReference Include="BenchmarkDotNet" Version="0.11.4-develop" />

src/SamplesApp/SamplesApp.UITests/UnoSamples_Tests.ContentControl.cs

@@ -34,8 +34,8 @@ public void ContentPresenter_Template()
 
 			_app.Marked("actionButton").FastTap();
 
-			Assert.IsFalse(_app.Marked("innerText").HasResults());
-			Assert.IsFalse(_app.Marked("innerText2").HasResults());
+			Assert.IsTrue(_app.Marked("innerText").HasResults());
+			Assert.IsTrue(_app.Marked("innerText2").HasResults());
 		}
 
 		[Test]

src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/ImageTests/UnoSamples_Tests.Image.cs

@@ -240,10 +240,10 @@ public void BitmapImage_vs_SvgImageSource_BitmapRemote()
 			var url = _app.Marked("url");
 			var btnBitmap = _app.Marked("btnBitmap");
 			var streamMode = _app.Marked("streamMode");
-			var showLow = _app.Marked("showLow");
+			var showLog = _app.Marked("showLog");
 			var img = _app.Marked("img");
 
-			showLow.SetDependencyPropertyValue("IsCheked", "False");
+			showLog.SetDependencyPropertyValue("IsChecked", "False");
 
 			// Load image from url
 			url.SetDependencyPropertyValue("Text", "https://uno-assets.platform.uno/tests/images/uno-overalls.png");
@@ -279,10 +279,10 @@ public void BitmapImage_vs_SvgImageSource_SvgRemote()
 			var url = _app.Marked("url");
 			var btnSvg = _app.Marked("btnSvg");
 			var streamMode = _app.Marked("streamMode");
-			var showLow = _app.Marked("showLow");
+			var showLog = _app.Marked("showLog");
 			var img = _app.Marked("img");
 
-			showLow.SetDependencyPropertyValue("IsCheked", "False");
+			showLog.SetDependencyPropertyValue("IsChecked", "False");
 
 			// Load image from url
 			url.SetDependencyPropertyValue("Text", "https://uno-assets.platform.uno/tests/images/uno-overalls.svg");
@@ -318,10 +318,10 @@ public void BitmapImage_vs_SvgImageSource_BitmapLocal()
 			var url = _app.Marked("url");
 			var btnBitmap = _app.Marked("btnBitmap");
 			var streamMode = _app.Marked("streamMode");
-			var showLow = _app.Marked("showLow");
+			var showLog = _app.Marked("showLog");
 			var img = _app.Marked("img");
 
-			showLow.SetDependencyPropertyValue("IsCheked", "False");
+			showLog.SetDependencyPropertyValue("IsChecked", "False");
 
 			// Load image from url
 			url.SetDependencyPropertyValue("Text", "ms-appx:///Assets/Formats/uno-overalls.png");
@@ -357,10 +357,10 @@ public void BitmapImage_vs_SvgImageSource_SvgLocal()
 			var url = _app.Marked("url");
 			var btnSvg = _app.Marked("btnSvg");
 			var streamMode = _app.Marked("streamMode");
-			var showLow = _app.Marked("showLow");
+			var showLog = _app.Marked("showLog");
 			var img = _app.Marked("img");
 
-			showLow.SetDependencyPropertyValue("IsCheked", "False");
+			showLog.SetDependencyPropertyValue("IsChecked", "False");
 
 			// Load image from url
 			url.SetDependencyPropertyValue("Text", "ms-appx:///Assets/Formats/uno-overalls.svg");

src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/TextBoxTests/TextBoxTests.cs

@@ -323,7 +323,7 @@ public void TextBox_Formatting_FlickerText()
 			using (new AssertionScope())
 			{
 				text2.Should().Be(text1, because: "Text content should not change at max length.");
-				text3.Should().Be("TextChanged: 1");
+				text3.Should().Be("TextChanged: 2");
 			}
 		}
 

src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Presentation/SampleChooserViewModel.cs

@@ -334,18 +334,18 @@ private async Task RecordAllTestsInner(string folderName, int totalGroups, int c
 
 							ContentPhone = content;
 
+							if (control is IWaitableSample waitableSample)
+							{
+								await waitableSample.SamplePreparedTask;
+							}
+
 #if HAS_UNO
 							await _dispatcher.RunIdleAsync(_ => { });
 							await _dispatcher.RunIdleAsync(_ => { });
 #else
 							await Task.Delay(500, ct);
 #endif
 
-							if (control is IWaitableSample waitableSample)
-							{
-								await waitableSample.SamplePreparedTask;
-							}
-
 							Console.WriteLine($"Generating screenshot for {fileName}");
 							var file = await rootFolder.CreateFileAsync(fileName + ".png",
 								CreationCollisionOption.ReplaceExisting

src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/TestCase.cs

@@ -11,7 +11,7 @@ namespace Uno.UI.Samples.Tests;
 
 internal record TestCase
 {
-	public object[] Parameters { get; init; } = Array.Empty<object>();
+	public object?[] Parameters { get; init; } = Array.Empty<object>();
 
 	public PointerDeviceType? Pointer { get; init; }
 

src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestMethodInfo.cs

@@ -13,7 +13,7 @@ namespace Uno.UI.Samples.Tests;
 
 internal record UnitTestMethodInfo
 {
-	private readonly List<object[]> _casesParameters;
+	private readonly List<object?[]> _casesParameters;
 	private readonly IList<PointerDeviceType> _injectedPointerTypes;
 
 	private readonly bool _ignoredBecauseOfConditionalTestAttribute;