Skip to content

Commit 99f3f55

Browse files
authored
renaming clrcompression --> System.IO.Compression.Native (#45713)
* renaming `clrcompression` --> `System.IO.Compression.Native` * rename `clrcompression.def` file * exclude `System.*.Native.dll` when creating managed shims * static library should be `System.IO.Compression.Native.lib` on Windows. Same as Globalization - without `lib` prefix * revert change to the resource string in tests * move consts to src/Interop, remove `lib` prefix on Windows * Delete what used to be System.IO.Compression.clrcompression package * Preserve old PlatformManifestFileEntry for clrcompression.dll * partially revert the src\Interop change * Adjust projects for removal of `Interop\Interop.Libraries.cs` revert 1 * Undo entire System.IO.Compression.csproj to get rid of an invisible edit.
1 parent 3c0d0e6 commit 99f3f55

93 files changed

Lines changed: 53 additions & 53 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/coding-guidelines/interop-guidelines.md

Lines changed: 1 addition & 1 deletion

src/coreclr/scripts/superpmi-setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
parser.add_argument("-max_size", help="Max size of each partition in MB")
5757
is_windows = platform.system() == "Windows"
5858
native_binaries_to_ignore = [
59-
"clrcompression.dll",
59+
"System.IO.Compression.Native.dll",
6060
"clretwrc.dll",
6161
"clrgc.dll",
6262
"clrjit.dll",

src/coreclr/vm/pinvokeoverride.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,16 @@ extern "C" const void* GlobalizationResolveDllImport(const char* name);
1414

1515
static PInvokeOverrideFn* s_overrideImpl = nullptr;
1616

17+
#if defined(_WIN32)
18+
#define GLOBALIZATION_DLL_NAME "System.Globalization.Native"
19+
#else
20+
#define GLOBALIZATION_DLL_NAME "libSystem.Globalization.Native"
21+
#endif
22+
1723
// here we handle PInvokes whose implementation is always statically linked (even in .so/.dll case)
1824
static const void* DefaultResolveDllImport(const char* libraryName, const char* entrypointName)
1925
{
20-
if (strcmp(libraryName, "libSystem.Globalization.Native") == 0)
26+
if (strcmp(libraryName, GLOBALIZATION_DLL_NAME) == 0)
2127
{
2228
return GlobalizationResolveDllImport(entrypointName);
2329
}

src/installer/corehost/cli/apphost/static/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ if(CLR_CMAKE_TARGET_WIN32)
119119
set(CORECLR_LIBRARIES
120120
${CORECLR_STATIC_LIB_LOCATION}/coreclr_static.lib
121121
${CORECLR_STATIC_LIB_LOCATION}/System.Globalization.Native.lib
122-
${CORECLR_STATIC_LIB_LOCATION}/libclrcompression.lib
122+
${CORECLR_STATIC_LIB_LOCATION}/System.IO.Compression.Native.lib
123123
kernel32.lib
124124
advapi32.lib
125125
ole32.lib

src/installer/corehost/cli/hostpolicy/hostpolicy_context.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ namespace
4747
extern "C" const void* CompressionResolveDllImport(const char* name);
4848

4949
#if defined(_WIN32)
50-
#define COMPRESSION_DLL_NAME "clrcompression"
50+
#define COMPRESSION_DLL_NAME "System.IO.Compression.Native"
5151
#else
5252
#define COMPRESSION_DLL_NAME "libSystem.IO.Compression.Native"
5353
#endif

src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
<PlatformManifestFileEntry Include="API-MS-Win-core-xstate-l2-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
178178
<PlatformManifestFileEntry Include="ucrtbase.dll" IsNative="true" />
179179
<PlatformManifestFileEntry Include="clrcompression.dll" IsNative="true" />
180+
<PlatformManifestFileEntry Include="System.IO.Compression.Native.dll" IsNative="true" />
180181
<PlatformManifestFileEntry Include="createdump.exe" IsNative="true" />
181182
<PlatformManifestFileEntry Include="createdump" IsNative="true" />
182183
<PlatformManifestFileEntry Include="libcoreclrtraceptprovider.so" IsNative="true" />

src/libraries/Common/src/Interop/Interop.Libraries.cs

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/libraries/Common/src/Interop/Unix/Interop.Libraries.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ internal static partial class Libraries
1010
internal const string NetSecurityNative = "libSystem.Net.Security.Native";
1111
internal const string CryptoNative = "libSystem.Security.Cryptography.Native.OpenSsl";
1212
internal const string CompressionNative = "libSystem.IO.Compression.Native";
13+
internal const string GlobalizationNative = "libSystem.Globalization.Native";
1314
internal const string IOPortsNative = "libSystem.IO.Ports.Native";
1415
internal const string Libdl = "libdl";
1516
internal const string HostPolicy = "libhostpolicy";

src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ internal static partial class Libraries
3131
internal const string Wldap32 = "wldap32.dll";
3232
internal const string Ws2_32 = "ws2_32.dll";
3333
internal const string Wtsapi32 = "wtsapi32.dll";
34-
internal const string CompressionNative = "clrcompression";
34+
internal const string CompressionNative = "System.IO.Compression.Native";
35+
internal const string GlobalizationNative = "System.Globalization.Native";
3536
internal const string MsQuic = "msquic.dll";
3637
internal const string HostPolicy = "hostpolicy.dll";
3738
}

src/libraries/Native/AnyOS/zlib/pal_zlib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#ifdef _WIN32
99
#define c_static_assert(e) static_assert((e),"")
10-
#include "../../Windows/clrcompression/zlib/zlib.h"
10+
#include "../../Windows/System.IO.Compression.Native/zlib/zlib.h"
1111
#else
1212
#include "pal_utilities.h"
1313
#include <zlib.h>

0 commit comments

Comments
 (0)