diff --git a/eng/native/naming.props b/eng/native/naming.props
new file mode 100644
index 00000000000000..541aaaa1bcbfda
--- /dev/null
+++ b/eng/native/naming.props
@@ -0,0 +1,41 @@
+
+
+
+
+
+ .exe
+
+ .dll
+ .pdb
+
+
+
+
+ lib
+ .dylib
+ .dwarf
+
+
+
+
+ lib
+ .so
+
+ .debug
+
+
+
+
+ lib
+ .so
+ .dbg
+
+
+
+
+
+
+
+
+
+
diff --git a/src/coreclr/src/.nuget/Directory.Build.props b/src/coreclr/src/.nuget/Directory.Build.props
index adaa4b2e06b734..01ce67861bfe0a 100644
--- a/src/coreclr/src/.nuget/Directory.Build.props
+++ b/src/coreclr/src/.nuget/Directory.Build.props
@@ -12,6 +12,9 @@
true
+
+ true
+
<_parseDistroRid>$(__DistroRid)
<_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(__BuildOS)' == 'OSX'">osx.10.12-x64
@@ -129,29 +132,7 @@
-
-
-
-
-
- .dylib
- .dwarf
-
-
-
-
- .so
-
- .debug
-
-
-
-
- .so
- .dbg
-
-
-
+
diff --git a/src/installer/pkg/projects/Directory.Build.props b/src/installer/pkg/projects/Directory.Build.props
index 69f9f503c8256d..d62f9f540dd57d 100644
--- a/src/installer/pkg/projects/Directory.Build.props
+++ b/src/installer/pkg/projects/Directory.Build.props
@@ -1,6 +1,5 @@
-
@@ -169,36 +168,5 @@
$(PackageRID)
-
-
-
- .exe
-
- .dll
- .pdb
-
-
-
-
-
- lib
- .dylib
- .dwarf
-
-
-
-
-
- lib
- .so
- .dbg
-
-
-
-
-
-
-
-
-
+
diff --git a/src/libraries/Common/src/Interop/Unix/Interop.Libraries.cs b/src/libraries/Common/src/Interop/Unix/Interop.Libraries.cs
index 10118ff305174e..85225cd8e2521f 100644
--- a/src/libraries/Common/src/Interop/Unix/Interop.Libraries.cs
+++ b/src/libraries/Common/src/Interop/Unix/Interop.Libraries.cs
@@ -7,12 +7,12 @@ internal static partial class Interop
internal static partial class Libraries
{
// Shims
- internal const string SystemNative = "System.Native";
- internal const string GlobalizationNative = "System.Globalization.Native";
- internal const string NetSecurityNative = "System.Net.Security.Native";
- internal const string CryptoNative = "System.Security.Cryptography.Native.OpenSsl";
- internal const string CompressionNative = "System.IO.Compression.Native";
- internal const string IOPortsNative = "System.IO.Ports.Native";
+ internal const string SystemNative = "libSystem.Native";
+ internal const string GlobalizationNative = "libSystem.Globalization.Native";
+ 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 IOPortsNative = "libSystem.IO.Ports.Native";
internal const string Libdl = "libdl";
}
}
diff --git a/src/libraries/Native/Unix/CMakeLists.txt b/src/libraries/Native/Unix/CMakeLists.txt
index f6570bc3fffcf9..42728349a434de 100644
--- a/src/libraries/Native/Unix/CMakeLists.txt
+++ b/src/libraries/Native/Unix/CMakeLists.txt
@@ -13,7 +13,6 @@ set(CMAKE_MACOSX_RPATH ON)
set(CMAKE_INSTALL_PREFIX $ENV{__CMakeBinDir})
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-set(CMAKE_SHARED_LIBRARY_PREFIX "")
set(VERSION_FILE_PATH "${CMAKE_BINARY_DIR}/version.c")
# We mark the function which needs exporting with PALEXPORT
diff --git a/src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt
index f185743c88d144..25d0211e2d5ae1 100644
--- a/src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt
+++ b/src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt
@@ -79,8 +79,6 @@ add_library(System.Globalization.Native-Static
${NATIVEGLOBALIZATION_SOURCES}
)
-# Disable the "lib" prefix and override default name
-set_target_properties(System.Globalization.Native-Static PROPERTIES PREFIX "")
set_target_properties(System.Globalization.Native-Static PROPERTIES OUTPUT_NAME System.Globalization.Native CLEAN_DIRECT_OUTPUT 1)
install (TARGETS System.Globalization.Native-Static DESTINATION .)
diff --git a/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt
index e064e6683f0542..b01e5210716898 100644
--- a/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt
+++ b/src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt
@@ -61,8 +61,6 @@ add_library(System.IO.Compression.Native-Static
${NATIVECOMPRESSION_SOURCES}
)
-# Disable the "lib" prefix and override default name
-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 CLEAN_DIRECT_OUTPUT 1)
install (TARGETS System.IO.Compression.Native-Static DESTINATION .)
diff --git a/src/libraries/Native/Unix/System.IO.Ports.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.IO.Ports.Native/CMakeLists.txt
index 5155a68a823e80..f076b642f21cc7 100644
--- a/src/libraries/Native/Unix/System.IO.Ports.Native/CMakeLists.txt
+++ b/src/libraries/Native/Unix/System.IO.Ports.Native/CMakeLists.txt
@@ -13,8 +13,6 @@ add_library(System.IO.Ports.Native-Static
pal_serial.c
)
-# Disable the "lib" prefix and override default name
-set_target_properties(System.IO.Ports.Native-Static PROPERTIES PREFIX "")
set_target_properties(System.IO.Ports.Native-Static PROPERTIES OUTPUT_NAME System.IO.Ports.Native CLEAN_DIRECT_OUTPUT 1)
install_library_and_symbols (System.IO.Ports.Native)
diff --git a/src/libraries/Native/Unix/System.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.Native/CMakeLists.txt
index c56450c678dd20..e491a59ae97aac 100644
--- a/src/libraries/Native/Unix/System.Native/CMakeLists.txt
+++ b/src/libraries/Native/Unix/System.Native/CMakeLists.txt
@@ -62,8 +62,6 @@ add_library(System.Native-Static
${NATIVE_SOURCES}
)
-# Disable the "lib" prefix and override default name
-set_target_properties(System.Native-Static PROPERTIES PREFIX "")
set_target_properties(System.Native-Static PROPERTIES OUTPUT_NAME System.Native CLEAN_DIRECT_OUTPUT 1)
install (TARGETS System.Native-Static DESTINATION .)
diff --git a/src/libraries/Native/Unix/System.Net.Security.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.Net.Security.Native/CMakeLists.txt
index 95c99012b71e79..12e0c9683d3862 100644
--- a/src/libraries/Native/Unix/System.Net.Security.Native/CMakeLists.txt
+++ b/src/libraries/Native/Unix/System.Net.Security.Native/CMakeLists.txt
@@ -36,8 +36,6 @@ add_library(System.Net.Security.Native-Static
${NATIVEGSS_SOURCES}
)
-# Disable the "lib" prefix and override default name
-set_target_properties(System.Net.Security.Native-Static PROPERTIES PREFIX "")
set_target_properties(System.Net.Security.Native-Static PROPERTIES OUTPUT_NAME System.Net.Security.Native CLEAN_DIRECT_OUTPUT 1)
target_link_libraries(System.Net.Security.Native
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/CMakeLists.txt b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/CMakeLists.txt
index 4bf9929db36b23..e0e2f660f79299 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/CMakeLists.txt
+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/CMakeLists.txt
@@ -32,11 +32,6 @@ add_library(System.Security.Cryptography.Native.Apple-Static
${NATIVECRYPTO_SOURCES}
)
-# Disable the "lib" prefix.
-set_target_properties(System.Security.Cryptography.Native.Apple PROPERTIES PREFIX "")
-
-# Disable the "lib" prefix and override default name
-set_target_properties(System.Security.Cryptography.Native.Apple-Static PROPERTIES PREFIX "")
set_target_properties(System.Security.Cryptography.Native.Apple-Static PROPERTIES OUTPUT_NAME System.Security.Cryptography.Native.Apple CLEAN_DIRECT_OUTPUT 1)
target_link_libraries(System.Security.Cryptography.Native.Apple
diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt
index 8515b80810f3ea..c1e5f6dedab0fe 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt
+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt
@@ -75,11 +75,6 @@ add_library(System.Security.Cryptography.Native.OpenSsl-Static
$
)
-# Disable the "lib" prefix.
-set_target_properties(System.Security.Cryptography.Native.OpenSsl PROPERTIES PREFIX "")
-
-# Disable the "lib" prefix and override default name
-set_target_properties(System.Security.Cryptography.Native.OpenSsl-Static PROPERTIES PREFIX "")
set_target_properties(System.Security.Cryptography.Native.OpenSsl-Static PROPERTIES OUTPUT_NAME System.Security.Cryptography.Native.OpenSsl CLEAN_DIRECT_OUTPUT 1)
if (FEATURE_DISTRO_AGNOSTIC_SSL)
diff --git a/src/libraries/pkg/Directory.Build.props b/src/libraries/pkg/Directory.Build.props
index 78d3bc0c36c943..5766fd6723da40 100644
--- a/src/libraries/pkg/Directory.Build.props
+++ b/src/libraries/pkg/Directory.Build.props
@@ -35,30 +35,11 @@
-
-
-
-
-
- .dylib
- .dwarf
-
-
-
-
- .so
- .dbg
-
-
-
-
-
-
-
-
true
+
+
diff --git a/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.pkgproj b/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.pkgproj
index 984960f7f4e07d..d899043c4b87a7 100644
--- a/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.pkgproj
+++ b/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.pkgproj
@@ -5,7 +5,7 @@
true
-
+
runtimes/$(PackageRID)/native
diff --git a/src/mono/netcore/nuget/Directory.Build.props b/src/mono/netcore/nuget/Directory.Build.props
index 9a0aea09a9fe8c..11100d5cd43a98 100644
--- a/src/mono/netcore/nuget/Directory.Build.props
+++ b/src/mono/netcore/nuget/Directory.Build.props
@@ -32,6 +32,7 @@
<_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))
<_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))
<_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' == '-1'">$(RuntimeOS)
+ $(_runtimeOSFamily)
<_isSupportedOSGroup>true
@@ -114,29 +115,7 @@
-
-
-
-
-
- .dylib
- .dwarf
-
-
-
-
- .so
-
- .debug
-
-
-
-
- .so
- .dbg
-
-
-
+