Skip to content

Commit 0b448ab

Browse files
authored
[One .NET] remove $(InvariantGlobalization) workaround (#6724)
Context: #5954 (comment) Context: #5605 This partially reverts da536fc. In da536fc, we started seeing a crash around `$(InvariantGlobalization)`. This is no longer needed since dotnet/runtime#53453 fixed the issue. Bringing back the original optimization in #5605.
1 parent 9b19277 commit 0b448ab

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,9 @@
8686
<EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
8787
<EnableUnsafeBinaryFormatterSerialization Condition="'$(EnableUnsafeBinaryFormatterSerialization)' == ''">false</EnableUnsafeBinaryFormatterSerialization>
8888
<EventSourceSupport Condition="'$(EventSourceSupport)' == ''">false</EventSourceSupport>
89-
<!--
90-
FIXME: set $(InvariantGlobalization) to empty unless it is set to true
91-
See: https://github.com/dotnet/sdk/blob/1f544a59270cecb2947e50a01f7056c685b4e319/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets#L389-L392
92-
-->
93-
<InvariantGlobalization Condition="'$(InvariantGlobalization)' != 'true'"></InvariantGlobalization>
9489
<UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == '' and '$(PublishTrimmed)' == 'true'">true</UseSystemResourceKeys>
9590
<HttpActivityPropagationSupport Condition="'$(HttpActivityPropagationSupport)' == ''">false</HttpActivityPropagationSupport>
91+
<InvariantGlobalization Condition="'$(InvariantGlobalization)' == ''">false</InvariantGlobalization>
9692
<StartupHookSupport Condition="'$(StartupHookSupport)' == ''">false</StartupHookSupport>
9793
<UseNativeHttpHandler Condition="'$(UseNativeHttpHandler)' == ''">true</UseNativeHttpHandler>
9894
<_AggressiveAttributeTrimming Condition="'$(_AggressiveAttributeTrimming)' == ''">true</_AggressiveAttributeTrimming>

0 commit comments

Comments
 (0)