Merge pull request #903 from unoplatform/dev/jela/fp-5-0

Forward port 5.0 changes
unoplatform · Nov 6, 2023 · 76406cf · 76406cf
2 parents 8b41048 + 7a4b937
commit 76406cf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props
@@ -19,17 +19,17 @@
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" />
     <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.6" />
-    <PackageVersion Include="SkiaSharp.Views" Version="2.88.5" />
+    <PackageVersion Include="SkiaSharp.Views" Version="2.88.6" />
     <PackageVersion Include="SkiaSharp.Views.Uno" Version="2.88.6" />
     <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
     <PackageVersion Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
-    <PackageVersion Include="Uno.Cupertino" Version="3.0.0-dev.352" />
-    <PackageVersion Include="Uno.Cupertino.WinUI" Version="3.0.0-dev.336" />
+    <PackageVersion Include="Uno.Cupertino" Version="4.0.4" />
+    <PackageVersion Include="Uno.Cupertino.WinUI" Version="4.0.4" />
     <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
     <PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
-    <PackageVersion Include="Uno.Material" Version="3.0.0-dev.352" />
-    <PackageVersion Include="Uno.Material.WinUI" Version="3.0.0-dev.352" />
+    <PackageVersion Include="Uno.Material" Version="4.0.4" />
+    <PackageVersion Include="Uno.Material.WinUI" Version="4.0.4" />
     <PackageVersion Include="Uno.UI" Version="5.1.0-dev.156" />
     <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.9" />
     <PackageVersion Include="Uno.UI.RemoteControl" Version="5.1.0-dev.156" />

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -9,21 +9,21 @@
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
     <PackageVersion Include="SkiaSharp" Version="2.88.6" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
-    <PackageVersion Include="SkiaSharp.Views.Uno" Version="2.88.5" />
-    <PackageVersion Include="SkiaSharp.Views.WinUI" Version="2.88.5" />
+    <PackageVersion Include="SkiaSharp.Views.Uno" Version="2.88.6" />
+    <PackageVersion Include="SkiaSharp.Views.WinUI" Version="2.88.6" />
     <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
     <PackageVersion Include="Uno.Core.Extensions.Collections" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
-    <PackageVersion Include="Uno.Cupertino" Version="3.0.0-dev.352" />
-    <PackageVersion Include="Uno.Cupertino.WinUI" Version="3.0.0-dev.352" />
-    <PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.0.0-dev.517" />
+    <PackageVersion Include="Uno.Cupertino" Version="4.0.4" />
+    <PackageVersion Include="Uno.Cupertino.WinUI" Version="4.0.4" />
+    <PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.0.10" />
     <PackageVersion Include="Uno.SourceGenerationTasks" Version="4.2.0" />
-    <PackageVersion Include="Uno.WinUI.Markup" Version="5.0.0-dev.517" />
-    <PackageVersion Include="Uno.Material" Version="3.0.0-dev.352" />
-    <PackageVersion Include="Uno.Material.WinUI" Version="3.0.0-dev.352" />
-    <PackageVersion Include="Uno.UI" Version="5.0.0-dev.1728" />
-    <PackageVersion Include="Uno.WinUI" Version="5.0.0-dev.1728" />
+    <PackageVersion Include="Uno.WinUI.Markup" Version="5.0.10" />
+    <PackageVersion Include="Uno.Material" Version="4.0.4" />
+    <PackageVersion Include="Uno.Material.WinUI" Version="4.0.4" />
+    <PackageVersion Include="Uno.UI" Version="5.0.19" />
+    <PackageVersion Include="Uno.WinUI" Version="5.0.19" />
     <PackageVersion Include="Uno.XamlMerge.Task" Version="1.1.0-dev.12" />
     <PackageVersion Include="FluentAssertions" Version="5.10.3" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
@@ -41,4 +41,4 @@
     <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.7.0-2.final" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22518.1" />
   </ItemGroup>
-</Project>
+</Project>