[dotnet] Ensure appropriate IL Strip value for multi-rid builds

Using logical conjunction, ensure an appropriate value is updated for IL Stripping in multi-rid builds. Fixes #17115
xamarin · Oct 2, 2024 · 38e2983 · 38e2983
1 parent f6501e9
commit 38e2983
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets
@@ -75,6 +75,10 @@
     <_RuntimeFrameworkVersion Condition="'$(CUSTOM_DOTNET_VERSION)' != ''">$(CUSTOM_DOTNET_VERSION)</_RuntimeFrameworkVersion>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <_MultiRidILStrip>true</_MultiRidILStrip>
+  </PropertyGroup>
+
   <ItemGroup Condition="'$(DisableImplicitFrameworkReferences)' != 'true'">
     <FrameworkReference Include="Microsoft.$(_PlatformName)" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
   </ItemGroup>

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -890,10 +890,13 @@
 			<EnableAssemblyILStripping>false</EnableAssemblyILStripping>
 
 			<!-- Strip if we are AOT and Release  -->
-			<EnableAssemblyILStripping Condition="'$(_RunAotCompiler)' == 'true' And '$(Configuration)' == 'Release'">true</EnableAssemblyILStripping>
+			<EnableAssemblyILStripping Condition="'$(_RunAotCompiler)' == 'true' And '$(Configuration)' == 'Release' And '$(_MultiRidILStrip)' == 'true'">true</EnableAssemblyILStripping>
 
 			<!-- Don't strip if we are running the interpreter  -->
 			<EnableAssemblyILStripping Condition="'$(MtouchInterpreter)' != ''">false</EnableAssemblyILStripping>
+
+			<!-- Using logical conjunction, ensure an appropriate value is updated for IL Stripping in multi-rid builds -->
+			<_MultiRidILStrip>$(EnableAssemblyILStripping)</_MultiRidILStrip>
 		</PropertyGroup>
 	</Target>