[pull] master from unoplatform:master

build/Uno.UI.Build.csproj

@@ -72,52 +72,56 @@
 			<NetCoreMobileFilter Condition="'$(UnoDisableNetCurrentMobile)'=='true'">filters\Uno.UI-packages-netcoremobile.slnf</NetCoreMobileFilter>
 		</PropertyGroup>
 		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-netcoremobile;PackageVersion=$(GITVERSION_SemVer)"
-             Projects="$(NetCoreMobileFilter)"
-             Targets="Restore;Build"
-             RebaseOutputs="false"
-             BuildInParallel="true" />
+			Projects="$(NetCoreMobileFilter)"
+			Targets="Restore;Build"
+			RebaseOutputs="false"
+			BuildInParallel="true" />
 
 	</Target>
 
 	<Target Name="BuildCIWasm">
 
-		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-wasm;PackageVersion=$(GITVERSION_SemVer)"
-             Projects="filters\Uno.UI-packages-wasm.slnf"
-             Targets="Restore;Build"
-             RebaseOutputs="false"
-             BuildInParallel="true" />
+		<MSBuild
+			Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-wasm;PackageVersion=$(GITVERSION_SemVer)"
+			Projects="filters\Uno.UI-packages-wasm.slnf"
+			Targets="Restore;Build"
+			RebaseOutputs="false"
+			BuildInParallel="true" />
 
 	</Target>
 
 	<Target Name="BuildCISkia">
 
-		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-skia;PackageVersion=$(GITVERSION_SemVer)"
-             Projects="filters\Uno.UI-packages-skia.slnf"
-             Targets="Restore;Build"
-             RebaseOutputs="false"
-             BuildInParallel="true" />
+		<MSBuild
+			Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-skia;PackageVersion=$(GITVERSION_SemVer)"
+			Projects="filters\Uno.UI-packages-skia.slnf"
+			Targets="Restore;Build"
+			RebaseOutputs="false"
+			BuildInParallel="true" />
 
 	</Target>
 
 	<Target Name="BuildCIReference">
 
-		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET7_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-skia;PackageVersion=$(GITVERSION_SemVer)"
-             Projects="filters\Uno.UI-packages-reference.slnf"
-             Targets="Restore;Build"
-             RebaseOutputs="false"
-             BuildInParallel="true" />
+		<MSBuild
+			Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET7_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-skia;PackageVersion=$(GITVERSION_SemVer)"
+			Projects="filters\Uno.UI-packages-reference.slnf"
+			Targets="Restore;Build"
+			RebaseOutputs="false"
+			BuildInParallel="true" />
 
 	</Target>
 
 	<Target Name="BuildSyncGenerator">
 		<!-- Restore the nuget packages for packages-* solution filters -->
 		<!-- These filters contain Uno.UI project and its dependencies, which are what needs to be restored -->
 		<!-- In addition, the reference project needs to be restored as well. -->
-		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true"
-				 Projects="filters\Uno.UI-packages-netcoremobile.slnf;filters\Uno.UI-packages-reference.slnf;filters\Uno.UI-packages-skia.slnf;filters\Uno.UI-packages-wasm.slnf;..\src\Uno.UWPSyncGenerator\Uno.UWPSyncGenerator.csproj;..\src\Uno.UWPSyncGenerator.Reference\Uno.UWPSyncGenerator.Reference.csproj"
-				 Targets="Restore;Clean"
-				 RebaseOutputs="false"
-				 BuildInParallel="true" />
+		<MSBuild
+			Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true"
+			Projects="filters\Uno.UI-packages-netcoremobile.slnf;filters\Uno.UI-packages-reference.slnf;filters\Uno.UI-packages-skia.slnf;filters\Uno.UI-packages-wasm.slnf;..\src\Uno.UWPSyncGenerator\Uno.UWPSyncGenerator.csproj;..\src\Uno.UWPSyncGenerator.Reference\Uno.UWPSyncGenerator.Reference.csproj"
+			Targets="Restore;Clean"
+			RebaseOutputs="false"
+			BuildInParallel="true" />
 
 		<MSBuild Properties="Configuration=Release" Projects="..\src\Uno.UWPSyncGenerator\Uno.UWPSyncGenerator.csproj" Targets="Build" />
 		<MSBuild Properties="Configuration=Release;Platform=x86" Projects="..\src\Uno.UWPSyncGenerator.Reference\Uno.UWPSyncGenerator.Reference.csproj" Targets="Build" />
@@ -128,19 +132,20 @@
 			<MixinTargetFrameworks Include="net7.0-macos" />
 		</ItemGroup>
 
-		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;TargetFramework=%(MixinTargetFrameworks.Identity)"
-						 Projects="..\src\Uno.UI\Uno.UI.netcoremobile.csproj"
-						 Targets="GenerateMixins"
-						 RebaseOutputs="false"
-						 BuildInParallel="true" />
+		<MSBuild
+			Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;TargetFramework=%(MixinTargetFrameworks.Identity)"
+			Projects="..\src\Uno.UI\Uno.UI.netcoremobile.csproj"
+			Targets="GenerateMixins"
+			RebaseOutputs="false"
+			BuildInParallel="true" />
 	</Target>
 
 	<Target Name="GenerateDoc" DependsOnTargets="BuildSyncGenerator">
 		<MSBuild Properties="Configuration=Debug"
-				 Projects="..\src\Uno.Foundation.Logging\Uno.Foundation.Logging.csproj"
-				 Targets="Restore;Build"
-				 RebaseOutputs="false"
-				 BuildInParallel="true" />
+			Projects="..\src\Uno.Foundation.Logging\Uno.Foundation.Logging.csproj"
+			Targets="Restore;Build"
+			RebaseOutputs="false"
+			BuildInParallel="true" />
 
 		<Exec Command="..\src\Uno.UWPSyncGenerator\Bin\Release\Uno.UWPSyncGenerator.exe &quot;doc&quot;" />
 		<Exec Command="powershell .\import_external_docs.ps1" WorkingDirectory="..\doc" />
@@ -149,7 +154,6 @@
 	</Target>
 
 	<Target Name="RunAPISyncTool" DependsOnTargets="BuildSyncGenerator">
-
 		<Exec Command="..\src\Uno.UWPSyncGenerator\Bin\Release\Uno.UWPSyncGenerator.exe &quot;sync&quot;" />
 	</Target>
 
@@ -384,7 +388,7 @@
 			<ArtifactsPlatformName Condition="'$(UNO_UWP_BUILD)'=='true'">UWP</ArtifactsPlatformName>
 		</PropertyGroup>
 
-        <ItemGroup>
+		<ItemGroup>
 			<_diffPackage Include="$(PackageNamePrefix)" Other="$(PackageNamePrefix).$(GITVERSION_SemVer).nupkg" />
 			<_diffPackage Include="$(PackageNamePrefix).Foldable" Other="..\..\..\NugetPackages-Artifacts-netcoremobile-$(ArtifactsPlatformName)\vslatest-netcoremobile\$(PackageNamePrefix).Foldable.$(GITVERSION_SemVer).nupkg" />
 			<_diffPackage Include="$(PackageNamePrefix).Lottie" Other="$(PackageNamePrefix).Lottie.$(GITVERSION_SemVer).nupkg" />
@@ -404,7 +408,7 @@
 			<_diffPackage Include="Uno.Foundation.Logging" Other="Uno.Foundation.Logging.$(GITVERSION_SemVer).nupkg" />
 			<_diffPackage Include="Uno.Foundation.Runtime.WebAssembly" Other="..\..\..\NugetPackages-Artifacts-wasm-$(ArtifactsPlatformName)\vslatest-wasm\Uno.Foundation.Runtime.WebAssembly.$(GITVERSION_SemVer).nupkg" />
 			<_diffPackage Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Other="Uno.UI.Adapter.Microsoft.Extensions.Logging.$(GITVERSION_SemVer).nupkg" />
-        </ItemGroup>
+		</ItemGroup>
 
 		<Exec Command="dotnet tool install --tool-path $(MSBuildThisFileDirectory)\tools Uno.PackageDiff --version 1.1.0-dev.25" IgnoreExitCode="true" />
 		<Exec Command="$(MSBuildThisFileDirectory)\tools\generatepkgdiff.exe --base=%(_diffPackage.Identity) --other=%(_diffPackage.Other) --diffignore=PackageDiffIgnore.xml --outfile=$(OutputDir)\ApiDiff.%(_diffPackage.Identity).$(GITVERSION_SemVer).md" />

build/ci/.azure-devops-wasm-uitests.yml

@@ -39,7 +39,7 @@ jobs:
       nugetPackages: $(NUGET_PACKAGES)
 
   - bash: |
-      dotnet msbuild /r /nr:false /p:Configuration=Release src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj /bl:$(build.artifactstagingdirectory)/build-wasm-uitest-net7-$(GitVersion.FullSemVer).binlog
+      dotnet msbuild /r /nr:false /p:Configuration=Release src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj /bl:$(build.artifactstagingdirectory)/build-wasm-$(XAML_FLAVOR_BUILD)-uitest-net7-$(GitVersion.FullSemVer).binlog
 
     displayName: 'Build sample app (net7.0)'
 

doc/articles/controls/RefreshContainer.md

@@ -0,0 +1,38 @@
+---
+uid: Uno.Controls.RefreshContainer
+---
+
+# RefreshContainer (Pull to Refresh)
+
+## Summary
+
+`RefreshContainer` is used to provide the pull-to-refresh UI functionality primarily for scrollable content.
+
+The touch-based pull capability is currently available only on Android, iOS and Windows (via WinUI). However, on the other targets you can still manually call the `RequestRefresh()` method to display the refresh UI.
+
+To handle the refresh, subscribe to the `RefreshRequested` event. You can perform any kind of work in the handler. To use `async/await`, make the method `async`, get the deferral in the beginning of the method, and complete it after all required work is finished:
+
+```csharp
+refreshContainer.RefreshRequested += OnRefreshRequested;
+
+private async void OnRefreshRequested(
+    object sender,
+    RefreshRequestedEventArgs e)
+{
+    var deferral = e.GetDeferral();
+    await Task.Delay(3000); // Do some asynchronous work
+    deferral.Complete();
+}
+```
+
+## Android and iOS specifics
+
+On Android and iOS `RefreshContainer` requires a scrollable element as the child of the control. This can be either a `ScrollViewer` or a list-based control like `ListView`:
+
+```xml
+<RefreshContainer>
+    <ScrollViewer>
+        <!-- Your content that should support refresh -->
+    </ScrollViewer>
+</RefreshContainer>
+```

doc/articles/features/PasswordVault.md

@@ -72,5 +72,5 @@ vault.Add(new Windows.Security.Credentials.PasswordCredential(
 var vault = new Windows.Security.Credentials.PasswordVault();
 var credential = vault.Retrieve("My App", userName);
 credential.RetrievePassword();
-var password = loginCredential.Password;
+var password = credential.Password;
 ```

doc/articles/features/windows-devices-haptics.md

@@ -11,10 +11,22 @@ uid: Uno.Features.WDHaptics
 
 ## `VibrationDevice` class
 
-The `RequestAccessAsync` method is implemented on all platforms and returns `Allowed` on all platforms, except for Android and Tizen. In the case of Android, the `android.permission.VIBRATE` permission needs to be declared. In the case of Tizen, the `http://tizen.org/privilege/haptic` privilege needs to be declared.
-
 The `GetDefaultAsync` method is implemented on all platforms and returns `null` for the unsupported platforms (WPF, GTK).
 
+### Platform-specific requirements
+
+#### Android
+
+For Android, there is one permission you must configure before using this API in your project. To do that, add the following to `AndroidManifest.xml`:
+
+```xml
+<uses-permission android:name="android.permission.VIBRATE" />
+```
+
+#### Tizen
+
+For Tizen, the `http://tizen.org/privilege/haptic` privilege needs to be declared in `tizen-manifest.xml` file.
+
 ## `SimpleHapticsController`
 
 The `SupportedFeedback` property returns the list of supported feedback types for the given platform. In most cases this includes `Click` and `Press`.

doc/articles/features/windows-system-power.md

@@ -33,6 +33,16 @@ uid: Uno.Features.WSPower
 
 For general usage, see [PowerManager Class](https://learn.microsoft.com/uwp/api/windows.system.power.powermanager).
 
+## Platform-specific requirements
+
+### Android
+
+For Android, there is one permission you must configure before using this API in your project. To do that, add the following to `AndroidManifest.xml`:
+
+```xml
+<uses-permission android:name="android.permission.BATTERY_STATS" />
+```
+
 ### Limitations
 
 #### Android

doc/articles/toc.yml

@@ -404,6 +404,8 @@
               href: controls/Popup.md
             - name: ProgressRing
               href: features/progressring.md
+            - name: RefreshContainer (Pull to Refresh)
+              href: controls/RefreshContainer.md
             - name: ScrollViewer
               href: controls/ScrollViewer.md
             - name: TextBox

src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.Reference.csproj

@@ -19,18 +19,18 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <None Remove="buildTransitive\Uno.UI.Lottie.targets" />
+		 <None Remove="buildTransitive\Uno.UI.Lottie.targets" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Content Include="buildTransitive\Uno.UI.Lottie.targets">
-	    <PackagePath>build</PackagePath>
-	    <Pack>true</Pack>
-	  </Content>
+		<Content Include="buildTransitive\Uno.UI.Lottie.targets">
+			<PackagePath>build</PackagePath>
+			<Pack>true</Pack>
+		</Content>
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\Uno.UI\Uno.UI.Reference.csproj" />
+		<ProjectReference Include="..\..\Uno.UI\Uno.UI.Reference.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>

src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.Tests.csproj

@@ -17,18 +17,18 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <None Remove="buildTransitive\Uno.UI.Lottie.targets" />
+		<None Remove="buildTransitive\Uno.UI.Lottie.targets" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Content Include="buildTransitive\Uno.UI.Lottie.targets">
-	    <PackagePath>build</PackagePath>
-	    <Pack>true</Pack>
-	  </Content>
+		<Content Include="buildTransitive\Uno.UI.Lottie.targets">
+			<PackagePath>build</PackagePath>
+			<Pack>true</Pack>
+		</Content>
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\Uno.UI\Uno.UI.Tests.csproj" />
+		<ProjectReference Include="..\..\Uno.UI\Uno.UI.Tests.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>

src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.Wasm.csproj

@@ -38,9 +38,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\Uno.Foundation.Runtime.WebAssembly\Uno.Foundation.Runtime.WebAssembly.csproj" />
-	  <ProjectReference Include="..\..\Uno.UI.Runtime.WebAssembly\Uno.UI.Runtime.WebAssembly.csproj" />
-	  <ProjectReference Include="..\..\Uno.UI\Uno.UI.Wasm.csproj" />
+		<ProjectReference Include="..\..\Uno.Foundation.Runtime.WebAssembly\Uno.Foundation.Runtime.WebAssembly.csproj" />
+		<ProjectReference Include="..\..\Uno.UI.Runtime.WebAssembly\Uno.UI.Runtime.WebAssembly.csproj" />
+		<ProjectReference Include="..\..\Uno.UI\Uno.UI.Wasm.csproj" />
 	</ItemGroup>
 
 	<Import Project="..\..\SourceGenerators\Uno.UI.SourceGenerators\Content\Uno.UI.SourceGenerators.props" />
@@ -63,7 +63,7 @@
 	</Target>
 
 	<ItemGroup>
-	  <SourceGeneratorInput Remove="AssemblyInfo.cs" />
+		<SourceGeneratorInput Remove="AssemblyInfo.cs" />
 	</ItemGroup>
 
 </Project>

src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.netcoremobile.csproj

@@ -17,18 +17,18 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <None Remove="buildTransitive\Uno.UI.Lottie.targets" />
+		<None Remove="buildTransitive\Uno.UI.Lottie.targets" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Content Include="buildTransitive\Uno.UI.Lottie.targets">
-	    <PackagePath>build</PackagePath>
-	    <Pack>true</Pack>
-	  </Content>
+		<Content Include="buildTransitive\Uno.UI.Lottie.targets">
+			<PackagePath>build</PackagePath>
+			<Pack>true</Pack>
+		</Content>
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\Uno.UI\Uno.UI.netcoremobile.csproj" />
+		<ProjectReference Include="..\..\Uno.UI\Uno.UI.netcoremobile.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>

src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.Skia.csproj

@@ -22,7 +22,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.Identity.Client" Version="4.47.0" />
+		<PackageReference Include="Microsoft.Identity.Client" Version="4.47.0" />
 	</ItemGroup>
 
 	<ItemGroup>

src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.Wasm.csproj

@@ -32,13 +32,13 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.TypeScript.MSBuild">
-		  <PrivateAssets>all</PrivateAssets>
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.Identity.Client" Version="4.47.0" />
+		<PackageReference Include="Microsoft.Identity.Client" Version="4.47.0" />
 	</ItemGroup>
 
 	<ItemGroup>

src/AddIns/Uno.UI.MediaPlayer.Skia.Gtk/Uno.UI.MediaPlayer.Skia.Gtk.csproj

@@ -23,8 +23,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="PolySharp" Version="1.13.2">
-		  <PrivateAssets>all</PrivateAssets>
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />

src/AddIns/Uno.UI.MediaPlayer.WebAssembly/Uno.UI.MediaPlayer.WebAssembly.csproj

@@ -31,11 +31,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <UpToDateCheckInput Remove="ts\MediaElement.ts" />
+		<UpToDateCheckInput Remove="ts\MediaElement.ts" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Content Include="tsconfig.json" />
+		<Content Include="tsconfig.json" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -55,7 +55,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Folder Include="WasmScripts\" />
+		 <Folder Include="WasmScripts\" />
 	</ItemGroup>
 
 	<Target Name="_UnoUIMSALOverrideNuget" AfterTargets="AfterBuild" DependsOnTargets="BuiltProjectOutputGroup" Condition="'$(UnoNugetOverrideVersion)'!=''">