From 295761a5d599763bc0a9dce3c4fee32fa1f86af1 Mon Sep 17 00:00:00 2001 From: Sedar Gokbulut Date: Thu, 5 Jan 2017 08:53:53 -0800 Subject: [PATCH] Revert "Adding Microsoft.NETCore.Native package (dotnet/coreclr#8791)" This reverts commit dotnet/coreclr@eea7b4691c0a489435814e48a257a9d047475006. Commit migrated from https://github.com/dotnet/coreclr/commit/dcf5aaa0c7579b9d427a6f29ec62f410ce4c729c --- .../Microsoft.NETCore.Native.builds | 65 ---------------------- .../Microsoft.NETCore.Native.pkgproj | 50 ----------------- .../alpine/3.4.3/Microsoft.NETCore.Native.pkgproj | 30 ---------- .../debian/Microsoft.NETCore.Native.pkgproj | 30 ---------- .../fedora/23/Microsoft.NETCore.Native.pkgproj | 30 ---------- .../fedora/24/Microsoft.NETCore.Native.pkgproj | 30 ---------- .../linux/Microsoft.NETCore.Native.pkgproj | 30 ---------- .../opensuse/13.2/Microsoft.NETCore.Native.pkgproj | 30 ---------- .../opensuse/42.1/Microsoft.NETCore.Native.pkgproj | 30 ---------- .../osx/Microsoft.NETCore.Native.pkgproj | 30 ---------- .../rhel/Microsoft.NETCore.Native.pkgproj | 30 ---------- .../ubuntu/14.04/Microsoft.NETCore.Native.pkgproj | 30 ---------- .../ubuntu/16.04/Microsoft.NETCore.Native.pkgproj | 30 ---------- .../ubuntu/16.10/Microsoft.NETCore.Native.pkgproj | 30 ---------- src/coreclr/src/.nuget/descriptions.json | 5 -- src/coreclr/src/.nuget/packages.builds | 1 - .../System.Globalization.Native/CMakeLists.txt | 16 ------ 17 files changed, 497 deletions(-) delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/alpine/3.4.3/Microsoft.NETCore.Native.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/debian/Microsoft.NETCore.Native.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/fedora/23/Microsoft.NETCore.Native.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/fedora/24/Microsoft.NETCore.Native.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/linux/Microsoft.NETCore.Native.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/opensuse/13.2/Microsoft.NETCore.Native.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/opensuse/42.1/Microsoft.NETCore.Native.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/osx/Microsoft.NETCore.Native.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/rhel/Microsoft.NETCore.Native.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/ubuntu/14.04/Microsoft.NETCore.Native.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.04/Microsoft.NETCore.Native.pkgproj delete mode 100644 src/coreclr/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.10/Microsoft.NETCore.Native.pkgproj diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds deleted file mode 100644 index a178ddb..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - $(PackageOutputPath) - - - - - - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - OSX - amd64 - - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index 51b524a..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,50 +0,0 @@ - - - - - true - true - x64;x86;arm64;arm; - $(PackagesOutputPath) - true - - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/alpine/3.4.3/Microsoft.NETCore.Native.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/alpine/3.4.3/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index b772b7f..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/alpine/3.4.3/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - true - alpine.3.4.3-$(PackagePlatform) - - x64; - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/debian/Microsoft.NETCore.Native.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/debian/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index 935954b..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/debian/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - true - debian.8-$(PackagePlatform) - - x64; - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/fedora/23/Microsoft.NETCore.Native.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/fedora/23/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index ed4f22b..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/fedora/23/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - true - fedora.23-$(PackagePlatform) - - x64; - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/fedora/24/Microsoft.NETCore.Native.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/fedora/24/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index fead3e5..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/fedora/24/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - true - fedora.24-$(PackagePlatform) - - x64; - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/linux/Microsoft.NETCore.Native.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/linux/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index afca009..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/linux/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - true - linux-$(PackagePlatform) - - x64; - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/opensuse/13.2/Microsoft.NETCore.Native.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/opensuse/13.2/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index becc455..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/opensuse/13.2/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - true - opensuse.13.2-$(PackagePlatform) - - x64; - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/opensuse/42.1/Microsoft.NETCore.Native.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/opensuse/42.1/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index 6dbdb29..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/opensuse/42.1/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - true - opensuse.42.1-$(PackagePlatform) - - x64; - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/osx/Microsoft.NETCore.Native.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/osx/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index 1fcd7f2..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/osx/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - true - osx.10.10-$(PackagePlatform) - - x64; - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/rhel/Microsoft.NETCore.Native.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/rhel/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index 99a23de..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/rhel/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - true - rhel.7-$(PackagePlatform) - - x64; - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/ubuntu/14.04/Microsoft.NETCore.Native.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/ubuntu/14.04/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index c2a9661..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/ubuntu/14.04/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - true - ubuntu.14.04-$(PackagePlatform) - - x64; - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.04/Microsoft.NETCore.Native.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.04/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index 4a4f2e7..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.04/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - true - ubuntu.16.04-$(PackagePlatform) - - x64; - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.10/Microsoft.NETCore.Native.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.10/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index 6e04e85..0000000 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.10/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - true - ubuntu.16.10-$(PackagePlatform) - - x64; - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/coreclr/src/.nuget/descriptions.json b/src/coreclr/src/.nuget/descriptions.json index ccb6af8..640ff02 100644 --- a/src/coreclr/src/.nuget/descriptions.json +++ b/src/coreclr/src/.nuget/descriptions.json @@ -38,10 +38,5 @@ "Name": "Microsoft.NETCore.TestHost", "Description": "CoreCLR application host for test applications", "CommonTypes": [ ] - }, - { - "Name": "Microsoft.NETCore.Native", - "Description": "Native shims for .NET Core runtime", - "CommonTypes": [ ] } ] diff --git a/src/coreclr/src/.nuget/packages.builds b/src/coreclr/src/.nuget/packages.builds index 5d1d025..7458c8e 100644 --- a/src/coreclr/src/.nuget/packages.builds +++ b/src/coreclr/src/.nuget/packages.builds @@ -18,7 +18,6 @@ - diff --git a/src/coreclr/src/corefx/System.Globalization.Native/CMakeLists.txt b/src/coreclr/src/corefx/System.Globalization.Native/CMakeLists.txt index 3c5c6a0..90f5067 100644 --- a/src/coreclr/src/corefx/System.Globalization.Native/CMakeLists.txt +++ b/src/coreclr/src/corefx/System.Globalization.Native/CMakeLists.txt @@ -67,14 +67,6 @@ _add_library(System.Globalization.Native ${NATIVEGLOBALIZATION_SOURCES} ) -_add_library(System.Globalization.Native_Static - 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 "") @@ -88,17 +80,10 @@ if(NOT CLR_CMAKE_PLATFORM_DARWIN) ${ICUUC} ${ICUI18N} ) - target_link_libraries(System.Globalization.Native_Static - ${ICUUC} - ${ICUI18N} - ) elseif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) target_link_libraries(System.Globalization.Native dl ) - target_link_libraries(System.Globalization.Native_Static - dl - ) endif() else() target_link_libraries(System.Globalization.Native @@ -115,5 +100,4 @@ verify_dependencies( # add the install targets install_clr(System.Globalization.Native) -install_clr(System.Globalization.Native_Static) -- 2.7.4