diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskRunSyncTests.cs b/src/libraries/System.Threading.Tasks/tests/Task/TaskRunSyncTests.cs index 281c26d326d9c..0f5a53b21bf54 100644 --- a/src/libraries/System.Threading.Tasks/tests/Task/TaskRunSyncTests.cs +++ b/src/libraries/System.Threading.Tasks/tests/Task/TaskRunSyncTests.cs @@ -524,6 +524,7 @@ public static void TaskRunSyncTest14() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))] [OuterLoop] public static void TaskRunSyncTest15() { @@ -541,6 +542,7 @@ public static void TaskRunSyncTest16() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))] [OuterLoop] public static void TaskRunSyncTest17() { @@ -550,6 +552,7 @@ public static void TaskRunSyncTest17() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))] [OuterLoop] public static void TaskRunSyncTest18() { @@ -558,6 +561,7 @@ public static void TaskRunSyncTest18() test.RealRun(); } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))] [OuterLoop] public static void TaskRunSyncTest19() { @@ -567,6 +571,7 @@ public static void TaskRunSyncTest19() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))] [OuterLoop] public static void TaskRunSyncTest20() { @@ -591,6 +596,7 @@ public static void TaskRunSyncTest22() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))] [OuterLoop] public static void TaskRunSyncTest23() { diff --git a/src/libraries/System.Threading.Tasks/tests/TaskScheduler/TaskSchedulerTests.cs b/src/libraries/System.Threading.Tasks/tests/TaskScheduler/TaskSchedulerTests.cs index 79aaf760e05e1..6acd4be3d9331 100644 --- a/src/libraries/System.Threading.Tasks/tests/TaskScheduler/TaskSchedulerTests.cs +++ b/src/libraries/System.Threading.Tasks/tests/TaskScheduler/TaskSchedulerTests.cs @@ -211,6 +211,7 @@ public static void RunBuggySchedulerTests() [Fact] [OuterLoop] + [ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))] public static void RunSynchronizationContextTaskSchedulerTests() { // Remember the current SynchronizationContext, so that we can restore it diff --git a/src/tasks/AndroidAppBuilder/Templates/monodroid.c b/src/tasks/AndroidAppBuilder/Templates/monodroid.c index 529ccb68cd341..ccd06557e8196 100644 --- a/src/tasks/AndroidAppBuilder/Templates/monodroid.c +++ b/src/tasks/AndroidAppBuilder/Templates/monodroid.c @@ -367,7 +367,7 @@ Java_net_dot_MonoRunner_initRuntime (JNIEnv* env, jobject thiz, jstring j_files_ for (int i = 0; i < args_len; ++i) { jstring j_arg = (*env)->GetObjectArrayElement(env, j_args, i); - managed_argv[i + 1] = (*env)->GetStringUTFChars(env, j_arg, NULL); + managed_argv[i + 1] = (char*)((*env)->GetStringUTFChars(env, j_arg, NULL)); } int res = mono_droid_runtime_init (executable, managed_argc, managed_argv, current_local_time); diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.cs b/src/tasks/AotCompilerTask/MonoAOTCompiler.cs index a7c8518317d1f..ffc95c0d38f2c 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.cs +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.cs @@ -1106,7 +1106,8 @@ private bool GenerateAotModulesTable(IEnumerable assemblies, string[] { writer.WriteLine($"extern void *{symbol};"); } - writer.WriteLine("void register_aot_modules ()"); + writer.WriteLine("void register_aot_modules (void);"); + writer.WriteLine("void register_aot_modules (void)"); writer.WriteLine("{"); foreach (var symbol in symbols) { @@ -1142,6 +1143,7 @@ private bool GenerateAotModulesTable(IEnumerable assemblies, string[] writer.WriteLine($"extern void *{symbol};"); } + writer.WriteLine("void register_aot_modules (void);"); writer.WriteLine("void register_aot_modules (void)"); writer.WriteLine("{"); foreach (var symbol in symbols)