Adding docker files, modifying scripts and code to handle ubuntu 16.04

This commit is contained in:
Livar Cunha 2016-05-26 12:48:16 -07:00
parent 2fb8656936
commit 84d1b60ffe
56 changed files with 178 additions and 12 deletions

View file

@ -181,6 +181,7 @@ The native installers are:
|--------------------- |------------------ |---------- |-------------------- | |--------------------- |------------------ |---------- |-------------------- |
| Windows | Bundle installer | Done | dotnet-{version}; | | Windows | Bundle installer | Done | dotnet-{version}; |
| Ubuntu 14.04/Debian | apt-get feed | Done | dotnet; dotnet-dbg | | Ubuntu 14.04/Debian | apt-get feed | Done | dotnet; dotnet-dbg |
| Ubuntu 16.04/Debian | apt-get feed | Done | dotnet; dotnet-dbg |
| OS X | PKG | Done | dotnet | | OS X | PKG | Done | dotnet |
| OS X | Homebrew | Not done | dotnet | | OS X | Homebrew | Not done | dotnet |
| CentOS/RH | RPM | Not done | dotnet | | CentOS/RH | RPM | Not done | dotnet |

View file

@ -54,6 +54,7 @@ Publish\ the\ application\ for\ a\ given\ framework\ identifier\ (FID).\ If\ not
Publish\ the\ application\ for\ a\ given\ runtime.\ If\ the\ option\ is\ not\ specified,\ the\ command\ will\ default\ to\ the\ runtime\ for\ the\ current\ operationg\ system.\ Supported\ values\ for\ the\ option\ at\ this\ time\ are: Publish\ the\ application\ for\ a\ given\ runtime.\ If\ the\ option\ is\ not\ specified,\ the\ command\ will\ default\ to\ the\ runtime\ for\ the\ current\ operationg\ system.\ Supported\ values\ for\ the\ option\ at\ this\ time\ are:
\ \ \ \ *\ ubuntu.14.04\-x64 \ \ \ \ *\ ubuntu.14.04\-x64
\ \ \ \ *\ ubuntu.16.04\-x64
\ \ \ \ *\ win7\-x64 \ \ \ \ *\ win7\-x64
\ \ \ \ *\ osx.10.10\-x64 \ \ \ \ *\ osx.10.10\-x64
\f[] \f[]

View file

@ -26,6 +26,7 @@ The following versions of Linux are supported:
- Debian 8.2 - Debian 8.2
- Ubuntu 14.04 LTS - Ubuntu 14.04 LTS
- Ubuntu 16.04 LTS
- CentOS 7.1 - CentOS 7.1
- Red Hat Enterprise Linux 7.2 - Red Hat Enterprise Linux 7.2

View file

@ -23,9 +23,9 @@ If you don't find your issue, please file one! However, given that this is a ver
Build Status Build Status
------------ ------------
|Ubuntu 14.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 |RHEL 7.2 | |Ubuntu 14.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 |RHEL 7.2 ||Ubuntu 16.04 |
|:------:|:------:|:------:|:------:|:------:|:------:|:------:| |:------:|:------:|:------:|:------:|:------:|:------:|:------:|
|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3132/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3132)|[![](https://mseng.visualstudio.com/DefaultCollection/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3271/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3271)|[![](https://mseng.visualstudio.com/DefaultCollection/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3022/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3022)|[![](https://mseng.visualstudio.com/DefaultCollection/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3071/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3071)|[![](https://devdiv.visualstudio.com/DefaultCollection/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/600/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3397)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3257/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3257)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3256/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3256)| |[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3132/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3132)|[![](https://mseng.visualstudio.com/DefaultCollection/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3271/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3271)|[![](https://mseng.visualstudio.com/DefaultCollection/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3022/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3022)|[![](https://mseng.visualstudio.com/DefaultCollection/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3071/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3071)|[![](https://devdiv.visualstudio.com/DefaultCollection/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/600/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3397)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3257/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3257)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3256/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3256)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3256/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3256)|
Installers and Binaries Installers and Binaries
----------------------- -----------------------
@ -43,19 +43,29 @@ You can download .NET Core as either an installer (MSI, PKG) or a zip (zip, gzip
|**Debian 8.2**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Debian_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.debian.x64.version)|N/A|N/A|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-debian-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-debian-x64.latest.tar.gz)| |**Debian 8.2**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Debian_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.debian.x64.version)|N/A|N/A|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-debian-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-debian-x64.latest.tar.gz)|
|**Mac OS X**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/OSX_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.osx.x64.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-osx-x64.latest.pkg)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-dev-osx-x64.latest.pkg)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-osx-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-osx-x64.latest.tar.gz)| |**Mac OS X**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/OSX_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.osx.x64.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-osx-x64.latest.pkg)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-dev-osx-x64.latest.pkg)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-osx-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-osx-x64.latest.tar.gz)|
|**CentOS 7.1**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/CentOS_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.centos.x64.version)|N/A |N/A |[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-centos-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-centos-x64.latest.tar.gz)| |**CentOS 7.1**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/CentOS_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.centos.x64.version)|N/A |N/A |[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-centos-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-centos-x64.latest.tar.gz)|
|**RHEL 7.2**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/RHEL_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.rhel.x64.version)|N/A |N/A |[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-rhel-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-rhel-x64.latest.tar.gz) | |**RHEL 7.2**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/RHEL_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.rhel.x64.version)|N/A |N/A |[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-rhel-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-rhel-x64.latest.tar.gz) |**Ubuntu 16.04**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Ubuntu_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.ubuntu.16.04.x64.version)|*See Below*|*See Below*|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-ubuntu.16.04-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz)|
Ubuntu Installers Ubuntu Installers
---------- ----------
*Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have three separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install them in the order presented below.* *Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have three separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install them in the order presented below.*
**For Ubuntu 14.04
| |Version |Installers| | |Version |Installers|
|---------|:------:|:------:|:------:| |---------|:------:|:------:|:------:|
|**Shared Host**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Ubuntu_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.ubuntu.x64.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-host-ubuntu-x64.latest.deb)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-ubuntu-x64.latest.tar.gz)| |**Shared Host**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Ubuntu_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.ubuntu.x64.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-host-ubuntu-x64.latest.deb)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-ubuntu-x64.latest.tar.gz)|
|**Shared Framework**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Ubuntu_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.ubuntu.x64.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-sharedframework-ubuntu-x64.latest.deb)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-ubuntu-x64.latest.tar.gz)| |**Shared Framework**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Ubuntu_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.ubuntu.x64.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-sharedframework-ubuntu-x64.latest.deb)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-ubuntu-x64.latest.tar.gz)|
|**Sdk**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Ubuntu_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.ubuntu.x64.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-sdk-ubuntu-x64.latest.deb)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-ubuntu-x64.latest.tar.gz)| |**Sdk**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Ubuntu_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.ubuntu.x64.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-sdk-ubuntu-x64.latest.deb)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-ubuntu-x64.latest.tar.gz)|
**For Ubuntu 16.04
| |Version |Installers|
|---------|:------:|:------:|:------:|
|**Shared Host**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Ubuntu_16_04_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.ubuntu.16.04.x64.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-host-ubuntu.16.04-x64.latest.deb)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz)|
|**Shared Framework**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Ubuntu_16_04_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.ubuntu.16.04.x64.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-sharedframework-ubuntu.16.04-x64.latest.deb)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-ubuntu.16.04-x64.latest.tar.gz)|
|**Sdk**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Ubuntu_16_04_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.ubuntu.16.04.x64.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-sdk-ubuntu.16.04-x64.latest.deb)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz)|
Docker Docker
------ ------

View file

@ -15,6 +15,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -15,6 +15,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -15,6 +15,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -19,6 +19,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -19,6 +19,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -15,6 +15,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -21,6 +21,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -15,6 +15,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -19,6 +19,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -22,6 +22,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -21,6 +21,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -34,6 +34,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -37,6 +37,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -38,6 +38,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -34,6 +34,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -30,6 +30,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -15,6 +15,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -15,6 +15,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -17,6 +17,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -15,6 +15,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -15,6 +15,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -22,6 +22,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -21,6 +21,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -20,6 +20,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -26,6 +26,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -15,6 +15,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -20,6 +20,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -19,6 +19,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -20,6 +20,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -20,6 +20,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -25,6 +25,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -19,6 +19,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -17,6 +17,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -15,6 +15,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -15,6 +15,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -16,6 +16,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -19,6 +19,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -19,6 +19,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -82,6 +82,11 @@ namespace Microsoft.DotNet.Cli.Build.Framework
} }
} }
public static bool IsPlatform(BuildPlatform platform, string version = null)
{
return IsPlatform(platform) && IsVersion(version);
}
public static bool IsPlatform(BuildPlatform platform) public static bool IsPlatform(BuildPlatform platform)
{ {
switch (platform) switch (platform)
@ -107,6 +112,11 @@ namespace Microsoft.DotNet.Cli.Build.Framework
} }
} }
public static bool IsVersion(string version)
{
return RuntimeEnvironment.OperatingSystemVersion.Equals(version, StringComparison.OrdinalIgnoreCase);
}
private static BuildPlatform DetermineCurrentPlatform() private static BuildPlatform DetermineCurrentPlatform()
{ {
if (IsWindows) if (IsWindows)

View file

@ -7,6 +7,7 @@ namespace Microsoft.DotNet.Cli.Build.Framework
public class BuildPlatformsAttribute : TargetConditionAttribute public class BuildPlatformsAttribute : TargetConditionAttribute
{ {
private IEnumerable<BuildPlatform> _buildPlatforms; private IEnumerable<BuildPlatform> _buildPlatforms;
private string _version;
public BuildPlatformsAttribute(params BuildPlatform[] platforms) public BuildPlatformsAttribute(params BuildPlatform[] platforms)
{ {
@ -18,11 +19,17 @@ namespace Microsoft.DotNet.Cli.Build.Framework
_buildPlatforms = platforms; _buildPlatforms = platforms;
} }
public BuildPlatformsAttribute(BuildPlatform platform, string version)
{
_buildPlatforms = new BuildPlatform[] { platform };
_version = version;
}
public override bool EvaluateCondition() public override bool EvaluateCondition()
{ {
foreach (var platform in _buildPlatforms) foreach (var platform in _buildPlatforms)
{ {
if (CurrentPlatform.IsPlatform(platform)) if (CurrentPlatform.IsPlatform(platform, _version))
{ {
return true; return true;
} }

View file

@ -45,6 +45,7 @@ namespace Microsoft.DotNet.Cli.Build
{ "osx.10.10-x64", "osx.10.10-x64" }, { "osx.10.10-x64", "osx.10.10-x64" },
{ "osx.10.11-x64", "osx.10.10-x64" }, { "osx.10.11-x64", "osx.10.10-x64" },
{ "ubuntu.14.04-x64", "ubuntu.14.04-x64" }, { "ubuntu.14.04-x64", "ubuntu.14.04-x64" },
{ "ubuntu.16.04-x64", "ubuntu.16.04-x64" },
{ "centos.7-x64", "rhel.7-x64" }, { "centos.7-x64", "rhel.7-x64" },
{ "rhel.7-x64", "rhel.7-x64" }, { "rhel.7-x64", "rhel.7-x64" },
{ "rhel.7.2-x64", "rhel.7-x64" }, { "rhel.7.2-x64", "rhel.7-x64" },

View file

@ -94,8 +94,19 @@ namespace Microsoft.DotNet.Cli.Build
// Copy the latest installer files // Copy the latest installer files
CopyBlobs($"{Channel}/Installers/{CliNuGetVersion}/", $"{Channel}/Installers/Latest/"); CopyBlobs($"{Channel}/Installers/{CliNuGetVersion}/", $"{Channel}/Installers/Latest/");
// Generate the SDK Version text files // Generate the CLI and SDK Version text files
List<string> versionFiles = new List<string>() { "win.x86.version", "win.x64.version", "ubuntu.x64.version", "rhel.x64.version", "osx.x64.version", "debian.x64.version", "centos.x64.version" }; List<string> versionFiles = new List<string>()
{
"win.x86.version",
"win.x64.version",
"ubuntu.x64.version",
"ubuntu.16.04.x64.version",
"rhel.x64.version",
"osx.x64.version",
"debian.x64.version",
"centos.x64.version"
};
string cliVersion = Utils.GetCliVersionFileContent(c); string cliVersion = Utils.GetCliVersionFileContent(c);
foreach (string version in versionFiles) foreach (string version in versionFiles)
{ {
@ -131,6 +142,7 @@ namespace Microsoft.DotNet.Cli.Build
{ "Windows_x86", false }, { "Windows_x86", false },
{ "Windows_x64", false }, { "Windows_x64", false },
{ "Ubuntu_x64", false }, { "Ubuntu_x64", false },
{ "Ubuntu_16_04_x64", false },
{ "RHEL_x64", false }, { "RHEL_x64", false },
{ "OSX_x64", false }, { "OSX_x64", false },
{ "Debian_x64", false }, { "Debian_x64", false },

View file

@ -34,6 +34,7 @@
"win7-x86": {}, "win7-x86": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {}

View file

@ -91,7 +91,7 @@ namespace Microsoft.DotNet.Cli.Build
} }
else if (CurrentPlatform.IsUbuntu) else if (CurrentPlatform.IsUbuntu)
{ {
rid = "ubuntu.14.04-x64"; rid = $"ubuntu.{RuntimeEnvironment.OperatingSystemVersion}-x64";
} }
else if (CurrentPlatform.IsCentOS || CurrentPlatform.IsRHEL) else if (CurrentPlatform.IsCentOS || CurrentPlatform.IsRHEL)
{ {

View file

@ -9,7 +9,7 @@ def project = GithubProject
def branch = GithubBranchName def branch = GithubBranchName
def isPR = true def isPR = true
def platformList = ['Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug'] def platformList = ['Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Release', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug']
def static getBuildJobName(def configuration, def os, def architecture) { def static getBuildJobName(def configuration, def os, def architecture) {
return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase()
@ -34,6 +34,9 @@ platformList.each { platform ->
else if (os == 'Ubuntu') { else if (os == 'Ubuntu') {
buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu --targets Default" buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu --targets Default"
} }
else if (os == 'Ubuntu16.04') {
buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu.16.04 --targets Default"
}
else { else {
// Jenkins non-Ubuntu CI machines don't have docker // Jenkins non-Ubuntu CI machines don't have docker
buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default" buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default"

View file

@ -23,7 +23,7 @@ export CHANNEL=$RELEASE_SUFFIX
#TODO this is a workaround for a nuget bug on ubuntu. Remove #TODO this is a workaround for a nuget bug on ubuntu. Remove
export DISABLE_PARALLEL="" export DISABLE_PARALLEL=""
[[ "$RID" =~ "ubuntu" ]] && export DISABLE_PARALLEL="" [[ "$RID" =~ "ubuntu" -o "$RID" =~ "ubuntu.16.04" ]] && export DISABLE_PARALLEL=""
unset COMMONSOURCE unset COMMONSOURCE
unset COMMONDIR unset COMMONDIR

View file

@ -0,0 +1,63 @@
#
# Copyright (c) .NET Foundation and contributors. All rights reserved.
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
#
FROM ubuntu:16.04
# Install the base toolchain we need to build anything (clang, cmake, make and the like)
# this does not include libraries that we need to compile different projects, we'd like
# them in a different layer.
RUN apt-get update && \
apt-get install -y wget && \
echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee /etc/apt/sources.list.d/llvm.list && \
wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - && \
apt-get update && \
apt-get install -y cmake \
make \
llvm-3.5 \
clang-3.5 \
lldb-3.6 \
lldb-3.6-dev && \
apt-get clean
# Install tools used by the VSO build automation. nodejs-legacy is a Debian specific
# package that provides `node' on the path (which azure cli needs).
RUN apt-get install -y git \
zip \
curl \
tar \
nodejs \
nodejs-legacy \
npm && \
apt-get clean && \
npm install -g azure-cli && \
npm cache clean
# Dependencies for CoreCLR and CoreFX
RUN apt-get install -y gettext \
libunwind8-dev \
libkrb5-dev \
libunwind8 \
libicu-dev \
liblttng-ust-dev \
libcurl4-openssl-dev \
libssl-dev \
uuid-dev && \
apt-get clean
# Setup User to match Host User, and give superuser permissions
ARG USER_ID=0
RUN useradd -m code_executor -u ${USER_ID} -g sudo
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
# With the User Change, we need to change permissions on these directories
RUN chmod -R a+rwx /usr/local
RUN chmod -R a+rwx /home
RUN chmod -R 755 /usr/lib/sudo
# Set user to the one we just created
USER ${USER_ID}
# Set working directory
WORKDIR /opt/code

View file

@ -56,8 +56,14 @@ if [ -z "$DOCKERFILE" ]; then
echo "Defaulting to 'ubuntu' image for Darwin" echo "Defaulting to 'ubuntu' image for Darwin"
export DOCKERFILE=scripts/docker/ubuntu export DOCKERFILE=scripts/docker/ubuntu
elif [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then elif [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then
echo "Detected current OS as Ubuntu, using 'ubuntu' image" echo "Detected current OS as Ubuntu, determining ubuntu version to use..."
export DOCKERFILE=scripts/docker/ubuntu if [ "$(cat /etc/*-release | grep -cim1 16.04)" -eq 1 ]; then
echo "using 'ubuntu.16.04' image"
export DOCKERFILE=scripts/docker/ubuntu.16.04
else
echo "using 'ubuntu' image"
export DOCKERFILE=scripts/docker/ubuntu
fi
elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then
echo "Detected current OS as CentOS, using 'centos' image" echo "Detected current OS as CentOS, using 'centos' image"
export DOCKERFILE=scripts/docker/centos export DOCKERFILE=scripts/docker/centos

View file

@ -66,6 +66,11 @@ get_current_os_name() {
else else
# Detect Distro # Detect Distro
if [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then if [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then
if [ "$(cat /etc/*-release | grep -cim1 16.04)" -eq 1 ]; then
echo "ubuntu.16.04"
return 0
fi
echo "ubuntu" echo "ubuntu"
return 0 return 0
elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then

View file

@ -29,7 +29,7 @@ namespace Microsoft.DotNet.Cli.Utils
public static readonly string LibCoreClrName = LibCoreClrFileName + DynamicLibSuffix; public static readonly string LibCoreClrName = LibCoreClrFileName + DynamicLibSuffix;
public static readonly string RuntimeIdentifier = CurrentPlatform == Platform.Windows ? "win7-x64" : public static readonly string RuntimeIdentifier = CurrentPlatform == Platform.Windows ? "win7-x64" :
CurrentPlatform == Platform.Darwin ? "osx.10.10-x64" : "ubuntu.14.04-x64"; CurrentPlatform == Platform.Darwin ? "osx.10.10-x64" : "ubuntu.{RuntimeEnvironment.OperatingSystemVersion}-x64";
public static readonly string StaticLibSuffix = CurrentPlatform == Platform.Windows ? ".lib" : ".a"; public static readonly string StaticLibSuffix = CurrentPlatform == Platform.Windows ? ".lib" : ".a";

View file

@ -127,6 +127,7 @@ namespace Microsoft.Extensions.DependencyModel.Tests
new RuntimeFallbacks("win8-x64", "win8", "win7-x64", "win7", "win-x64", "win", "any", "base"), new RuntimeFallbacks("win8-x64", "win8", "win7-x64", "win7", "win-x64", "win", "any", "base"),
new RuntimeFallbacks("win7-x64", "win7", "win-x64", "win", "any", "base"), new RuntimeFallbacks("win7-x64", "win7", "win-x64", "win", "any", "base"),
new RuntimeFallbacks("ubuntu-x64", "ubuntu", "linux-x64", "linux", "unix", "any", "base"), new RuntimeFallbacks("ubuntu-x64", "ubuntu", "linux-x64", "linux", "unix", "any", "base"),
new RuntimeFallbacks("ubuntu.16.04-x64", "ubuntu", "linux-x64", "linux", "unix", "any", "base"),
new RuntimeFallbacks("rhel-x64", "rhel", "linux-x64", "linux", "unix", "any", "base"), new RuntimeFallbacks("rhel-x64", "rhel", "linux-x64", "linux", "unix", "any", "base"),
new RuntimeFallbacks("osx-x64", "osx", "unix", "any", "base"), new RuntimeFallbacks("osx-x64", "osx", "unix", "any", "base"),
}); });

View file

@ -41,6 +41,12 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
Rid="ubuntu.14.04-x64", Rid="ubuntu.14.04-x64",
HostExtension="", HostExtension="",
ExpectedArtifacts=new string[] { "libhostfxr.so", "libcoreclr.so", "libhostpolicy.so" } ExpectedArtifacts=new string[] { "libhostfxr.so", "libcoreclr.so", "libhostpolicy.so" }
},
new
{
Rid="ubuntu.16.04-x64",
HostExtension="",
ExpectedArtifacts=new string[] { "libhostfxr.so", "libcoreclr.so", "libhostpolicy.so" }
}, },
new new
{ {