Commit 39526e3
authored
[One .NET] set %(IsTrimmable) for @(KnownFrameworkReference) (dotnet#5115)
Context: https://github.com/dotnet/installer/blob/97f447f228824c0217d2c8b845b003118673ff22/src/redist/targets/GenerateBundledVersions.targets#L208-L218
Context: https://docs.microsoft.com/dotnet/core/deploying/trimming-options
Right now we are modifying the `@(ResolvedFileToPublish)` item group
and setting `%(IsTrimmable)` for `Mono.Android.dll`,
`Mono.Android.Export.dll`, and `Java.Interop.dll`. Instead we can set
this metadata on `@(KnownFrameworkReference)`, which is the way that
`Microsoft.NETCore.App` is setup. This way these assembly references
will be "trimmable" by default.
We should also rename `Microsoft.Android.Sdk.Linker.targets` to
`Microsoft.Android.ILLink.targets` to better match the naming in .NET 5.
I updated the `LibraryProjectTargetsDoNotBreak` test to use `Touch()`,
as it seems like it was randomly failing after these changes.1 parent 28add0d commit 39526e3
File tree
4 files changed
+17
-30
lines changed- build-tools/create-packs
- src/Xamarin.Android.Build.Tasks
- Microsoft.Android.Sdk/targets
- Tests/Xamarin.Android.Build.Tests
4 files changed
+17
-30
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
127 | 129 | | |
128 | 130 | | |
129 | 131 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | 16 | | |
25 | 17 | | |
26 | 18 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
Lines changed: 2 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
501 | 501 | | |
502 | 502 | | |
503 | 503 | | |
504 | | - | |
505 | | - | |
506 | | - | |
507 | | - | |
508 | | - | |
509 | | - | |
510 | | - | |
511 | | - | |
512 | | - | |
| 504 | + | |
| 505 | + | |
513 | 506 | | |
514 | 507 | | |
515 | 508 | | |
| |||
0 commit comments