diff options
22 files changed, 127 insertions, 42 deletions
@@ -58,7 +58,7 @@ usage() initDistroRid() { - if [ "$__BuildOS" == "Linux" ]; then + if [ "$__HostOS" == "Linux" ]; then if [ ! -e /etc/os-release ]; then echo "WARNING: Can not determine runtime id for current distro." export __DistroRid="" @@ -69,6 +69,19 @@ initDistroRid() fi } +initTargetDistroRid() +{ + if [ "$__BuildOS" == "Linux" ]; then + if [ ! -e /etc/os-release ]; then + echo "WARNING: Can not determine runtime id for current distro." + export __CrossDistroRid="" + else + source $ROOTFS_DIR/etc/os-release + export __CrossDistroRid="$ID.$VERSION_ID-$__BuildArch" + fi + fi +} + setup_dirs() { echo Setting up directories for build @@ -699,6 +712,7 @@ if [ $__CrossBuild == 1 ]; then if ! [[ -n "$ROOTFS_DIR" ]]; then export ROOTFS_DIR="$__ProjectRoot/cross/rootfs/$__BuildArch" fi + initTargetDistroRid fi # Make the directories necessary for build if they don't exist @@ -128,9 +128,11 @@ <TargetsWindows Condition="'$(BuildOS)' == 'Windows_NT'">true</TargetsWindows> <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true'">true</TargetsUnix> + <TargetsLinuxCross Condition="'$(TargetsLinux)' == 'true' and '$(CROSSCOMPILE)' != ''">true</TargetsLinuxCross> <!-- We are only tracking Linux Distributions for Nuget RID mapping --> - <DistroRid Condition="'$(TargetsLinux)' == 'true'">$(__DistroRid)</DistroRid> + <DistroRid Condition="'$(TargetsLinux)' == 'true' and '$(TargetsLinuxCross)' != 'true'">$(__DistroRid)</DistroRid> + <DistroRid Condition="'$(TargetsLinux)' == 'true' and '$(TargetsLinuxCross)' == 'true'">$(__CrossDistroRid)</DistroRid> </PropertyGroup> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds index 6f417e678b..692aeb6401 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds @@ -67,6 +67,14 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-arm'" Include="ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>arm</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-arm'" Include="ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>arm</Platform> + </Project> <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.ILAsm.pkgproj"> <OSGroup>OSX</OSGroup> <Platform>amd64</Platform> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj index a67cf4cac2..aa9fcc4be0 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -52,9 +52,15 @@ <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.ILAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> <ProjectReference Include="osx\Microsoft.NETCore.ILAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> 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 index 0864a65790..cacadc78b1 100644 --- 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 @@ -4,8 +4,8 @@ <PropertyGroup> <SkipPackageFileCheck>true</SkipPackageFileCheck> <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> + <!-- build for x64, arm --> + <PackagePlatforms>x64;arm;</PackagePlatforms> </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)ilasm" /> @@ -26,4 +26,4 @@ </File> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> 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 index b48290bed1..818495e6e2 100644 --- 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 @@ -4,8 +4,8 @@ <PropertyGroup> <SkipPackageFileCheck>true</SkipPackageFileCheck> <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> + <!-- build for x64, arm --> + <PackagePlatforms>x64;arm;</PackagePlatforms> </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)ilasm" /> @@ -26,4 +26,4 @@ </File> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds index 01cb6f6782..b856d33c89 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds @@ -67,6 +67,14 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-arm'" Include="ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>arm</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-arm'" Include="ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>arm</Platform> + </Project> <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.ILDAsm.pkgproj"> <OSGroup>OSX</OSGroup> <Platform>amd64</Platform> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj index 1f2f3975d9..d26250ff6a 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -52,9 +52,15 @@ <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.ILDAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> <ProjectReference Include="osx\Microsoft.NETCore.ILDAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> 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 index e5bdb5122d..9f98961415 100644 --- 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 @@ -4,8 +4,8 @@ <PropertyGroup> <SkipPackageFileCheck>true</SkipPackageFileCheck> <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> + <!-- build for x64, arm --> + <PackagePlatforms>x64;arm</PackagePlatforms> </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)ildasm" /> @@ -26,4 +26,4 @@ </File> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> 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 index b20c9c9969..776e59ba16 100644 --- 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 @@ -4,8 +4,8 @@ <PropertyGroup> <SkipPackageFileCheck>true</SkipPackageFileCheck> <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> + <!-- build for x64, arm --> + <PackagePlatforms>x64;arm;</PackagePlatforms> </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)ildasm" /> @@ -26,4 +26,4 @@ </File> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds index d730126eb2..760de04614 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds @@ -67,6 +67,14 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-arm'" Include="ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>arm</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-arm'" Include="ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>arm</Platform> + </Project> <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.Jit.pkgproj"> <OSGroup>OSX</OSGroup> <Platform>amd64</Platform> diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj index c2e5ee6aa0..7c1510ed15 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj @@ -51,9 +51,15 @@ <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.Jit.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.Jit.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Jit.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> <ProjectReference Include="osx\Microsoft.NETCore.Jit.pkgproj"> <Platform>amd64</Platform> </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> 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 index e6775dabff..50d343f977 100644 --- 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 @@ -4,8 +4,8 @@ <PropertyGroup> <SkipPackageFileCheck>true</SkipPackageFileCheck> <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> + <!-- build for x64, arm --> + <PackagePlatforms>x64;arm;</PackagePlatforms> </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> @@ -26,4 +26,4 @@ </File> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> 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 index dc59c2a8ad..e57b7c51d5 100644 --- 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 @@ -4,8 +4,8 @@ <PropertyGroup> <SkipPackageFileCheck>true</SkipPackageFileCheck> <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> + <!-- build for x64, arm --> + <PackagePlatforms>x64;arm;</PackagePlatforms> </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> @@ -26,4 +26,4 @@ </File> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</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 284edcb28c..2320d87c1d 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 @@ -6,7 +6,6 @@ <!-- This property must be set to the same value as $(PackageOutputPath) for the nuspecs and nupkgs to be binplaced to the intended location. --> <OutputPath>$(PackageOutputPath)</OutputPath> </PropertyGroup> - <!-- We always build the identity/redirection package. However, the platform specific runtime-*.nupkg is built based upon the target OS we are building the product for. --> <ItemGroup> <Project Include="Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> @@ -67,6 +66,14 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-arm'" Include="ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>arm</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-arm'" Include="ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>arm</Platform> + </Project> <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <OSGroup>OSX</OSGroup> <Platform>amd64</Platform> 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 aa01e6265d..7683385295 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 @@ -57,9 +57,15 @@ <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> <ProjectReference Include="osx\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> 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 index 4b1f151f1d..86cb61a264 100644 --- 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 @@ -4,12 +4,12 @@ <PropertyGroup> <SkipPackageFileCheck>true</SkipPackageFileCheck> <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> + <!-- build for x64, arm --> + <PackagePlatforms>x64;arm;</PackagePlatforms> </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> - <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so" /> + <NativeSplittableBinary Condition="'$(PackagePlatform)' != 'arm'" Include="$(BinDir)libcoreclrtraceptprovider.so" /> <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> @@ -17,8 +17,8 @@ <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" /> + <ArchitectureSpecificNativeFile Condition="'$(PackagePlatform)'!='arm'" Include="$(BinDir)mscorlib.ni.dll" /> + <ArchitectureSpecificNativeFile Condition="'$(PackagePlatform)'!='arm'" Include="$(BinDir)System.Private.CoreLib.ni.dll" /> <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> 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 index 7163623d37..b6a915b495 100644 --- 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 @@ -4,12 +4,12 @@ <PropertyGroup> <SkipPackageFileCheck>true</SkipPackageFileCheck> <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> + <!-- build for x64, arm --> + <PackagePlatforms>x64;arm;</PackagePlatforms> </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> - <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so" /> + <NativeSplittableBinary Condition="'($PackagePlatform)' == 'arm'" Include="$(BinDir)libcoreclrtraceptprovider.so" /> <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> @@ -17,8 +17,8 @@ <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" /> + <ArchitectureSpecificNativeFile Condition="'($PackagePlatform)' == 'arm'" Include="$(BinDir)mscorlib.ni.dll" /> + <ArchitectureSpecificNativeFile Condition="'($PackagePlatform)' == 'arm'" Include="$(BinDir)System.Private.CoreLib.ni.dll" /> <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds index 2053727996..7734bec9bc 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds @@ -67,6 +67,14 @@ <OSGroup>Linux</OSGroup> <Platform>amd64</Platform> </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-arm'" Include="ubuntu/14.04/Microsoft.NETCore.TestHost.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>arm</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-arm'" Include="ubuntu/16.04/Microsoft.NETCore.TestHost.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>arm</Platform> + </Project> <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.TestHost.pkgproj"> <OSGroup>OSX</OSGroup> <Platform>amd64</Platform> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj index 928397e724..5744be8250 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj @@ -51,9 +51,15 @@ <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.TestHost.pkgproj"> <Platform>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.TestHost.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.TestHost.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> <ProjectReference Include="osx\Microsoft.NETCore.TestHost.pkgproj"> <Platform>amd64</Platform> </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> 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 index a73159ab00..8750e16817 100644 --- 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 @@ -4,8 +4,8 @@ <PropertyGroup> <SkipPackageFileCheck>true</SkipPackageFileCheck> <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> + <!-- build for x64, arm --> + <PackagePlatforms>x64;arm;</PackagePlatforms> </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)corerun" /> @@ -26,4 +26,4 @@ </File> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> 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 index 061319408b..3f1397f92f 100644 --- 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 @@ -4,8 +4,8 @@ <PropertyGroup> <SkipPackageFileCheck>true</SkipPackageFileCheck> <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> + <!-- build for x64, arm --> + <PackagePlatforms>x64;arm;</PackagePlatforms> </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)corerun" /> @@ -26,4 +26,4 @@ </File> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> |