Fix MobileILStrip handling of unmanaged dlls (#21098)
Fixes https://github.com/dotnet/runtime/issues/101967 Follow up to the runtime change https://github.com/dotnet/runtime/pull/106267
This commit is contained in:
Родитель
571cb3164b
Коммит
d5a7b3981c
|
@ -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>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.2.24463.7</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>
|
||||
|
|
|
@ -23,17 +23,15 @@ namespace Xamarin.MacDev.Tasks {
|
|||
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;
|
||||
}
|
||||
|
|
Двоичный файл не отображается.
|
@ -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" />
|
||||
|
|
Загрузка…
Ссылка в новой задаче