[net6] Fix ILStrip'ed apps to actually work again (#13098)

* [net6] Fix ILStrip'ed apps to actually work again

- In a late minute change to the ILStrip PR (https://github.com/xamarin/xamarin-macios/pull/12563) a change to support XVS support broke execution of Apps that were stripped
- Applications were broken because none of the stripped assemblies were actually copied into the bundle
- However, the tests still passed, because all assemblies that were there had no IL (zero assemblies total)

Now why did this happen?
- The stripped assemblies were changed to return via an msbuild Output Element
- Output Element can return an Property or ItemGroup, depending if you use the PropertyName or ItemName attributes
- Unfortunately I used PropertyName, when I expected an ItemGroup. So I silently had a property created instead.
- Thus zero items were added to the list of files to copy into the bundle
- Which was undetected as the test did not confirm files were copied in, and manual tests were not run so late into the PR (3 weeks after PR was opened)

How was it fixed?
- Correctly using ItemName on Output created a valid item group to reference
- However, that still failed with an absurdly confusing error:

 PATH/Microsoft.NET.Publish.targets(277,5): error MSB3024: Could not copy the file FILE to the destination file PATH, because the destination is a folder instead of a file. To copy the source file into a folder, consider using the DestinationFolder parameter instead of DestinationFiles.

- After a splunking through netcore targets, I found the metadata on these assemblies references really matters. Without it, they are not processed correctly at all.
- Thus, I updated ILStripBase to clone the existing metadata when changing the original assembly reference to the stripped path
- Finally, I corrected the test to assert that required files are copied in. I also manually ran our device test.

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
This commit is contained in:
Chris Hamons 2021-10-25 11:31:42 -05:00 коммит произвёл GitHub
Родитель 5d09fd774e
Коммит ab5c0c6b56
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 4 добавлений и 2 удалений

Просмотреть файл

@ -657,7 +657,7 @@
</_AssembliesToBeStripped>
</ItemGroup>
<Xamarin.MacDev.Tasks.ILStrip Assemblies="@(_AssembliesToBeStripped)" SessionId="$(BuildSessionId)">
<Output TaskParameter="StrippedAssemblies" PropertyName="_StrippedAssemblies" />
<Output TaskParameter="StrippedAssemblies" ItemName="_StrippedAssemblies" />
</Xamarin.MacDev.Tasks.ILStrip>
<ItemGroup>
<ResolvedFileToPublish Remove="@(_AssembliesToBeStripped)" />

Просмотреть файл

@ -23,7 +23,7 @@ namespace ILStripTasks {
{
foreach (var item in Assemblies)
{
stripedItems.Add (new TaskItem (item.GetMetadata("OutputPath")));
stripedItems.Add (new TaskItem (item.GetMetadata("OutputPath"), item.CloneCustomMetadata ()));
}
}

Просмотреть файл

@ -83,6 +83,8 @@ namespace Xamarin.Tests {
DotNet.AssertBuild (project_path, properties);
AssertBundleAssembliesStripStatus (appPath, shouldStrip);
Assert.That (Path.Combine (appPath, "MySimpleApp.dll"), Does.Exist, "Application Assembly");
Assert.That (Path.Combine (appPath, "Xamarin.iOS.dll"), Does.Exist, "Platform Assembly");
}
[Test]