Skip to content

[build] Remove classic components from NUPKGs #8464

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

Merged
merged 4 commits into from
Oct 30, 2023
Merged

[build] Remove classic components from NUPKGs #8464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93b094c
[build] Remove classic components from NUPKGs
pjcollins Oct 26, 2023
ff7b068
Restore ExcludeFromLegacy content
pjcollins Oct 26, 2023
90ea010
Bump monodroid
pjcollins Oct 27, 2023
57e54fe
Bump monodroid
pjcollins Oct 27, 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
2 changes: 1 addition & 1 deletion .external
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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