Reorganize libs.native (#61958)
authorAdeel Mujahid <3840695+am11@users.noreply.github.com>
Wed, 24 Nov 2021 22:47:45 +0000 (00:47 +0200)
committerGitHub <noreply@github.com>
Wed, 24 Nov 2021 22:47:45 +0000 (14:47 -0800)
* Reorganize libs.native

* Fix darwin build

* Fix wasm-win32 build

* Fix pipelines path evaluation

472 files changed:
docs/workflow/building/libraries/README.md
eng/Subsets.props
eng/native/configurecompiler.cmake
eng/native/configurepaths.cmake
eng/pipelines/common/evaluate-default-paths.yml
eng/pipelines/libraries/enterprise/linux.yml
src/coreclr/CMakeLists.txt
src/coreclr/vm/CMakeLists.txt
src/libraries/Native/Unix/.clang-format [deleted file]
src/libraries/Native/Unix/CMakeLists.txt [deleted file]
src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt [deleted file]
src/libraries/Native/Windows/CMakeLists.txt [deleted file]
src/libraries/Native/Windows/System.IO.Compression.Native/CMakeLists.txt [deleted file]
src/libraries/native-binplace.proj [moved from src/libraries/Native/native-binplace.proj with 100% similarity]
src/mono/CMakeLists.txt
src/mono/Directory.Build.props
src/mono/mono/mini/CMakeLists.txt
src/mono/wasm/Makefile
src/mono/wasm/wasm.proj
src/native/corehost/apphost/static/CMakeLists.txt
src/native/libs/CMakeLists.txt [new file with mode: 0644]
src/native/libs/Common/pal_atomic.h [moved from src/libraries/Native/Unix/Common/pal_atomic.h with 100% similarity]
src/native/libs/Common/pal_compiler.h [moved from src/libraries/Native/Unix/Common/pal_compiler.h with 100% similarity]
src/native/libs/Common/pal_config.h.in [moved from src/libraries/Native/Unix/Common/pal_config.h.in with 100% similarity]
src/native/libs/Common/pal_error_common.h [moved from src/libraries/Native/Unix/Common/pal_error_common.h with 100% similarity]
src/native/libs/Common/pal_io_common.h [moved from src/libraries/Native/Unix/Common/pal_io_common.h with 100% similarity]
src/native/libs/Common/pal_networking_common.h [moved from src/libraries/Native/Unix/Common/pal_networking_common.h with 100% similarity]
src/native/libs/Common/pal_safecrt.h [moved from src/libraries/Native/Unix/Common/pal_safecrt.h with 100% similarity]
src/native/libs/Common/pal_ssl_types.h [moved from src/libraries/Native/Unix/Common/pal_ssl_types.h with 100% similarity]
src/native/libs/Common/pal_types.h [moved from src/libraries/Native/Unix/Common/pal_types.h with 100% similarity]
src/native/libs/Common/pal_utilities.h [moved from src/libraries/Native/Unix/Common/pal_utilities.h with 100% similarity]
src/native/libs/Common/pal_x509_types.h [moved from src/libraries/Native/Unix/Common/pal_x509_types.h with 100% similarity]
src/native/libs/System.Globalization.Native/CMakeLists.txt [moved from src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt with 100% similarity]
src/native/libs/System.Globalization.Native/config.h.in [moved from src/libraries/Native/Unix/System.Globalization.Native/config.h.in with 100% similarity]
src/native/libs/System.Globalization.Native/configure.cmake [moved from src/libraries/Native/Unix/System.Globalization.Native/configure.cmake with 100% similarity]
src/native/libs/System.Globalization.Native/entrypoints.c [moved from src/libraries/Native/Unix/System.Globalization.Native/entrypoints.c with 100% similarity]
src/native/libs/System.Globalization.Native/pal_calendarData.c [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_calendarData.c with 100% similarity]
src/native/libs/System.Globalization.Native/pal_calendarData.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_calendarData.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_casing.c [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_casing.c with 100% similarity]
src/native/libs/System.Globalization.Native/pal_casing.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_casing.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_collation.c [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_collation.c with 100% similarity]
src/native/libs/System.Globalization.Native/pal_collation.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_collation.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_errors.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_errors.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_errors_internal.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_errors_internal.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_icushim.c [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c with 100% similarity]
src/native/libs/System.Globalization.Native/pal_icushim.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_icushim_internal.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_icushim_internal.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_icushim_internal_android.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_icushim_internal_android.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_icushim_static.c [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_icushim_static.c with 100% similarity]
src/native/libs/System.Globalization.Native/pal_idna.c [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_idna.c with 100% similarity]
src/native/libs/System.Globalization.Native/pal_idna.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_idna.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_locale.c [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_locale.c with 100% similarity]
src/native/libs/System.Globalization.Native/pal_locale.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_locale.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_localeNumberData.c [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_localeNumberData.c with 100% similarity]
src/native/libs/System.Globalization.Native/pal_localeNumberData.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_localeNumberData.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_localeStringData.c [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_localeStringData.c with 100% similarity]
src/native/libs/System.Globalization.Native/pal_localeStringData.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_localeStringData.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_locale_internal.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_locale_internal.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_normalization.c [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_normalization.c with 100% similarity]
src/native/libs/System.Globalization.Native/pal_normalization.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_normalization.h with 100% similarity]
src/native/libs/System.Globalization.Native/pal_timeZoneInfo.c [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_timeZoneInfo.c with 100% similarity]
src/native/libs/System.Globalization.Native/pal_timeZoneInfo.h [moved from src/libraries/Native/Unix/System.Globalization.Native/pal_timeZoneInfo.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/CMakeLists.txt [new file with mode: 0644]
src/native/libs/System.IO.Compression.Native/Native.rc [moved from src/libraries/Native/Windows/System.IO.Compression.Native/Native.rc with 100% similarity]
src/native/libs/System.IO.Compression.Native/System.IO.Compression.Native.def [moved from src/libraries/Native/Windows/System.IO.Compression.Native/System.IO.Compression.Native.def with 100% similarity]
src/native/libs/System.IO.Compression.Native/System.IO.Compression.Native_unixexports.src [moved from src/libraries/Native/Unix/System.IO.Compression.Native/System.IO.Compression.Native_unixexports.src with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli-version.txt [moved from src/libraries/Native/AnyOS/brotli-version.txt with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/common/constants.c [moved from src/libraries/Native/AnyOS/brotli/common/constants.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/common/constants.h [moved from src/libraries/Native/AnyOS/brotli/common/constants.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/common/context.c [moved from src/libraries/Native/AnyOS/brotli/common/context.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/common/context.h [moved from src/libraries/Native/AnyOS/brotli/common/context.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/common/dictionary.bin [moved from src/libraries/Native/AnyOS/brotli/common/dictionary.bin with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/common/dictionary.bin.br [moved from src/libraries/Native/AnyOS/brotli/common/dictionary.bin.br with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/common/dictionary.c [moved from src/libraries/Native/AnyOS/brotli/common/dictionary.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/common/dictionary.h [moved from src/libraries/Native/AnyOS/brotli/common/dictionary.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/common/platform.c [moved from src/libraries/Native/AnyOS/brotli/common/platform.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/common/platform.h [moved from src/libraries/Native/AnyOS/brotli/common/platform.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/common/transform.c [moved from src/libraries/Native/AnyOS/brotli/common/transform.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/common/transform.h [moved from src/libraries/Native/AnyOS/brotli/common/transform.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/common/version.h [moved from src/libraries/Native/AnyOS/brotli/common/version.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/dec/bit_reader.c [moved from src/libraries/Native/AnyOS/brotli/dec/bit_reader.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/dec/bit_reader.h [moved from src/libraries/Native/AnyOS/brotli/dec/bit_reader.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/dec/decode.c [moved from src/libraries/Native/AnyOS/brotli/dec/decode.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/dec/huffman.c [moved from src/libraries/Native/AnyOS/brotli/dec/huffman.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/dec/huffman.h [moved from src/libraries/Native/AnyOS/brotli/dec/huffman.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/dec/prefix.h [moved from src/libraries/Native/AnyOS/brotli/dec/prefix.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/dec/state.c [moved from src/libraries/Native/AnyOS/brotli/dec/state.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/dec/state.h [moved from src/libraries/Native/AnyOS/brotli/dec/state.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/backward_references.c [moved from src/libraries/Native/AnyOS/brotli/enc/backward_references.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/backward_references.h [moved from src/libraries/Native/AnyOS/brotli/enc/backward_references.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/backward_references_hq.c [moved from src/libraries/Native/AnyOS/brotli/enc/backward_references_hq.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/backward_references_hq.h [moved from src/libraries/Native/AnyOS/brotli/enc/backward_references_hq.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/backward_references_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/backward_references_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/bit_cost.c [moved from src/libraries/Native/AnyOS/brotli/enc/bit_cost.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/bit_cost.h [moved from src/libraries/Native/AnyOS/brotli/enc/bit_cost.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/bit_cost_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/bit_cost_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/block_encoder_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/block_encoder_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/block_splitter.c [moved from src/libraries/Native/AnyOS/brotli/enc/block_splitter.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/block_splitter.h [moved from src/libraries/Native/AnyOS/brotli/enc/block_splitter.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/block_splitter_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/block_splitter_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/brotli_bit_stream.c [moved from src/libraries/Native/AnyOS/brotli/enc/brotli_bit_stream.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/brotli_bit_stream.h [moved from src/libraries/Native/AnyOS/brotli/enc/brotli_bit_stream.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/cluster.c [moved from src/libraries/Native/AnyOS/brotli/enc/cluster.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/cluster.h [moved from src/libraries/Native/AnyOS/brotli/enc/cluster.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/cluster_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/cluster_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/command.c [moved from src/libraries/Native/AnyOS/brotli/enc/command.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/command.h [moved from src/libraries/Native/AnyOS/brotli/enc/command.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/compress_fragment.c [moved from src/libraries/Native/AnyOS/brotli/enc/compress_fragment.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/compress_fragment.h [moved from src/libraries/Native/AnyOS/brotli/enc/compress_fragment.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/compress_fragment_two_pass.c [moved from src/libraries/Native/AnyOS/brotli/enc/compress_fragment_two_pass.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/compress_fragment_two_pass.h [moved from src/libraries/Native/AnyOS/brotli/enc/compress_fragment_two_pass.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/dictionary_hash.c [moved from src/libraries/Native/AnyOS/brotli/enc/dictionary_hash.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/dictionary_hash.h [moved from src/libraries/Native/AnyOS/brotli/enc/dictionary_hash.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/encode.c [moved from src/libraries/Native/AnyOS/brotli/enc/encode.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/encoder_dict.c [moved from src/libraries/Native/AnyOS/brotli/enc/encoder_dict.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/encoder_dict.h [moved from src/libraries/Native/AnyOS/brotli/enc/encoder_dict.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/entropy_encode.c [moved from src/libraries/Native/AnyOS/brotli/enc/entropy_encode.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/entropy_encode.h [moved from src/libraries/Native/AnyOS/brotli/enc/entropy_encode.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/entropy_encode_static.h [moved from src/libraries/Native/AnyOS/brotli/enc/entropy_encode_static.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/fast_log.c [moved from src/libraries/Native/AnyOS/brotli/enc/fast_log.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/fast_log.h [moved from src/libraries/Native/AnyOS/brotli/enc/fast_log.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/find_match_length.h [moved from src/libraries/Native/AnyOS/brotli/enc/find_match_length.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/hash.h [moved from src/libraries/Native/AnyOS/brotli/enc/hash.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/hash_composite_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/hash_composite_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/hash_forgetful_chain_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/hash_forgetful_chain_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/hash_longest_match64_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/hash_longest_match64_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/hash_longest_match_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/hash_longest_match_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/hash_longest_match_quickly_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/hash_longest_match_quickly_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/hash_rolling_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/hash_rolling_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/hash_to_binary_tree_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/hash_to_binary_tree_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/histogram.c [moved from src/libraries/Native/AnyOS/brotli/enc/histogram.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/histogram.h [moved from src/libraries/Native/AnyOS/brotli/enc/histogram.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/histogram_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/histogram_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/literal_cost.c [moved from src/libraries/Native/AnyOS/brotli/enc/literal_cost.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/literal_cost.h [moved from src/libraries/Native/AnyOS/brotli/enc/literal_cost.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/memory.c [moved from src/libraries/Native/AnyOS/brotli/enc/memory.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/memory.h [moved from src/libraries/Native/AnyOS/brotli/enc/memory.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/metablock.c [moved from src/libraries/Native/AnyOS/brotli/enc/metablock.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/metablock.h [moved from src/libraries/Native/AnyOS/brotli/enc/metablock.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/metablock_inc.h [moved from src/libraries/Native/AnyOS/brotli/enc/metablock_inc.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/params.h [moved from src/libraries/Native/AnyOS/brotli/enc/params.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/prefix.h [moved from src/libraries/Native/AnyOS/brotli/enc/prefix.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/quality.h [moved from src/libraries/Native/AnyOS/brotli/enc/quality.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/ringbuffer.h [moved from src/libraries/Native/AnyOS/brotli/enc/ringbuffer.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/static_dict.c [moved from src/libraries/Native/AnyOS/brotli/enc/static_dict.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/static_dict.h [moved from src/libraries/Native/AnyOS/brotli/enc/static_dict.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/static_dict_lut.h [moved from src/libraries/Native/AnyOS/brotli/enc/static_dict_lut.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/utf8_util.c [moved from src/libraries/Native/AnyOS/brotli/enc/utf8_util.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/utf8_util.h [moved from src/libraries/Native/AnyOS/brotli/enc/utf8_util.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/enc/write_bits.h [moved from src/libraries/Native/AnyOS/brotli/enc/write_bits.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/fuzz/decode_fuzzer.c [moved from src/libraries/Native/AnyOS/brotli/fuzz/decode_fuzzer.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/fuzz/run_decode_fuzzer.c [moved from src/libraries/Native/AnyOS/brotli/fuzz/run_decode_fuzzer.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/fuzz/test_fuzzer.sh [moved from src/libraries/Native/AnyOS/brotli/fuzz/test_fuzzer.sh with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/include/brotli/decode.h [moved from src/libraries/Native/AnyOS/brotli/include/brotli/decode.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/include/brotli/encode.h [moved from src/libraries/Native/AnyOS/brotli/include/brotli/encode.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/include/brotli/port.h [moved from src/libraries/Native/AnyOS/brotli/include/brotli/port.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/include/brotli/types.h [moved from src/libraries/Native/AnyOS/brotli/include/brotli/types.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/tools/brotli.c [moved from src/libraries/Native/AnyOS/brotli/tools/brotli.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/brotli/tools/brotli.md [moved from src/libraries/Native/AnyOS/brotli/tools/brotli.md with 100% similarity]
src/native/libs/System.IO.Compression.Native/entrypoints.c [moved from src/libraries/Native/AnyOS/System.IO.Compression.Native/entrypoints.c with 87% similarity]
src/native/libs/System.IO.Compression.Native/extra_libs.cmake [moved from src/libraries/Native/Unix/System.IO.Compression.Native/extra_libs.cmake with 100% similarity]
src/native/libs/System.IO.Compression.Native/pal_zlib.c [moved from src/libraries/Native/AnyOS/zlib/pal_zlib.c with 98% similarity]
src/native/libs/System.IO.Compression.Native/pal_zlib.h [moved from src/libraries/Native/AnyOS/zlib/pal_zlib.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/README.txt [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/README.txt with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/adler32.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/adler32.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/compress.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/compress.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/crc32.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/crc32.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/crc32.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/crc32.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/crc_folding.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/crc_folding.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/deflate.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/deflate.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/deflate.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/deflate.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/deflate_medium.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/deflate_medium.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/deflate_quick.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/deflate_quick.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/gzguts.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/gzguts.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/inffast.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inffast.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/inffast.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inffast.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/inffixed.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inffixed.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/inflate.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inflate.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/inflate.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inflate.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/inftrees.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inftrees.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/inftrees.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inftrees.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/match.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/match.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/slide_sse.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/slide_sse.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/trees.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/trees.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/trees.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/trees.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/x86.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/x86.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/x86.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/x86.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/zconf.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zconf.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/zlib.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/zlib.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/zutil.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/zutil.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib-intel/zutil.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/zutil.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib.md [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib.md with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/CMakeLists.txt [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/CMakeLists.txt with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/ChangeLog [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/ChangeLog with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/FAQ [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/FAQ with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/INDEX [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/INDEX with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/Makefile [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/Makefile with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/Makefile.in [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/Makefile.in with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/README [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/README with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/adler32.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/adler32.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/compress.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/compress.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/configure [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/configure with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/crc32.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/crc32.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/crc32.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/crc32.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/deflate.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/deflate.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/deflate.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/deflate.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/gzclose.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzclose.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/gzguts.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzguts.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/gzlib.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzlib.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/gzread.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzread.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/gzwrite.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzwrite.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/infback.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/infback.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/inffast.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inffast.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/inffast.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inffast.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/inffixed.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inffixed.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/inflate.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inflate.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/inflate.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inflate.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/inftrees.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inftrees.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/inftrees.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inftrees.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/make_vms.com [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/make_vms.com with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/treebuild.xml [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/treebuild.xml with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/trees.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/trees.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/trees.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/trees.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/uncompr.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/uncompr.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/zconf.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/zconf.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/zconf.h.cmakein [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zconf.h.cmakein with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/zconf.h.in [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zconf.h.in with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/zlib.3 [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.3 with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/zlib.3.pdf [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.3.pdf with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/zlib.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.h with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/zlib.map [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.map with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/zlib.pc.cmakein [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.pc.cmakein with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/zlib.pc.in [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.pc.in with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/zlib2ansi [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib2ansi with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/zutil.c [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zutil.c with 100% similarity]
src/native/libs/System.IO.Compression.Native/zlib/zutil.h [moved from src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zutil.h with 100% similarity]
src/native/libs/System.IO.Ports.Native/CMakeLists.txt [moved from src/libraries/Native/Unix/System.IO.Ports.Native/CMakeLists.txt with 100% similarity]
src/native/libs/System.IO.Ports.Native/pal_serial.c [moved from src/libraries/Native/Unix/System.IO.Ports.Native/pal_serial.c with 100% similarity]
src/native/libs/System.IO.Ports.Native/pal_serial.h [moved from src/libraries/Native/Unix/System.IO.Ports.Native/pal_serial.h with 100% similarity]
src/native/libs/System.IO.Ports.Native/pal_termios.c [moved from src/libraries/Native/Unix/System.IO.Ports.Native/pal_termios.c with 100% similarity]
src/native/libs/System.IO.Ports.Native/pal_termios.h [moved from src/libraries/Native/Unix/System.IO.Ports.Native/pal_termios.h with 100% similarity]
src/native/libs/System.Native/CMakeLists.txt [moved from src/libraries/Native/Unix/System.Native/CMakeLists.txt with 100% similarity]
src/native/libs/System.Native/entrypoints.c [moved from src/libraries/Native/Unix/System.Native/entrypoints.c with 100% similarity]
src/native/libs/System.Native/extra_libs.cmake [moved from src/libraries/Native/Unix/System.Native/extra_libs.cmake with 100% similarity]
src/native/libs/System.Native/ios/net/if_media.h [moved from src/libraries/Native/Unix/System.Native/ios/net/if_media.h with 100% similarity]
src/native/libs/System.Native/ios/net/route.h [moved from src/libraries/Native/Unix/System.Native/ios/net/route.h with 100% similarity]
src/native/libs/System.Native/ios/netinet/icmp_var.h [moved from src/libraries/Native/Unix/System.Native/ios/netinet/icmp_var.h with 100% similarity]
src/native/libs/System.Native/ios/netinet/ip_var.h [moved from src/libraries/Native/Unix/System.Native/ios/netinet/ip_var.h with 100% similarity]
src/native/libs/System.Native/ios/netinet/tcp_fsm.h [moved from src/libraries/Native/Unix/System.Native/ios/netinet/tcp_fsm.h with 100% similarity]
src/native/libs/System.Native/ios/netinet/udp_var.h [moved from src/libraries/Native/Unix/System.Native/ios/netinet/udp_var.h with 100% similarity]
src/native/libs/System.Native/pal_autoreleasepool.c [moved from src/libraries/Native/Unix/System.Native/pal_autoreleasepool.c with 100% similarity]
src/native/libs/System.Native/pal_autoreleasepool.h [moved from src/libraries/Native/Unix/System.Native/pal_autoreleasepool.h with 100% similarity]
src/native/libs/System.Native/pal_autoreleasepool.m [moved from src/libraries/Native/Unix/System.Native/pal_autoreleasepool.m with 100% similarity]
src/native/libs/System.Native/pal_console.c [moved from src/libraries/Native/Unix/System.Native/pal_console.c with 100% similarity]
src/native/libs/System.Native/pal_console.h [moved from src/libraries/Native/Unix/System.Native/pal_console.h with 100% similarity]
src/native/libs/System.Native/pal_datetime.c [moved from src/libraries/Native/Unix/System.Native/pal_datetime.c with 100% similarity]
src/native/libs/System.Native/pal_datetime.h [moved from src/libraries/Native/Unix/System.Native/pal_datetime.h with 100% similarity]
src/native/libs/System.Native/pal_environment.c [moved from src/libraries/Native/Unix/System.Native/pal_environment.c with 100% similarity]
src/native/libs/System.Native/pal_environment.h [moved from src/libraries/Native/Unix/System.Native/pal_environment.h with 100% similarity]
src/native/libs/System.Native/pal_environment.m [moved from src/libraries/Native/Unix/System.Native/pal_environment.m with 100% similarity]
src/native/libs/System.Native/pal_errno.c [moved from src/libraries/Native/Unix/System.Native/pal_errno.c with 100% similarity]
src/native/libs/System.Native/pal_errno.h [moved from src/libraries/Native/Unix/System.Native/pal_errno.h with 100% similarity]
src/native/libs/System.Native/pal_interfaceaddresses.c [moved from src/libraries/Native/Unix/System.Native/pal_interfaceaddresses.c with 100% similarity]
src/native/libs/System.Native/pal_interfaceaddresses.h [moved from src/libraries/Native/Unix/System.Native/pal_interfaceaddresses.h with 100% similarity]
src/native/libs/System.Native/pal_io.c [moved from src/libraries/Native/Unix/System.Native/pal_io.c with 100% similarity]
src/native/libs/System.Native/pal_io.h [moved from src/libraries/Native/Unix/System.Native/pal_io.h with 100% similarity]
src/native/libs/System.Native/pal_iossupportversion.c [moved from src/libraries/Native/Unix/System.Native/pal_iossupportversion.c with 100% similarity]
src/native/libs/System.Native/pal_iossupportversion.h [moved from src/libraries/Native/Unix/System.Native/pal_iossupportversion.h with 100% similarity]
src/native/libs/System.Native/pal_iossupportversion.m [moved from src/libraries/Native/Unix/System.Native/pal_iossupportversion.m with 100% similarity]
src/native/libs/System.Native/pal_log.c [moved from src/libraries/Native/Unix/System.Native/pal_log.c with 100% similarity]
src/native/libs/System.Native/pal_log.h [moved from src/libraries/Native/Unix/System.Native/pal_log.h with 100% similarity]
src/native/libs/System.Native/pal_log.m [moved from src/libraries/Native/Unix/System.Native/pal_log.m with 100% similarity]
src/native/libs/System.Native/pal_maphardwaretype.c [moved from src/libraries/Native/Unix/System.Native/pal_maphardwaretype.c with 100% similarity]
src/native/libs/System.Native/pal_maphardwaretype.h [moved from src/libraries/Native/Unix/System.Native/pal_maphardwaretype.h with 100% similarity]
src/native/libs/System.Native/pal_memory.c [moved from src/libraries/Native/Unix/System.Native/pal_memory.c with 100% similarity]
src/native/libs/System.Native/pal_memory.h [moved from src/libraries/Native/Unix/System.Native/pal_memory.h with 100% similarity]
src/native/libs/System.Native/pal_mount.c [moved from src/libraries/Native/Unix/System.Native/pal_mount.c with 100% similarity]
src/native/libs/System.Native/pal_mount.h [moved from src/libraries/Native/Unix/System.Native/pal_mount.h with 100% similarity]
src/native/libs/System.Native/pal_networkchange.c [moved from src/libraries/Native/Unix/System.Native/pal_networkchange.c with 100% similarity]
src/native/libs/System.Native/pal_networkchange.h [moved from src/libraries/Native/Unix/System.Native/pal_networkchange.h with 100% similarity]
src/native/libs/System.Native/pal_networking.c [moved from src/libraries/Native/Unix/System.Native/pal_networking.c with 100% similarity]
src/native/libs/System.Native/pal_networking.h [moved from src/libraries/Native/Unix/System.Native/pal_networking.h with 100% similarity]
src/native/libs/System.Native/pal_networkstatistics.c [moved from src/libraries/Native/Unix/System.Native/pal_networkstatistics.c with 100% similarity]
src/native/libs/System.Native/pal_networkstatistics.h [moved from src/libraries/Native/Unix/System.Native/pal_networkstatistics.h with 100% similarity]
src/native/libs/System.Native/pal_process.c [moved from src/libraries/Native/Unix/System.Native/pal_process.c with 100% similarity]
src/native/libs/System.Native/pal_process.h [moved from src/libraries/Native/Unix/System.Native/pal_process.h with 100% similarity]
src/native/libs/System.Native/pal_random.c [moved from src/libraries/Native/Unix/System.Native/pal_random.c with 100% similarity]
src/native/libs/System.Native/pal_random.h [moved from src/libraries/Native/Unix/System.Native/pal_random.h with 100% similarity]
src/native/libs/System.Native/pal_random.js [moved from src/libraries/Native/Unix/System.Native/pal_random.js with 100% similarity]
src/native/libs/System.Native/pal_runtimeextensions.c [moved from src/libraries/Native/Unix/System.Native/pal_runtimeextensions.c with 100% similarity]
src/native/libs/System.Native/pal_runtimeextensions.h [moved from src/libraries/Native/Unix/System.Native/pal_runtimeextensions.h with 100% similarity]
src/native/libs/System.Native/pal_runtimeinformation.c [moved from src/libraries/Native/Unix/System.Native/pal_runtimeinformation.c with 100% similarity]
src/native/libs/System.Native/pal_runtimeinformation.h [moved from src/libraries/Native/Unix/System.Native/pal_runtimeinformation.h with 100% similarity]
src/native/libs/System.Native/pal_searchpath.c [moved from src/libraries/Native/Unix/System.Native/pal_searchpath.c with 100% similarity]
src/native/libs/System.Native/pal_searchpath.h [moved from src/libraries/Native/Unix/System.Native/pal_searchpath.h with 100% similarity]
src/native/libs/System.Native/pal_searchpath.m [moved from src/libraries/Native/Unix/System.Native/pal_searchpath.m with 100% similarity]
src/native/libs/System.Native/pal_signal.c [moved from src/libraries/Native/Unix/System.Native/pal_signal.c with 100% similarity]
src/native/libs/System.Native/pal_signal.h [moved from src/libraries/Native/Unix/System.Native/pal_signal.h with 100% similarity]
src/native/libs/System.Native/pal_string.c [moved from src/libraries/Native/Unix/System.Native/pal_string.c with 100% similarity]
src/native/libs/System.Native/pal_string.h [moved from src/libraries/Native/Unix/System.Native/pal_string.h with 100% similarity]
src/native/libs/System.Native/pal_sysctl.c [moved from src/libraries/Native/Unix/System.Native/pal_sysctl.c with 100% similarity]
src/native/libs/System.Native/pal_sysctl.h [moved from src/libraries/Native/Unix/System.Native/pal_sysctl.h with 100% similarity]
src/native/libs/System.Native/pal_tcpstate.c [moved from src/libraries/Native/Unix/System.Native/pal_tcpstate.c with 100% similarity]
src/native/libs/System.Native/pal_tcpstate.h [moved from src/libraries/Native/Unix/System.Native/pal_tcpstate.h with 100% similarity]
src/native/libs/System.Native/pal_threading.c [moved from src/libraries/Native/Unix/System.Native/pal_threading.c with 100% similarity]
src/native/libs/System.Native/pal_threading.h [moved from src/libraries/Native/Unix/System.Native/pal_threading.h with 100% similarity]
src/native/libs/System.Native/pal_time.c [moved from src/libraries/Native/Unix/System.Native/pal_time.c with 100% similarity]
src/native/libs/System.Native/pal_time.h [moved from src/libraries/Native/Unix/System.Native/pal_time.h with 100% similarity]
src/native/libs/System.Native/pal_uid.c [moved from src/libraries/Native/Unix/System.Native/pal_uid.c with 100% similarity]
src/native/libs/System.Native/pal_uid.h [moved from src/libraries/Native/Unix/System.Native/pal_uid.h with 100% similarity]
src/native/libs/System.Net.Security.Native/CMakeLists.txt [moved from src/libraries/Native/Unix/System.Net.Security.Native/CMakeLists.txt with 100% similarity]
src/native/libs/System.Net.Security.Native/entrypoints.c [moved from src/libraries/Native/Unix/System.Net.Security.Native/entrypoints.c with 100% similarity]
src/native/libs/System.Net.Security.Native/extra_libs.cmake [moved from src/libraries/Native/Unix/System.Net.Security.Native/extra_libs.cmake with 100% similarity]
src/native/libs/System.Net.Security.Native/pal_gssapi.c [moved from src/libraries/Native/Unix/System.Net.Security.Native/pal_gssapi.c with 100% similarity]
src/native/libs/System.Net.Security.Native/pal_gssapi.h [moved from src/libraries/Native/Unix/System.Net.Security.Native/pal_gssapi.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/CMakeLists.txt [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/CMakeLists.txt with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_bignum.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_bignum.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_bignum.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_bignum.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_cipher.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_cipher.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_cipher.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_cipher.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_dsa.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_dsa.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_dsa.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_dsa.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_ecc_import_export.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_ecc_import_export.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_ecc_import_export.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_ecc_import_export.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_ecdh.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_ecdh.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_ecdh.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_ecdh.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_ecdsa.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_ecdsa.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_ecdsa.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_ecdsa.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_eckey.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_eckey.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_eckey.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_eckey.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_err.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_err.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_err.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_err.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_evp.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_evp.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_evp.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_evp.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_hmac.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_hmac.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_hmac.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_hmac.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_jni.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_jni.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_jni.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_lifetime.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_lifetime.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_lifetime.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_lifetime.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_memory.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_memory.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_misc.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_misc.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_misc.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_misc.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_rsa.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_rsa.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_rsa.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_rsa.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_signature.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_signature.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_signature.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_signature.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_ssl.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_ssl.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_ssl.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_ssl.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_sslstream.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_sslstream.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_x509.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_x509.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_x509.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_x509.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_x509chain.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_x509chain.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_x509chain.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_x509chain.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_x509store.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_x509store.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Android/pal_x509store.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/pal_x509store.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/CMakeLists.txt with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/entrypoints.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/entrypoints.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/extra_libs.cmake [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/extra_libs.cmake with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_digest.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_digest.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_digest.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_digest.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_ecc.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ecc.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_ecc.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ecc.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_hmac.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_hmac.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_hmac.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_hmac.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_keyagree.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keyagree.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_keyagree.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keyagree.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_keychain_ios.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain_ios.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_keychain_ios.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain_ios.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_keychain_macos.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain_macos.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_keychain_macos.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keychain_macos.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_keyderivation_macos.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keyderivation_macos.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_keyderivation_macos.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_keyderivation_macos.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_random.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_random.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_random.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_random.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_rsa.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_rsa.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_rsa.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_sec.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_sec.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_sec.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_sec.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_seckey.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_seckey.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_seckey_macos.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey_macos.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_seckey_macos.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_seckey_macos.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_signverify.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_signverify.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_signverify.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_signverify.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_ssl.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_ssl.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_symmetric.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_symmetric.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_symmetric.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_symmetric.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_trust_macos.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_trust_macos.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_trust_macos.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_trust_macos.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_x509.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_x509.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_x509_ios.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509_ios.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_x509_ios.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509_ios.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_x509_macos.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509_macos.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_x509_macos.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509_macos.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_x509chain.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native.Apple/pal_x509chain.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/CMakeLists.txt [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/apibridge.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/apibridge.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/apibridge.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/apibridge.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/apibridge_30.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/apibridge_30.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/apibridge_30.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/apibridge_30.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/apibridge_30_rev.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/apibridge_30_rev.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/configure.cmake [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/configure.cmake with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/entrypoints.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/entrypoints.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/extra_libs.cmake [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/extra_libs.cmake with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/openssl.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/openssl.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/openssl.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/openssl.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/openssl_1_0_structs.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/openssl_1_0_structs.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/opensslshim.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/opensslshim.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/osslcompat_102.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/osslcompat_102.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/osslcompat_111.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/osslcompat_111.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/osslcompat_30.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/osslcompat_30.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_asn1.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_asn1.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_asn1.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_asn1.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_bignum.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_bignum.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_bignum.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_bignum.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_bio.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_bio.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_bio.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_bio.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_crypto_config.h.in [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_crypto_config.h.in with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_crypto_types.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_crypto_types.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_dsa.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_dsa.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_dsa.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_dsa.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_ecc_import_export.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_ecc_import_export.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_ecc_import_export.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_ecc_import_export.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_ecdsa.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_ecdsa.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_ecdsa.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_ecdsa.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_eckey.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_eckey.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_eckey.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_eckey.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_err.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_err.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_err.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_err.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp_cipher.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_cipher.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp_cipher.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_cipher.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_dsa.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_dsa.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_dsa.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_dsa.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_ecdh.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_ecdh.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_ecdh.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_ecdh.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_eckey.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_eckey.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_eckey.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_eckey.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_hmac.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_hmac.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_hmac.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_hmac.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_ocsp.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_ocsp.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_ocsp.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_ocsp.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_pkcs7.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_pkcs7.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_pkcs7.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_pkcs7.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_ssl.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_ssl.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_ssl.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_ssl.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_x509.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_x509.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_x509.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_x509.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_x509_name.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_x509_name.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_x509_name.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_x509_name.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_x509_root.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_x509_root.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_x509_root.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_x509_root.h with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_x509ext.c [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_x509ext.c with 100% similarity]
src/native/libs/System.Security.Cryptography.Native/pal_x509ext.h [moved from src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_x509ext.h with 100% similarity]
src/native/libs/build-native.cmd [moved from src/libraries/Native/build-native.cmd with 93% similarity]
src/native/libs/build-native.proj [moved from src/libraries/Native/build-native.proj with 97% similarity]
src/native/libs/build-native.sh [moved from src/libraries/Native/build-native.sh with 99% similarity]
src/native/libs/configure.cmake [moved from src/libraries/Native/Unix/configure.cmake with 100% similarity]
src/native/libs/format-code.py [moved from src/libraries/Native/Unix/format-code.py with 100% similarity]
src/native/libs/verify-entrypoints.sh [moved from src/libraries/Native/Unix/verify-entrypoints.sh with 100% similarity]
src/native/libs/verify-so.sh [moved from src/libraries/Native/Unix/verify-so.sh with 100% similarity]

index 0b0e4fc..9d2cd6f 100644 (file)
@@ -111,12 +111,12 @@ The libraries build contains some native code. This includes shims over libc, op
 
 - Building in debug mode for platform x64
 ```bash
-./src/libraries/Native/build-native.sh debug x64
+./src/native/libs/build-native.sh debug x64
 ```
 
 - The following example shows how you would do an arm cross-compile build
 ```bash
-./src/libraries/Native/build-native.sh debug arm cross verbose
+./src/native/libs/build-native.sh debug arm cross verbose
 ```
 
 For Windows, replace `build-native.sh` with `build-native.cmd`.
index 03dc4a5..65da9d8 100644 (file)
 
   <!-- Libraries sets -->
   <ItemGroup Condition="$(_subset.Contains('+libs.native+'))">
-    <ProjectToBuild Include="$(LibrariesProjectRoot)Native\build-native.proj" Category="libs" />
+    <ProjectToBuild Include="$(SharedNativeRoot)libs\build-native.proj" Category="libs" />
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+libs.ref+'))">
index a298574..0421f1f 100644 (file)
@@ -525,7 +525,7 @@ if (MSVC)
 
   # disable C++ RTTI
   # /GR is added by default by CMake, so remove it manually.
-  string(REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  string(REPLACE "/GR " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
 
   add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/FC>) # use full pathnames in diagnostics
index 19407a4..3f41026 100644 (file)
@@ -1,7 +1,6 @@
 get_filename_component(CLR_REPO_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE)
 set(CLR_ENG_NATIVE_DIR ${CMAKE_CURRENT_LIST_DIR})
 get_filename_component(CLR_SRC_NATIVE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../src/native ABSOLUTE)
-get_filename_component(CLR_SRC_LIBS_NATIVE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../src/libraries/Native ABSOLUTE)
 set (CLR_ARTIFACTS_OBJ_DIR "${CLR_REPO_ROOT_DIR}/artifacts/obj")
 set(VERSION_HEADER_PATH "${CLR_ARTIFACTS_OBJ_DIR}/_version.h")
 set(VERSION_FILE_PATH "${CLR_ARTIFACTS_OBJ_DIR}/_version.c")
index d7ae882..326cc76 100644 (file)
@@ -9,9 +9,9 @@ jobs:
     - subset: coreclr
       include:
       - src/libraries/System.Private.CoreLib/*
-      - src/libraries/Native/Unix/System.Globalization.Native/*
-      - src/libraries/Native/Unix/Common/*
-      - src/native/*
+      - src/native/libs/Common/*
+      - src/native/libs/System.Globalization.Native/*
+      - src/native/libs/System.IO.Compression.Native/*
       exclude:
       - eng/Version.Details.xml
       - '*.md'
@@ -22,6 +22,7 @@ jobs:
       - src/installer/*
       - src/mono/*
       - src/libraries/*
+      - src/native/libs/*
       - src/tests/*
       - eng/pipelines/installer/*
       - eng/pipelines/mono/*
@@ -29,9 +30,9 @@ jobs:
     - subset: mono
       include:
       - src/libraries/System.Private.CoreLib/*
-      - src/libraries/Native/Unix/System.Globalization.Native/*
-      - src/libraries/Native/Unix/Common/*
-      - src/native/*
+      - src/native/libs/Common/*
+      - src/native/libs/System.Globalization.Native/*
+      - src/native/libs/System.IO.Compression.Native/*
       exclude:
       - eng/Version.Details.xml
       - '*.md'
@@ -42,6 +43,7 @@ jobs:
       - src/installer/*
       - src/coreclr/*
       - src/libraries/*
+      - src/native/libs/*
       - src/tests/*
       - eng/pipelines/installer/*
       - eng/pipelines/coreclr/*
index d958c56..aa2ccee 100644 (file)
@@ -14,7 +14,7 @@ pr:
       - eng/pipelines/libraries/enterprise/*
       - src/libraries/Common/src/System/Net/*
       - src/libraries/Common/tests/System/Net/*
-      - src/libraries/Native/Unix/System.Net.Security.Native/*
+      - src/native/libs/System.Net.Security.Native/*
       - src/libraries/System.Net.Http/*
       - src/libraries/System.Net.Security/*
 
index bd4e572..ea62977 100644 (file)
@@ -84,12 +84,7 @@ endif()
 #-------------------------------
 if(NOT CLR_CROSS_COMPONENTS_BUILD)
     set(STATIC_LIBS_ONLY 1)
-
-    if(CLR_CMAKE_TARGET_WIN32)
-        add_subdirectory(${CLR_REPO_ROOT_DIR}/src/libraries/Native/Windows Native.Windows)
-    else()
-        add_subdirectory(${CLR_REPO_ROOT_DIR}/src/libraries/Native/Unix Native.Unix)
-    endif()
+    add_subdirectory(${CLR_SRC_NATIVE_DIR}/libs libs-native)
 endif(NOT CLR_CROSS_COMPONENTS_BUILD)
 
 #-----------------------------------------
index a9fcdcb..bbc411c 100644 (file)
@@ -7,10 +7,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../interop/inc)
 include_directories(${CLR_SRC_NATIVE_DIR})
 
 # needed when zLib compression is used
-include_directories(${CLR_SRC_LIBS_NATIVE_DIR}/AnyOS/zlib)
-if(NOT CLR_CMAKE_TARGET_WIN32)
-    include_directories(${CLR_SRC_LIBS_NATIVE_DIR}/Unix/Common)
-endif()
+include_directories(${CLR_SRC_NATIVE_DIR}/libs/System.IO.Compression.Native)
+include_directories(${CLR_SRC_NATIVE_DIR}/libs/Common)
 
 add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)
diff --git a/src/libraries/Native/Unix/.clang-format b/src/libraries/Native/Unix/.clang-format
deleted file mode 100644 (file)
index bec589a..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
----
-Language:        Cpp
-# BasedOnStyle:  LLVM
-AlignEscapedNewlinesLeft: false
-AllowShortFunctionsOnASingleLine: false
-AlwaysBreakTemplateDeclarations: true
-BinPackArguments: false
-BinPackParameters: false
-BreakBeforeBraces: Allman
-ColumnLimit:     120
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-IndentCaseLabels: true
-IndentWidth: 4
-PointerAlignment: Left
-TabWidth:    4
-...
-
diff --git a/src/libraries/Native/Unix/CMakeLists.txt b/src/libraries/Native/Unix/CMakeLists.txt
deleted file mode 100644 (file)
index 1006922..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-cmake_minimum_required(VERSION 3.6.2)
-include(CheckCCompilerFlag)
-
-if(CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
-    # CMake 3.14.5 contains bug fixes for iOS
-    cmake_minimum_required(VERSION 3.14.5)
-elseif(CLR_CMAKE_TARGET_MACCATALYST)
-    # CMake 3.18.1 properly generates MacCatalyst C compiler
-    cmake_minimum_required(VERSION 3.18.1)
-endif()
-cmake_policy(SET CMP0042 NEW)
-
-project(CoreFX C)
-
-include(../../../../eng/native/configurepaths.cmake)
-include(${CLR_ENG_NATIVE_DIR}/configurecompiler.cmake)
-
-include_directories(${CLR_SRC_NATIVE_DIR})
-
-set(CMAKE_MACOSX_RPATH ON)
-if(CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
-    set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
-    set(CMAKE_INSTALL_NAME_DIR "@rpath")
-endif()
-set(CMAKE_INSTALL_PREFIX $ENV{__CMakeBinDir})
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-
-add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common)
-add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common)
-
-if(STATIC_LIBS_ONLY)
-    # Suppress exporting of the PAL APIs
-    add_definitions(-DPALEXPORT=EXTERN_C)
-
-    set(STATIC_LIB_DESTINATION lib)
-    set(GEN_SHARED_LIB 0)
-else()
-    set(STATIC_LIB_DESTINATION .)
-    set(GEN_SHARED_LIB 1)
-endif()
-
-if(CLR_CMAKE_TARGET_BROWSER)
-    set(GEN_SHARED_LIB 0)
-    set(STATIC_LIB_DESTINATION .)
-endif()
-
-if(CLR_CMAKE_TARGET_TVOS)
-    # with -fembed-bitcode passing -headerpad_max_install_names is not allowed so remove it from the CMake flags
-    string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_C_LINK_FLAGS ${CMAKE_C_LINK_FLAGS})
-    string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
-    add_compile_options(-fembed-bitcode)
-    add_link_options(-fembed-bitcode)
-endif()
-
-if(CLR_CMAKE_TARGET_ANDROID)
-    if(CROSS_ROOTFS)
-        include_directories(SYSTEM "${CROSS_ROOTFS}/usr/include")
-    endif()
-endif()
-
-string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_CMAKE_BUILD_TYPE)
-
-if (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED)
-    if (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG)
-        add_compile_options(-O0)
-    elseif (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED)
-        add_compile_options(-O2)
-    endif ()
-
-    add_definitions(-DDEBUG)
-
-    # obtain settings from running coreclr\enablesanitizers.sh
-    string(FIND "$ENV{DEBUG_SANITIZERS}" "asan" __ASAN_POS)
-    string(FIND "$ENV{DEBUG_SANITIZERS}" "ubsan" __UBSAN_POS)
-    if ((${__ASAN_POS} GREATER -1) OR (${__UBSAN_POS} GREATER -1))
-      set(CLR_SANITIZE_LINK_FLAGS "${CLR_SANITIZE_LINK_FLAGS} -fsanitize=")
-      if (${__ASAN_POS} GREATER -1)
-        set(CLR_SANITIZE_LINK_FLAGS "${CLR_SANITIZE_LINK_FLAGS}address,")
-        message("Address Sanitizer (asan) enabled")
-      endif ()
-      if (${__UBSAN_POS} GREATER -1)
-        set(CLR_SANITIZE_LINK_FLAGS "${CLR_SANITIZE_LINK_FLAGS}undefined")
-        message("Undefined Behavior Sanitizer (ubsan) enabled")
-      endif ()
-
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CLR_SANITIZE_LINK_FLAGS}")
-
-      # -Wl and --gc-sections: drop unused sections\functions (similar to Windows /Gy function-level-linking)
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CLR_SANITIZE_LINK_FLAGS} -Wl,--gc-sections")
-    endif ()
-elseif (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE)
-    # Use O1 option when the clang version is smaller than 3.9
-    # Otherwise use O3 option in release build
-    if (CLR_CMAKE_TARGET_ARCH_ARMV7L AND DEFINED ENV{CROSSCOMPILE} AND CMAKE_C_COMPILER_VERSION VERSION_LESS 3.9)
-        add_compile_options (-O1)
-    else()
-        add_compile_options (-O3)
-    endif()
-    add_definitions(-DNDEBUG)
-else ()
-    message(FATAL_ERROR "Unknown build type. Set CMAKE_BUILD_TYPE to DEBUG or RELEASE.")
-endif ()
-
-if (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
-    add_definitions(-D__APPLE_USE_RFC_3542)
-endif ()
-
-if (CLR_CMAKE_TARGET_LINUX)
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE")
-endif ()
-
-include(configure.cmake)
-
-add_subdirectory(System.IO.Compression.Native)
-
-if (NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS AND NOT CLR_CMAKE_TARGET_ANDROID)
-    add_subdirectory(System.IO.Ports.Native)
-endif()
-
-if(CMAKE_C_COMPILER_ID STREQUAL Clang)
-    add_compile_options(-Weverything)
-    add_compile_options(-Wno-format-nonliteral)
-    add_compile_options(-Wno-disabled-macro-expansion)
-    add_compile_options(-Wno-padded)
-    add_compile_options(-Wno-empty-translation-unit)
-    add_compile_options(-Wno-cast-align)
-    add_compile_options(-Wno-typedef-redefinition)
-    add_compile_options(-Wno-c11-extensions)
-    add_compile_options(-Wno-thread-safety-analysis)
-endif()
-
-add_subdirectory(System.Native)
-
-if(CLR_CMAKE_TARGET_BROWSER)
-    # skip for now
-elseif(CLR_CMAKE_TARGET_MACCATALYST)
-    add_subdirectory(System.Net.Security.Native)
-    # System.Security.Cryptography.Native is intentionally disabled on iOS
-    # it is only used for interacting with OpenSSL which isn't useful there
-elseif(CLR_CMAKE_TARGET_IOS)
-    add_subdirectory(System.Net.Security.Native)
-    # System.Security.Cryptography.Native is intentionally disabled on iOS
-    # it is only used for interacting with OpenSSL which isn't useful there
-elseif(CLR_CMAKE_TARGET_TVOS)
-    #add_subdirectory(System.Net.Security.Native) # no gssapi on tvOS, see https://developer.apple.com/documentation/gss
-    # System.Security.Cryptography.Native is intentionally disabled on tvOS
-    # it is only used for interacting with OpenSSL which isn't useful there
-elseif(CLR_CMAKE_TARGET_ANDROID)
-    add_subdirectory(System.Security.Cryptography.Native.Android)
-else()
-    add_subdirectory(System.Globalization.Native)
-    add_subdirectory(System.Net.Security.Native)
-    add_subdirectory(System.Security.Cryptography.Native)
-endif()
-
-if(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
-    add_subdirectory(System.Security.Cryptography.Native.Apple)
-endif()
diff --git a/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt
deleted file mode 100644 (file)
index fd332e3..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-project(System.IO.Compression.Native C)
-
-if (CLR_CMAKE_TARGET_BROWSER)
-    add_definitions(-s USE_ZLIB)
-endif()
-
-include(${CMAKE_CURRENT_LIST_DIR}/extra_libs.cmake)
-
-set(NATIVE_LIBS_EXTRA)
-append_extra_compression_libs(NATIVE_LIBS_EXTRA)
-
-set(NATIVECOMPRESSION_SOURCES
-    ../../AnyOS/zlib/pal_zlib.c
-)
-
-if (NOT CLR_CMAKE_TARGET_BROWSER)
-    #Include Brotli include files
-    include_directories("../../AnyOS/brotli/include")
-
-    set (NATIVECOMPRESSION_SOURCES
-        ${NATIVECOMPRESSION_SOURCES}
-        ../../AnyOS/brotli/common/constants.c
-        ../../AnyOS/brotli/common/context.c
-        ../../AnyOS/brotli/common/dictionary.c
-        ../../AnyOS/brotli/common/platform.c
-        ../../AnyOS/brotli/common/transform.c
-        ../../AnyOS/brotli/dec/bit_reader.c
-        ../../AnyOS/brotli/dec/decode.c
-        ../../AnyOS/brotli/dec/huffman.c
-        ../../AnyOS/brotli/dec/state.c
-        ../../AnyOS/brotli/enc/backward_references.c
-        ../../AnyOS/brotli/enc/backward_references_hq.c
-        ../../AnyOS/brotli/enc/bit_cost.c
-        ../../AnyOS/brotli/enc/block_splitter.c
-        ../../AnyOS/brotli/enc/brotli_bit_stream.c
-        ../../AnyOS/brotli/enc/cluster.c
-        ../../AnyOS/brotli/enc/command.c
-        ../../AnyOS/brotli/enc/compress_fragment.c
-        ../../AnyOS/brotli/enc/compress_fragment_two_pass.c
-        ../../AnyOS/brotli/enc/dictionary_hash.c
-        ../../AnyOS/brotli/enc/encode.c
-        ../../AnyOS/brotli/enc/encoder_dict.c
-        ../../AnyOS/brotli/enc/entropy_encode.c
-        ../../AnyOS/brotli/enc/fast_log.c
-        ../../AnyOS/brotli/enc/histogram.c
-        ../../AnyOS/brotli/enc/literal_cost.c
-        ../../AnyOS/brotli/enc/memory.c
-        ../../AnyOS/brotli/enc/metablock.c
-        ../../AnyOS/brotli/enc/static_dict.c
-        ../../AnyOS/brotli/enc/utf8_util.c
-        ../../AnyOS/System.IO.Compression.Native/entrypoints.c
-    )
-
-    # Disable implicit fallthrough warning for Brotli
-    set(FLAGS -Wno-implicit-fallthrough)
-
-    # Delete this supression once brotli is upgraded to vNext (current latest v1.0.9
-    # does not contain upstream fix: https://github.com/google/brotli/commit/0a3944c)
-    set(FLAGS "${FLAGS} -Wno-vla-parameter")
-
-    set_source_files_properties(${NATIVECOMPRESSION_SOURCES} PROPERTIES COMPILE_FLAGS ${FLAGS})
-endif()
-
-if (GEN_SHARED_LIB)
-    add_definitions(-DBROTLI_SHARED_COMPILATION)
-
-    add_library(System.IO.Compression.Native
-        SHARED
-        ${NATIVECOMPRESSION_SOURCES}
-        ${VERSION_FILE_PATH}
-    )
-
-    target_link_libraries(System.IO.Compression.Native
-        ${NATIVE_LIBS_EXTRA}
-    )
-
-    if (NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS AND NOT CLR_CMAKE_TARGET_ANDROID)
-        set(DEF_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/System.IO.Compression.Native_unixexports.src)
-        set(EXPORTS_FILE ${CMAKE_CURRENT_BINARY_DIR}/System.IO.Compression.Native.exports)
-        generate_exports_file(${DEF_SOURCES} ${EXPORTS_FILE})
-        set_exports_linker_option(${EXPORTS_FILE})
-
-        add_custom_target(System.IO.Compression.Native_exports DEPENDS ${EXPORTS_FILE})
-        add_dependencies(System.IO.Compression.Native System.IO.Compression.Native_exports)
-
-        set_property(TARGET System.IO.Compression.Native APPEND_STRING PROPERTY LINK_FLAGS ${EXPORTS_LINKER_OPTION})
-        set_property(TARGET System.IO.Compression.Native APPEND_STRING PROPERTY LINK_DEPENDS ${EXPORTS_FILE})
-
-        add_custom_command(TARGET System.IO.Compression.Native POST_BUILD
-            COMMENT "Verifying System.IO.Compression.Native entry points against entrypoints.c "
-            COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../verify-entrypoints.sh
-                $<TARGET_FILE:System.IO.Compression.Native>
-                ${CMAKE_CURRENT_SOURCE_DIR}/../../AnyOS/System.IO.Compression.Native/entrypoints.c
-                ${CMAKE_NM}
-            VERBATIM
-        )
-    endif()
-
-    install_with_stripped_symbols (System.IO.Compression.Native PROGRAMS .)
-endif ()
-
-add_library(System.IO.Compression.Native-Static
-    STATIC
-    ${NATIVECOMPRESSION_SOURCES}
-)
-
-set_target_properties(System.IO.Compression.Native-Static PROPERTIES OUTPUT_NAME System.IO.Compression.Native  CLEAN_DIRECT_OUTPUT 1)
-
-install (TARGETS System.IO.Compression.Native-Static DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs)
diff --git a/src/libraries/Native/Windows/CMakeLists.txt b/src/libraries/Native/Windows/CMakeLists.txt
deleted file mode 100644 (file)
index 229adbd..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-cmake_policy(SET CMP0091 NEW)
-
-include(../../../../eng/native/configurepaths.cmake)
-
-# C Compiler flags
-SET (CMAKE_C_FLAGS_INIT                     "/W3 /FC")
-SET (CMAKE_C_FLAGS_DEBUG_INIT               "/Od /Zi")
-SET (CMAKE_C_FLAGS_RELEASE_INIT             "/Ox")
-SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT      "/O2 /Zi")
-SET (CMAKE_ASM_MASM_FLAGS                   "${CMAKE_ASM_MASM_FLAGS} /ZH:SHA_256")
-
-# Configuration of our libray specs and our directories
-SET (CMAKE_INCLUDE_CURRENT_DIR              ON)
-SET (CMAKE_SHARED_LIBRARY_PREFIX            "")
-
-set(__SharedLinkArgs)
-set(__LinkArgs)
-
-# Force an out of source build
-if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
-    message(FATAL_ERROR "Binary directory isn't being correctly set before calling Cmake. Tree must be built in separate directory from source.")
-endif()
-
-if(STATIC_LIBS_ONLY)
-    # Suppress exporting of the PAL APIs
-    add_definitions(-DPALEXPORT=EXTERN_C)
-
-    set(GEN_SHARED_LIB 0)
-    set(STATIC_LIB_DESTINATION lib)
-else()
-    set(GEN_SHARED_LIB 1)
-    set(STATIC_LIB_DESTINATION .)
-endif()
-
-project(CoreFX)
-
-include(../../../../eng/native/configurepaths.cmake)
-
-# The following options are set by the razzle build
-add_compile_options(/d2Zi+)       # make optimized builds debugging easier
-add_compile_options(/nologo)      # Suppress Startup Banner
-add_compile_options(/Oi)          # enable intrinsics
-add_compile_options(/Oy-)         # disable suppressing of the creation of frame pointers on the call stack for quicker function calls
-add_compile_options(/U_MT)        # undefine the predefined _MT macro
-add_compile_options(/GF)          # enable read-only string pooling
-add_compile_options(/Gm-)         # disable minimal rebuild
-string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-add_compile_options(/EHa)         # enable C++ EH (w/ SEH exceptions)
-add_compile_options(/Zp8)         # pack structs on 8-byte boundary
-add_compile_options(/Gy)          # separate functions for linker
-add_compile_options(/Zc:forScope) # C++ language conformance: enforce Standard C++ for scoping rules
-string(REPLACE "/GR " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-add_compile_options(/GR-)         # disable C++ RTTI
-add_compile_options(/FC)          # use full pathnames in diagnostics
-add_compile_options(/MP)          # Build with Multiple Processes (number of processes equal to the number of processors)
-add_compile_options(/GS)          # Buffer Security Check
-add_compile_options(/Zm200)       # Specify Precompiled Header Memory Allocation Limit of 150MB
-add_compile_options(/Zi)          # enable debugging information
-add_compile_options(/Zl)          # enable debugging information
-add_compile_options(/wd4960 /wd4961 /wd4603 /wd4627 /wd4838 /wd4456 /wd4457 /wd4458 /wd4459 /wd4091 /we4640)
-add_compile_options(/ZH:SHA_256) # use SHA256 for generating hashes of compiler processed source files.
-
-if (${CLR_CMAKE_HOST_ARCH} STREQUAL "x86")
-    add_compile_options(/Gz)
-endif ()
-
-# enable control-flow-guard support for native components
-add_compile_options(/guard:cf)
-list(APPEND __SharedLinkArgs /guard:cf)
-
-if (${CLR_CMAKE_HOST_ARCH} STREQUAL "x86_64" OR ${CLR_CMAKE_HOST_ARCH} STREQUAL "amd64" OR ${CLR_CMAKE_HOST_ARCH} STREQUAL "x64")
-    # Enable EH continuation table and CETCOMPAT for native components
-    add_compile_options(/guard:ehcont)
-    list(APPEND __SharedLinkArgs /guard:ehcont)
-    list(APPEND __SharedLinkArgs /CETCOMPAT)
-endif ()
-
-# Statically linked CRT (libcmt[d].lib, libvcruntime[d].lib and libucrt[d].lib) by default. This is done to avoid
-# linking in VCRUNTIME140.DLL for a simplified xcopy experience by reducing the dependency on VC REDIST.
-#
-# For Release builds, we shall dynamically link into uCRT [ucrtbase.dll] (which is pushed down as a Windows Update on downlevel OS) but
-# won't do the same for debug/checked builds since ucrtbased.dll is not redistributable and Debug/Checked builds are not
-# production-time scenarios.
-
-set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-
-add_compile_options($<$<CONFIG:RELEASE>:/GL>)
-
-list(APPEND __LinkLibraries $<$<CONFIG:DEBUG>:libcmtd.lib>)
-list(APPEND __LinkLibraries $<$<CONFIG:RELEASE>:libcmt.lib>)
-
-list(APPEND __LinkLibraries $<$<CONFIG:DEBUG>:libvcruntimed.lib>)
-list(APPEND __LinkLibraries $<$<CONFIG:RELEASE>:libvcruntime.lib>)
-
-# Linker flags
-list(APPEND __SharedLinkArgs /INCREMENTAL:NO)
-list(APPEND __SharedLinkArgs /MANIFEST:NO)            #Do not create Side-by-Side Assembly Manifest
-list(APPEND __SharedLinkArgs /LARGEADDRESSAWARE)      # can handle addresses larger than 2 gigabytes
-list(APPEND __SharedLinkArgs /RELEASE)                #sets the checksum in the header
-list(APPEND __SharedLinkArgs /NXCOMPAT)               #Compatible with Data Execution Prevention
-list(APPEND __SharedLinkArgs /DYNAMICBASE)            #Use address space layout randomization
-list(APPEND __SharedLinkArgs /DEBUGTYPE:cv,fixup)     #debugging format
-list(APPEND __SharedLinkArgs /PDBCOMPRESS)            #shrink pdb size
-list(APPEND __SharedLinkArgs /DEBUG)
-list(APPEND __SharedLinkArgs /IGNORE:4197,4013,4254,4070,4221)
-
-# Release build specific flags
-list(APPEND __LinkArgs $<$<CONFIG:RELEASE>:/LTCG>)
-list(APPEND __SharedLinkArgs $<$<CONFIG:RELEASE>:/OPT:REF>)
-list(APPEND __SharedLinkArgs $<$<CONFIG:RELEASE>:/OPT:ICF>)
-
-# Force uCRT to be dynamically linked for Release build (unless env variable CLR_CMAKE_WIN32_FORCE_STATIC_LINK is set to true)
-set(CLR_CMAKE_WIN32_FORCE_STATIC_LINK $ENV{CLR_CMAKE_WIN32_FORCE_STATIC_LINK})
-if(NOT CLR_CMAKE_WIN32_FORCE_STATIC_LINK)
-    list(APPEND __SharedLinkArgs $<$<CONFIG:RELEASE>:/NODEFAULTLIB:libucrt.lib>)
-    list(APPEND __SharedLinkArgs $<$<CONFIG:RELEASE>:/DEFAULTLIB:ucrt.lib>)
-endif()
-
-# Debug build specific flags
-list(INSERT __SharedLinkArgs 0 $<$<OR:$<CONFIG:DEBUG>,$<CONFIG:CHECKED>>:/NOVCFEATURE>)
-
-if (${CLR_CMAKE_HOST_ARCH} STREQUAL "x86_64" OR ${CLR_CMAKE_HOST_ARCH} STREQUAL "amd64" OR ${CLR_CMAKE_HOST_ARCH} STREQUAL "x64")
-    add_definitions(-DTARGET_64BIT=1)
-endif ()
-
-# Do not define DEBUG. zlib has asserts under DEBUG for non-catastrophic cases,
-# such as on bad user-provided inputs.  We leave NDEBUG defined, however,
-# as other asserts should still be included.
-add_compile_definitions($<$<CONFIG:RELEASE>:NDEBUG>)
-
-include_directories(${CLR_SRC_NATIVE_DIR})
-
-# we only need to build System.Globalization.Native when building static libs.
-if(STATIC_LIBS_ONLY)
-    add_subdirectory(../Unix/System.Globalization.Native System.Globalization.Native)
-endif()
-
-add_subdirectory(System.IO.Compression.Native)
diff --git a/src/libraries/Native/Windows/System.IO.Compression.Native/CMakeLists.txt b/src/libraries/Native/Windows/System.IO.Compression.Native/CMakeLists.txt
deleted file mode 100644 (file)
index 936c077..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-project(System.IO.Compression.Native)
-
-if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
-    message(FATAL_ERROR "Binary directory isn't being correctly set before calling Cmake. Tree must be built in separate directory from source.")
-endif()
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-if (GEN_SHARED_LIB)
-    include (GenerateExportHeader)
-endif()
-
-if(${CLR_CMAKE_HOST_ARCH} STREQUAL x86 OR ${CLR_CMAKE_HOST_ARCH} STREQUAL x64)
-    set(NATIVECOMPRESSION_SOURCES
-        zlib-intel/adler32.c
-        zlib-intel/compress.c
-        zlib-intel/crc_folding.c
-        zlib-intel/crc32.c
-        zlib-intel/deflate_medium.c
-        zlib-intel/deflate_quick.c
-        zlib-intel/deflate.c
-        zlib-intel/inffast.c
-        zlib-intel/inflate.c
-        zlib-intel/inftrees.c
-        zlib-intel/match.c
-        zlib-intel/slide_sse.c
-        zlib-intel/trees.c
-        zlib-intel/x86.c
-        zlib-intel/zutil.c
-)
-else()
-    set(NATIVECOMPRESSION_SOURCES
-        zlib/adler32.c
-        zlib/compress.c
-        zlib/crc32.c
-        zlib/deflate.c
-        zlib/inffast.c
-        zlib/inflate.c
-        zlib/inftrees.c
-        zlib/trees.c
-        zlib/zutil.c
-    )
-endif()
-
-set (NATIVECOMPRESSION_SOURCES
-    ${NATIVECOMPRESSION_SOURCES}
-    ../../AnyOS/zlib/pal_zlib.c
-    ../../AnyOS/brotli/common/constants.c
-    ../../AnyOS/brotli/common/context.c
-    ../../AnyOS/brotli/common/dictionary.c
-    ../../AnyOS/brotli/common/platform.c
-    ../../AnyOS/brotli/common/transform.c
-    ../../AnyOS/brotli/dec/bit_reader.c
-    ../../AnyOS/brotli/dec/decode.c
-    ../../AnyOS/brotli/dec/huffman.c
-    ../../AnyOS/brotli/dec/state.c
-    ../../AnyOS/brotli/enc/backward_references.c
-    ../../AnyOS/brotli/enc/backward_references_hq.c
-    ../../AnyOS/brotli/enc/bit_cost.c
-    ../../AnyOS/brotli/enc/block_splitter.c
-    ../../AnyOS/brotli/enc/brotli_bit_stream.c
-    ../../AnyOS/brotli/enc/cluster.c
-    ../../AnyOS/brotli/enc/command.c
-    ../../AnyOS/brotli/enc/compress_fragment.c
-    ../../AnyOS/brotli/enc/compress_fragment_two_pass.c
-    ../../AnyOS/brotli/enc/dictionary_hash.c
-    ../../AnyOS/brotli/enc/encode.c
-    ../../AnyOS/brotli/enc/encoder_dict.c
-    ../../AnyOS/brotli/enc/entropy_encode.c
-    ../../AnyOS/brotli/enc/fast_log.c
-    ../../AnyOS/brotli/enc/histogram.c
-    ../../AnyOS/brotli/enc/literal_cost.c
-    ../../AnyOS/brotli/enc/memory.c
-    ../../AnyOS/brotli/enc/metablock.c
-    ../../AnyOS/brotli/enc/static_dict.c
-    ../../AnyOS/brotli/enc/utf8_util.c
-)
-
-#Include Brotli include files
-include_directories("../../AnyOS/brotli/include")
-
-if (GEN_SHARED_LIB)
-    add_library(System.IO.Compression.Native
-        SHARED
-        ${NATIVECOMPRESSION_SOURCES}
-        System.IO.Compression.Native.def
-        # This will add versioning to the library
-        ${VERSION_FILE_RC_PATH}
-    )
-endif()
-
-if (NOT GEN_SHARED_LIB AND NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS AND NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_BROWSER)
-    set(NATIVECOMPRESSION_SOURCES ${NATIVECOMPRESSION_SOURCES} ../../AnyOS/System.IO.Compression.Native/entrypoints.c)
-endif()
-
-add_library(System.IO.Compression.Native-Static
-    STATIC
-    ${NATIVECOMPRESSION_SOURCES}
-)
-
-# Allow specification of arguments that should be passed to the linker
-if (GEN_SHARED_LIB)
-    SET_TARGET_PROPERTIES(System.IO.Compression.Native PROPERTIES LINK_OPTIONS "${__LinkArgs};${__SharedLinkArgs}")
-endif()
-SET_TARGET_PROPERTIES(System.IO.Compression.Native-Static PROPERTIES STATIC_LIBRARY_OPTIONS "${__LinkArgs}")
-
-# Allow specification of libraries that should be linked against
-if (GEN_SHARED_LIB)
-    target_link_libraries(System.IO.Compression.Native ${__LinkLibraries})
-endif()
-target_link_libraries(System.IO.Compression.Native-Static ${__LinkLibraries})
-
-if (GEN_SHARED_LIB)
-    GENERATE_EXPORT_HEADER( System.IO.Compression.Native
-         BASE_NAME System.IO.Compression.Native
-         EXPORT_MACRO_NAME System.IO.Compression.Native_EXPORT
-         EXPORT_FILE_NAME System.IO.Compression.Native_Export.h
-         STATIC_DEFINE System.IO.Compression.Native_BUILT_AS_STATIC
-    )
-
-    install (TARGETS System.IO.Compression.Native DESTINATION .)
-    install (FILES $<TARGET_PDB_FILE:System.IO.Compression.Native> DESTINATION .)
-endif()
-
-install (TARGETS System.IO.Compression.Native-Static DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs)
index 0016841..7ce1332 100644 (file)
@@ -589,7 +589,7 @@ endif()
 ######################################
 # ICU CHECKS
 ######################################
-set(ICU_SHIM_PATH "${CLR_SRC_LIBS_NATIVE_DIR}/Unix/System.Globalization.Native")
+set(ICU_SHIM_PATH "${CLR_SRC_NATIVE_DIR}/libs/System.Globalization.Native")
 if(MONO_CROSS_COMPILE)
 elseif(HOST_OSX AND NOT HOST_MACCAT)
   include(FindPkgConfig)
index 3536792..64cbb38 100644 (file)
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- Minimum target OS version, keep in sync with src/libraries/Native/build-native.sh -->
+    <!-- Minimum target OS version, keep in sync with src/native/libs/build-native.sh -->
     <iOSVersionMin>10.0</iOSVersionMin>
     <tvOSVersionMin>10.0</tvOSVersionMin>
     <watchOSVersionMin>2.0</watchOSVersionMin>
index 17c52fc..2610dda 100644 (file)
@@ -81,7 +81,7 @@ if(HAVE_SYS_ICU)
       ${pal_icushim_sources_base})
   addprefix(icu_shim_sources "${ICU_SHIM_PATH}" "${icu_shim_sources_base}")
   set_source_files_properties(${icu_shim_sources} PROPERTIES COMPILE_DEFINITIONS OSX_ICU_LIBRARY_PATH="${OSX_ICU_LIBRARY_PATH}")
-  set_source_files_properties(${icu_shim_sources} PROPERTIES COMPILE_FLAGS "-I\"${ICU_INCLUDEDIR}\" -I\"${CMAKE_CURRENT_SOURCE_DIR}/../../../libraries/Native/Unix/System.Globalization.Native/\" -I\"${CMAKE_CURRENT_SOURCE_DIR}/../../../libraries/Native/Unix/Common/\" ${ICU_FLAGS}")
+  set_source_files_properties(${icu_shim_sources} PROPERTIES COMPILE_FLAGS "-I\"${ICU_INCLUDEDIR}\" -I\"${CLR_SRC_NATIVE_DIR}/libs/System.Globalization.Native/\" -I\"${CLR_SRC_NATIVE_DIR}/libs/Common/\" ${ICU_FLAGS}")
   if(TARGET_WIN32)
       set_source_files_properties(${icu_shim_sources} PROPERTIES LANGUAGE CXX)
   endif()
index f8355fe..4152d95 100644 (file)
@@ -19,7 +19,7 @@ PINVOKE_TABLE?=$(TOP)/artifacts/obj/wasm/pinvoke-table.h
 MONO_BIN_DIR?=$(BINDIR)/mono/Browser.wasm.$(CONFIG)
 NATIVE_BIN_DIR?=$(BINDIR)/native/net7.0-Browser-$(CONFIG)-wasm
 ICU_LIBDIR?=
-SYSTEM_NATIVE_LIBDIR?=$(TOP)/src/libraries/Native/Unix/System.Native
+SYSTEM_NATIVE_LIBDIR?=$(TOP)/src/native/libs/System.Native
 _MSBUILD_WASM_BUILD_ARGS=/p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=$(CONFIG)
 XHARNESS_BROWSER?=chrome
 EMCC_DEFAULT_RSP=$(NATIVE_BIN_DIR)/src/emcc-default.rsp
index 68482d7..f2cc833 100644 (file)
       <CMakeConfigurationLinkFlags Condition="'$(Configuration)' == 'Debug'">$(CMakeConfigurationEmccFlags)</CMakeConfigurationLinkFlags>
       <CMakeConfigurationLinkFlags Condition="'$(Configuration)' == 'Release'">-O2</CMakeConfigurationLinkFlags>
       <CMakeConfigurationEmsdkPath Condition="'$(Configuration)' == 'Release'"> -DEMSDK_PATH=&quot;$(EMSDK_PATH.TrimEnd('\/'))&quot;</CMakeConfigurationEmsdkPath>
-      <CMakeBuildRuntimeConfigureCmd>emcmake cmake $(MSBuildThisFileDirectory)runtime -DCMAKE_BUILD_TYPE=$(Configuration) -DCONFIGURATION_EMCC_FLAGS=&quot;$(CMakeConfigurationEmccFlags)&quot; -DCONFIGURATION_LINK_FLAGS=&quot;$(CMakeConfigurationLinkFlags)&quot; -DMONO_INCLUDES=&quot;$(MonoArtifactsPath)include/mono-2.0&quot; -DMONO_OBJ_INCLUDES=&quot;$(MonoObjDir.TrimEnd('\/'))&quot; -DICU_LIB_DIR=&quot;$(ICULibDir.TrimEnd('\/'))&quot; -DMONO_ARTIFACTS_DIR=&quot;$(MonoArtifactsPath.TrimEnd('\/'))&quot; -DNATIVE_BIN_DIR=&quot;$(NativeBinDir.TrimEnd('\/'))&quot; -DSYSTEM_NATIVE_DIR=&quot;$(RepoRoot)src/libraries/Native/Unix/System.Native&quot; -DSOURCE_DIR=&quot;$(MSBuildThisFileDirectory.TrimEnd('\/'))/runtime&quot;$(CMakeConfigurationEmsdkPath)</CMakeBuildRuntimeConfigureCmd>
+      <CMakeBuildRuntimeConfigureCmd>emcmake cmake $(MSBuildThisFileDirectory)runtime -DCMAKE_BUILD_TYPE=$(Configuration) -DCONFIGURATION_EMCC_FLAGS=&quot;$(CMakeConfigurationEmccFlags)&quot; -DCONFIGURATION_LINK_FLAGS=&quot;$(CMakeConfigurationLinkFlags)&quot; -DMONO_INCLUDES=&quot;$(MonoArtifactsPath)include/mono-2.0&quot; -DMONO_OBJ_INCLUDES=&quot;$(MonoObjDir.TrimEnd('\/'))&quot; -DICU_LIB_DIR=&quot;$(ICULibDir.TrimEnd('\/'))&quot; -DMONO_ARTIFACTS_DIR=&quot;$(MonoArtifactsPath.TrimEnd('\/'))&quot; -DNATIVE_BIN_DIR=&quot;$(NativeBinDir.TrimEnd('\/'))&quot; -DSYSTEM_NATIVE_DIR=&quot;$(RepoRoot)src/native/libs/System.Native&quot; -DSOURCE_DIR=&quot;$(MSBuildThisFileDirectory.TrimEnd('\/'))/runtime&quot;$(CMakeConfigurationEmsdkPath)</CMakeBuildRuntimeConfigureCmd>
       <CMakeBuildRuntimeConfigureCmd Condition="'$(OS)' == 'Windows_NT'">call &quot;$(RepositoryEngineeringDir)native\init-vs-env.cmd&quot; &amp;&amp; call &quot;$([MSBuild]::NormalizePath('$(EMSDK_PATH)', 'emsdk_env.bat'))&quot; &amp;&amp; $(CMakeBuildRuntimeConfigureCmd)</CMakeBuildRuntimeConfigureCmd>
       <CMakeBuildRuntimeConfigureCmd Condition="'$(OS)' != 'Windows_NT'">bash -c 'source $(EMSDK_PATH)/emsdk_env.sh 2>&amp;1 &amp;&amp; $(CMakeBuildRuntimeConfigureCmd)'</CMakeBuildRuntimeConfigureCmd>
 
       <CMakeBuildRuntimeCmd>cmake --build . --config $(Configuration)</CMakeBuildRuntimeCmd>
       <CMakeBuildRuntimeCmd Condition="'$(OS)' == 'Windows_NT'">call &quot;$(RepositoryEngineeringDir)native\init-vs-env.cmd&quot; &amp;&amp; call &quot;$([MSBuild]::NormalizePath('$(EMSDK_PATH)', 'emsdk_env.bat'))&quot; &amp;&amp; $(CMakeBuildRuntimeCmd)</CMakeBuildRuntimeCmd>
       <CMakeBuildRuntimeCmd Condition="'$(OS)' != 'Windows_NT'">bash -c 'source $(EMSDK_PATH)/emsdk_env.sh 2>&amp;1 &amp;&amp;  $(CMakeBuildRuntimeCmd)'</CMakeBuildRuntimeCmd>
-      <SystemNativeDir>$(RepoRoot)src\libraries\Native\Unix\System.Native</SystemNativeDir>
     </PropertyGroup>
 
     <Copy SourceFiles="$(PInvokeTableFile)"
                        runtime/pinvoke.c;
                        runtime/corebindings.c;
                        runtime/library-dotnet.js;
-                       $(SystemNativeDir)\pal_random.js;"
+                       $(SharedNativeRoot)libs\System.Native\pal_random.js;"
           DestinationFolder="$(NativeBinDir)src"
           SkipUnchangedFiles="true" />
 
index 0d9ae54..d9c9250 100644 (file)
@@ -18,11 +18,8 @@ set(SKIP_VERSIONING 1)
 
 include_directories(..)
 include_directories(../../json)
-
-include_directories(${CLR_SRC_LIBS_NATIVE_DIR}/AnyOS/zlib)
-if(NOT CLR_CMAKE_TARGET_WIN32)
-    include_directories(${CLR_SRC_LIBS_NATIVE_DIR}/Unix/Common)
-endif()
+include_directories(${CLR_SRC_NATIVE_DIR}/libs/System.IO.Compression.Native)
+include_directories(${CLR_SRC_NATIVE_DIR}/libs/Common)
 
 set(SOURCES
     ../bundle_marker.cpp
@@ -151,19 +148,19 @@ else()
     )
 
     # additional requirements for System.IO.Compression.Native
-    include(${CLR_REPO_ROOT_DIR}/src/libraries/Native/Unix/System.IO.Compression.Native/extra_libs.cmake)
+    include(${CLR_SRC_NATIVE_DIR}/libs/System.IO.Compression.Native/extra_libs.cmake)
     append_extra_compression_libs(NATIVE_LIBS)
 
     # Additional requirements for System.Net.Security.Native
-    include(${CLR_REPO_ROOT_DIR}/src/libraries/Native/Unix/System.Net.Security.Native/extra_libs.cmake)
+    include(${CLR_SRC_NATIVE_DIR}/libs/System.Net.Security.Native/extra_libs.cmake)
     append_extra_security_libs(NATIVE_LIBS)
 
     # Additional requirements for System.Native
-    include(${CLR_REPO_ROOT_DIR}/src/libraries/Native/Unix/System.Native/extra_libs.cmake)
+    include(${CLR_SRC_NATIVE_DIR}/libs/System.Native/extra_libs.cmake)
     append_extra_system_libs(NATIVE_LIBS)
 
     # Additional requirements for System.Security.Cryptography.Native.OpenSsl
-    include(${CLR_REPO_ROOT_DIR}/src/libraries/Native/Unix/System.Security.Cryptography.Native/extra_libs.cmake)
+    include(${CLR_SRC_NATIVE_DIR}/libs/System.Security.Cryptography.Native/extra_libs.cmake)
     append_extra_cryptography_libs(NATIVE_LIBS)
 
     set(RUNTIMEINFO_LIB runtimeinfo)
@@ -176,7 +173,7 @@ if(CLR_CMAKE_TARGET_OSX)
     )
 
     # Additional requirements for System.Security.Cryptography.Native.Apple
-    include(${CLR_REPO_ROOT_DIR}/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/extra_libs.cmake)
+    include(${CLR_SRC_NATIVE_DIR}/libs/System.Security.Cryptography.Native.Apple/extra_libs.cmake)
     append_extra_cryptography_apple_libs(NATIVE_LIBS)
 endif()
 
diff --git a/src/native/libs/CMakeLists.txt b/src/native/libs/CMakeLists.txt
new file mode 100644 (file)
index 0000000..46dfafc
--- /dev/null
@@ -0,0 +1,176 @@
+cmake_minimum_required(VERSION 3.6.2)
+include(CheckCCompilerFlag)
+
+if (CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
+    # CMake 3.14.5 contains bug fixes for iOS
+    cmake_minimum_required(VERSION 3.14.5)
+elseif (CLR_CMAKE_TARGET_MACCATALYST)
+    # CMake 3.18.1 properly generates MacCatalyst C compiler
+    cmake_minimum_required(VERSION 3.18.1)
+endif ()
+
+if (WIN32)
+    cmake_policy(SET CMP0091 NEW)
+else ()
+    cmake_policy(SET CMP0042 NEW)
+endif ()
+
+project(CoreFX C)
+
+include(../../../eng/native/configurepaths.cmake)
+include(${CLR_ENG_NATIVE_DIR}/configurecompiler.cmake)
+
+include_directories(${CLR_SRC_NATIVE_DIR})
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+if (STATIC_LIBS_ONLY)
+    # Suppress exporting of the PAL APIs
+    add_definitions(-DPALEXPORT=EXTERN_C)
+
+    set(GEN_SHARED_LIB 0)
+    set(STATIC_LIB_DESTINATION lib)
+else ()
+    set(GEN_SHARED_LIB 1)
+    set(STATIC_LIB_DESTINATION .)
+endif ()
+
+if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER)
+    set(CMAKE_MACOSX_RPATH ON)
+    if (CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
+        set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
+        set(CMAKE_INSTALL_NAME_DIR "@rpath")
+    endif ()
+
+    set(CMAKE_INSTALL_PREFIX $ENV{__CMakeBinDir})
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+
+    add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common)
+    add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common)
+
+    if (CLR_CMAKE_TARGET_BROWSER)
+        set(GEN_SHARED_LIB 0)
+        set(STATIC_LIB_DESTINATION .)
+    endif ()
+
+    if (CLR_CMAKE_TARGET_TVOS)
+        # with -fembed-bitcode passing -headerpad_max_install_names is not allowed so remove it from the CMake flags
+        string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_C_LINK_FLAGS ${CMAKE_C_LINK_FLAGS})
+        string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
+        add_compile_options(-fembed-bitcode)
+        add_link_options(-fembed-bitcode)
+    endif ()
+
+    if (CLR_CMAKE_TARGET_ANDROID)
+        if (CROSS_ROOTFS)
+            include_directories(SYSTEM "${CROSS_ROOTFS}/usr/include")
+        endif ()
+    endif ()
+
+    string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_CMAKE_BUILD_TYPE)
+
+    if (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED)
+        if (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG)
+            add_compile_options(-O0)
+        elseif (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED)
+            add_compile_options(-O2)
+        endif ()
+
+        add_definitions(-DDEBUG)
+
+        # obtain settings from running coreclr\enablesanitizers.sh
+        string(FIND "$ENV{DEBUG_SANITIZERS}" "asan" __ASAN_POS)
+        string(FIND "$ENV{DEBUG_SANITIZERS}" "ubsan" __UBSAN_POS)
+        if (${__ASAN_POS} GREATER -1 OR ${__UBSAN_POS} GREATER -1)
+            set(CLR_SANITIZE_LINK_FLAGS "${CLR_SANITIZE_LINK_FLAGS} -fsanitize=")
+            if (${__ASAN_POS} GREATER -1)
+                set(CLR_SANITIZE_LINK_FLAGS "${CLR_SANITIZE_LINK_FLAGS}address,")
+                message("Address Sanitizer (asan) enabled")
+            endif ()
+            if (${__UBSAN_POS} GREATER -1)
+                set(CLR_SANITIZE_LINK_FLAGS "${CLR_SANITIZE_LINK_FLAGS}undefined")
+                message("Undefined Behavior Sanitizer (ubsan) enabled")
+            endif ()
+
+            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CLR_SANITIZE_LINK_FLAGS}")
+
+            # -Wl and --gc-sections: drop unused sections\functions (similar to Windows /Gy function-level-linking)
+            set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CLR_SANITIZE_LINK_FLAGS} -Wl,--gc-sections")
+        endif ()
+    elseif (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE)
+        # Use O1 option when the clang version is smaller than 3.9
+        # Otherwise use O3 option in release build
+        if (CLR_CMAKE_TARGET_ARCH_ARMV7L AND DEFINED ENV{CROSSCOMPILE} AND CMAKE_C_COMPILER_VERSION VERSION_LESS 3.9)
+            add_compile_options (-O1)
+        else ()
+            add_compile_options (-O3)
+        endif ()
+    else ()
+        message(FATAL_ERROR "Unknown build type. Set CMAKE_BUILD_TYPE to DEBUG or RELEASE.")
+    endif ()
+
+    if (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
+        add_definitions(-D__APPLE_USE_RFC_3542)
+    endif ()
+
+    if (CLR_CMAKE_TARGET_LINUX)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE")
+    endif ()
+else ()
+    set(CMAKE_SHARED_LIBRARY_PREFIX "")
+
+    # we only need to build System.Globalization.Native when building static libs.
+    if (STATIC_LIBS_ONLY)
+        add_subdirectory(System.Globalization.Native)
+    endif ()
+endif ()
+
+add_subdirectory(System.IO.Compression.Native)
+
+if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER)
+    include(configure.cmake)
+
+    if (NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS AND NOT CLR_CMAKE_TARGET_ANDROID)
+        add_subdirectory(System.IO.Ports.Native)
+    endif ()
+
+    if (CMAKE_C_COMPILER_ID STREQUAL Clang)
+        add_compile_options(-Weverything)
+        add_compile_options(-Wno-format-nonliteral)
+        add_compile_options(-Wno-disabled-macro-expansion)
+        add_compile_options(-Wno-padded)
+        add_compile_options(-Wno-empty-translation-unit)
+        add_compile_options(-Wno-cast-align)
+        add_compile_options(-Wno-typedef-redefinition)
+        add_compile_options(-Wno-c11-extensions)
+        add_compile_options(-Wno-thread-safety-analysis)
+    endif ()
+
+    add_subdirectory(System.Native)
+
+    if (CLR_CMAKE_TARGET_BROWSER)
+        # skip for now
+    elseif (CLR_CMAKE_TARGET_MACCATALYST)
+        add_subdirectory(System.Net.Security.Native)
+        # System.Security.Cryptography.Native is intentionally disabled on iOS
+        # it is only used for interacting with OpenSSL which isn't useful there
+    elseif (CLR_CMAKE_TARGET_IOS)
+        add_subdirectory(System.Net.Security.Native)
+        # System.Security.Cryptography.Native is intentionally disabled on iOS
+        # it is only used for interacting with OpenSSL which isn't useful there
+    elseif (CLR_CMAKE_TARGET_TVOS)
+        #add_subdirectory(System.Net.Security.Native) # no gssapi on tvOS, see https://developer.apple.com/documentation/gss
+        # System.Security.Cryptography.Native is intentionally disabled on tvOS
+        # it is only used for interacting with OpenSSL which isn't useful there
+    elseif (CLR_CMAKE_TARGET_ANDROID)
+        add_subdirectory(System.Security.Cryptography.Native.Android)
+    else ()
+        add_subdirectory(System.Globalization.Native)
+        add_subdirectory(System.Net.Security.Native)
+        add_subdirectory(System.Security.Cryptography.Native)
+    endif ()
+
+    if (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
+        add_subdirectory(System.Security.Cryptography.Native.Apple)
+    endif ()
+endif ()
diff --git a/src/native/libs/System.IO.Compression.Native/CMakeLists.txt b/src/native/libs/System.IO.Compression.Native/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4dcc4b8
--- /dev/null
@@ -0,0 +1,186 @@
+project(System.IO.Compression.Native C)
+
+include(${CMAKE_CURRENT_LIST_DIR}/extra_libs.cmake)
+
+set(NATIVECOMPRESSION_SOURCES
+    pal_zlib.c
+)
+
+if (NOT CLR_CMAKE_TARGET_BROWSER)
+    #Include Brotli include files
+    include_directories("brotli/include")
+
+    set (NATIVECOMPRESSION_SOURCES
+        ${NATIVECOMPRESSION_SOURCES}
+        brotli/common/constants.c
+        brotli/common/context.c
+        brotli/common/dictionary.c
+        brotli/common/platform.c
+        brotli/common/transform.c
+        brotli/dec/bit_reader.c
+        brotli/dec/decode.c
+        brotli/dec/huffman.c
+        brotli/dec/state.c
+        brotli/enc/backward_references.c
+        brotli/enc/backward_references_hq.c
+        brotli/enc/bit_cost.c
+        brotli/enc/block_splitter.c
+        brotli/enc/brotli_bit_stream.c
+        brotli/enc/cluster.c
+        brotli/enc/command.c
+        brotli/enc/compress_fragment.c
+        brotli/enc/compress_fragment_two_pass.c
+        brotli/enc/dictionary_hash.c
+        brotli/enc/encode.c
+        brotli/enc/encoder_dict.c
+        brotli/enc/entropy_encode.c
+        brotli/enc/fast_log.c
+        brotli/enc/histogram.c
+        brotli/enc/literal_cost.c
+        brotli/enc/memory.c
+        brotli/enc/metablock.c
+        brotli/enc/static_dict.c
+        brotli/enc/utf8_util.c
+        entrypoints.c
+    )
+endif ()
+
+if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER)
+    set(NATIVE_LIBS_EXTRA)
+    append_extra_compression_libs(NATIVE_LIBS_EXTRA)
+
+    if (CLR_CMAKE_TARGET_BROWSER)
+        add_definitions(-s USE_ZLIB)
+    else ()
+        # Disable implicit fallthrough warning for Brotli
+        set(FLAGS -Wno-implicit-fallthrough)
+
+        # Delete this supression once brotli is upgraded to vNext (current latest v1.0.9
+        # does not contain upstream fix: https://github.com/google/brotli/commit/0a3944c)
+        set(FLAGS "${FLAGS} -Wno-vla-parameter")
+
+        set_source_files_properties(${NATIVECOMPRESSION_SOURCES} PROPERTIES COMPILE_FLAGS ${FLAGS})
+    endif ()
+
+    if (GEN_SHARED_LIB)
+        add_definitions(-DBROTLI_SHARED_COMPILATION)
+
+        add_library(System.IO.Compression.Native
+            SHARED
+            ${NATIVECOMPRESSION_SOURCES}
+            ${VERSION_FILE_PATH}
+        )
+
+        target_link_libraries(System.IO.Compression.Native
+            ${NATIVE_LIBS_EXTRA}
+        )
+
+        if (NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS AND NOT CLR_CMAKE_TARGET_ANDROID)
+            set(DEF_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/System.IO.Compression.Native_unixexports.src)
+            set(EXPORTS_FILE ${CMAKE_CURRENT_BINARY_DIR}/System.IO.Compression.Native.exports)
+            generate_exports_file(${DEF_SOURCES} ${EXPORTS_FILE})
+            set_exports_linker_option(${EXPORTS_FILE})
+
+            add_custom_target(System.IO.Compression.Native_exports DEPENDS ${EXPORTS_FILE})
+            add_dependencies(System.IO.Compression.Native System.IO.Compression.Native_exports)
+
+            set_property(TARGET System.IO.Compression.Native APPEND_STRING PROPERTY LINK_FLAGS ${EXPORTS_LINKER_OPTION})
+            set_property(TARGET System.IO.Compression.Native APPEND_STRING PROPERTY LINK_DEPENDS ${EXPORTS_FILE})
+
+            add_custom_command(TARGET System.IO.Compression.Native POST_BUILD
+                COMMENT "Verifying System.IO.Compression.Native entry points against entrypoints.c "
+                COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../verify-entrypoints.sh
+                    $<TARGET_FILE:System.IO.Compression.Native>
+                    ${CMAKE_CURRENT_SOURCE_DIR}/entrypoints.c
+                    ${CMAKE_NM}
+                VERBATIM
+            )
+        endif ()
+
+        install_with_stripped_symbols (System.IO.Compression.Native PROGRAMS .)
+    endif ()
+
+    add_library(System.IO.Compression.Native-Static
+        STATIC
+        ${NATIVECOMPRESSION_SOURCES}
+    )
+
+    set_target_properties(System.IO.Compression.Native-Static PROPERTIES OUTPUT_NAME System.IO.Compression.Native CLEAN_DIRECT_OUTPUT 1)
+else ()
+    if (GEN_SHARED_LIB)
+        include (GenerateExportHeader)
+    endif ()
+
+    if (CLR_CMAKE_HOST_ARCH_I386 OR CLR_CMAKE_HOST_ARCH_AMD64)
+        set(ZLIB_SOURCES
+            zlib-intel/adler32.c
+            zlib-intel/compress.c
+            zlib-intel/crc_folding.c
+            zlib-intel/crc32.c
+            zlib-intel/deflate_medium.c
+            zlib-intel/deflate_quick.c
+            zlib-intel/deflate.c
+            zlib-intel/inffast.c
+            zlib-intel/inflate.c
+            zlib-intel/inftrees.c
+            zlib-intel/match.c
+            zlib-intel/slide_sse.c
+            zlib-intel/trees.c
+            zlib-intel/x86.c
+            zlib-intel/zutil.c
+        )
+    else ()
+        set(ZLIB_SOURCES
+            zlib/adler32.c
+            zlib/compress.c
+            zlib/crc32.c
+            zlib/deflate.c
+            zlib/inffast.c
+            zlib/inflate.c
+            zlib/inftrees.c
+            zlib/trees.c
+            zlib/zutil.c
+        )
+    endif ()
+
+    set(NATIVECOMPRESSION_SOURCES ${ZLIB_SOURCES} ${NATIVECOMPRESSION_SOURCES})
+
+    if (GEN_SHARED_LIB)
+        add_library(System.IO.Compression.Native
+            SHARED
+            ${NATIVECOMPRESSION_SOURCES}
+            System.IO.Compression.Native.def
+            # This will add versioning to the library
+            ${VERSION_FILE_RC_PATH}
+        )
+    endif ()
+
+    if (NOT GEN_SHARED_LIB AND NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS AND NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_BROWSER)
+        set(NATIVECOMPRESSION_SOURCES ${NATIVECOMPRESSION_SOURCES} entrypoints.c)
+    endif ()
+
+    add_library(System.IO.Compression.Native-Static
+        STATIC
+        ${NATIVECOMPRESSION_SOURCES}
+    )
+
+    # Allow specification of libraries that should be linked against
+    if (GEN_SHARED_LIB)
+        target_link_libraries(System.IO.Compression.Native ${__LinkLibraries})
+    endif ()
+    target_link_libraries(System.IO.Compression.Native-Static ${__LinkLibraries})
+
+    if (GEN_SHARED_LIB)
+        GENERATE_EXPORT_HEADER( System.IO.Compression.Native
+         BASE_NAME System.IO.Compression.Native
+         EXPORT_MACRO_NAME System.IO.Compression.Native_EXPORT
+         EXPORT_FILE_NAME System.IO.Compression.Native_Export.h
+         STATIC_DEFINE System.IO.Compression.Native_BUILT_AS_STATIC
+        )
+
+        install (TARGETS System.IO.Compression.Native DESTINATION .)
+        install (FILES $<TARGET_PDB_FILE:System.IO.Compression.Native> DESTINATION .)
+    endif ()
+endif ()
+
+install (TARGETS System.IO.Compression.Native-Static DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs)
@@ -4,11 +4,11 @@
 #include <minipal/entrypoints.h>
 
 // Include System.IO.Compression.Native headers
-#include "../zlib/pal_zlib.h"
-#include "../brotli/include/brotli/decode.h"
-#include "../brotli/include/brotli/encode.h"
-#include "../brotli/include/brotli/port.h"
-#include "../brotli/include/brotli/types.h"
+#include "pal_zlib.h"
+#include "brotli/include/brotli/decode.h"
+#include "brotli/include/brotli/encode.h"
+#include "brotli/include/brotli/port.h"
+#include "brotli/include/brotli/types.h"
 
 static const Entry s_compressionNative[] =
 {
@@ -7,7 +7,7 @@
 
 #ifdef  _WIN32
     #define c_static_assert(e) static_assert((e),"")
-    #include "../../Windows/System.IO.Compression.Native/zlib/zlib.h"
+    #include "zlib/zlib.h"
 #else
     #include "pal_utilities.h"
     #include <zlib.h>
similarity index 93%
rename from src/libraries/Native/build-native.cmd
rename to src/native/libs/build-native.cmd
index 8d54bc7..ae97ff4 100644 (file)
@@ -56,12 +56,6 @@ set __cmakeRepoRoot=%__repoRoot:\=/%
 set __ExtraCmakeParams="-DCMAKE_REPO_ROOT=%__cmakeRepoRoot%"
 set __ExtraCmakeParams=%__ExtraCmakeParams% "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%"
 
-if /i "%__BuildArch%" == "wasm" (
-    set __sourceDir=%__sourceRootDir%\Unix
-) else (
-    set __sourceDir=%__sourceRootDir%\Windows
-)
-
 if [%__outConfig%] == [] set __outConfig=%__TargetOS%-%__BuildArch%-%CMAKE_BUILD_TYPE%
 
 if %__CMakeBinDir% == "" (
@@ -91,7 +85,7 @@ echo %MSBUILD_EMPTY_PROJECT_CONTENT% > "%__artifactsDir%\obj\native\Directory.Bu
 :: Regenerate the VS solution
 
 pushd "%__IntermediatesDir%"
-call "%__repoRoot%\eng\native\gen-buildsys.cmd" "%__sourceDir%" "%__IntermediatesDir%" %__VSVersion% %__BuildArch% %__ExtraCmakeParams%
+call "%__repoRoot%\eng\native\gen-buildsys.cmd" "%__sourceRootDir%" "%__IntermediatesDir%" %__VSVersion% %__BuildArch% %__ExtraCmakeParams%
 if NOT [%errorlevel%] == [0] goto :Failure
 popd
 
similarity index 97%
rename from src/libraries/Native/build-native.proj
rename to src/native/libs/build-native.proj
index c23e65a..b35a2b3 100644 (file)
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="native-binplace.proj" />
+    <ProjectReference Include="$(LibrariesProjectRoot)native-binplace.proj" />
   </ItemGroup>
 
   <Target Name="BuildNativeUnix"
similarity index 99%
rename from src/libraries/Native/build-native.sh
rename to src/native/libs/build-native.sh
index 64525fd..2928934 100755 (executable)
@@ -4,7 +4,7 @@ usage_list=("-outconfig: Configuration, typically a quadruplet such as 'net7.0-L
 usage_list+=("-staticLibLink: Optional argument to statically link any native library.")
 
 __scriptpath="$(cd "$(dirname "$0")"; pwd -P)"
-__nativeroot="$__scriptpath"/Unix
+__nativeroot="$__scriptpath"
 __RepoRootDir="$(cd "$__scriptpath"/../../..; pwd -P)"
 __artifactsDir="$__RepoRootDir/artifacts"