Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-3e74f8e9-3f00-4c8f-9965-537c03a27a5a

Author: rolfbjarne

dotnet/targets/Xamarin.Shared.Sdk.targets

@@ -1211,12 +1211,13 @@
 			<_IsDedupEnabled Condition="'$(_IsDedupEnabled)' == '' And '$(_RunAotCompiler)' == 'true' And '$(IsMacEnabled)' == 'true' And '$(TargetArchitectures)' == 'ARM64' And '$(MtouchInterpreter)' != 'all'">true</_IsDedupEnabled>
 			<_DedupAssembly Condition="'$(_IsDedupEnabled)' == 'true'">$(IntermediateOutputPath)aot-instances.dll</_DedupAssembly>
 
-			<!-- This property isn't accurate with CoreCLR, it should probably be renamed to something like '_LibRuntimeLinkMode' at some point -->
-			<_LibMonoLinkMode Condition="'$(_LibMonoLinkMode)' == '' And '$(UseMonoRuntime)' == 'false'">dylib</_LibMonoLinkMode>
 			<!-- default to 'static' for Mac Catalyst to work around https://github.com/dotnet/macios/issues/14686 -->
-			<_LibMonoLinkMode Condition="'$(_LibMonoLinkMode)' == '' And '$(_PlatformName)' == 'MacCatalyst'">static</_LibMonoLinkMode>
-			<_LibMonoLinkMode Condition="'$(_LibMonoLinkMode)' == '' And '$(ComputedPlatform)' != 'iPhone'">dylib</_LibMonoLinkMode>
-			<_LibMonoLinkMode Condition="'$(_LibMonoLinkMode)' == ''">static</_LibMonoLinkMode>
+			<_LibMonoLinkMode Condition="'$(_LibMonoLinkMode)' == '' And '$(_PlatformName)' == 'MacCatalyst' And '$(UseMonoRuntime)' == 'true'">static</_LibMonoLinkMode>
+			<!-- temporarily use 'dylib' for CoreCLR on mobile because we need to implement .dylib -> .framework conversion to use 'static' -->
+			<_LibMonoLinkMode Condition="'$(_LibMonoLinkMode)' == '' And ('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS') And '$(_XamarinRuntime)' == 'CoreCLR'">dylib</_LibMonoLinkMode>
+			<!-- we can't use dylibs for mobile apps when building for device, because the App Store won't allow it -->
+			<_LibMonoLinkMode Condition="'$(_LibMonoLinkMode)' == '' And '$(ComputedPlatform)' == 'iPhone'">static</_LibMonoLinkMode>
+			<_LibMonoLinkMode Condition="'$(_LibMonoLinkMode)' == ''">dylib</_LibMonoLinkMode>
 			<_LibMonoExtension Condition="'$(_LibMonoLinkMode)' == 'dylib'">dylib</_LibMonoExtension>
 			<_LibMonoExtension Condition="'$(_LibMonoLinkMode)' == 'static'">a</_LibMonoExtension>
 

tests/dotnet/UnitTests/expected/iOS-NativeAOT-size.txt

@@ -1,13 +1,8 @@
-AppBundleSize: 3,909,630 bytes (3,818.0 KB = 3.7 MB)
+AppBundleSize: 2,483,703 bytes (2,425.5 KB = 2.4 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
-_CodeSignature/CodeResources: 3,879 bytes (3.8 KB = 0.0 MB)
+_CodeSignature/CodeResources: 2,589 bytes (2.5 KB = 0.0 MB)
 archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
-Info.plist: 1,167 bytes (1.1 KB = 0.0 MB)
-libSystem.Globalization.Native.dylib: 110,512 bytes (107.9 KB = 0.1 MB)
-libSystem.IO.Compression.Native.dylib: 891,856 bytes (871.0 KB = 0.9 MB)
-libSystem.Native.dylib: 163,696 bytes (159.9 KB = 0.2 MB)
-libSystem.Net.Security.Native.dylib: 88,336 bytes (86.3 KB = 0.1 MB)
-libSystem.Security.Cryptography.Native.Apple.dylib: 218,256 bytes (213.1 KB = 0.2 MB)
+Info.plist: 1,138 bytes (1.1 KB = 0.0 MB)
 PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
 runtimeconfig.bin: 1,808 bytes (1.8 KB = 0.0 MB)
-SizeTestApp: 2,429,728 bytes (2,372.8 KB = 2.3 MB)
+SizeTestApp: 2,477,776 bytes (2,419.7 KB = 2.4 MB)