[pull] master from unoplatform:master

License.md

@@ -1,9 +1,3 @@
-# Uno Platform
-
-Copyright (c) Uno Platform Inc.
-
-All rights reserved. 
-
 # Apache 2.0 License
 
                                  Apache License
@@ -207,3 +201,9 @@ All rights reserved.
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+# Uno Platform
+
+Copyright (c) Uno Platform Inc.
+
+All rights reserved.

build/ci/templates/gitversion.yml

@@ -42,6 +42,10 @@ steps:
       ## jobs creating packages, and update pushed to the main branch.
       echo "Updating PR Version from [$(GITVERSION.SemVer)] to [$PR_VERSION]"
       echo "##vso[task.setvariable variable=GITVERSION.SemVer]$PR_VERSION"
+      ## Uno.UI.Build.csproj uses GITVERSION_SemVer, so we update it.
+      ## Previously, we didn't have this line and Uno.UI.Build.csproj used to work
+      ## But, it's no longer working (probably due to an update in agents)
+      echo "##vso[task.setvariable variable=GITVERSION_SemVer]$PR_VERSION"
 
     condition: eq(variables['Build.Reason'], 'PullRequest')
     displayName: Update GITVERSION.SemVer for PullRequests

doc/articles/features/windows-storage-pickers.md

@@ -33,18 +33,19 @@ On some platforms, you can further customize the file-picking experience by util
 | Feature                 | UWP  | WebAssembly | Android | iOS   | macOS | WPF | GTK |
 |-------------------------|------|-------------|---------|-------|-------|-----|-----|
 | SuggestedFileName       | ✔   | ✔           | ✖      | ✖     | ✔    | ✔   | ✔  |
-| SuggestedStartLocation  | ✔   | ✔ (1)       | 💬     | ✔ (3) | ✔    | ✔   | ✔  |
+| SuggestedStartLocation  | ✔   | ✔ (1)       | 💬 (4) | ✔ (3) | ✔    | ✔   | ✔  |
 | SettingsIdentifier      | ✔   | ✔ (1)       | ✔      | ✖     | ✖    | ✖   | ✖  |
 
 *(1) - Only for the native file pickers - see WebAssembly section below*\
 *(2) - For FileOpenPicker, VideosLibrary and PicturesLibrary are used to apply `image/*` and `video/*` filters*\
-*(3) - PicturesLibrary opens the picture library with the image picker controller*
+*(3) - PicturesLibrary opens the picture library with the image picker controller*\
+*(4) - See Android section below*
 
 On platforms where the additional features are not supported yet, setting them will not have any effect.
 
 ## Uno.WinUI-specific Initialization
 
-If you are using Uno.WinUI (Windows App SDK-based form of Uno Platform), you need to make sure the pickers are initialized for the current window, otherwise the code would fail on Windows. This is done using `WinRT.Interop` and is required for all file and folder pickers. For example, in case of `FileOpenPicker`:
+If you are using Uno.WinUI (Windows App SDK-based form of Uno Platform), you need to make sure the pickers are initialized for the current window, otherwise the code would fail on Windows. This is done using `WinRT.Interop` and it is required for all file and folder pickers. For example, in the case of `FileOpenPicker`:
 
 ```csharp
 var picker = new FileOpenPicker();
@@ -208,7 +209,7 @@ For iOS and macOS, `UTType` is utilized for the same purpose. Here you can provi
 Uno.WinRTFeatureConfiguration.FileTypes.FileTypeToUTTypeMapping.Add(".myextension", "my.custom.UTType");
 ```
 
-Custom Uniform Type Identifiers must be declared in the `info.plist` of your iOS and macOS application. See a full example of this in [Uniform Type Identifiers Overview from Apple documentation](https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/understanding_utis/understand_utis_declare/understand_utis_declare.html).
+Custom Uniform Type Identifiers must be declared in the `info.plist` of your iOS and macOS applications. See a full example of this in [Uniform Type Identifiers Overview from Apple documentation](https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/understanding_utis/understand_utis_declare/understand_utis_declare.html).
 
 ## WebAssembly
 
@@ -226,15 +227,15 @@ The most powerful picker implementation on WebAssembly uses the <a href="https:/
 
 File System Access API pickers allow direct access to the picked files and folders. This means that any modifications the user does to the files are persisted on the target file system.
 
-However, writing to the target file system is limited, so when a write-stream is opened for a file, Uno Platform creates a copy of the file in temporary storage and your changes are applied to this temporary file instead. When your file stream is then flushed, closed, or disposed of, the changes are written to the source file and the temporary file is discarded.
+However, writing to the target file system is limited, so when a write-stream is opened for a file, Uno Platform creates a copy of the file in temporary storage, and your changes are applied to this temporary file instead. When your file stream is then flushed, closed, or disposed of, the changes are written to the source file, and the temporary file is discarded.
 
 ### Download/upload pickers
 
 In case the **File System Access API** is not available in the browser, Uno Platform also offers a fallback to "download" and "upload" experiences.
 
 For the upload picker, the browser triggers a file picker dialog and Uno Platform then copies the selected files into temporary storage of the app. The `StorageFile` instance you receive is private for your application and the changes are not reflected in the original file. To save the changes, you need to trigger the "download picker".
 
-For the download picker, the experience requires the use of [`CachedFileManager`](https://learn.microsoft.com/uwp/api/Windows.Storage.CachedFileManager). Triggering `PickSaveFileAsync` does not actually show the download picker to the user. Instead, only a temporary file is created to allow you to write any content. Afterwards, calling `CompleteUpdatesAsync` opens the download dialog which allows the user to save the file.
+For the download picker, the experience requires the use of [`CachedFileManager`](https://learn.microsoft.com/uwp/api/Windows.Storage.CachedFileManager). Triggering `PickSaveFileAsync` does not actually show the download picker to the user. Instead, only a temporary file is created to allow you to write any content. Afterward, calling `CompleteUpdatesAsync` opens the download dialog, which allows the user to save the file.
 
 The `CachedFileManager` class works transparently with both the **Download picker** and the **File System Access API**, which means you can write a single snippet of code that handles both scenarios correctly:
 
@@ -338,19 +339,21 @@ Browsers generally treat file opening/saving operations as sensitive operations,
 SecurityError: Failed to execute 'showSaveFilePicker' on 'Window': Must be handling a user gesture to show a file picker.
 ```
 
-This generally means that the Uno file picking APIs have been invoked without an explicit user interaction, or have been rescheduled from the original user interaction callback (e.g. using `DispatcherQueue.TryRun()` inside a `Button.Click` handler to open a picker).
+This generally means that the Uno file picking APIs have been invoked without explicit user interaction or have been rescheduled from the original user interaction callback (e.g., using `DispatcherQueue.TryRun()` inside a `Button.Click` handler to open a picker).
 
 ## Android
 
-Files picked from file pickers on Android are provided by the *Storage Access Framework API*. Due to its limitations, it is not possible to write to existing file in-place. Instead, Uno Platform creates a copy of the file in temporary storage and your changes are applied to this temporary file instead. When your file stream is then flushed, closed, or disposed of, the changes are written to the source file and the temporary file is discarded.
+Files picked from file pickers on Android are provided by the *Storage Access Framework API*. Due to its limitations, it is not possible to write to existing file in-place. Instead, Uno Platform creates a copy of the file in temporary storage and your changes are applied to this temporary file instead. When your file stream is then flushed, closed, or disposed of, the changes are written to the source file, and the temporary file is discarded.
 
-The `FileSavePicker` API which uses `ACTION_CREATE_DOCUMENT` on Android has various limitations. To allow for the best possible compatibility across different Android versions, you should always add your file type extension to `FileTypeChoices`, and if possible provide only one such file type. In addition, if the `SuggestedFileName` or the user-typed file name matches an existing file, the resulting file will be renamed with `(1)` in the name, e.g. `test.txt` will become `test (1).txt` and the existing file will not be overwritten. However, if the user explicitly taps an existing file in the file browser, the system will show a dialog allowing the app to overwrite the existing file. This inconsistent behavior is caused by Android itself, so there is unfortunately no way to work around it from our side. See [this issue](https://issuetracker.google.com/issues/37136466) for more information.
+The `SuggestedStartLocation` property has no effect on certain Android devices, and the file picker will always open in the root directory of the internal storage. When using VideosLibrary or PicturesLibrary locations, the file picker will open the picture library with the image picker controller. Still, for those devices that do not support it, it will open the root directory of the internal storage and suggest all the applications that can handle file types.
+
+The `FileSavePicker` API, which uses `ACTION_CREATE_DOCUMENT` on Android, has various limitations. To allow for the best possible compatibility across different Android versions, you should always add your file type extension to `FileTypeChoices`, and, if possible, provide only one such file type. In addition, if the `SuggestedFileName` or the user-typed file name matches an existing file, the resulting file will be renamed with `(1)` in the name, e.g., `test.txt` will become `test (1).txt` and the existing file will not be overwritten. However, if the user explicitly taps an existing file in the file browser, the system will show a dialog allowing the app to overwrite the existing file. This inconsistent behavior is caused by Android itself, so there is, unfortunately, no way to work around it from our side. See [this issue](https://issuetracker.google.com/issues/37136466) for more information.
 
 ## iOS
 
-iOS does not offer a built-in `FileSavePicker` experience. Luckily it is possible to implement this functionality for example using a combination of a `FolderPicker` and `ContentDialog`.
+iOS does not offer a built-in `FileSavePicker` experience. Luckily, it is possible to implement this functionality, for example, using a combination of a `FolderPicker` and `ContentDialog`.
 
-To provide your own custom implementation, create a class that implements the `IFileSavePickerExtension` which is only available on iOS. This class must have a `public` constructor with a `object` parameter. This will actually be an instance of `FileSavePicker` when invoked later. Then implement the `PickSaveFileAsync` method:
+To provide your own custom implementation, create a class that implements the `IFileSavePickerExtension`, which is only available on iOS. This class must have a `public` constructor with an `object` parameter. This will actually be an instance of `FileSavePicker` when invoked later. Then implement the `PickSaveFileAsync` method:
 
 ```csharp
 #if __IOS__

doc/articles/upgrading-nuget-packages.md

@@ -30,12 +30,28 @@ It typically looks similar to this:
 ```
 
 > [!IMPORTANT]
-> At this time the NuGet Manager in Visual Studio 2022 does not parse or manage Sdks provided by NuGet. If you would like to see this feature added, please be sure to provide your [feedback or upvote this issue](https://github.com/NuGet/Home/issues/13127).
+> In Visual Studio 2022, once the Uno Version is updated, you'll need to close and reopen the solution or restart Visual Studio for the change to take effect.
+>
+> At this time, the NuGet package Manager does not parse or manage Sdks provided by NuGet. If you would like to see this feature added, please be sure to provide your [feedback or upvote this issue](https://github.com/NuGet/Home/issues/13127).
 
-To update the version, pick the latest stable build from the [Uno.WinUI](https://www.nuget.org/packages/Uno.WinUI) package with either:
+To find the version to update to, pick the latest stable build from the [Uno.WinUI](https://www.nuget.org/packages/Uno.WinUI) package with either:
 
-- [Uno.WinUI in Nuget Package Explorer](https://nuget.info)
+- When using Visual Studio 2022, use the NuGet Package Manager
+- Use [`dotnet outdated`](https://github.com/dotnet-outdated/dotnet-outdated):
+  - Install the tool using:
+
+    ```dotnetcli
+    dotnet tool install --global dotnet-outdated-tool
+    ```
+
+  - Then, at the root of the solution, run the tool with:
+
+    ```dotnetcli
+    dotnet outdated
+    ```
+
+  - When available, the tool will provide the versions which can be updated.
+- [Uno.WinUI in Nuget Package Explorer](https://nuget.info/packages/Uno.WinUI)
 - [Uno.WinUI in nuget.org](https://www.nuget.org/packages/Uno.WinUI)
-- The latest Uno.WinUI package in the Visual Studio 2022 NuGet Package Manager.
 
-Once the version has been chosen, change the `global.json` line with `"Uno.Sdk"` to use the newer version of Uno Platform.
+Once the version has been chosen, change the `global.json` line with `"Uno.Sdk"` to use the newer version of Uno Platform. If you're running Visual Studio 2022, make sure to close/reopen the solution or restart the IDE.

doc/import_external_docs.ps1

@@ -10,7 +10,7 @@ $external_docs = @{
     "uno.wasm.bootstrap" = "5ef2048d98df307c738186a5339eedcc4665be72"
     "uno.themes"         = "6ce3ce8b0f61a7a017893541e1dd901ab04c906e"
     "uno.toolkit.ui"     = "d7eaf4b923b81e5386a5ceb0aff4ae4014239ffa"
-    "uno.check"          = "251e61153ef936748520ecbaa99e45e10970bab1"
+    "uno.check"          = "0350ba1b78ee7488d88f093e8f92cc4d9cb055f5"
     "uno.xamlmerge.task" = "7e8ffef206e87dfea90c53805c45e93a7d8c0b46"
     "figma-docs"         = "0e204b21d437478d89845b6b0edb212c3f482cbc"
     "uno.resizetizer"    = "3eec4aad0b7b3480ec6c2a121911ffde844fc4f8"

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

@@ -62,7 +62,7 @@ struct Native
 		/// </summary>
 		public VideoView()
 		{
-			if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+			if (OperatingSystem.IsLinux())
 			{
 #pragma warning disable CA1806 // Do not ignore method results
 				Native.XInitThreads();

src/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 
-	<Import Project="$(SolutionDir)\crosstargeting_override.props" Condition="exists('$(SolutionDir)\crosstargeting_override.props')" />
+	<Import Project="crosstargeting_override.props" Condition="exists('crosstargeting_override.props')" />
 
 	<PropertyGroup>
 		<DebugType>portable</DebugType>

src/SamplesApp/SamplesApp.Shared/App.xaml.cs

@@ -433,7 +433,7 @@ public static void ConfigureLogging()
 				builder.AddFilter("Uno.UI.RemoteControl", LogLevel.Information);
 
 				// Adjust logging when debugging the Given_HotReloadWorkspace tests
-				builder.AddFilter("Uno.UI.RuntimeTests.Tests.HotReload.Given_HotReloadWorkspace", LogLevel.Warning);
+				builder.AddFilter("Uno.UI.RuntimeTests.Tests.HotReload.Given_HotReloadWorkspace", LogLevel.Debug);
 
 				// Display Skia related information
 				builder.AddFilter("Uno.UI.Runtime.Skia", LogLevel.Debug);

src/SamplesApp/SamplesApp.UITests/SampleControlUITestBase.cs

@@ -80,7 +80,7 @@ static SampleControlUITestBase()
 		private static void TryInitializeSkiaSharpLoader()
 		{
 			if (AppInitializer.GetLocalPlatform() == Platform.Browser
-				&& !RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+				&& !OperatingSystem.IsWindows())
 			{
 #if DEBUG
 				Console.WriteLine("Initializing SkiaSharp loader");

src/SamplesApp/UITests.Shared/Playground/Playground.xaml

@@ -30,14 +30,7 @@
 				<ColumnDefinition Width="*" />
 				<ColumnDefinition Width="*" />
 			</Grid.ColumnDefinitions>
-			<wasm:Grid>
-				<monaco:CodeEditor x:Name="xamlText"
-				   Background="Transparent"
-				   RequestedTheme="Light"
-				   HasGlyphMargin="True"
-				   Text="XAML editor"
-				   CodeLanguage="XML"
-				   Loaded="OnXamlEditorLoaded" />
+			<wasm:Grid x:Name="MonacoContainer">
 			</wasm:Grid>
 			<not_wasm:Grid>
 				<TextBox x:Name="xamlText" AcceptsReturn="True" FontFamily="ms-appx:///Assets/Fonts/CascadiaCode-Regular.ttf" />

src/SamplesApp/UITests.Shared/Playground/Playground.xaml.cs

@@ -1,40 +1,67 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading.Tasks;
+using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Markup;
 using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using MUXControlsTestApp;
 using Uno.UI.Samples.Controls;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.Storage;
+#if __WASM__
+using Monaco;
+#endif
 
 namespace UITests.Playground;
 
 [SampleControlInfo("Playground", "Playground", ignoreInSnapshotTests: true)]
 public sealed partial class Playground : UserControl
 {
+#if __WASM__
+	private CodeEditor _codeEditor;
+#endif
+
 	public Playground()
 	{
 		this.InitializeComponent();
+#if __WASM__
+		this.Loaded += OnLoaded;
+#endif
+#if !__WASM__
 		xamlText.Text = ApplicationData.Current.LocalSettings.Values["PlaygroundXaml"] as string ?? "";
+#endif
 	}
 
 #if __WASM__
+	private async void OnLoaded(object sender, RoutedEventArgs e)
+	{
+		await Task.Delay(100); // Workaround for https://github.com/unoplatform/uno/issues/15374
+		_codeEditor = new CodeEditor()
+		{
+			Background = new SolidColorBrush(Microsoft.UI.Colors.Transparent),
+			HasGlyphMargin = true,
+			Text = ApplicationData.Current.LocalSettings.Values["PlaygroundXaml"] as string ?? "",
+			CodeLanguage = "XML"
+		};
+		_codeEditor.Loaded += OnXamlEditorLoaded;
+		MonacoContainer.Children.Add(_codeEditor);
+	}
+
 	private async void OnXamlEditorLoaded(object sender, RoutedEventArgs e)
 	{
-		xamlText.CodeLanguage = "xml";
+		_codeEditor.CodeLanguage = "xml";
 	}
 #endif
 
+	private string GetEditorText()
+	{
+#if __WASM__
+		return _codeEditor.Text;
+#else
+		return xamlText.Text;
+#endif
+	}
+
 	private string GetXamlInput()
 	{
 		var ns = new[] {
@@ -57,7 +84,7 @@ private string GetXamlInput()
 			$@"<Grid
 				xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
 				{nsTags}>
-			{xamlText.Text}
+			{GetEditorText()}
 			</Grid>";
 
 	}
@@ -66,7 +93,7 @@ private void OnApply()
 	{
 		try
 		{
-			ApplicationData.Current.LocalSettings.Values["PlaygroundXaml"] = xamlText.Text;
+			ApplicationData.Current.LocalSettings.Values["PlaygroundXaml"] = GetEditorText();
 			renderSurface.Content = XamlReader.Load(GetXamlInput());
 		}
 		catch (Exception e)