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

[build] Remove classic components from NUPKGs #8464

Merged
merged 4 commits into from
Oct 30, 2023
Merged

Conversation

pjcollins
Copy link
Member

@pjcollins pjcollins commented Oct 26, 2023

We had already excluded most of the classic-specific and mono bundle components from our .NET NUPKGs, but we were still restributing a few files that should no longer be needed:

  • ICSharpCode.SharpZipLib.dll - dependency of Xamarin.Installer.Build.Tasks, moved to monodroid
  • Mono.Profiler.Log.dll - dependency of aprofutil.exe
  • Mono.CompilerServices.SymbolWriter.dll - dependency of pdb2mdb.exe
  • monodoc.dll - dependency of mdoc.exe

We had already excluded most of the classic-specific and mono bundle
components from our .NET NUPKGs, but we were still restributing a few
files that should no longer be needed:

 * ICSharpCode.SharpZipLib.dll - dependency of mdoc.exe
 * Mono.Profiler.Log.dll - dependency of aprofutil.exe
 * Mono.CompilerServices.SymbolWriter.dll - dependency of pdb2mdb.exe
 * monodoc.dll - dependency of mdoc.exe

The macOS signing targets have also been updated to sign and harden a
handful of files that were being unintentionally skipped.
@pjcollins
Copy link
Member Author

@pjcollins pjcollins marked this pull request as draft October 26, 2023 17:00
Comment on lines -153 to -154
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Mono.Profiler.Log.dll" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Mono.Profiler.Log.pdb" />
Copy link
Member

Choose a reason for hiding this comment

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

I was checking this package, and it redistributes this file anyway:

I don't think it even had a way to find & load this assembly, so I had to put it inside this package.

@pjcollins
Copy link
Member Author

Looks like ICSharpCode.SharpZipLib.dll is also a dependency of Xamarin.Installer.Build.Tasks, we'll need some changes through there and monodroid first.

@pjcollins pjcollins marked this pull request as ready for review October 29, 2023 17:04
@jonpryor
Copy link
Member

[build] Remove classic components from .NET packages (#8464)

Context: 8ad7f520e7f7e01b77cc262e3577b93f7a5f52e7
Context: e0b472585e416e840926d1033b5bf1f43294175d
Context: fb637e082b07872bd8196eeb6f099c8536441620

Changes: https://github.com/xamarin/monodroid/compare/47bdaaa9b8ac16d6197a8982c8cc810d177c5cff...4d3ede83f699e1d127fed4a18de992819983d715

  * xamarin/monodroid@4d3ede83f: [build] Add ICSharpCode.SharpZipLib.dll to dependencies (xamarin/monodroid#1384)
  * xamarin/monodroid@461dc5a51: Bump external/android-sdk-installer from `f3906e6` to `4b2541e` (xamarin/monodroid#1383)
  * xamarin/monodroid@e6c1728ce: Bump external/android-sdk-installer from `3880589` to `f3906e6` (xamarin/monodroid#1381)
  * xamarin/monodroid@88c538ecc: Bump external/xamarin-android from `2b0761b` to `afd1274` (xamarin/monodroid#1380)

We had already excluded most of the Classic Xamarin.Android-specific
and mono bundle components from our .NET `.nupkg` files, but we were
still redistributing a few files that should no longer be needed:

  * `Mono.Profiler.Log.dll`: dependency of `aprofutil.exe`, removed
    from the .NET install in 8ad7f520.
  * `Mono.CompilerServices.SymbolWriter.dll`: dependency of
    `pdb2mdb.exe`, removed from the .NET install in e0b47258.
  * `monodoc.dll`: dependency of `mdoc.exe`, removed from the .NET
     install in fb637e08.

The macOS signing targets have also been updated to sign and harden a
handful of files that were being unintentionally skipped.

@jonpryor jonpryor merged commit b830f57 into main Oct 30, 2023
47 checks passed
@jonpryor jonpryor deleted the dev/pjc/excludebundle branch October 30, 2023 18:51
grendello added a commit that referenced this pull request Oct 30, 2023
* main:
  [build] Remove classic components from .NET packages (#8464)
  [tests] assert that Designer Assembly is not packaged. (#8467)
@github-actions github-actions bot locked and limited conversation to collaborators Jan 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants