diff --git a/Configuration.props b/Configuration.props index 5e87a5827f3..6e3e33186fa 100644 --- a/Configuration.props +++ b/Configuration.props @@ -77,9 +77,9 @@ 6.0.100 - $(DotNetPreviewVersionBand)-preview.1.21109.8 + $(DotNetPreviewVersionBand)-preview.2.21114.3 - 6.0.0-preview.2.21108.2 + 6.0.0-preview.2.21114.2 6.0.0 $(ILLinkVersionBand)-alpha.1.21109.1 $(AndroidToolchainDirectory)\wix\ diff --git a/src/Microsoft.Android.Sdk.ILLink/PreserveLists/System.Private.CoreLib.xml b/src/Microsoft.Android.Sdk.ILLink/PreserveLists/System.Private.CoreLib.xml new file mode 100644 index 00000000000..62a8dd4e979 --- /dev/null +++ b/src/Microsoft.Android.Sdk.ILLink/PreserveLists/System.Private.CoreLib.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/monodroid/jni/embedded-assemblies-zip.cc b/src/monodroid/jni/embedded-assemblies-zip.cc index 42b32e52a8a..09a2aff1c4b 100644 --- a/src/monodroid/jni/embedded-assemblies-zip.cc +++ b/src/monodroid/jni/embedded-assemblies-zip.cc @@ -105,6 +105,7 @@ EmbeddedAssemblies::zip_load_entries (int fd, const char *apk_name, monodroid_sh continue; } +#if !defined(NET6) if (utils.ends_with (file_name, ".config") && bundled_assemblies != nullptr) { char *assembly_name = strdup (basename (file_name)); // Remove '.config' suffix @@ -115,6 +116,7 @@ EmbeddedAssemblies::zip_load_entries (int fd, const char *apk_name, monodroid_sh continue; } +#endif // ndef NET6 if (!utils.ends_with (file_name, ".dll")) continue; diff --git a/src/monodroid/jni/monodroid-glue.cc b/src/monodroid/jni/monodroid-glue.cc index ab5c632ab5e..c501f2d68e1 100644 --- a/src/monodroid/jni/monodroid-glue.cc +++ b/src/monodroid/jni/monodroid-glue.cc @@ -801,10 +801,18 @@ MonodroidRuntime::mono_runtime_init ([[maybe_unused]] dynamic_local_string(mono_jit_set_aot_mode), .mono_aot_register_module = mono_aot_register_module, +#if !defined(NET6) .mono_config_parse_memory = mono_config_parse_memory, +#else + .mono_config_parse_memory = nullptr, +#endif // ndef NET6 .mono_register_machine_config = reinterpret_cast(mono_register_machine_config), }; @@ -813,7 +821,14 @@ MonodroidRuntime::mono_runtime_init ([[maybe_unused]] dynamic_local_string(mono_jit_set_aot_mode)); + mono_mkbundle_init ( + mono_register_bundled_assemblies, +#if defined(NET6) + nullptr, +#else + mono_register_config_for_assembly, +#endif // def NET6 + reinterpret_cast(mono_jit_set_aot_mode)); /* * Assembly preload hooks are invoked in _reverse_ registration order. diff --git a/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs b/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs index e60469c940e..3147b3dd140 100644 --- a/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs +++ b/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs @@ -65,6 +65,11 @@ void Profile (ProjectBuilder builder, Action action, [CallerMemb double GetDurationFromBinLog (ProjectBuilder builder) { + //TODO: BuildEventArgsReader.Read() returns null in .NET 6 Preview 2 + // See: https://github.com/dotnet/msbuild/issues/6225 + if (Builder.UseDotNet) + Assert.Ignore ("Cannot currently parse .binlog files in .NET 6 Preview 2"); + var duration = TimeSpan.Zero; var binlog = Path.Combine (Root, builder.ProjectDirectory, "msbuild.binlog"); FileAssert.Exists (binlog);