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

[Xamarin.Android.Build.Tasks] Remove ILRepack #9226

Merged
merged 2 commits into from
Aug 20, 2024
Merged

Conversation

pjcollins
Copy link
Member

@pjcollins pjcollins commented Aug 19, 2024

The historical reasons for needing to ILRepack assemblies should no
longer be a concern in a .NET world without VS for Mac.

The ILRepacker target has been removed, and the remaining assemblies
that were being repacked have been added to the workload SDK packs.

The historical reasons for needing to ILRepack assemblies should no
longer be a concern in a .NET world without VS for Mac.

The ILRepacker target has been removed, and the one remaining external
assembly (Newtonsoft.Json.dll) that was being repacked has been added to
our workload SDK pack instead.
@pjcollins
Copy link
Member Author

pjcollins commented Aug 19, 2024

Running a full build here to test further: https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=10071464&view=results

@pjcollins pjcollins marked this pull request as ready for review August 20, 2024 01:13
Copy link
Contributor

@dellis1972 dellis1972 left a comment

Choose a reason for hiding this comment

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

This looks ok. Do we have a way of testing this in Visual Studio on windows? I ask because that was were we generally hit the probolem which caused us to use ILRepacker in the first place.

Vs would need to have a third party extension in it that used something like Cecil or NewtonSoft.Json.

Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

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

In a different PR, we could probably also port Newtonsoft -> System.Text.Json.

@@ -119,6 +119,7 @@
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Mono.Options.dll" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Mono.Options.pdb" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)MULTIDEX_JAR_LICENSE" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Newtonsoft.Json.dll" />
Copy link
Member

Choose a reason for hiding this comment

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

Will some SignCheck step fail in VS, if we are missing Newtonsoft.Json.pdb? Do we have another pipeline to fetch symbols now?

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 set up https://devdiv.visualstudio.com/DevDiv/_git/VS/pullrequest/573022 to test a bit in VS, and to get some sign/symbol check validation as I also updated the sign list to skip signing of NuGet assemblies that should already be signed.

Copy link
Member Author

Choose a reason for hiding this comment

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

Looks like symbol and sign check are green there, so they must have access to the symbols from the package version we're using

@jonpryor jonpryor merged commit 003f5d1 into main Aug 20, 2024
66 checks passed
@jonpryor jonpryor deleted the dev/pjc/no-ilrepack branch August 20, 2024 18:14
grendello added a commit that referenced this pull request Aug 27, 2024
* main: (47 commits)
  Bump to dotnet/sdk@5642787dac 9.0.100-rc.2.24426.2 (#9247)
  LEGO: Merge pull request 9246
  Bump to 34.0.137 of the .NET 8 Android workload (#9243)
  Bump external/Java.Interop from `d30d554` to `51b784a` (#9241)
  Bump dotnet/android-tools@6575743 (#9235)
  Bump to mono/debugger-libs@d5664344 (#9238)
  [ci] Improve push_signed_nugets job condition (#9240)
  Bump to dotnet/android-tools@657574378a6 and xamarin/monodroid@8bd4bae7 (#9216)
  Bump to dotnet/java-interop@d30d554 (#9234)
  Localized file check-in by OneLocBuild Task (#9236)
  Bump to dotnet/sdk@e2b7b9d2b4 9.0.100-rc.2.24420.1 (#9228)
  $(AndroidPackVersionSuffix)=rc.2; net9 is 35.0.0-rc.2 (#9233)
  [Xamarin.Android.Build.Tasks] Scan for JCWs for each ABI in parallel (#9215)
  [Xamarin.Android.Build.Tasks] %(JavaArtifact) is a list (#9112)
  [native/monodroid] Fix error demangling satellite assembly names (#9166)
  [build] Update package metadata (#9230)
  [Xamarin.Android.Build.Tasks] Remove ILRepack (#9226)
  [Xamarin.Android.Build.Tasks] Fix an issue with incremental builds (#9183)
  [Xamarin.Android.Build.Tasks] remove `$XAMARIN_BUILD_ID` (#9223)
  [Mono.Android] Use .NET version of mdoc (#9225)
  ...
@github-actions github-actions bot locked and limited conversation to collaborators Sep 20, 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.

4 participants