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.

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

Update HarfBuzzSharp #13357

Merged
merged 1 commit into from
Oct 24, 2023
Merged

Conversation

Gillibald
Copy link
Contributor

@Gillibald Gillibald commented Oct 23, 2023

What does the pull request do?

New environment variables were introduced for each supported platform to only reference the native assets of the current platform

What is the current behavior?

What is the updated/expected behavior with this PR?

How was the solution implemented (if it's not obvious)?

Checklist

Breaking changes

Obsoletions / Deprecations

Fixed issues

Comment on lines 4 to 10
<PackageReference Condition="'$(IncludeWindowsSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Win32" Version="7.3.0" />
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0" />
<PackageReference Condition="'$(IncludeMacSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.macOS" Version="7.3.0" />
<PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="7.3.0" />
<PackageReference Condition="'$(IncludeAndroidSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Android" Version="7.3.0" />
<PackageReference Condition="'$(IncludeIOSSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.iOS" Version="7.3.0" />
<PackageReference Condition="'$(IncludeTizenSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Tizen" Version="7.3.0" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything but WASM and Linux should still be included automatically. You can see from dependencies page here: https://www.nuget.org/packages/HarfBuzzSharp

.NETStandard 2.0 has Win32 and macOS
And .NET 6 has mobile platforms as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm so it looks like everything is referenced automatically

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, everything automatically, except linux and non-blazor browser. But we already cover these platforms manually.

@@ -6,6 +6,7 @@
<MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
<DebugType>portable</DebugType>
<AndroidResgenNamespace>Avalonia.Android.Internal</AndroidResgenNamespace>
<IncludeAndroidSkia>true</IncludeAndroidSkia>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these properties work only when build/HarfBuzzSharp.props is referenced directly in the project.

@Gillibald Gillibald force-pushed the feature/updateHarfBuzzSharp branch from c4ac3d2 to 3d99158 Compare October 24, 2023 08:44
@maxkatz6 maxkatz6 added this pull request to the merge queue Oct 24, 2023
Merged via the queue into AvaloniaUI:master with commit a6075db Oct 24, 2023
5 checks passed
@Gillibald Gillibald deleted the feature/updateHarfBuzzSharp branch October 24, 2023 16:30
@maxkatz6 maxkatz6 added the backport-candidate-11.0.x Consider this PR for backporting to 11.0 branch label Nov 5, 2023
maxkatz6 pushed a commit that referenced this pull request Dec 5, 2023
@maxkatz6 maxkatz6 added backported-11.0.x and removed backport-candidate-11.0.x Consider this PR for backporting to 11.0 branch labels Dec 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants