Skip to content

Implement Environment.GetEnvironmentVariables for Apple platforms using official API on iOS/tvOS/MacCatalyst #58161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akoeplinger merged 11 commits into from
Aug 27, 2021
Merged

Implement Environment.GetEnvironmentVariables for Apple platforms using official API on iOS/tvOS/MacCatalyst #58161

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7d697e7
Implement mono_icall_get_environment_variable_names for Apple platfor…
filipnavara Aug 26, 2021
33e5b5d
Move environment handling from Mono runtime to System.Native
filipnavara Aug 26, 2021
5eb8dc2
Revert unnecessary changes
filipnavara Aug 26, 2021
3346036
Split pal_environment, remove HAVE_NSGETENVIRON
filipnavara Aug 26, 2021
0e520ab
Bring back _NSGetEnviron
filipnavara Aug 26, 2021
d9f527b
Remove the memory leak
filipnavara Aug 26, 2021
d55d4ad
Fix error with unused variable
filipnavara Aug 26, 2021
30b72b4
Add try-finally block
filipnavara Aug 26, 2021
8759796
Match Windows behavior for duplicate keys
filipnavara Aug 26, 2021
64744d6
Update src/libraries/Native/Unix/System.Native/pal_environment.h
filipnavara Aug 26, 2021
316b2f1
Update src/libraries/Native/Unix/System.Native/pal_environment.h
filipnavara Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert unnecessary changes
  • Loading branch information
@filipnavara
filipnavara committed Aug 26, 2021
commit 5eb8dc2f352ef04fd1fd9d229d55cbbcd2964a00
18 changes: 9 additions & 9 deletions src/mono/mono/metadata/icall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ array_set_value_impl (MonoArrayHandle arr_handle, MonoObjectHandle value_handle,

if (mono_class_is_nullable (ec)) {
if (vc && m_class_is_primitive (vc) && vc != m_class_get_nullable_elem_class (ec)) {
// T -> Nullable<T> T must be exact
// T -> Nullable<T> T must be exact
set_invalid_cast (error, vc, ec);
goto leave;
}
Expand Down Expand Up @@ -3069,11 +3069,11 @@ ves_icall_RuntimeType_GetCorrespondingInflatedMethod (MonoReflectionTypeHandle r
MonoMethod *method;
gpointer iter = NULL;
while ((method = mono_class_get_methods (klass, &iter))) {
if (method->token == generic_method->token) {
if (method->token == generic_method->token) {
ret = mono_method_get_object_handle (method, klass, error);
return_val_if_nok (error, MONO_HANDLE_CAST (MonoReflectionMethod, NULL_HANDLE));
}
}
}

return ret;
}
Expand Down Expand Up @@ -4638,7 +4638,7 @@ g_concat_dir_and_file (const char *dir, const char *file)
g_return_val_if_fail (dir != NULL, NULL);
g_return_val_if_fail (file != NULL, NULL);

/*
/*
* If the directory name doesn't have a / on the end, we need
* to add one so we get a proper path to the file
*/
Expand Down Expand Up @@ -5553,11 +5553,11 @@ ves_icall_AssemblyExtensions_ApplyUpdate (MonoAssembly *assm,
g_assert (image_base);

#ifndef HOST_WASM
if (mono_is_debugger_attached ()) {
mono_error_set_not_supported (error, "Cannot use System.Reflection.Metadata.MetadataUpdater.ApplyChanges while debugger is attached");
mono_error_set_pending_exception (error);
return;
}
if (mono_is_debugger_attached ()) {
mono_error_set_not_supported (error, "Cannot use System.Reflection.Metadata.MetadataUpdater.ApplyChanges while debugger is attached");
mono_error_set_pending_exception (error);
return;
}
#endif

mono_image_load_enc_delta (MONO_ENC_DELTA_API, image_base, dmeta_bytes, dmeta_len, dil_bytes, dil_len, dpdb_bytes, dpdb_len, error);
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/mini/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if(HOST_DARWIN)
set(OS_LIBS "-framework CoreFoundation" "-framework Foundation")

if(CMAKE_SYSTEM_VARIANT STREQUAL "MacCatalyst")
set(OS_LIBS ${OS_LIBS} "-lobjc" "-lc++")
set(OS_LIBS "-lobjc" "-lc++")
endif()
elseif(HOST_IOS)
set(OS_LIBS "-framework CoreFoundation" "-lobjc" "-lc++")
Expand Down