Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Forward port 5.0 changes #903

Merged
merged 10 commits into from
Nov 6, 2023
Merged

Forward port 5.0 changes #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c778398
chore: Update to latest stable packages
jeromelaban Oct 29, 2023
5171085
chore: Disable failing test
jeromelaban Oct 29, 2023
cc540f8
chore: Disable tests
jeromelaban Oct 29, 2023
b94c0f9
chore: disable failing test
jeromelaban Oct 29, 2023
a6254eb
chore: disable tests
jeromelaban Oct 29, 2023
82a9181
Restore disabled tests
jeromelaban Oct 29, 2023
dc5fd81
chore: Bump to latest uno
jeromelaban Oct 31, 2023
2505bc1
chore: Update to latest stable packages
jeromelaban Oct 31, 2023
2b4b755
chore: Adjust for backport
jeromelaban Nov 6, 2023
7a4b937
chore: Backport update
jeromelaban Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions samples/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
22 changes: 11 additions & 11 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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>
Loading