diff options
| author | Hyeongseok Oh <hseok82.oh@samasung.com> | 2016-12-05 11:32:59 +0900 |
|---|---|---|
| committer | Hyeongseok Oh <hseok82.oh@samasung.com> | 2016-12-05 11:32:59 +0900 |
| commit | d06878377c5addeee92421ed9a287d1790c32cbc (patch) | |
| tree | 1e37e8a57b56ae4f95bd652e606029d1fb080a86 /src/.nuget/Microsoft.NETCore.Runtime.CoreCLR | |
| parent | 5145193d4970eaf9a008014a7b02307611bd96ef (diff) | |
| download | coreclr-d06878377c5addeee92421ed9a287d1790c32cbc.tar.gz coreclr-d06878377c5addeee92421ed9a287d1790c32cbc.tar.bz2 coreclr-d06878377c5addeee92421ed9a287d1790c32cbc.zip | |
Change order in .builds and .pkgproj, fix build.sh for not modifying dir.prop
Diffstat (limited to 'src/.nuget/Microsoft.NETCore.Runtime.CoreCLR')
| -rw-r--r-- | src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds | 16 | ||||
| -rw-r--r-- | src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj | 12 |
2 files changed, 14 insertions, 14 deletions
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 2320d87c1d..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 @@ -54,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> @@ -66,14 +74,6 @@ <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 7683385295..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,21 +48,21 @@ <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> <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> |