Merge pull request #1111 from unoplatform/dev/maso/lightpipspager

unoplatform · Aug 11, 2023 · 1b52cdc · 1b52cdc
2 parents d8a0497 + 73822cc
commit 1b52cdc
Show file tree

Hide file tree

Showing 7 changed files with 369 additions and 159 deletions.
diff --git a/src/library/Uno.Cupertino/Uno.Cupertino.csproj b/src/library/Uno.Cupertino/Uno.Cupertino.csproj
@@ -86,14 +86,14 @@
 			</PropertyGroup>
 
 			<ItemGroup>
-				<PackageReference Include="Uno.UI" Version="5.0.0-dev.1433" />
+				<PackageReference Include="Uno.UI" Version="5.0.0-dev.1634" />
 			</ItemGroup>
 			<ItemGroup Condition="$(_IsUWP)">
 				<PackageReference Include="Microsoft.UI.Xaml" Version="2.6.0-prerelease.210113001" />
 				<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Lottie" Version="6.1.0" />
 			</ItemGroup>
 			<ItemGroup Condition="!$(_IsUWP)">
-				<PackageReference Include="Uno.UI.Lottie" Version="5.0.0-dev.1433" />
+				<PackageReference Include="Uno.UI.Lottie" Version="5.0.0-dev.1634" />
 			</ItemGroup>
 
 			<ItemGroup Condition="$(_IsUWP)">

diff --git a/src/library/Uno.Material/Styles/Controls/v2/PipsPager.Base.xaml b/src/library/Uno.Material/Styles/Controls/v2/PipsPager.Base.xaml
diff --git a/src/library/Uno.Material/Uno.Material.csproj b/src/library/Uno.Material/Uno.Material.csproj
@@ -97,14 +97,14 @@
 			</PropertyGroup>
 
 			<ItemGroup>
-				<PackageReference Include="Uno.UI" Version="5.0.0-dev.1433" />
+				<PackageReference Include="Uno.UI" Version="5.0.0-dev.1634" />
 			</ItemGroup>
 			<ItemGroup Condition="$(_IsUWP)">
 				<PackageReference Include="Microsoft.UI.Xaml" Version="2.6.0-prerelease.210113001" />
 				<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Lottie" Version="6.1.0" />
 			</ItemGroup>
 			<ItemGroup Condition="!$(_IsUWP)">
-				<PackageReference Include="Uno.UI.Lottie" Version="5.0.0-dev.1433" />
+				<PackageReference Include="Uno.UI.Lottie" Version="5.0.0-dev.1634" />
 			</ItemGroup>
 
 

diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj b/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj
@@ -44,11 +44,11 @@
 		<PackageReference Include="Uno.ShowMeTheXAML.MSBuild">
 			<Version>1.0.59</Version>
 		</PackageReference>
-		<PackageReference Include="Uno.UI" Version="5.0.0-dev.1433" />
-		<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.0-dev.1433" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI" Version="5.0.0-dev.1634" />
+		<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.0-dev.1634" Condition="'$(Configuration)'=='Debug'" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1433" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1634" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
 	</ItemGroup>

diff --git a/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj b/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj
@@ -36,9 +36,9 @@
 		<PackageReference Include="SkiaSharp.Views.Uno" Version="2.88.1-preview.79" />
 		<PackageReference Include="Uno.ShowMeTheXAML" Version="1.0.59" />
 		<PackageReference Include="Uno.ShowMeTheXAML.MSBuild" Version="1.0.59" />
-		<PackageReference Include="Uno.UI.Skia.Gtk" Version="5.0.0-dev.1433" />
-		<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.0-dev.1433" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1433" />
+		<PackageReference Include="Uno.UI.Skia.Gtk" Version="5.0.0-dev.1634" />
+		<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.0-dev.1634" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1634" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
 	</ItemGroup>

diff --git a/src/samples/UWP/Uno.Themes.Samples.UWP/Uno.Themes.Samples.UWP.csproj b/src/samples/UWP/Uno.Themes.Samples.UWP/Uno.Themes.Samples.UWP.csproj
@@ -37,7 +37,7 @@
       <Version>1.0.59</Version>
     </PackageReference>
     <PackageReference Include="Uno.UI">
-      <Version>5.0.0-dev.1433</Version>
+      <Version>5.0.0-dev.1634</Version>
     </PackageReference>
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />

diff --git a/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj b/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj
@@ -54,9 +54,9 @@
 		</PackageReference>
 		<PackageReference Include="Uno.ShowMeTheXAML" Version="1.0.59" />
 		<PackageReference Include="Uno.ShowMeTheXAML.MSBuild" Version="1.0.59" />
-		<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.0-dev.1433" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.WebAssembly" Version="5.0.0-dev.1433" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1433" />
+		<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.0-dev.1634" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.WebAssembly" Version="5.0.0-dev.1634" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1634" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
 		<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.20" />