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

chore: Refactor package packing #26

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

Youssef1313
Copy link
Member

@Youssef1313 Youssef1313 commented Jan 19, 2023

IMPORTANT: I haven't verified if the package still works as intended. This is important before merging. @jeromelaban Would you be able to do that?

GitHub Issue (If applicable): Closes #24

PR Type

What kind of change does this PR introduce?

What is the current behavior?

What is the new behavior?

PR Checklist

Please check if your PR fulfills the following requirements:

  • Tested code with current supported SDKs
  • Docs have been added/updated which fit documentation template. (for bug fixes / features)
  • Unit Tests and/or UI Tests for the changes have been added (for bug fixes / features) (if applicable)
  • Wasm UI Tests are not showing unexpected any differences. Validate PR Screenshots Compare Test Run results.
  • Contains NO breaking changes
  • Updated the Release Notes
  • Associated with an issue (GitHub or internal)

Other information

Internal Issue (If applicable):

Comment on lines 7 to 9
<Target Name="_UnoAddPriMarker" AfterTargets="ResolvePackageAssets">
<_UnoPriFiles Include="$(MSBuildThisFileDirectory)uno.fonts.fluent.uprimarker" />
</Target>
Copy link
Member Author

Choose a reason for hiding this comment

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

The intention of this target is to let Uno correctly detect uprimarker and properly find the font file during ExpandPackageAssets.

@@ -3,4 +3,8 @@
<PropertyGroup Condition="'$(UnoFontsFluentDisableImport)'==''">
<UnoPlatformDefaultSymbolsFontFamily>ms-appx://uno.fonts.fluent/Fonts/uno-fluentui-assets.ttf</UnoPlatformDefaultSymbolsFontFamily>
</PropertyGroup>

<Target Name="_UnoAddPriMarker" AfterTargets="ResolvePackageAssets">
Copy link
Member Author

Choose a reason for hiding this comment

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

It could also be BeforeTargets="_UnoFindPackageAssetMarkers". I think both should work.

Copy link
Member

@jeromelaban jeromelaban Jan 19, 2023

Choose a reason for hiding this comment

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

I wanted to avoid relying on an internal implementation detail of the marker resolution assembly (assuming that most libraries will also contain code). We still have additional work to do on fonts (default text font), and this may be part of it to include a more robust way of creating font-only packages.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not sure I understand the problem with relying on the internal implementation detail. But anyway, let me revert this part for now.

Copy link
Member

Choose a reason for hiding this comment

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

The use of _UnoPriFiles is an internal implementation detail at this time.

Copy link
Member Author

Choose a reason for hiding this comment

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

@jeromelaban Does it look better now?

@Youssef1313 Youssef1313 changed the title fix: Remove dll from package and refactor packing the package chore: Refactor package packing Jan 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NuGet package shouldn't have a public class Class1
2 participants