Set TrimMode partial by default by agocke · Pull Request #7132 · dotnet/android

agocke · 2022-06-28T18:46:38Z

…Microsoft.Android.Sdk.DefaultProperties.targets Co-authored-by: Jonathan Peppers <jonathan.peppers@gmail.com>

agocke · 2022-06-28T19:04:07Z

Note, this trimmode will only be understood once the linker change is merged, so we'll have to wait for that.

agocke · 2022-06-28T19:11:34Z

Worryingly, this passed, so I suspect we're not actually running any trim tests, or that I missed another setting of TrimMode -- I'll double check that.

agocke · 2022-06-28T19:15:46Z

Ah, I see no tests are run here.

jonathanpeppers · 2022-06-28T19:33:47Z

/azp run

azure-pipelines · 2022-06-28T19:34:19Z

Azure Pipelines successfully started running 1 pipeline(s).

jonathanpeppers · 2022-06-28T19:35:16Z

So when the change in dotnet/linker#2856 flows all the way to dotnet/installer, we can try this.

Our Maestro cadence right now is weekly, but I can do it faster if that change lands. Let me know.

agocke · 2022-06-28T19:37:22Z

Yeah, once this goes in I think we'll want to flow through everywhere ASAP to flush out problems. Thanks for your help.

agocke · 2022-07-11T02:51:12Z

SDK change has just moved through been merged, so we probably need to merge it in for this to update.

agocke · 2022-07-13T23:44:03Z

Updated the linker version manually so this should be ready and merged ASAP

agocke · 2022-07-13T23:44:32Z

Note: the SDK change is in p7 so this needs to be in p7 as well

jonpryor · 2022-07-13T23:56:30Z

/azp run

azure-pipelines · 2022-07-13T23:57:01Z

Azure Pipelines successfully started running 1 pipeline(s).

jonpryor · 2022-07-13T23:57:58Z

@agocke : any links to useful documentation about what $(TrimMode)=partial means, what it does, how to investigate breakage, etc.?

jonathanpeppers · 2022-07-14T13:36:14Z

 <PropertyGroup>
 <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.7.22354.2</MicrosoftDotnetSdkInternalPackageVersion>
- <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22351.1</MicrosoftNETILLinkTasksPackageVersion>
+ <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22362.3</MicrosoftNETILLinkTasksPackageVersion>


Changing this number manually, actually doesn't update the dotnet/linker we are testing against. It only updates the reference assembly this project builds against:
https://github.com/xamarin/xamarin-android/blob/8d22eed397dc56d1ede51010dd192ed65123707f/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj#L12
To get a newer dotnet/linker, we bump dotnet/installer.
This one doesn't have your change either (#7162), let me try to get newer Maestro bumps in.

jonathanpeppers · 2022-07-14T13:37:49Z

Related to #7132 (comment), I'd like to add a test here for at least TrimMode=partial, and TrimMode=full. Is this the equivalent of our old Xamarin settings AndroidLinkMode=SdkOnly and AndroidLinkMode=Full?

jonathanpeppers · 2022-07-14T17:38:06Z

@agocke I think this one would have the changes from dotnet/linker that you need: #7170

agocke · 2022-07-14T17:56:24Z

I see, in that case I'll revert my changes.

We haven't had a chance to update docs yet. TrimMode=partial only trims things that are marked IsTrimmable (so mostly the SDK), and full trims everything, unless it's opted out in some way (like setting IsTrimmable=false on a particular assembly).

agocke · 2022-07-14T20:55:38Z

@jonathanpeppers Happy to add a test, but I think android will be broken if we don't merge this soon. The SDK will default to trimming everything unless told otherwise.

…36b-bdbc39f54705' into set-trimmode-partial

agocke · 2022-07-14T20:57:27Z

/azp run

azure-pipelines · 2022-07-14T20:57:33Z

Commenter does not have sufficient privileges for PR 7132 in repo xamarin/xamarin-android

jonathanpeppers · 2022-07-14T21:30:43Z

/azp run

azure-pipelines · 2022-07-14T21:31:24Z

Azure Pipelines successfully started running 1 pipeline(s).

jonathanpeppers · 2022-07-14T21:34:03Z

I think we have an existing test for both modes:

https://github.com/xamarin/xamarin-android/blob/6401f2f7da54379b907295b4fe62b46dffea1a54/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs#L333-L334

AndroidLinkMode=SdkOnly should map to TrimMode=partial, and AndroidLinkMode=Full map to TrimMode=link:

https://github.com/xamarin/xamarin-android/blob/d4f94249a1a8c67747f1551627a3796610619c70/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets#L68-L69

This is probably good enough for now, as this test runs for Xamarin.Android and .NET 7+.

jonathanpeppers · 2022-07-15T16:59:06Z

I'm going to merge this into #7170, as it is giving some test failures that show TrimMode=link is on by default.

Companion to dotnet/linker#2856 * Update src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets * Remove more usages of TrimMode * Update linker versions manually Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>

Changes: dotnet/installer@85a0482...a9c056c Changes: dotnet/linker@ef2d0f2...d27ff61 Changes: dotnet/runtime@206dccb...072eda8 Changes: dotnet/emsdk@40e7c62...11a9acf Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-preview.7.22361.1 to 7.0.100-rc.1.22368.2 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22354.1 to 7.0.100-1.22365.1 * Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22356.1 to 7.0.0-rc.1.22366.5 * Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-preview.7.22330.1 to 7.0.0-rc.1.22362.2 ~~ Set `$(TrimMode)` `partial` by default (#7132) ~~ Companion to dotnet/linker#2856 * Update src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets * Remove usages of `%(TrimMode)` for `$(AndroidLinkMode)` of `Full` * Update .apkdesc files ~~ Set `$(LangVersion)` to 10 in Mono.Android.csproj ~~ There appears to be a C# 11 IL size regression in: dotnet/roslyn#62832 We can use C# 10 for now to avoid this. * Fixed `Mono.Android.dll` size in `.apkdesc` files Co-authored-by: Andy Gocke <andy@commentout.net> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>

Changes: dotnet/installer@d2fff6d...dbdda95 Changes: dotnet/linker@ef2d0f2...33a76b8 Changes: dotnet/runtime@206dccb...db5d4df Changes: dotnet/emsdk@40e7c62...7d27778 Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-preview.7.22362.31 to 7.0.100-preview.7.22370.3 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22354.1 to 7.0.100-1.22362.1 * Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22356.1 to 7.0.0-preview.7.22369.4 * Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-preview.7.22330.1 to 7.0.0-preview.7.22361.2 ~~ Set `$(TrimMode)` `partial` by default (#7132) ~~ Companion to dotnet/linker#2856 * Update src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets * Remove usages of `%(TrimMode)` for `$(AndroidLinkMode)` of `Full` * Update .apkdesc files ~~ Set `$(LangVersion)` to 10 in Mono.Android.csproj ~~ There appears to be a C# 11 IL size regression in: dotnet/roslyn#62832 We can use C# 10 for now to avoid this. * Fixed `Mono.Android.dll` size in `.apkdesc` files Co-authored-by: Andy Gocke <andy@commentout.net> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>

Set TrimMode partial by default
e95be39
Companion to dotnet/linker#2856

agocke requested review from dellis1972 and jonathanpeppers as code owners June 28, 2022 18:46

jonathanpeppers reviewed Jun 28, 2022
View reviewed changes

Comment thread...id.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets Outdated

Update src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/…
860f12f
…Microsoft.Android.Sdk.DefaultProperties.targets Co-authored-by: Jonathan Peppers <jonathan.peppers@gmail.com>

Remove more usages of TrimMode
04a5543

jonathanpeppers mentioned this pull request Jul 1, 2022
.NET: Unify the MtouchLink and LinkMode MSBuild properties dotnet/macios#12796
Closed

Update linker versions manually
ac27361

agocke requested review from jonpryor and pjcollins as code owners July 13, 2022 23:40

Merge remote-tracking branch 'upstream/main' into set-trimmode-partial
ccbbe34

jonathanpeppers reviewed Jul 14, 2022
View reviewed changes

Merge branch 'main' into set-trimmode-partial
f1b2d33

Merge remote-tracking branch 'upstream/darc-main-1a7fcdae-fd29-44ca-9…
d4f9424
…36b-bdbc39f54705' into set-trimmode-partial

jonathanpeppers changed the base branch from main to darc-main-1a7fcdae-fd29-44ca-936b-bdbc39f54705July 15, 2022 16:59

jonathanpeppers merged commit e62dcb0 into dotnet:darc-main-1a7fcdae-fd29-44ca-936b-bdbc39f54705Jul 15, 2022

agocke deleted the set-trimmode-partial branch July 17, 2022 06:09

github-actionsBot locked and limited conversation to collaborators Jan 24, 2024

Uh oh!

Conversation

agocke commented Jun 28, 2022

Uh oh!

Uh oh!

agocke commented Jun 28, 2022

Uh oh!

agocke commented Jun 28, 2022

Uh oh!

agocke commented Jun 28, 2022

Uh oh!

jonathanpeppers commented Jun 28, 2022

Uh oh!

azure-pipelinesBot commented Jun 28, 2022

Uh oh!

jonathanpeppers commented Jun 28, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

agocke commented Jun 28, 2022

Uh oh!

agocke commented Jul 11, 2022

Uh oh!

agocke commented Jul 13, 2022

Uh oh!

agocke commented Jul 13, 2022

Uh oh!

jonpryor commented Jul 13, 2022

Uh oh!

azure-pipelinesBot commented Jul 13, 2022

Uh oh!

jonpryor commented Jul 13, 2022

Uh oh!

jonathanpeppersJul 14, 2022

Choose a reason for hiding this comment

Uh oh!

jonathanpeppers commented Jul 14, 2022

Uh oh!

jonathanpeppers commented Jul 14, 2022

Uh oh!

agocke commented Jul 14, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

agocke commented Jul 14, 2022

Uh oh!

agocke commented Jul 14, 2022

Uh oh!

azure-pipelinesBot commented Jul 14, 2022

Uh oh!

jonathanpeppers commented Jul 14, 2022

Uh oh!

azure-pipelinesBot commented Jul 14, 2022

Uh oh!

jonathanpeppers commented Jul 14, 2022

Uh oh!

jonathanpeppers commented Jul 15, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jonathanpeppers commented Jun 28, 2022•
edited
Loading

agocke commented Jul 14, 2022•
edited
Loading