fix(ios): Adjust for duplicate gcparams

jeromelaban · Apr 11, 2024 · d8b7b4d · d8b7b4d
1 parent 37dfe9f
commit d8b7b4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build/nuget/uno.winui.common.targets b/build/nuget/uno.winui.common.targets
@@ -210,8 +210,8 @@
 			'$(UnoDisableValidateIOSStaticRegistrar)'=='' and
 			'$(TargetFramework)'=='net6.0-ios' and '$(RuntimeIdentifier)'=='iossimulator-x64' and (
 				'$(MtouchExtraArgs)'!=''
-				and !$(MtouchExtraArgs.Contains('--registrar:static'))
-				and !$(MtouchExtraArgs.Contains('--registrar=static'))
+				and !$(MtouchExtraArgs.ToLowerInvariant().Contains('--registrar:static'))
+				and !$(MtouchExtraArgs.ToLowerInvariant().Contains('--registrar=static'))
 			)
 			">
 		<Error Text="Building for the iOS Simulator requires the use of the static registrar. Make sure that `MtouchExtraArgs` contains `--registrar:static`. See https://github.com/unoplatform/uno/issues/9430 for more details." />

diff --git a/src/Uno.Sdk/targets/xamarin-ios-maccatalyst-workarounds.targets b/src/Uno.Sdk/targets/xamarin-ios-maccatalyst-workarounds.targets
@@ -3,9 +3,9 @@
 	<PropertyGroup>
 		<!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
 		<!-- <MtouchExtraArgs Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
-		<MtouchExtraArgs Condition="!$(MtouchExtraArgs.Contains('--setenv=MONO_GC_Params=')) and $(DisableXamarinDebug_Workaround) != 'true'">$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
+		<MtouchExtraArgs Condition="!$(MtouchExtraArgs.ToLowerInvariant().Contains('--setenv=mono_gc_params=')) and $(DisableXamarinDebug_Workaround) != 'true'">$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
 
 		<!-- See https://github.com/unoplatform/uno/issues/9430 for more details. -->
-		<MtouchExtraArgs Condition="!$(MtouchExtraArgs.Contains('--registrar:')) and $(DisableUno9430_Workaround) != 'true'">$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
+		<MtouchExtraArgs Condition="!$(MtouchExtraArgs.ToLowerInvariant().Contains('--registrar:')) and $(DisableUno9430_Workaround) != 'true'">$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
 	</PropertyGroup>
 </Project>