diff options
| author | Matt Ellis <matell@microsoft.com> | 2016-05-25 12:37:23 -0700 |
|---|---|---|
| committer | Matt Ellis <matell@microsoft.com> | 2016-05-26 18:50:40 -0700 |
| commit | ba385ce8b44e2018579cf3a52e34c3980a82b5c4 (patch) | |
| tree | 9df509d90de9c26bd810b995a229f2fe940e7653 | |
| parent | 5e40c4dbfd67fa996fb6cea9842a433b8976e1ed (diff) | |
| download | coreclr-ba385ce8b44e2018579cf3a52e34c3980a82b5c4.tar.gz coreclr-ba385ce8b44e2018579cf3a52e34c3980a82b5c4.tar.bz2 coreclr-ba385ce8b44e2018579cf3a52e34c3980a82b5c4.zip | |
Add Fedora, OpenSuse and Ubuntu 16.04 packages
- Add packages for Fedora 23 and OpenSuse 13.2
- Move the package authoring for Ubuntu into versioned folders
- Update our selection logic for what to produce to be based on an
actual RID instead of just a distro name, since that's now not enough
with us building for two Ubuntu versions
28 files changed, 689 insertions, 83 deletions
diff --git a/build-packages.sh b/build-packages.sh index c6580bd00d..0403c3f1f0 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -103,18 +103,13 @@ case $OSName in esac if [ "$__BuildOS" == "Linux" ]; then - # Detect Distro - if [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then - export __DistroName=ubuntu - elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then - export __DistroName=rhel - elif [ "$(cat /etc/*-release | grep -cim1 rhel)" -eq 1 ]; then - export __DistroName=rhel - elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then - export __DistroName=debian - else - export __DistroName="" - fi + if [ ! -e /etc/os-release ]; then + echo "WARNING: Can not determine runtime id for current distro." + export __DistroRid="" + else + source /etc/os-release + export __DistroRid="$ID.$VERSION_ID-$__BuildArch" + fi fi __IntermediatesDir="$__ProjectRoot/bin/obj/$__BuildOS.$__BuildArch.$__BuildType" @@ -29,20 +29,15 @@ usage() exit 1 } -initDistroName() +initDistroRid() { if [ "$__BuildOS" == "Linux" ]; then - # Detect Distro - if [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then - export __DistroName=ubuntu - elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then - export __DistroName=rhel - elif [ "$(cat /etc/*-release | grep -cim1 rhel)" -eq 1 ]; then - export __DistroName=rhel - elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then - export __DistroName=debian + if [ ! -e /etc/os-release ]; then + echo "WARNING: Can not determine runtime id for current distro." + export __DistroRid="" else - export __DistroName="" + source /etc/os-release + export __DistroRid="$ID.$VERSION_ID-$__BuildArch" fi fi } @@ -216,17 +211,11 @@ isMSBuildOnNETCoreSupported() if [ "$__BuildArch" == "x64" ]; then if [ "$__BuildOS" == "Linux" ]; then - if [ "$__DistroName" == "ubuntu" ]; then - __OSVersion=$(lsb_release -rs) - if [ "$__OSVersion" == "14.04" ]; then - __isMSBuildOnNETCoreSupported=1 - elif [ "$(cat /etc/*-release | grep -cim1 14.04)" -eq 1 ]; then - # Linux Mint based on Ubuntu 14.04 - __isMSBuildOnNETCoreSupported=1 - fi - elif [ "$__DistroName" == "rhel" ]; then + if [ "$__DistroRid" == "ubuntu.14.04-x64" ]; then + __isMSBuildOnNETCoreSupported=1 + elif [ "$__DistroRid" == "rhel.7.2-x64" ]; then __isMSBuildOnNETCoreSupported=1 - elif [ "$__DistroName" == "debian" ]; then + elif [ "$__DistroRid" == "debian.8-x64" ]; then __isMSBuildOnNETCoreSupported=1 fi elif [ "$__BuildOS" == "OSX" ]; then @@ -234,7 +223,7 @@ isMSBuildOnNETCoreSupported() fi elif [ "$__BuildArch" == "arm" ] || [ "$__BuildArch" == "arm64" ] ; then if [ "$__BuildOS" == "Linux" ]; then - if [ "$__DistroName" == "ubuntu" ]; then + if [ "$__DistroRid" == "ubuntu.14.04-x64" ]; then __isMSBuildOnNETCoreSupported=1 fi fi @@ -478,7 +467,7 @@ __ClangMajorVersion=0 __ClangMinorVersion=0 __MSBuildPath=$__ProjectRoot/Tools/MSBuild.exe __NuGetPath="$__PackagesDir/NuGet.exe" -__DistroName="" +__DistroRid="" __cmakeargs="" __OfficialBuildIdArg= __SkipGenerateVersion=0 @@ -673,7 +662,7 @@ if [[ $__ConfigureOnly == 1 && $__SkipConfigure == 1 ]]; then fi # init the distro name -initDistroName +initDistroRid # Set the remaining variables based upon the determined build configuration __BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType" @@ -132,7 +132,7 @@ <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true'">true</TargetsUnix> <!-- We are only tracking Linux Distributions for Nuget RID mapping --> - <DistroName Condition="'$(TargetsLinux)' == 'true'">$(__DistroName)</DistroName> + <DistroRid Condition="'$(TargetsLinux)' == 'true'">$(__DistroRid)</DistroRid> </PropertyGroup> diff --git a/init-tools.sh b/init-tools.sh index 45009d4c8d..2d20cd4876 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -3,17 +3,12 @@ initDistroName() { if [ "$1" == "Linux" ]; then - # Detect Distro - if [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then - export __DistroName=ubuntu - elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then - export __DistroName=centos - elif [ "$(cat /etc/*-release | grep -cim1 rhel)" -eq 1 ]; then - export __DistroName=rhel - elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then - export __DistroName=debian + if [ ! -e /etc/os-release ]; then + echo "WARNING: Can not determine runtime id for current distro." + export __DistroRid="" else - export __DistroName="" + source /etc/os-release + export __DistroRid="$ID.$VERSION_ID-$__BuildArch" fi fi } @@ -41,7 +36,7 @@ __BUILD_TOOLS_PATH=$__PACKAGES_DIR/Microsoft.DotNet.BuildTools/$__BUILD_TOOLS_PA __PROJECT_JSON_PATH=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION __PROJECT_JSON_FILE=$__PROJECT_JSON_PATH/project.json __PROJECT_JSON_CONTENTS="{ \"dependencies\": { \"Microsoft.DotNet.BuildTools\": \"$__BUILD_TOOLS_PACKAGE_VERSION\" }, \"frameworks\": { \"dnxcore50\": { } } }" -__DistroName="" +__DistroRid="" OSName=$(uname -s) case $OSName in @@ -65,12 +60,12 @@ esac # Initialize Linux Distribution name and .NET CLI package name. initDistroName $OS -if [ "$__DistroName" == "centos" ]; then +if [ "$__DistroRid" == "centos.7-x64" ]; then __DOTNET_PKG=dotnet-dev-centos-x64 fi -if [ "$__DistroName" == "rhel" ]; then - __DOTNET_PKG=dotnet-dev-centos-x64 +if [ "$__DistroRid" == "rhel.7.2-x64" ]; then + __DOTNET_PKG=dotnet-dev-rhel-x64 fi # Work around mac build issue diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds index 2d45d6bd27..ff5bc807d2 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> @@ -19,15 +19,27 @@ <OSGroup>Windows_NT</OSGroup> <Platform>x86</Platform> </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'rhel'" Include="rhel/Microsoft.NETCore.ILAsm.pkgproj"> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.ILAsm.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'debian'" Include="debian/Microsoft.NETCore.ILAsm.pkgproj"> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.23-x64'" Include="fedora/23/Microsoft.NETCore.ILAsm.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'ubuntu'" Include="ubuntu/Microsoft.NETCore.ILAsm.pkgproj"> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.13.2-x64'" Include="opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.ILAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-x64'" Include="ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-x64'" Include="ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj index f635d192dc..c31aec462e 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -24,16 +24,25 @@ <ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj"> <Platform>arm</Platform> </ProjectReference> + <ProjectReference Include="debian\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="fedora\23\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="rhel\Microsoft.NETCore.ILAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> - <ProjectReference Include="debian\Microsoft.NETCore.ILAsm.pkgproj"> + <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> - <ProjectReference Include="osx\Microsoft.NETCore.ILAsm.pkgproj"> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> - <ProjectReference Include="ubuntu\Microsoft.NETCore.ILAsm.pkgproj"> + <ProjectReference Include="osx\Microsoft.NETCore.ILAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> </ItemGroup> 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 new file mode 100644 index 0000000000..df59a839d5 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/fedora/23/Microsoft.NETCore.ILAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.2</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ilasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> 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 new file mode 100644 index 0000000000..dd38e08523 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.2</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ilasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj index 4163a29da9..41bbacd9d4 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj @@ -26,7 +26,7 @@ <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> - <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> 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 new file mode 100644 index 0000000000..b06cb2dcff --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.2</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ilasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds index dc741833ea..30694e9fb9 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> @@ -19,15 +19,27 @@ <OSGroup>Windows_NT</OSGroup> <Platform>x86</Platform> </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'rhel'" Include="rhel/Microsoft.NETCore.ILDAsm.pkgproj"> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.ILDAsm.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'debian'" Include="debian/Microsoft.NETCore.ILDAsm.pkgproj"> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.23-x64'" Include="fedora/23/Microsoft.NETCore.ILDAsm.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'ubuntu'" Include="ubuntu/Microsoft.NETCore.ILDAsm.pkgproj"> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.13.2-x64'" Include="opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.ILDAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-x64'" Include="ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-x64'" Include="ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj index 4df4010f00..42207c6efb 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -24,16 +24,25 @@ <ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj"> <Platform>arm</Platform> </ProjectReference> + <ProjectReference Include="debian\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="fedora\23\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="rhel\Microsoft.NETCore.ILDAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> - <ProjectReference Include="debian\Microsoft.NETCore.ILDAsm.pkgproj"> + <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILDAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> - <ProjectReference Include="osx\Microsoft.NETCore.ILDAsm.pkgproj"> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILDAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> - <ProjectReference Include="ubuntu\Microsoft.NETCore.ILDAsm.pkgproj"> + <ProjectReference Include="osx\Microsoft.NETCore.ILDAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> </ItemGroup> 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 new file mode 100644 index 0000000000..49bd4488e8 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/23/Microsoft.NETCore.ILDAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.2</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ildasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> 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 new file mode 100644 index 0000000000..bc04cc1f9b --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.2</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ildasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj index 8698f5cf66..d9b21796f5 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj @@ -26,7 +26,7 @@ <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> - <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> 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 new file mode 100644 index 0000000000..038b26f2fa --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.2</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)ildasm"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds index a0a56fd4b6..f742b4906d 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> @@ -19,15 +19,27 @@ <OSGroup>Windows_NT</OSGroup> <Platform>x86</Platform> </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'rhel'" Include="rhel/Microsoft.NETCore.Jit.pkgproj"> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.Jit.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'debian'" Include="debian/Microsoft.NETCore.Jit.pkgproj"> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.23-x64'" Include="fedora/23/Microsoft.NETCore.Jit.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'ubuntu'" Include="ubuntu/Microsoft.NETCore.Jit.pkgproj"> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.13.2-x64'" Include="opensuse/13.2/Microsoft.NETCore.Jit.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.Jit.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-x64'" Include="ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-x64'" Include="ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj index 3ff2bd7ea0..76b10fce8a 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj @@ -21,16 +21,25 @@ <ProjectReference Include="win\Microsoft.NETCore.Jit.pkgproj"> <Platform>arm</Platform> </ProjectReference> + <ProjectReference Include="debian\Microsoft.NETCore.Jit.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="fedora\23\Microsoft.NETCore.Jit.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.Jit.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="rhel\Microsoft.NETCore.Jit.pkgproj"> <Platform>amd64</Platform> </ProjectReference> - <ProjectReference Include="debian\Microsoft.NETCore.Jit.pkgproj"> + <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.Jit.pkgproj"> <Platform>amd64</Platform> </ProjectReference> - <ProjectReference Include="osx\Microsoft.NETCore.Jit.pkgproj"> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Jit.pkgproj"> <Platform>amd64</Platform> </ProjectReference> - <ProjectReference Include="ubuntu\Microsoft.NETCore.Jit.pkgproj"> + <ProjectReference Include="osx\Microsoft.NETCore.Jit.pkgproj"> <Platform>amd64</Platform> </ProjectReference> </ItemGroup> 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 new file mode 100644 index 0000000000..18d9dffbac --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Jit/fedora/23/Microsoft.NETCore.Jit.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.2</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)libclrjit.so"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> 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 new file mode 100644 index 0000000000..dfc3ba13bd --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Jit/opensuse/13.2/Microsoft.NETCore.Jit.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.2</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)libclrjit.so"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj index 9f58736c0f..1035fde4e5 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj @@ -26,7 +26,7 @@ <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> - <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> 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 new file mode 100644 index 0000000000..d3d36bf99e --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.2</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)libclrjit.so"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> 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 93757aaa55..fe468ecfad 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,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> @@ -19,15 +19,27 @@ <OSGroup>Windows_NT</OSGroup> <Platform>x86</Platform> </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'rhel'" Include="rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'debian'" Include="debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.23-x64'" Include="fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'ubuntu'" Include="ubuntu/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.13.2-x64'" Include="opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-x64'" Include="ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-x64'" Include="ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> 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 11d593f63a..1d233b16e0 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 @@ -29,16 +29,25 @@ <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>arm</Platform> </ProjectReference> + <ProjectReference Include="debian\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="fedora\23\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> <ProjectReference Include="rhel\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> - <ProjectReference Include="debian\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> - <ProjectReference Include="osx\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> - <ProjectReference Include="ubuntu\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <ProjectReference Include="osx\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> </ItemGroup> 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 new file mode 100644 index 0000000000..c56905aa9c --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.2</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)libcoreclr.so"/> + <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so"/> + <NativeSplittableBinary Include="$(BinDir)libdbgshim.so"/> + <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so"/> + <NativeSplittableBinary Include="$(BinDir)libmscordbi.so"/> + <NativeSplittableBinary Include="$(BinDir)libsos.so"/> + <NativeSplittableBinary Include="$(BinDir)libsosplugin.so"/> + <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll"/> + <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll"/> + <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll"/> + <ArchitectureSpecificToolFile Include="$(BinDir)crossgen"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + + <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> + <File Include="@(ArchitectureSpecificLibFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> + </File> + + <!-- No reference: don't permit reference to the implementation from lib --> + <File Include="$(PlaceholderFile)"> + <TargetPath>ref/netstandard1.0</TargetPath> + </File> + + <File Include="@(ArchitectureSpecificToolFile)"> + <TargetPath>tools</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> 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 new file mode 100644 index 0000000000..227639d46f --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.2</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)libcoreclr.so"/> + <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so"/> + <NativeSplittableBinary Include="$(BinDir)libdbgshim.so"/> + <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so"/> + <NativeSplittableBinary Include="$(BinDir)libmscordbi.so"/> + <NativeSplittableBinary Include="$(BinDir)libsos.so"/> + <NativeSplittableBinary Include="$(BinDir)libsosplugin.so"/> + <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll"/> + <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll"/> + <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll"/> + <ArchitectureSpecificToolFile Include="$(BinDir)crossgen"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + + <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> + <File Include="@(ArchitectureSpecificLibFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> + </File> + + <!-- No reference: don't permit reference to the implementation from lib --> + <File Include="$(PlaceholderFile)"> + <TargetPath>ref/netstandard1.0</TargetPath> + </File> + + <File Include="@(ArchitectureSpecificToolFile)"> + <TargetPath>tools</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 11c9c634a4..006223c88f 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -55,7 +55,7 @@ <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt"/> <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen"/> - <ArchitectureSpecificNativeSymbol Include="..\_.pdb"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> 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 new file mode 100644 index 0000000000..71674b2f4b --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.2</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + <NativeSplittableBinary Include="$(BinDir)libcoreclr.so"/> + <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so"/> + <NativeSplittableBinary Include="$(BinDir)libdbgshim.so"/> + <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so"/> + <NativeSplittableBinary Include="$(BinDir)libmscordbi.so"/> + <NativeSplittableBinary Include="$(BinDir)libsos.so"/> + <NativeSplittableBinary Include="$(BinDir)libsosplugin.so"/> + <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll"/> + <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll"/> + <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll"/> + <ArchitectureSpecificToolFile Include="$(BinDir)crossgen"/> + + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + + <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> + <File Include="@(ArchitectureSpecificLibFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> + </File> + + <!-- No reference: don't permit reference to the implementation from lib --> + <File Include="$(PlaceholderFile)"> + <TargetPath>ref/netstandard1.0</TargetPath> + </File> + + <File Include="@(ArchitectureSpecificToolFile)"> + <TargetPath>tools</TargetPath> + </File> + </ItemGroup> + + <ItemGroup Condition="'$(__BuildType)' == 'Release'"> + <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')"/> + + <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt"/> + <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen"/> + <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb"/> + + <File Include="@(ArchitectureSpecificNativeSymbol)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> |