diff options
21 files changed, 137 insertions, 47 deletions
@@ -56,19 +56,36 @@ usage() exit 1 } -initDistroRid() +initHostDistroRid() { - 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="" + __HostDistroRid="" else source /etc/os-release - export __DistroRid="$ID.$VERSION_ID-$__HostArch" + __HostDistroRid="$ID.$VERSION_ID-$__HostArch" fi fi } +initTargetDistroRid() +{ + if [ $__CrossBuild == 1 ]; then + if [ "$__BuildOS" == "Linux" ]; then + if [ ! -e $ROOTFS_DIR/etc/os-release ]; then + echo "WARNING: Can not determine runtime id for current distro." + export __DistroRid="" + else + source $ROOTFS_DIR/etc/os-release + export __DistroRid="$ID.$VERSION_ID-$__BuildArch" + fi + fi + else + export __DistroRid="$__HostDistroRid" + fi +} + setup_dirs() { echo Setting up directories for build @@ -234,7 +251,7 @@ isMSBuildOnNETCoreSupported() if [ "$__HostArch" == "x64" ]; then if [ "$__HostOS" == "Linux" ]; then - case "$__DistroRid" in + case "$__HostDistroRid" in "centos.7-x64") __isMSBuildOnNETCoreSupported=1 ;; @@ -482,6 +499,7 @@ __CrossBuild=0 __ClangMajorVersion=0 __ClangMinorVersion=0 __NuGetPath="$__PackagesDir/NuGet.exe" +__HostDistroRid="" __DistroRid="" __cmakeargs="" __SkipGenerateVersion=0 @@ -670,8 +688,8 @@ fi # Set dependent variables __LogsDir="$__RootBinDir/Logs" -# init the distro name -initDistroRid +# init the host distro name +initHostDistroRid # Set the remaining variables based upon the determined build configuration __BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType" @@ -707,6 +725,9 @@ if [ $__CrossBuild == 1 ]; then fi fi +# init the target distro name +initTargetDistroRid + # Make the directories necessary for build if they don't exist setup_dirs diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds index 6f417e678b..90a17861e7 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds @@ -55,10 +55,18 @@ <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-x64'" Include="ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</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="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.ILAsm.pkgproj"> <OSGroup>Linux</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..48c8db3629 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -43,9 +43,15 @@ <ProjectReference Include="ubuntu\14.04\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>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILAsm.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.ILAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> @@ -57,4 +63,4 @@ </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..db3bf8bb8c 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds @@ -55,10 +55,18 @@ <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-x64'" Include="ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</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="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.ILDAsm.pkgproj"> <OSGroup>Linux</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..8538749980 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -43,9 +43,15 @@ <ProjectReference Include="ubuntu\14.04\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>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILDAsm.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.ILDAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> @@ -57,4 +63,4 @@ </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..e087645962 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..6a95697853 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds @@ -55,10 +55,18 @@ <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-x64'" Include="ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</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="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.Jit.pkgproj"> <OSGroup>Linux</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..6775ccc614 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj @@ -42,9 +42,15 @@ <ProjectReference Include="ubuntu\14.04\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>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Jit.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.Jit.pkgproj"> <Platform>amd64</Platform> </ProjectReference> @@ -56,4 +62,4 @@ </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..6124136722 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"> @@ -55,10 +54,18 @@ <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-x64'" Include="ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</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="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <OSGroup>Linux</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..f40ee4f4b7 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 @@ -48,9 +48,15 @@ <ProjectReference Include="ubuntu\14.04\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>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> @@ -62,4 +68,4 @@ </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..72c48ee459 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..78681ef43b 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds @@ -55,10 +55,18 @@ <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-x64'" Include="ubuntu/16.04/Microsoft.NETCore.TestHost.pkgproj"> <OSGroup>Linux</OSGroup> <Platform>amd64</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="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.TestHost.pkgproj"> <OSGroup>Linux</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..c831f931cf 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj @@ -42,9 +42,15 @@ <ProjectReference Include="ubuntu\14.04\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>amd64</Platform> </ProjectReference> + <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.TestHost.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.TestHost.pkgproj"> <Platform>amd64</Platform> </ProjectReference> @@ -56,4 +62,4 @@ </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> |