Simplify a bit.

xamarin · Oct 15, 2024 · 6515f32 · 6515f32
1 parent 8a3c11d
commit 6515f32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/tests/common/shared-dotnet.csproj b/tests/common/shared-dotnet.csproj
@@ -81,6 +81,8 @@
 		<TrimmerSingleWarn Condition="'$(TrimmerSingleWarn)' == ''">false</TrimmerSingleWarn>
 		<!-- IL2104: Assembly '...' produced trim warnings -->
 		<NoWarn>$(NoWarn);IL2104</NoWarn>
+		<!-- Touch.Unit is not trimmer-safe, so ignore any trimmer warnings if we're including Touch.Unit in the build -->
+		<SuppressTrimAnalysisWarnings Condition="'$(SuppressTrimAnalysisWarnings)' == '' And '$(ExcludeTouchUnitReference)' != 'true'">true</SuppressTrimAnalysisWarnings>
 	</PropertyGroup>
 	<Target Name="IgnoreTrimmerWarningsInNUnit" BeforeTargets="PrepareForILLink">
 		<ItemGroup>

diff --git a/tests/monotouch-test/dotnet/shared.csproj b/tests/monotouch-test/dotnet/shared.csproj
@@ -44,9 +44,6 @@
     <!-- We're warning-free, so let's make sure we stay that way -->
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors>Nullable</WarningsAsErrors>
-
-    <!-- monotouch-test is not trimmer-safe -->
-    <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
   </PropertyGroup>
 
   <ItemGroup>