From 48f57c6f89eec240304e799b9be91cf313af311d Mon Sep 17 00:00:00 2001 From: VS MobileTools Engineering Service 2 Date: Mon, 25 Oct 2021 18:41:44 -0700 Subject: [PATCH] [release/6.0.1xx-preview10] [net6] Fix ILStrip'ed apps to actually work again (#13106) * [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. * Update tests/dotnet/UnitTests/PostBuildTest.cs Co-authored-by: Rolf Bjarne Kvinge Co-authored-by: Chris Hamons Co-authored-by: Rolf Bjarne Kvinge --- dotnet/targets/Xamarin.Shared.Sdk.targets | 2 +- msbuild/Xamarin.iOS.Tasks.Core/Tasks/ILStripBase.cs | 2 +- tests/dotnet/UnitTests/PostBuildTest.cs | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index 0aa3739153dc..f720c430d11d 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -657,7 +657,7 @@ - + diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Tasks/ILStripBase.cs b/msbuild/Xamarin.iOS.Tasks.Core/Tasks/ILStripBase.cs index 622df7cc9859..cc3c4e68037d 100644 --- a/msbuild/Xamarin.iOS.Tasks.Core/Tasks/ILStripBase.cs +++ b/msbuild/Xamarin.iOS.Tasks.Core/Tasks/ILStripBase.cs @@ -23,7 +23,7 @@ public override bool Execute () { foreach (var item in Assemblies) { - stripedItems.Add (new TaskItem (item.GetMetadata("OutputPath"))); + stripedItems.Add (new TaskItem (item.GetMetadata("OutputPath"), item.CloneCustomMetadata ())); } } diff --git a/tests/dotnet/UnitTests/PostBuildTest.cs b/tests/dotnet/UnitTests/PostBuildTest.cs index 5d0aa38679b1..a7184f545c8f 100644 --- a/tests/dotnet/UnitTests/PostBuildTest.cs +++ b/tests/dotnet/UnitTests/PostBuildTest.cs @@ -83,6 +83,8 @@ public void AssemblyStripping (ApplePlatform platform, string runtimeIdentifiers 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]