diff --git a/docs/coding-guidelines/interop-guidelines.md b/docs/coding-guidelines/interop-guidelines.md
index 5ce81404073fbe..24cb0755d727c4 100644
--- a/docs/coding-guidelines/interop-guidelines.md
+++ b/docs/coding-guidelines/interop-guidelines.md
@@ -41,7 +41,7 @@ internal static partial class Interop
### File organization
- The Interop partial class definitions should live in Interop.*.cs files. These Interop.*.cs files should all live under Common rather than within a given assembly's folder.
- - The only exception to this should be when an assembly P/Invokes to its own native library that isn't available to or consumed by anyone else, e.g. System.IO.Compression P/Invoking to clrcompression.dll. In such cases, System.IO.Compression should have its own Interop folder which follows a similar scheme as outlined in this proposal, but just for these private P/Invokes.
+ - The only exception to this should be when an assembly P/Invokes to its own native library that isn't available to or consumed by anyone else, e.g. System.IO.Compression P/Invoking to System.IO.Compression.Native.dll. In such cases, System.IO.Compression should have its own Interop folder which follows a similar scheme as outlined in this proposal, but just for these private P/Invokes.
- Under Common\src\Interop, we'll have a folder for each target platform, and within each platform, for each library from which functionality is being consumed. The Interop.*.cs files will live within those library folders, e.g.
```
diff --git a/src/coreclr/scripts/superpmi-setup.py b/src/coreclr/scripts/superpmi-setup.py
index 10365804de8b2b..ba32ebfdb2779f 100644
--- a/src/coreclr/scripts/superpmi-setup.py
+++ b/src/coreclr/scripts/superpmi-setup.py
@@ -56,7 +56,7 @@
parser.add_argument("-max_size", help="Max size of each partition in MB")
is_windows = platform.system() == "Windows"
native_binaries_to_ignore = [
- "clrcompression.dll",
+ "System.IO.Compression.Native.dll",
"clretwrc.dll",
"clrgc.dll",
"clrjit.dll",
diff --git a/src/coreclr/vm/pinvokeoverride.cpp b/src/coreclr/vm/pinvokeoverride.cpp
index 07af650e3aa926..2f4f0924142aab 100644
--- a/src/coreclr/vm/pinvokeoverride.cpp
+++ b/src/coreclr/vm/pinvokeoverride.cpp
@@ -14,10 +14,16 @@ extern "C" const void* GlobalizationResolveDllImport(const char* name);
static PInvokeOverrideFn* s_overrideImpl = nullptr;
+#if defined(_WIN32)
+#define GLOBALIZATION_DLL_NAME "System.Globalization.Native"
+#else
+#define GLOBALIZATION_DLL_NAME "libSystem.Globalization.Native"
+#endif
+
// here we handle PInvokes whose implementation is always statically linked (even in .so/.dll case)
static const void* DefaultResolveDllImport(const char* libraryName, const char* entrypointName)
{
- if (strcmp(libraryName, "libSystem.Globalization.Native") == 0)
+ if (strcmp(libraryName, GLOBALIZATION_DLL_NAME) == 0)
{
return GlobalizationResolveDllImport(entrypointName);
}
diff --git a/src/installer/corehost/cli/apphost/static/CMakeLists.txt b/src/installer/corehost/cli/apphost/static/CMakeLists.txt
index cf100a715d1a34..530806e4ae2403 100644
--- a/src/installer/corehost/cli/apphost/static/CMakeLists.txt
+++ b/src/installer/corehost/cli/apphost/static/CMakeLists.txt
@@ -119,7 +119,7 @@ if(CLR_CMAKE_TARGET_WIN32)
set(CORECLR_LIBRARIES
${CORECLR_STATIC_LIB_LOCATION}/coreclr_static.lib
${CORECLR_STATIC_LIB_LOCATION}/System.Globalization.Native.lib
- ${CORECLR_STATIC_LIB_LOCATION}/libclrcompression.lib
+ ${CORECLR_STATIC_LIB_LOCATION}/System.IO.Compression.Native.lib
kernel32.lib
advapi32.lib
ole32.lib
diff --git a/src/installer/corehost/cli/hostpolicy/hostpolicy_context.cpp b/src/installer/corehost/cli/hostpolicy/hostpolicy_context.cpp
index aba62722a0da58..6abafe19a841b0 100644
--- a/src/installer/corehost/cli/hostpolicy/hostpolicy_context.cpp
+++ b/src/installer/corehost/cli/hostpolicy/hostpolicy_context.cpp
@@ -47,7 +47,7 @@ namespace
extern "C" const void* CompressionResolveDllImport(const char* name);
#if defined(_WIN32)
-#define COMPRESSION_DLL_NAME "clrcompression"
+#define COMPRESSION_DLL_NAME "System.IO.Compression.Native"
#else
#define COMPRESSION_DLL_NAME "libSystem.IO.Compression.Native"
#endif
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
index 036716cf0a7f9f..bf739ab1e4cf4b 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
@@ -177,6 +177,7 @@
+
diff --git a/src/libraries/Common/src/Interop/Interop.Libraries.cs b/src/libraries/Common/src/Interop/Interop.Libraries.cs
deleted file mode 100644
index e57d5918ba350d..00000000000000
--- a/src/libraries/Common/src/Interop/Interop.Libraries.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-internal static partial class Interop
-{
- internal static partial class Libraries
- {
- internal const string GlobalizationNative = "libSystem.Globalization.Native";
- }
-}
diff --git a/src/libraries/Common/src/Interop/Unix/Interop.Libraries.cs b/src/libraries/Common/src/Interop/Unix/Interop.Libraries.cs
index 6a624e1ced4c64..bccd11e9a517cf 100644
--- a/src/libraries/Common/src/Interop/Unix/Interop.Libraries.cs
+++ b/src/libraries/Common/src/Interop/Unix/Interop.Libraries.cs
@@ -10,6 +10,7 @@ internal static partial class Libraries
internal const string NetSecurityNative = "libSystem.Net.Security.Native";
internal const string CryptoNative = "libSystem.Security.Cryptography.Native.OpenSsl";
internal const string CompressionNative = "libSystem.IO.Compression.Native";
+ internal const string GlobalizationNative = "libSystem.Globalization.Native";
internal const string IOPortsNative = "libSystem.IO.Ports.Native";
internal const string Libdl = "libdl";
internal const string HostPolicy = "libhostpolicy";
diff --git a/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs b/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs
index 4893a2894682de..fbddd07aaaf016 100644
--- a/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs
+++ b/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs
@@ -31,7 +31,8 @@ internal static partial class Libraries
internal const string Wldap32 = "wldap32.dll";
internal const string Ws2_32 = "ws2_32.dll";
internal const string Wtsapi32 = "wtsapi32.dll";
- internal const string CompressionNative = "clrcompression";
+ internal const string CompressionNative = "System.IO.Compression.Native";
+ internal const string GlobalizationNative = "System.Globalization.Native";
internal const string MsQuic = "msquic.dll";
internal const string HostPolicy = "hostpolicy.dll";
}
diff --git a/src/libraries/Native/AnyOS/zlib/pal_zlib.c b/src/libraries/Native/AnyOS/zlib/pal_zlib.c
index da4566a278ffb4..2c399639d0fa92 100644
--- a/src/libraries/Native/AnyOS/zlib/pal_zlib.c
+++ b/src/libraries/Native/AnyOS/zlib/pal_zlib.c
@@ -7,7 +7,7 @@
#ifdef _WIN32
#define c_static_assert(e) static_assert((e),"")
- #include "../../Windows/clrcompression/zlib/zlib.h"
+ #include "../../Windows/System.IO.Compression.Native/zlib/zlib.h"
#else
#include "pal_utilities.h"
#include
diff --git a/src/libraries/Native/Windows/CMakeLists.txt b/src/libraries/Native/Windows/CMakeLists.txt
index 1f3ac2bd8ecccf..66bb91dcc603e9 100644
--- a/src/libraries/Native/Windows/CMakeLists.txt
+++ b/src/libraries/Native/Windows/CMakeLists.txt
@@ -129,4 +129,4 @@ if(STATIC_LIBS_ONLY)
add_subdirectory(../Unix/System.Globalization.Native System.Globalization.Native)
endif()
-add_subdirectory(clrcompression)
+add_subdirectory(System.IO.Compression.Native)
diff --git a/src/libraries/Native/Windows/clrcompression/CMakeLists.txt b/src/libraries/Native/Windows/System.IO.Compression.Native/CMakeLists.txt
similarity index 70%
rename from src/libraries/Native/Windows/clrcompression/CMakeLists.txt
rename to src/libraries/Native/Windows/System.IO.Compression.Native/CMakeLists.txt
index 9566e381d88ec1..8b0633417c5267 100644
--- a/src/libraries/Native/Windows/clrcompression/CMakeLists.txt
+++ b/src/libraries/Native/Windows/System.IO.Compression.Native/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(clrcompression)
+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.")
@@ -81,46 +81,46 @@ set (NATIVECOMPRESSION_SOURCES
include_directories("../../AnyOS/brotli/include")
if (GEN_SHARED_LIB)
- add_library(clrcompression
+ add_library(System.IO.Compression.Native
SHARED
${NATIVECOMPRESSION_SOURCES}
- clrcompression.def
+ System.IO.Compression.Native.def
# This will add versioning to the library
${CMAKE_REPO_ROOT}/artifacts/obj/NativeVersion.rc
)
endif()
-add_library(clrcompression-static
+add_library(System.IO.Compression.Native-static
STATIC
${NATIVECOMPRESSION_SOURCES}
)
-SET_TARGET_PROPERTIES(clrcompression-static PROPERTIES PREFIX "")
-SET_TARGET_PROPERTIES(clrcompression-static PROPERTIES OUTPUT_NAME libclrcompression)
+SET_TARGET_PROPERTIES(System.IO.Compression.Native-static PROPERTIES PREFIX "")
+SET_TARGET_PROPERTIES(System.IO.Compression.Native-static PROPERTIES OUTPUT_NAME System.IO.Compression.Native)
# Allow specification of arguments that should be passed to the linker
if (GEN_SHARED_LIB)
- SET_TARGET_PROPERTIES(clrcompression PROPERTIES LINK_OPTIONS "${__LinkArgs};${__SharedLinkArgs}")
+ SET_TARGET_PROPERTIES(System.IO.Compression.Native PROPERTIES LINK_OPTIONS "${__LinkArgs};${__SharedLinkArgs}")
endif()
-SET_TARGET_PROPERTIES(clrcompression-static PROPERTIES STATIC_LIBRARY_OPTIONS "${__LinkArgs}")
+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(clrcompression ${__LinkLibraries})
+ target_link_libraries(System.IO.Compression.Native ${__LinkLibraries})
endif()
-target_link_libraries(clrcompression-static ${__LinkLibraries})
+target_link_libraries(System.IO.Compression.Native-static ${__LinkLibraries})
if (GEN_SHARED_LIB)
- GENERATE_EXPORT_HEADER( clrcompression
- BASE_NAME clrcompression
- EXPORT_MACRO_NAME clrcompression_EXPORT
- EXPORT_FILE_NAME clrcompression_Export.h
- STATIC_DEFINE clrcompression_BUILT_AS_STATIC
+ 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 clrcompression DESTINATION .)
- install (FILES $ DESTINATION .)
+ install (TARGETS System.IO.Compression.Native DESTINATION .)
+ install (FILES $ DESTINATION .)
endif()
-install (TARGETS clrcompression-static DESTINATION ${STATIC_LIB_DESTINATION})
+install (TARGETS System.IO.Compression.Native-static DESTINATION ${STATIC_LIB_DESTINATION})
diff --git a/src/libraries/Native/Windows/clrcompression/Native.rc b/src/libraries/Native/Windows/System.IO.Compression.Native/Native.rc
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/Native.rc
rename to src/libraries/Native/Windows/System.IO.Compression.Native/Native.rc
diff --git a/src/libraries/Native/Windows/clrcompression/clrcompression.def b/src/libraries/Native/Windows/System.IO.Compression.Native/System.IO.Compression.Native.def
similarity index 92%
rename from src/libraries/Native/Windows/clrcompression/clrcompression.def
rename to src/libraries/Native/Windows/System.IO.Compression.Native/System.IO.Compression.Native.def
index 95a413f199e929..a5d192ee42e83e 100644
--- a/src/libraries/Native/Windows/clrcompression/clrcompression.def
+++ b/src/libraries/Native/Windows/System.IO.Compression.Native/System.IO.Compression.Native.def
@@ -1,4 +1,4 @@
-LIBRARY clrcompression.dll
+LIBRARY System.IO.Compression.Native.dll
EXPORTS
CompressionNative_Crc32
@@ -31,4 +31,4 @@ EXPORTS
BrotliDecoderTakeOutput
BrotliDecoderVersion
BrotliGetDictionary
- BrotliSetDictionaryData
\ No newline at end of file
+ BrotliSetDictionaryData
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/README.txt b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/README.txt
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/README.txt
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/README.txt
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/adler32.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/adler32.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/adler32.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/adler32.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/compress.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/compress.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/compress.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/compress.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/crc32.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/crc32.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/crc32.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/crc32.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/crc32.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/crc32.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/crc32.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/crc32.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/crc_folding.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/crc_folding.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/crc_folding.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/crc_folding.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/deflate.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/deflate.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/deflate.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/deflate.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/deflate.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/deflate.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/deflate.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/deflate.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/deflate_medium.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/deflate_medium.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/deflate_medium.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/deflate_medium.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/deflate_quick.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/deflate_quick.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/deflate_quick.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/deflate_quick.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/gzguts.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/gzguts.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/gzguts.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/gzguts.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/inffast.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inffast.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/inffast.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inffast.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/inffast.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inffast.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/inffast.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inffast.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/inffixed.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inffixed.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/inffixed.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inffixed.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/inflate.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inflate.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/inflate.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inflate.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/inflate.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inflate.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/inflate.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inflate.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/inftrees.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inftrees.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/inftrees.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inftrees.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/inftrees.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inftrees.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/inftrees.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/inftrees.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/match.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/match.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/match.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/match.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/slide_sse.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/slide_sse.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/slide_sse.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/slide_sse.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/trees.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/trees.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/trees.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/trees.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/trees.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/trees.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/trees.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/trees.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/x86.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/x86.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/x86.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/x86.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/x86.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/x86.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/x86.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/x86.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/zconf.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/zconf.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/zconf.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/zconf.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/zlib.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/zlib.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/zlib.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/zlib.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/zutil.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/zutil.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/zutil.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/zutil.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib-intel/zutil.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/zutil.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib-intel/zutil.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib-intel/zutil.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/CMakeLists.txt b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/CMakeLists.txt
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/CMakeLists.txt
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/CMakeLists.txt
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/ChangeLog b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/ChangeLog
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/ChangeLog
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/ChangeLog
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/FAQ b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/FAQ
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/FAQ
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/FAQ
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/INDEX b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/INDEX
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/INDEX
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/INDEX
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/Makefile b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/Makefile
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/Makefile
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/Makefile
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/Makefile.in b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/Makefile.in
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/Makefile.in
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/Makefile.in
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/README b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/README
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/README
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/README
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/adler32.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/adler32.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/adler32.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/adler32.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/compress.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/compress.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/compress.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/compress.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/configure b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/configure
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/configure
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/configure
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/crc32.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/crc32.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/crc32.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/crc32.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/crc32.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/crc32.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/crc32.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/crc32.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/deflate.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/deflate.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/deflate.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/deflate.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/deflate.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/deflate.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/deflate.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/deflate.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/gzclose.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzclose.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/gzclose.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzclose.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/gzguts.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzguts.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/gzguts.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzguts.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/gzlib.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzlib.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/gzlib.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzlib.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/gzread.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzread.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/gzread.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzread.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/gzwrite.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzwrite.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/gzwrite.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/gzwrite.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/infback.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/infback.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/infback.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/infback.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/inffast.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inffast.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/inffast.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inffast.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/inffast.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inffast.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/inffast.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inffast.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/inffixed.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inffixed.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/inffixed.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inffixed.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/inflate.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inflate.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/inflate.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inflate.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/inflate.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inflate.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/inflate.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inflate.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/inftrees.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inftrees.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/inftrees.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inftrees.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/inftrees.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inftrees.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/inftrees.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/inftrees.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/make_vms.com b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/make_vms.com
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/make_vms.com
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/make_vms.com
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/treebuild.xml b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/treebuild.xml
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/treebuild.xml
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/treebuild.xml
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/trees.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/trees.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/trees.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/trees.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/trees.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/trees.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/trees.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/trees.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/uncompr.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/uncompr.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/uncompr.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/uncompr.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/zconf.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zconf.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/zconf.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zconf.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/zconf.h.cmakein b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zconf.h.cmakein
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/zconf.h.cmakein
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zconf.h.cmakein
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/zconf.h.in b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zconf.h.in
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/zconf.h.in
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zconf.h.in
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/zlib.3 b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.3
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/zlib.3
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.3
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/zlib.3.pdf b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.3.pdf
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/zlib.3.pdf
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.3.pdf
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/zlib.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/zlib.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.h
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/zlib.map b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.map
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/zlib.map
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.map
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/zlib.pc.cmakein b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.pc.cmakein
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/zlib.pc.cmakein
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.pc.cmakein
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/zlib.pc.in b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.pc.in
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/zlib.pc.in
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib.pc.in
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/zlib2ansi b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib2ansi
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/zlib2ansi
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zlib2ansi
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/zutil.c b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zutil.c
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/zutil.c
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zutil.c
diff --git a/src/libraries/Native/Windows/clrcompression/zlib/zutil.h b/src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zutil.h
similarity index 100%
rename from src/libraries/Native/Windows/clrcompression/zlib/zutil.h
rename to src/libraries/Native/Windows/System.IO.Compression.Native/zlib/zutil.h
diff --git a/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateZLib/ZLibNative.cs b/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateZLib/ZLibNative.cs
index 8cffa5df290d6d..8118aeba0ecb82 100644
--- a/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateZLib/ZLibNative.cs
+++ b/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateZLib/ZLibNative.cs
@@ -8,7 +8,7 @@ namespace System.IO.Compression
{
///
/// This class provides declaration for constants and PInvokes as well as some basic tools for exposing the
- /// native CLRCompression.dll (effectively, ZLib) library to managed code.
+ /// native System.IO.Compression.Native.dll (effectively, ZLib) library to managed code.
///
/// See also: How to choose a compression level (in comments to CompressionLevel.
///
@@ -159,12 +159,12 @@ public enum CompressionMethod : int
* This was done on purpose to:
*
* - Achieve the right encapsulation in a situation where ZLibNative may be compiled division-wide
- * into different assemblies that wish to consume CLRCompression. Since internal
+ * into different assemblies that wish to consume System.IO.Compression.Native. Since internal
* scope is effectively like public scope when compiling ZLibNative into a higher
* level assembly, we need a combination of inner types and private-scope members to achieve
* the right encapsulation.
*
- * - Achieve late dynamic loading of CLRCompression.dll at the right time.
+ * - Achieve late dynamic loading of System.IO.Compression.Native.dll at the right time.
* The native assembly will not be loaded unless it is actually used since the loading is performed by a static
* constructor of an inner type that is not directly referenced by user code.
*
diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
index 5e67e042260718..dafa471e67f9cc 100644
--- a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
+++ b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
@@ -1047,9 +1047,6 @@
-
- Common\Interop\Interop.Libraries.cs
-
Common\Interop\Interop.Calendar.cs
diff --git a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
index 1273cc6c5d1c40..524801d2ed72cf 100644
--- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
+++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
@@ -30,7 +30,7 @@
+ Link="Common\Interop\Windows\Interop.Libraries.cs" />
+ Link="Common\Interop\Windows\Interop.Libraries.cs" />
+ Exclude="$(NetCoreAppCurrentRuntimePath)$(MSBuildProjectName).dll;
+ $(NetCoreAppCurrentRuntimePath)System.*.Native.dll"
+ />
diff --git a/src/mono/mono/metadata/native-library.c b/src/mono/mono/metadata/native-library.c
index 0003bcfdae620e..25923730d70313 100644
--- a/src/mono/mono/metadata/native-library.c
+++ b/src/mono/mono/metadata/native-library.c
@@ -1261,10 +1261,17 @@ legacy_lookup_native_library (MonoImage *image, const char *scope)
#endif // ENABLE_NETCORE
#if defined(ENABLE_NETCORE) && !defined(NO_GLOBALIZATION_SHIM)
+
+#ifdef HOST_WIN32
+#define GLOBALIZATION_DLL_NAME "System.Globalization.Native"
+#else
+#define GLOBALIZATION_DLL_NAME "libSystem.Globalization.Native"
+#endif
+
static gpointer
default_resolve_dllimport (const char *dll, const char *func)
{
- if (strcmp (dll, "libSystem.Globalization.Native") == 0) {
+ if (strcmp (dll, GLOBALIZATION_DLL_NAME) == 0) {
const void *method_impl = GlobalizationResolveDllImport (func);
if (method_impl)
return (gpointer)method_impl;