diff --git a/build.sh b/build.sh index 8d03121479e3..a6254be55d7f 100755 --- a/build.sh +++ b/build.sh @@ -48,7 +48,7 @@ usage() echo "cmakeargs - user-settable additional arguments passed to CMake." echo "bindir - output directory (defaults to $__ProjectRoot/bin)" echo "buildstandalonegc - builds the GC in a standalone mode. Can't be used with \"cmakeargs\"." - + echo "msbuildonunsupportedplatform" exit 1 } @@ -304,42 +304,46 @@ isMSBuildOnNETCoreSupported() if [ "$__HostArch" == "x64" ]; then if [ "$__HostOS" == "Linux" ]; then - case "$__HostDistroRid" in - "centos.7-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "debian.8-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "fedora.23-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "fedora.24-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "opensuse.13.2-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "opensuse.42.1-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "rhel.7"*"-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.14.04-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.16.04-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.16.10-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "alpine.3.4.3-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - *) - esac + if [ "$__msbuildonunsupportedplatform" == "1" ]; then + __isMSBuildOnNETCoreSupported=1 + else + case "$__HostDistroRid" in + "centos.7-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "debian.8-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "fedora.23-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "fedora.24-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "opensuse.13.2-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "opensuse.42.1-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "rhel.7"*"-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "ubuntu.14.04-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "ubuntu.16.04-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "ubuntu.16.10-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "alpine.3.4.3-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + *) + esac + fi elif [ "$__HostOS" == "OSX" ]; then __isMSBuildOnNETCoreSupported=1 fi @@ -558,6 +562,7 @@ __cmakeargs="" __SkipGenerateVersion=0 __DoCrossArchBuild=0 __PortableLinux=0 +__msbuildonunsupportedplatform=0 while :; do if [ $# -le 0 ]; then @@ -728,6 +733,9 @@ while :; do buildstandalonegc) __cmakeargs="-DFEATURE_STANDALONE_GC=1" ;; + msbuildonunsupportedplatform) + __msbuildonunsupportedplatform=1 + ;; *) __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1" ;; diff --git a/dir.traversal.targets b/dir.traversal.targets index fd8fb93d3186..c0b284d79130 100644 --- a/dir.traversal.targets +++ b/dir.traversal.targets @@ -18,4 +18,5 @@ + \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds index e568ca57f5fc..93d9e296d479 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds @@ -1,89 +1,11 @@ - + - - - $(PackageOutputPath) - - - - - - - Windows_NT - amd64 - - - Windows_NT - arm64 - - - Windows_NT - x86 - - - Windows_NT - arm - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - arm - - - Linux - amd64 - - - Linux - arm - - - Linux - amd64 - - - Linux - amd64 - - - OSX - amd64 - + + - - + + diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj index c0b213461070..f863619c9cc0 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -1,69 +1,13 @@  - - - true - true - x64;x86;arm64;arm; - $(PackagesOutputPath) - true + + + + x64;x86;arm64;arm; + true - - - - amd64 - - - arm64 - - - x86 - - - arm - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - arm - - - amd64 - - - arm - - - amd64 - - - amd64 - - - amd64 - - + + + diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/alpine/3.4.3/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/alpine/3.4.3/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 41a5b4c301ee..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/alpine/3.4.3/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - alpine.3.4.3-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index f821897b4fe6..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - debian.8-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/fedora/23/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/fedora/23/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index ac8f53b4fed8..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/fedora/23/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - fedora.23-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/fedora/24/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/fedora/24/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 3ad08a9b77b2..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/fedora/24/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - fedora.24-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 6181ab366eba..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - opensuse.13.2-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/42.1/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/42.1/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 85adbd609236..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/42.1/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - opensuse.42.1-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/rhel/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/rhel/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 6410798f63d1..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/rhel/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - rhel.7-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/linux/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props similarity index 67% rename from src/.nuget/Microsoft.NETCore.ILAsm/linux/Microsoft.NETCore.ILAsm.pkgproj rename to src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props index ce3bf6320ee6..a8692a781ec8 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/linux/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props @@ -1,10 +1,6 @@ - + - - true - linux-$(PackagePlatform) - x64; @@ -19,11 +15,10 @@ - + runtimes/$(PackageTargetRuntime)/native true - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/osx/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props similarity index 67% rename from src/.nuget/Microsoft.NETCore.ILAsm/osx/Microsoft.NETCore.ILAsm.pkgproj rename to src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props index bee340b23c9b..bcd75f9c3aab 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/osx/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props @@ -1,10 +1,6 @@ - + - - true - osx.10.10-$(PackagePlatform) - x64; @@ -19,11 +15,10 @@ - + runtimes/$(PackageTargetRuntime)/native true - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Windows_NT.Microsoft.NETCore.ILAsm.props similarity index 67% rename from src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj rename to src/.nuget/Microsoft.NETCore.ILAsm/runtime.Windows_NT.Microsoft.NETCore.ILAsm.props index 57364df70645..478c4600de0f 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Windows_NT.Microsoft.NETCore.ILAsm.props @@ -1,9 +1,7 @@ - + - $(MinOSForArch)-$(PackagePlatform) - true @@ -14,11 +12,9 @@ - + runtimes/$(PackageTargetRuntime)/native true - - - \ No newline at end of file + diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index cacadc78b1ff..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - ubuntu.14.04-$(PackagePlatform) - - x64;arm; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 818495e6e285..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - ubuntu.16.04-$(PackagePlatform) - - x64;arm; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.10/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.10/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 91ee7f350323..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.10/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - ubuntu.16.10-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds index 5939fdaf6ef9..3c8ff0810c5c 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds @@ -1,89 +1,11 @@ - + - - - $(PackageOutputPath) - - - - - - - Windows_NT - amd64 - - - Windows_NT - arm64 - - - Windows_NT - x86 - - - Windows_NT - arm - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - arm - - - Linux - amd64 - - - Linux - arm - - - Linux - amd64 - - - Linux - amd64 - - - OSX - amd64 - + + - - - + + + \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj index 47683ef0a3dd..f863619c9cc0 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -1,69 +1,13 @@  - - - true - true - x64;x86;arm64;arm; - $(PackagesOutputPath) - true + + + + x64;x86;arm64;arm; + true - - - - amd64 - - - arm64 - - - x86 - - - arm - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - arm - - - amd64 - - - arm - - - amd64 - - - amd64 - - - amd64 - - + + + diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/alpine/3.4.3/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/alpine/3.4.3/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index b27fe0876706..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/alpine/3.4.3/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - alpine.3.4.3-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index af9d384ae12f..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - debian.8-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/23/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/23/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index 8385c5d55ae0..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/23/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - fedora.23-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/24/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/24/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index 20ad52225b18..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/24/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - fedora.24-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index d91ef02df35c..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - opensuse.13.2-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/42.1/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/42.1/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index 07370b4915da..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/42.1/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - opensuse.42.1-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/rhel/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/rhel/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index 355c1c9162e9..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/rhel/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - rhel.7-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/linux/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props similarity index 68% rename from src/.nuget/Microsoft.NETCore.ILDAsm/linux/Microsoft.NETCore.ILDAsm.pkgproj rename to src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props index 7a7f82ddd5a5..70f2f46be52e 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/linux/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props @@ -1,9 +1,6 @@ - + - - true - linux-$(PackagePlatform) x64; @@ -19,11 +16,9 @@ - + runtimes/$(PackageTargetRuntime)/native true - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/osx/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props similarity index 67% rename from src/.nuget/Microsoft.NETCore.ILDAsm/osx/Microsoft.NETCore.ILDAsm.pkgproj rename to src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props index 9a17267a661e..7629cae19f4f 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/osx/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props @@ -1,10 +1,6 @@ - + - - true - osx.10.10-$(PackagePlatform) - x64; @@ -19,11 +15,10 @@ - + runtimes/$(PackageTargetRuntime)/native true - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Windows_NT.Microsoft.NETCore.ILDAsm.props similarity index 69% rename from src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj rename to src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Windows_NT.Microsoft.NETCore.ILDAsm.props index d32b540b0bc7..850df28e6d0f 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Windows_NT.Microsoft.NETCore.ILDAsm.props @@ -1,9 +1,7 @@ - + - $(MinOSForArch)-$(PackagePlatform) - true @@ -15,11 +13,10 @@ - + runtimes/$(PackageTargetRuntime)/native true - - \ No newline at end of file + diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index e087645962a5..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - ubuntu.14.04-$(PackagePlatform) - - x64;arm; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index 776e59ba1683..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - ubuntu.16.04-$(PackagePlatform) - - x64;arm; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.10/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.10/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index 6c73eba24017..000000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.10/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - ubuntu.16.10-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds index 61c690ebb13e..372d8d8d641c 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds @@ -1,89 +1,11 @@ - - + + - - - $(PackageOutputPath) - - - - - - - Windows_NT - amd64 - - - Windows_NT - arm64 - - - Windows_NT - x86 - - - Windows_NT - arm - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - arm - - - Linux - amd64 - - - Linux - arm - - - Linux - amd64 - - - Linux - amd64 - - - OSX - amd64 - + + - - - + + + \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj index bcd4e4232fd0..27b0bc8c2b3d 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj @@ -1,68 +1,47 @@  - - - true - true - x64;x86;arm64;arm; - $(PackagesOutputPath) - true + + + + x64;x86;arm64;arm; + true + + + + + + + .dylib + .dwarf + + + + + .so + .dbg + + + - - amd64 - - - arm64 - - - x86 - - - arm - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - arm - - - amd64 - - - arm - - - amd64 - - - amd64 - - - amd64 - + + + + + netcoreapp + 2.0 + $(TargetFrameworkName)$(TargetFrameworkVersion) + + $(PackagePlatform) + amd64 + $(CrossTargetComponentFolder) + amd64 + _$(LongNamePlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).0$(BuildNumberMinor) + _$(CrossTargetPlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).0$(BuildNumberMinor) + + + + diff --git a/src/.nuget/Microsoft.NETCore.Jit/alpine/3.4.3/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/alpine/3.4.3/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 96851ff3ac9c..000000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/alpine/3.4.3/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - alpine.3.4.3-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/debian/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/debian/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 9d6043e46548..000000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/debian/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - debian.8-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/fedora/23/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/fedora/23/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 1dea18c33d21..000000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/fedora/23/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - fedora.23-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/fedora/24/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/fedora/24/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 42f974ab96cf..000000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/fedora/24/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - fedora.24-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/opensuse/13.2/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/opensuse/13.2/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 28a8769d5e90..000000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/opensuse/13.2/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - opensuse.13.2-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/opensuse/42.1/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/opensuse/42.1/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 930606c175fd..000000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/opensuse/42.1/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - opensuse.42.1-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/rhel/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/rhel/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index fa9f58c81bc2..000000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/rhel/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - rhel.7-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/linux/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props similarity index 64% rename from src/.nuget/Microsoft.NETCore.Jit/linux/Microsoft.NETCore.Jit.pkgproj rename to src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props index 541b81e4abd8..4f333eefe3e6 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/linux/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props @@ -1,11 +1,7 @@ - + - - true - linux-$(PackagePlatform) - - x64; + x64; @@ -19,11 +15,10 @@ - + runtimes/$(PackageTargetRuntime)/native true - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/osx/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props similarity index 64% rename from src/.nuget/Microsoft.NETCore.Jit/osx/Microsoft.NETCore.Jit.pkgproj rename to src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props index 87e7e2bffde8..abc18a70eb8b 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/osx/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props @@ -1,11 +1,7 @@ - + - - true - osx.10.10-$(PackagePlatform) - - x64; + x64; @@ -19,11 +15,10 @@ - + runtimes/$(PackageTargetRuntime)/native true - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props similarity index 76% rename from src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj rename to src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props index 66106c30dc66..49a216440188 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props @@ -1,11 +1,5 @@ - + - - - true - $(MinOSForArch)-$(PackagePlatform) - true - @@ -25,7 +19,7 @@ - + runtimes/$(PackageTargetRuntime)/native @@ -36,5 +30,4 @@ true - diff --git a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 50d343f977f8..000000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - ubuntu.14.04-$(PackagePlatform) - - x64;arm; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index e57b7c51d5e5..000000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - ubuntu.16.04-$(PackagePlatform) - - x64;arm; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.10/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.10/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 338d23372f8a..000000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.10/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - ubuntu.16.10-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds index a178ddb9618b..976f64b1bf68 100644 --- a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds +++ b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds @@ -1,65 +1,13 @@ - + - - - $(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 - + + - - - + + + \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj index 51b524a1c8c7..bcca6d20e57a 100644 --- a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj @@ -1,50 +1,16 @@  - - - true - true + + + + + + x64;x86;arm64;arm; - $(PackagesOutputPath) - true + true - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.props b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.props new file mode 100644 index 000000000000..ff2f587a1c25 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.props @@ -0,0 +1,6 @@ + + + + Linux;OSX + + \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Native/alpine/3.4.3/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/alpine/3.4.3/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index 90545a900138..000000000000 --- a/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/.nuget/Microsoft.NETCore.Native/debian/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/debian/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index c136a2c0571d..000000000000 --- a/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/.nuget/Microsoft.NETCore.Native/fedora/23/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/fedora/23/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index 8547114cdd45..000000000000 --- a/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/.nuget/Microsoft.NETCore.Native/fedora/24/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/fedora/24/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index f4987de01d24..000000000000 --- a/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/.nuget/Microsoft.NETCore.Native/opensuse/13.2/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/opensuse/13.2/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index bf8307a0b38d..000000000000 --- a/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/.nuget/Microsoft.NETCore.Native/opensuse/42.1/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/opensuse/42.1/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index 19ac91cd888e..000000000000 --- a/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/.nuget/Microsoft.NETCore.Native/rhel/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/rhel/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index f9dc309a6bd8..000000000000 --- a/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/.nuget/Microsoft.NETCore.Native/linux/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props similarity index 69% rename from src/.nuget/Microsoft.NETCore.Native/linux/Microsoft.NETCore.Native.pkgproj rename to src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props index 8b1064f08109..59628e4ccd2f 100644 --- a/src/.nuget/Microsoft.NETCore.Native/linux/Microsoft.NETCore.Native.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props @@ -1,10 +1,6 @@ - + - - true - linux-$(PackagePlatform) - x64; @@ -20,11 +16,10 @@ - + runtimes/$(PackageTargetRuntime)/native true - - + \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Native/osx/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props similarity index 69% rename from src/.nuget/Microsoft.NETCore.Native/osx/Microsoft.NETCore.Native.pkgproj rename to src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props index b358c8679975..23a12832ee75 100644 --- a/src/.nuget/Microsoft.NETCore.Native/osx/Microsoft.NETCore.Native.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props @@ -1,10 +1,6 @@ - + - - true - osx.10.10-$(PackagePlatform) - x64; @@ -20,11 +16,10 @@ - + runtimes/$(PackageTargetRuntime)/native true - - + \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Native/ubuntu/14.04/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/ubuntu/14.04/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index d1c5be74ffda..000000000000 --- a/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/.nuget/Microsoft.NETCore.Native/ubuntu/16.04/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.04/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index b2b0f9658751..000000000000 --- a/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/.nuget/Microsoft.NETCore.Native/ubuntu/16.10/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.10/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index da4a03d668d1..000000000000 --- a/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/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds index c7bfdc3b0405..372d8d8d641c 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds @@ -1,88 +1,11 @@ - - + + - - - $(PackageOutputPath) - - - - - - Windows_NT - amd64 - - - Windows_NT - arm64 - - - Windows_NT - x86 - - - Windows_NT - arm - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - arm - - - Linux - amd64 - - - Linux - arm - - - Linux - amd64 - - - Linux - amd64 - - - OSX - amd64 - + + - - - + + + \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index a1405d5fff53..b92deb69da4c 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -1,69 +1,17 @@  - - - true - true - x64;x86;arm64;arm; - $(PackagesOutputPath) - true + + + + x64;x86;arm64;arm; + true - + + - - amd64 - - - arm64 - - - x86 - - - arm - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - arm - - - amd64 - - - arm - - - amd64 - - - amd64 - - - amd64 - + + + diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/alpine/3.4.3/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/alpine/3.4.3/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index c779349b7c88..000000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/alpine/3.4.3/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - true - alpine.3.4.3-$(PackagePlatform) - - x64; - - - - - - - - - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - runtimes/$(PackageTargetRuntime)/lib/netstandard1.0 - - - - ref/netstandard1.0 - - - tools - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index 4f95c2550f28..000000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - true - debian.8-$(PackagePlatform) - - x64; - - - - - - - - - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - runtimes/$(PackageTargetRuntime)/lib/netstandard1.0 - - - - ref/netstandard1.0 - - - tools - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index a68fe2c0c626..000000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - true - fedora.23-$(PackagePlatform) - - x64; - - - - - - - - - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - runtimes/$(PackageTargetRuntime)/lib/netstandard1.0 - - - - ref/netstandard1.0 - - - tools - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/24/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/24/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index d19a1dd80f81..000000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/24/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - true - fedora.24-$(PackagePlatform) - - x64; - - - - - - - - - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - runtimes/$(PackageTargetRuntime)/lib/netstandard1.0 - - - - ref/netstandard1.0 - - - tools - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/linux/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/linux/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index 31e719601d7a..000000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/linux/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - true - linux-$(PackagePlatform) - - x64; - - - - - - - - - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - runtimes/$(PackageTargetRuntime)/lib/netstandard1.0 - - - - ref/netstandard1.0 - - - tools - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index e5c70c93da47..000000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - true - opensuse.13.2-$(PackagePlatform) - - x64; - - - - - - - - - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - runtimes/$(PackageTargetRuntime)/lib/netstandard1.0 - - - - ref/netstandard1.0 - - - tools - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index f12793fe736b..000000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - true - rhel.7-$(PackagePlatform) - - x64; - - - - - - - - - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - runtimes/$(PackageTargetRuntime)/lib/netstandard1.0 - - - - ref/netstandard1.0 - - - tools - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/42.1/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props similarity index 84% rename from src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/42.1/Microsoft.NETCore.Runtime.CoreCLR.pkgproj rename to src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props index 990a0526c595..50df04bc11d2 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/42.1/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props @@ -1,10 +1,6 @@ - + - - true - opensuse.42.1-$(PackagePlatform) - x64; @@ -19,8 +15,8 @@ - + @@ -46,11 +42,10 @@ - + runtimes/$(PackageTargetRuntime)/native true - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props similarity index 83% rename from src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj rename to src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props index 6425e8b6f11d..7433a9460d95 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props @@ -1,10 +1,6 @@ - + - - true - osx.10.10-$(PackagePlatform) - x64; @@ -44,11 +40,11 @@ - + runtimes/$(PackageTargetRuntime)/native true - - + + \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props similarity index 94% rename from src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj rename to src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props index 844fb0b10f89..533864ce8754 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props @@ -1,10 +1,7 @@ - + - - $(MinOSForArch)-$(PackagePlatform) - true $(PackagePlatform) amd64 $(CrossTargetComponentFolder) @@ -94,6 +91,4 @@ true - - diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index 86cb61a26482..000000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - true - ubuntu.14.04-$(PackagePlatform) - - x64;arm; - - - - - - - - - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - runtimes/$(PackageTargetRuntime)/lib/netstandard1.0 - - - - ref/netstandard1.0 - - - tools - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index 72c48ee4599e..000000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - true - ubuntu.16.04-$(PackagePlatform) - - x64;arm; - - - - - - - - - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - runtimes/$(PackageTargetRuntime)/lib/netstandard1.0 - - - - ref/netstandard1.0 - - - tools - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.10/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.10/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index 9f226f853079..000000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.10/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - true - ubuntu.16.10-$(PackagePlatform) - - x64; - - - - - - - - - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - runtimes/$(PackageTargetRuntime)/lib/netstandard1.0 - - - - ref/netstandard1.0 - - - tools - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds index c1d076fb0e20..93d9e296d479 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds @@ -1,89 +1,11 @@ - + - - - $(PackageOutputPath) - - - - - - - Windows_NT - amd64 - - - Windows_NT - arm64 - - - Windows_NT - x86 - - - Windows_NT - arm - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - amd64 - - - Linux - arm - - - Linux - amd64 - - - Linux - arm - - - Linux - amd64 - - - Linux - amd64 - - - OSX - amd64 - + + - - + + diff --git a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj index 325461d3ac2f..dae102f97dfa 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj @@ -1,68 +1,12 @@  - - - true - true - x64;x86;arm64;arm; - $(PackagesOutputPath) - true + + + + x64;x86;arm64;arm; + true - - - amd64 - - - arm64 - - - x86 - - - arm - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - amd64 - - - arm - - - amd64 - - - arm - - - amd64 - - - amd64 - - - amd64 - - - - + + + + diff --git a/src/.nuget/Microsoft.NETCore.TestHost/alpine/3.4.3/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/alpine/3.4.3/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index dd142f671178..000000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/alpine/3.4.3/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - alpine.3.4.3-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/debian/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/debian/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 045b2e756983..000000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/debian/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - debian.8-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/fedora/23/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/fedora/23/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 2edb86a28a1b..000000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/fedora/23/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - fedora.23-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/fedora/24/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/fedora/24/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 219026c703bb..000000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/fedora/24/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - fedora.24-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/opensuse/13.2/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/opensuse/13.2/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 31740920e07d..000000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/opensuse/13.2/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - opensuse.13.2-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/opensuse/42.1/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/opensuse/42.1/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 8aaec62373c8..000000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/opensuse/42.1/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - opensuse.42.1-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/rhel/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/rhel/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 1cfaf50d5dcc..000000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/rhel/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - rhel.7-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/linux/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props similarity index 67% rename from src/.nuget/Microsoft.NETCore.TestHost/linux/Microsoft.NETCore.TestHost.pkgproj rename to src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props index 06a6f4ce1047..59e6d63c34f4 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/linux/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props @@ -1,10 +1,6 @@ - + - - true - linux-$(PackagePlatform) - x64; @@ -19,11 +15,10 @@ - + runtimes/$(PackageTargetRuntime)/native true - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/osx/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props similarity index 67% rename from src/.nuget/Microsoft.NETCore.TestHost/osx/Microsoft.NETCore.TestHost.pkgproj rename to src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props index cbcc805d8d28..56a23f47f57d 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/osx/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props @@ -1,10 +1,6 @@ - + - - true - osx.10.10-$(PackagePlatform) - x64; @@ -19,11 +15,10 @@ - + runtimes/$(PackageTargetRuntime)/native true - \ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/win/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Windows_NT.Microsoft.NETCore.TestHost.props similarity index 68% rename from src/.nuget/Microsoft.NETCore.TestHost/win/Microsoft.NETCore.TestHost.pkgproj rename to src/.nuget/Microsoft.NETCore.TestHost/runtime.Windows_NT.Microsoft.NETCore.TestHost.props index 33ab15fb62c8..bab9b9f8ba78 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/win/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Windows_NT.Microsoft.NETCore.TestHost.props @@ -1,9 +1,7 @@ - + - $(MinOSForArch)-$(PackagePlatform) - true @@ -14,11 +12,10 @@ - + runtimes/$(PackageTargetRuntime)/native true - - \ No newline at end of file + diff --git a/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/14.04/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/14.04/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 8750e168170f..000000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/14.04/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - ubuntu.14.04-$(PackagePlatform) - - x64;arm; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.04/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.04/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 3f1397f92fee..000000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.04/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - ubuntu.16.04-$(PackagePlatform) - - x64;arm; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.10/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.10/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 88ad98a4dbe4..000000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.10/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - true - ubuntu.16.10-$(PackagePlatform) - - x64; - - - - - - runtimes/$(PackageTargetRuntime)/native - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - \ No newline at end of file diff --git a/src/.nuget/init/project.json b/src/.nuget/init/project.json index 5440fde0de23..5908fcc3f9b4 100644 --- a/src/.nuget/init/project.json +++ b/src/.nuget/init/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.2-beta-24224-02", + "Microsoft.NETCore.Platforms": "1.0.2-beta-24224-02" }, "frameworks": { "dnxcore50": { diff --git a/src/.nuget/packaging.props b/src/.nuget/packaging.props new file mode 100644 index 000000000000..7f1c5bcac4e0 --- /dev/null +++ b/src/.nuget/packaging.props @@ -0,0 +1,135 @@ + + + + + + Windows_NT;OSX;Linux + ;$(SupportedPackageOSGroups); + + $(Platform) + $(BuildArch) + <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789")) + <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex))) + <_isSupportedOSGroup>true + + + + + <_derivedPackageTargetOSGroup>Linux + <_derivedPackageTargetOSGroup Condition="'$(_runtimeOSFamily)' == 'osx'">OSX + <_derivedPackageTargetOSGroup Condition="'$(_runtimeOSFamily)' == 'win'">Windows_NT + + <_isSupportedOSGroup Condition="!$(SupportedPackageOSGroups.Contains(';$(_derivedPackageTargetOSGroup);'))">false + + + + + <_packageTargetOSGroup>$(_derivedPackageTargetOSGroup) + + + + true + $(PackageOutputPath) + + + + true + true + x64;x86;arm64;arm;armel + + + + + + + win7-$(ArchGroup) + win8-$(ArchGroup) + win10-$(ArchGroup) + + + + + osx.10.10-$(ArchGroup) + + + + + rhel.7-$(ArchGroup) + + + + + $(RuntimeOS)-$(ArchGroup) + + + + + + + + armel + + + + + + + + + + armel + + + arm + + + + arm + + + + arm + + + + + + + + + x86 + + + + arm + + + arm64 + + + + + + + amd64 + $(ArchGroup) + + + + + <_project Include="@(BuildRID)"> + amd64 + %(Identity) + PackageTargetRuntime=%(Identity);Platform=%(Platform) + + + + + + + + + \ No newline at end of file diff --git a/src/.nuget/packaging.targets b/src/.nuget/packaging.targets new file mode 100644 index 000000000000..8439616d8286 --- /dev/null +++ b/src/.nuget/packaging.targets @@ -0,0 +1,19 @@ + + + + + + + + + + + <_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == '$(PackageRID)' OR '%(Project.PackageTargetRuntime)' == ''" /> + + + + + + + + \ No newline at end of file