Skip to content

Fix MobileILStrip handling of unmanaged dlls #21098

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Sep 20, 2024
Merged

Fix MobileILStrip handling of unmanaged dlls #21098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5250612
Add unmanaged dll to monotouch-test
jkurdek Aug 21, 2024
57dfadb
Enable skipping unmanaged assemblies in MobileILStrip
jkurdek Sep 4, 2024
6d99632
Auto-format source code
Sep 4, 2024
fad0878
Merge branch 'net9.0' into fix/il-strip-unmanaged-assembly
rolfbjarne Sep 16, 2024
64bccc8
Bumped MonoTargets.Sdk version
jkurdek Sep 18, 2024
af306be
Merge branch 'net9.0' into fix/il-strip-unmanaged-assembly
rolfbjarne Sep 19, 2024
55ff968
Merge branch 'net9.0' into fix/il-strip-unmanaged-assembly
rolfbjarne Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>06fea905cf900ab5296b08d7b67dadddc733dd65</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="9.0.0-alpha.1.23556.4">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="9.0.0-rc.2.24462.10">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf47d9ff6827a3e1d6f2acbf925cd618418f20dd</Sha>
<Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24419.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24466.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
Expand Down
6 changes: 2 additions & 4 deletions msbuild/Xamarin.MacDev.Tasks/Tasks/ILStrip.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,15 @@ public override bool Execute ()
if (this.ShouldExecuteRemotely (SessionId))
return new TaskRunner (SessionId, BuildEngine4).RunAsync (this).Result;

var stripedItems = new List<ITaskItem> ();
foreach (var item in Assemblies) {
var outputPath = item.GetMetadata ("OutputPath");
stripedItems.Add (new TaskItem (outputPath, item.CloneCustomMetadata ()));
Directory.CreateDirectory (Path.GetDirectoryName (outputPath));
}

var result = base.Execute ();

if (result)
StrippedAssemblies = stripedItems.ToArray ();
if (result && UpdatedAssemblies is not null)
StrippedAssemblies = UpdatedAssemblies;

return result;
}
Expand Down
Binary file added tests/monotouch-test/NativeLibrary.dll
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions tests/monotouch-test/dotnet/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@
<ProjectReference Include="$(RootTestsDirectory)\fsharplibrary\dotnet\$(_PlatformName)\fsharplibrary.fsproj" />
</ItemGroup>

<ItemGroup>
<None Include="$(RootTestsDirectory)\monotouch-test\NativeLibrary.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
<None Include="$(MonoTouchTestDirectory)\Entitlements.plist" />
<None Include="$(MonoTouchTestDirectory)\app.config" />
Expand Down