diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index 87082b58d069..be9bc17d3951 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -129,7 +129,8 @@ false false false - false + + true false true false @@ -1462,10 +1463,11 @@ <_NativeExecutableFrameworks Include="CFNetwork" Condition="'$(_PlatformName)' == 'iOS'" /> - + <_MainLinkerFlags Include="-lz" /> <_MainLinkerFlags Include="-liconv" /> <_MainLinkerFlags Include="-lcompression" /> + <_MainLinkerFlags Include="-licucore" /> <_MainLinkerFlags Include="-lobjc" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2feeb8998cbe..aa483f93f6ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,30 +1,30 @@ - + https://github.com/dotnet/installer - 1d730bb539bd28a0963222dd43d50d21f520908d + cc07296328b45ea6721d1c17662c3bc59aaff392 https://github.com/dotnet/runtime cf47d9ff6827a3e1d6f2acbf925cd618418f20dd - + https://github.com/dotnet/runtime - c282395b63c1757d4f4c1dc2e236680cfe2e7f96 + e5bab5fa31aac21633e13f5733a81bf2fae15abf - + https://github.com/dotnet/runtime - c282395b63c1757d4f4c1dc2e236680cfe2e7f96 + e5bab5fa31aac21633e13f5733a81bf2fae15abf - + https://github.com/dotnet/aspnetcore - 496e975d0996c5ad53e374ce3ef74840fa8555c7 + 4ed85056f57c8e64e471b21c8d46a3bbbe697378 - + https://github.com/dotnet/emsdk - 13ad0749b943e56246a8c40aea3e58648dfa0996 + 5cda86493ac07dce11dcb04323d2b57eecff00b7 https://github.com/dotnet/cecil diff --git a/eng/Versions.props b/eng/Versions.props index fb3367a68fd3..3c60f17e3304 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,11 +2,11 @@ - 9.0.100-alpha.1.23619.5 - 9.0.0-alpha.1.23618.7 + 9.0.100-alpha.1.24061.3 + 9.0.0-alpha.1.24060.26 9.0.0-alpha.1.23556.4 6.0.0-beta.21212.6 - 9.0.0-alpha.1.23618.7 + 9.0.0-alpha.1.24060.26 8.0.0-rtm.23511.3 9.0.0-alpha.1.23556.4 7.0.100-alpha.1.21601.1 diff --git a/global.json b/global.json index 907814f1d3ef..2c2e5eb66097 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "9.0.100-alpha.1.23619.5" + "version": "9.0.100-alpha.1.24061.3" } } diff --git a/runtime/Makefile b/runtime/Makefile index 29641e0fba73..a9c8938271a6 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -637,9 +637,9 @@ endef $(foreach platform,$(DOTNET_NATIVEAOT_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),$(eval $(call DotNetNativeAotLibTemplate,$(platform),$(rid))))) # a few lookup tables, because the data we have is not always in the format we need it -DOTNET_iphonesimulator_DYLIB_FLAGS=-lmonosgen-2.0 -licudata -licui18n -licuuc -framework UIKit -DOTNET_iphoneos_DYLIB_FLAGS=-lmonosgen-2.0 -licudata -licui18n -licuuc -framework UIKit -DOTNET_tvsimulator_DYLIB_FLAGS=-lmonosgen-2.0 -licudata -licui18n -licuuc -framework UIKit +DOTNET_iphonesimulator_DYLIB_FLAGS=-lmonosgen-2.0 -framework UIKit +DOTNET_iphoneos_DYLIB_FLAGS=-lmonosgen-2.0 -framework UIKit +DOTNET_tvsimulator_DYLIB_FLAGS=-lmonosgen-2.0 -framework UIKit DOTNET_tvos_DYLIB_FLAGS=-lmonosgen-2.0 -framework UIKit DOTNET_maccatalyst_DYLIB_FLAGS=-lmonosgen-2.0 -framework UIKit DOTNET_mac_DYLIB_FLAGS=-lcoreclr diff --git a/tests/dotnet/UnitTests/BundleStructureTest.cs b/tests/dotnet/UnitTests/BundleStructureTest.cs index 18537a2b66cf..b1b8b611e60b 100644 --- a/tests/dotnet/UnitTests/BundleStructureTest.cs +++ b/tests/dotnet/UnitTests/BundleStructureTest.cs @@ -294,8 +294,6 @@ internal static void CheckAppBundleContents (ApplePlatform platform, IEnumerable expectedFiles.Add (Path.Combine (xpcServicesDirectory, "Subfolder")); // misc other files not directly related to the test itself - if (!isCoreCLR) - expectedFiles.Add (Path.Combine (assemblyDirectory, "icudt.dat")); AddMultiRidAssembly (platform, expectedFiles, assemblyDirectory, "BundleStructure", runtimeIdentifiers, addConfig: true, includeDebugFiles: includeDebugFiles); if (platform != ApplePlatform.MacOSX) AddMultiRidAssembly (platform, expectedFiles, assemblyDirectory, "MonoTouch.Dialog", runtimeIdentifiers, forceSingleRid: true, includeDebugFiles: includeDebugFiles);