[Microsoft.Android.Sdk.ILLink] remove more linker sources #8572
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This removes various linker sources that are no longer used in
xamarin-android/main and .NET 9. These shouldn't actually affect any
`.dll` / binaries we produce, but merely reorganizes and removes files.
* Delete unused `*.cs` files
* Delete unused `*.xml` files
* Move appropriate `*.cs` files to `Microsoft.Android.Sdk.ILLink`.
* Remove appropriate `#if ILLINK` blocks for moved `*.cs` files, as this
code is not shared with `Xamarin.Android.Build.Tasks.csproj`.
After this change, we have the following files shared (where `#if
ILLINK` is still used):
<Compile Include="..\Xamarin.Android.Build.Tasks\Linker\MonoDroid.Tuner\AddKeepAlivesStep.cs" Link="MonoDroid.Tuner\AddKeepAlivesStep.cs" />
<Compile Include="..\Xamarin.Android.Build.Tasks\Linker\MonoDroid.Tuner\AndroidLinkConfiguration.cs" Link="MonoDroid.Tuner\AndroidLinkConfiguration.cs" />
<Compile Include="..\Xamarin.Android.Build.Tasks\Linker\MonoDroid.Tuner\Extensions.cs" Link="MonoDroid.Tuner\Extensions.cs" />
<Compile Include="..\Xamarin.Android.Build.Tasks\Linker\MonoDroid.Tuner\FixAbstractMethodsStep.cs" Link="MonoDroid.Tuner\FixAbstractMethodsStep.cs" />
<Compile Include="..\Xamarin.Android.Build.Tasks\Linker\MonoDroid.Tuner\FixLegacyResourceDesignerStep.cs" Link="MonoDroid.Tuner\FixLegacyResourceDesignerStep.cs" />
<Compile Include="..\Xamarin.Android.Build.Tasks\Linker\MonoDroid.Tuner\LinkDesignerBase.cs" Link="MonoDroid.Tuner\LinkDesignerBase.cs" />
<Compile Include="..\Xamarin.Android.Build.Tasks\Linker\MonoDroid.Tuner\RemoveResourceDesignerStep.cs" Link="MonoDroid.Tuner\RemoveResourceDesignerStep.cs" />
<Compile Include="..\Xamarin.Android.Build.Tasks\Linker\MonoDroid.Tuner\MonoDroidProfile.cs" Link="MonoDroid.Tuner\MonoDroidProfile.cs" />
<Compile Include="..\Xamarin.Android.Build.Tasks\Linker\Mobile.Tuner\MobileProfile.cs" Link="Mobile.Tuner\MobileProfile.cs" />
jonathanpeppers
force-pushed
the
RemoveMoreLinkerSources
branch
from
d136445
to
d23db9e
Compare
jonathanpeppers
commented
Dec 8, 2023
Comment on lines
-195
to
-212
| <EmbeddedResource Include="Linker\PreserveLists\Java.Interop.xml"> | ||
| <LogicalName>Java.Interop.xml</LogicalName> | ||
| </EmbeddedResource> | ||
| <EmbeddedResource Include="Linker\PreserveLists\mscorlib.xml"> | ||
| <LogicalName>mscorlib.xml</LogicalName> | ||
| </EmbeddedResource> | ||
| <EmbeddedResource Include="Linker\PreserveLists\System.Data.Services.Client.xml"> | ||
| <LogicalName>System.Data.Services.Client.xml</LogicalName> | ||
| </EmbeddedResource> | ||
| <EmbeddedResource Include="Linker\PreserveLists\System.ServiceModel.xml"> | ||
| <LogicalName>System.ServiceModel.xml</LogicalName> | ||
| </EmbeddedResource> | ||
| <EmbeddedResource Include="Linker\PreserveLists\OpenTK.xml"> | ||
| <LogicalName>OpenTK.xml</LogicalName> | ||
| </EmbeddedResource> | ||
| <EmbeddedResource Include="Linker\PreserveLists\Mono.Android.xml"> | ||
| <LogicalName>Mono.Android.xml</LogicalName> | ||
| </EmbeddedResource> |
There was a problem hiding this comment.
These EmbeddedResource aren't used at all in .NET 6+, we use the set here instead:
pjcollins
approved these changes
Dec 8, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This removes various linker sources that are no longer used in xamarin-android/main and .NET 9. These shouldn't actually affect any
.dll/ binaries we produce, but merely reorganizes and removes files.Delete unused
*.csfilesDelete unused
*.xmlfilesMove appropriate
*.csfiles toMicrosoft.Android.Sdk.ILLink.Remove appropriate
#if ILLINKblocks for moved*.csfiles, as this code is not shared withXamarin.Android.Build.Tasks.csproj.After this change, we have the following files shared (where
#if ILLINKis still used):