Skip to content

Commit

Permalink
[build] Remove classic components from .NET packages (#8464)
Browse files Browse the repository at this point in the history
Context: 8ad7f52
Context: e0b4725
Context: fb637e0

Changes: xamarin/monodroid@47bdaaa...4d3ede8

  * 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 8ad7f52.
  * `Mono.CompilerServices.SymbolWriter.dll`: dependency of
    `pdb2mdb.exe`, removed from the .NET install in e0b4725.
  * `monodoc.dll`: dependency of `mdoc.exe`, removed from the .NET
     install in fb637e0.
  • Loading branch information
pjcollins authored Oct 30, 2023
1 parent a9a5d2c commit b830f57
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 103 deletions.
2 changes: 1 addition & 1 deletion .external
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xamarin/monodroid:main@47bdaaa9b8ac16d6197a8982c8cc810d177c5cff
xamarin/monodroid:main@4d3ede83f699e1d127fed4a18de992819983d715
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
6 changes: 2 additions & 4 deletions build-tools/create-packs/Microsoft.Android.Sdk.proj
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ core workload SDK packs imported by WorkloadManifest.targets.
<PackageId>Microsoft.Android.Sdk.$(HostOS)</PackageId>
<Description>C# Tools and Bindings for the Android SDK.</Description>
<Description Condition=" '$(HostOS)' == 'Linux' ">$(Description) Please note that this package is not officially supported, and has not received extensive testing.</Description>
<!-- Exclude mono bundle components declared in `create-installers.targets`. -->
<IncludeMonoBundleComponents>false</IncludeMonoBundleComponents>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

Expand All @@ -30,8 +28,8 @@ core workload SDK packs imported by WorkloadManifest.targets.
<Target Name="_GenerateXASdkContent"
DependsOnTargets="ConstructInstallerItems;_GetLicense">
<ItemGroup>
<AndroidSdkBuildTools Include="@(MSBuildItemsWin)" PackagePath="tools\$([System.IO.Path]::GetDirectoryName('%(MSBuildItemsWin.RelativePath)'))" Condition=" '%(MSBuildItemsWin.ExcludeFromAndroidNETSdk)' != 'true' and '$(HostOS)' == 'Windows' " />
<AndroidSdkBuildTools Include="@(MSBuildItemsUnix)" PackagePath="tools\$([System.IO.Path]::GetDirectoryName('%(MSBuildItemsUnix.RelativePath)'))" Condition=" '%(MSBuildItemsUnix.ExcludeFromAndroidNETSdk)' != 'true' and ('$(HostOS)' == 'Linux' or '$(HostOS)' == 'Darwin') " />
<AndroidSdkBuildTools Include="@(MSBuildItemsWin)" PackagePath="tools\$([System.IO.Path]::GetDirectoryName('%(MSBuildItemsWin.RelativePath)'))" Condition=" '$(HostOS)' == 'Windows' " />
<AndroidSdkBuildTools Include="@(MSBuildItemsUnix)" PackagePath="tools\$([System.IO.Path]::GetDirectoryName('%(MSBuildItemsUnix.RelativePath)'))" Condition=" '$(HostOS)' == 'Linux' or '$(HostOS)' == 'Darwin' " />
</ItemGroup>

<GenerateUnixFilePermissions
Expand Down
1 change: 0 additions & 1 deletion build-tools/create-packs/SignList.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

<ItemGroup>
<ThirdParty Include="HtmlAgilityPack.dll" />
<ThirdParty Include="ICSharpCode.SharpZipLib.dll" />
<ThirdParty Include="INIFileParser.dll" />
<ThirdParty Include="Irony.dll" />
<ThirdParty Include="K4os.Compression.LZ4.dll" />
Expand Down
Loading

0 comments on commit b830f57

Please sign in to comment.