Enable skipping unmanaged assemblies in MobileILStrip

xamarin · Sep 4, 2024 · 57dfadb · 57dfadb
1 parent 5250612
commit 57dfadb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -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.1.24414.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cf47d9ff6827a3e1d6f2acbf925cd618418f20dd</Sha>
+      <Sha>0fbd81404d1f211572387498474063bc6f407f0f</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -8,7 +8,7 @@
     <MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.24408.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.1.24414.5</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
-    <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
+    <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.1.24414.5</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
     <MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24379.1</MicrosoftDotNetCecilPackageVersion>
     <MicrosoftDotNetXHarnessiOSSharedPackageVersion>9.0.0-prerelease.24405.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>

diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/ILStrip.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/ILStrip.cs
@@ -32,8 +32,8 @@ public override bool Execute ()
 
 			var result = base.Execute ();
 
-			if (result)
-				StrippedAssemblies = stripedItems.ToArray ();
+			if (result && UpdatedAssemblies != null)
+				StrippedAssemblies = UpdatedAssemblies;
 
 			return result;
 		}

diff --git a/tests/monotouch-test/NativeLibrary.dll b/tests/monotouch-test/NativeLibrary.dll
diff --git a/tests/monotouch-test/dotnet/shared.csproj b/tests/monotouch-test/dotnet/shared.csproj
@@ -64,9 +64,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="NativeLibrary.dll">
-      <HintPath>$(RootTestsDirectory)\monotouch-test\NativeLibrary.dll</HintPath>
-    </Reference>
+    <None Include="$(RootTestsDirectory)\monotouch-test\NativeLibrary.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <ItemGroup>