Remove lib prefix for System.Globalization.Native.a to match all other libraries...

diff --git a/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props b/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props
index 87db2a7..dea614a 100644 (file)
--- a/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props
+++ b/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" />
+    <NativeBinary Include="$(BinDir)System.Globalization.Native.a" />
     <NativeBinary Include="$(BinDir)System.Globalization.Native.so" />
   </ItemGroup>
 </Project>

diff --git a/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props b/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props
index 8ce7030..734ec7d 100644 (file)
--- a/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props
+++ b/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" />
+    <NativeBinary Include="$(BinDir)System.Globalization.Native.a" />
     <NativeBinary Include="$(BinDir)System.Globalization.Native.dylib" />
   </ItemGroup>
 </Project>

diff --git a/src/corefx/System.Globalization.Native/CMakeLists.txt b/src/corefx/System.Globalization.Native/CMakeLists.txt
index 55c6854..d3280db 100644 (file)
--- a/src/corefx/System.Globalization.Native/CMakeLists.txt
+++ b/src/corefx/System.Globalization.Native/CMakeLists.txt
@@ -65,12 +65,13 @@ _add_library(System.Globalization.Native_Static
     ${NATIVEGLOBALIZATION_SOURCES}
 )
 
-# Remove the _Static postfix from the static library name
-set_target_properties(System.Globalization.Native_Static PROPERTIES OUTPUT_NAME System.Globalization.Native)
-
 # Disable the "lib" prefix.
 set_target_properties(System.Globalization.Native PROPERTIES PREFIX "")
 
+# 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)
+
 if(NOT CLR_CMAKE_PLATFORM_DARWIN)
     if (NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD)
         target_link_libraries(System.Globalization.Native