diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
index e079aa203d..60afaac973 100644
--- a/BuildToolsVersion.txt
+++ b/BuildToolsVersion.txt
@@ -1 +1 @@
-2.0.0-prerelease-01616-04
+2.0.0-servicing-02011-01
\ No newline at end of file
diff --git a/README.md b/README.md
index 47cea24787..fa76ada338 100644
--- a/README.md
+++ b/README.md
@@ -30,224 +30,81 @@ They can be downloaded from [here](https://www.microsoft.com/net/download#core).
Daily Builds
------------
-| Platform | Master
[![][build-badge-master]][build-master] | Release/1.1.X
[![][build-badge-1.X.X]][build-1.X.X] | Release/1.0.X
[![][build-badge-1.0.X]][build-1.0.X] |
-|---------|:----------:|:----------:|:----------:|
-| **Windows (x64)** | [![][win-x64-badge-master]][win-x64-version-master]
[Installer][win-x64-installer-master]
[zip][win-x64-zip-master]
[Symbols (zip)][win-x64-symbols-zip-master] | [![][win-x64-badge-1.1.X]][win-x64-version-1.1.X]
[Installer][win-x64-installer-1.1.X]
[zip][win-x64-zip-1.1.X] | [![][win-x64-badge-preview]][win-x64-version-preview]
[Installer][win-x64-installer-preview]
[zip][win-x64-zip-preview] |
-| **Windows (x86)** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master]
[zip][win-x86-zip-master]
[Symbols (zip)][win-x86-symbols-zip-master] | [![][win-x86-badge-1.1.X]][win-x86-version-1.1.X]
[Installer][win-x86-installer-1.1.X]
[zip][win-x86-zip-1.1.X] | [![][win-x86-badge-preview]][win-x86-version-preview]
[Installer][win-x86-installer-preview]
[zip][win-x86-zip-preview] |
-| **Windows (arm32)** | [![][win-arm-badge-master]][win-arm-version-master]
[zip][win-arm-zip-master]
[Symbols (zip)][win-arm-symbols-zip-master] | N/A | N/A |
-| **Windows (arm64)** | [![][win-arm64-badge-master]][win-arm64-version-master]
[zip][win-arm64-zip-master]
[Symbols (zip)][win-arm64-symbols-zip-master] | N/A | N/A |
-| **Mac OS X (x64)** | [![][osx-badge-master]][osx-version-master]
[Installer][osx-installer-master]
[tar.gz][osx-targz-master]
[Symbols (tar.gz)][osx-symbols-targz-master] | [![][osx-badge-1.1.X]][osx-version-1.1.X]
[Installer][osx-installer-1.1.X]
[tar.gz][osx-targz-1.1.X] | [![][osx-badge-preview]][osx-version-preview]
[Installer][osx-installer-preview]
[tar.gz][osx-targz-preview] |
-| **Linux (x64)** (for glibc based OS) | [![][linux-x64-badge-master]][linux-x64-version-master]
[tar.gz][linux-x64-targz-master]
[Symbols (tar.gz)][linux-x64-symbols-targz-master] | N/A | N/A |
-| **Linux (armhf)** (for glibc based OS) | [![][linux-arm-badge-master]][linux-arm-version-master]
[tar.gz][linux-arm-targz-master]
[Symbols (tar.gz)][linux-arm-symbols-targz-master] | N/A | N/A |
-| **Ubuntu 14.04 (x64)** | [![][ubuntu-14.04-badge-master]][ubuntu-14.04-version-master]
[Host][ubuntu-14.04-host-master]
[Host FX Resolver][ubuntu-14.04-hostfxr-master]
[Shared Framework][ubuntu-14.04-sharedfx-master]
| [![][ubuntu-14.04-badge-1.1.X]][ubuntu-14.04-version-1.1.X]
[Host][ubuntu-14.04-host-1.1.X]
[Host FX Resolver][ubuntu-14.04-hostfxr-1.1.X]
[Shared Framework][ubuntu-14.04-sharedfx-1.1.X]
[tar.gz][ubuntu-14.04-targz-1.1.X] | [![][ubuntu-14.04-badge-preview]][ubuntu-14.04-version-preview]
[Host][ubuntu-14.04-host-preview]
[Host FX Resolver][ubuntu-14.04-hostfxr-preview]
[Shared Framework][ubuntu-14.04-sharedfx-preview]
[tar.gz][ubuntu-14.04-targz-preview] |
-| **Ubuntu 16.04 (x64)** | [![][ubuntu-16.04-badge-master]][ubuntu-16.04-version-master]
[Host][ubuntu-16.04-host-master]
[Host FX Resolver][ubuntu-16.04-hostfxr-master]
[Shared Framework][ubuntu-16.04-sharedfx-master]
| [![][ubuntu-16.04-badge-1.1.X]][ubuntu-16.04-version-1.1.X]
[Host][ubuntu-16.04-host-1.1.X]
[Host FX Resolver][ubuntu-16.04-hostfxr-1.1.X]
[Shared Framework][ubuntu-16.04-sharedfx-1.1.X]
[tar.gz][ubuntu-16.04-targz-1.1.X] | [![][ubuntu-16.04-badge-preview]][ubuntu-16.04-version-preview]
[Host][ubuntu-16.04-host-preview]
[Host FX Resolver][ubuntu-16.04-hostfxr-preview]
[Shared Framework][ubuntu-16.04-sharedfx-preview]
[tar.gz][ubuntu-16.04-targz-preview] |
-| **Ubuntu 16.10 (x64)** | [![][ubuntu-16.10-badge-master]][ubuntu-16.10-version-master]
[Host][ubuntu-16.10-host-master]
[Host FX Resolver][ubuntu-16.10-hostfxr-master]
[Shared Framework][ubuntu-16.10-sharedfx-master]
| [![][ubuntu-16.10-badge-1.1.X]][ubuntu-16.10-version-1.1.X]
[Host][ubuntu-16.10-host-1.1.X]
[Host FX Resolver][ubuntu-16.10-hostfxr-1.1.X]
[Shared Framework][ubuntu-16.10-sharedfx-1.1.X]
[tar.gz][ubuntu-16.10-targz-1.1.X] | N/A |
-| **Debian 8.2 (x64)** | [![][debian-8.2-badge-master]][debian-8.2-version-master]
[Host][debian-8.2-host-master]
[Host FX Resolver][debian-8.2-hostfxr-master]
[Shared Framework][debian-8.2-sharedfx-master]
| [![][debian-8.2-badge-1.1.X]][debian-8.2-version-1.1.X]
[Host][debian-8.2-host-1.1.X]
[Host FX Resolver][debian-8.2-hostfxr-1.1.X]
[Shared Framework][debian-8.2-sharedfx-1.1.X]
[tar.gz][debian-8.2-targz-1.1.X] | [![][debian-8.2-badge-preview]][debian-8.2-version-preview]
[Host][debian-8.2-host-preview]
[Host FX Resolver][debian-8.2-hostfxr-preview]
[Shared Framework][debian-8.2-sharedfx-preview]
[tar.gz][debian-8.2-targz-preview] |
-| **CentOS 7.1 (x64)** | N/A | [![][centos-badge-1.1.X]][centos-version-1.1.X]
[tar.gz][centos-targz-1.1.X] | [![][centos-badge-preview]][centos-version-preview]
[tar.gz][centos-targz-preview] |
-| **RHEL 7.2 (x64)** | [![][rhel7-badge-master]][rhel7-version-master]
[Host][rhel7-host-master]
[Host FX Resolver][rhel7-hostfxr-master]
[Shared Framework][rhel7-sharedfx-master]
| [![][rhel-badge-1.1.X]][rhel-version-1.1.X]
[tar.gz][rhel-targz-1.1.X] | [![][rhel-badge-preview]][rhel-version-preview]
[tar.gz][rhel-targz-preview] |
-| **Fedora 23 (x64)** | N/A | [![][fedora-23-badge-1.1.X]][fedora-23-version-1.1.X]
[tar.gz][fedora-23-targz-1.1.X] | [![][fedora-23-badge-preview]][fedora-23-version-preview]
[tar.gz][fedora-23-targz-preview] |
-| **Fedora 24 (x64)** | N/A | [![][fedora-24-badge-1.1.X]][fedora-24-version-1.1.X]
[tar.gz][fedora-24-targz-1.1.X] | N/A |
-| **OpenSUSE 42.1 (x64)** | N/A | [![][opensuse-42.1-badge-1.1.X]][opensuse-42.1-version-1.1.X]
[tar.gz][opensuse-42.1-targz-1.1.X] | N/A |
+| Platform | Release/2.0.X
[![][build-badge-2.0.x]][build-2.0.x] |
+|---------|:----------:|
+| **Windows (x64)** | [![][win-x64-badge-2.0.X]][win-x64-badge-2.0.X]
[Installer][win-x64-installer-2.0.X]
[zip][win-x64-zip-2.0.X]
[Symbols (zip)][win-x64-symbols-zip-2.0.X] |
+| **Windows (x86)** | [![][win-x86-badge-2.0.X]][win-x86-badge-2.0.X]
[Installer][win-x86-installer-2.0.X]
[zip][win-x86-zip-2.0.X]
[Symbols (zip)][win-x86-symbols-zip-2.0.X] |
+| **Windows (arm32)** | [![][win-arm-badge-2.0.X]][win-arm-badge-2.0.X]
[zip][win-arm-zip-2.0.X]
[Symbols (zip)][win-arm-symbols-zip-2.0.X] |
+| **Windows (arm64)** | [![][win-arm64-badge-2.0.X]][win-arm64-badge-2.0.X]
[zip][win-arm64-zip-2.0.X]
[Symbols (zip)][win-arm64-symbols-zip-2.0.X] |
+| **Mac OS X (x64)** | [![][osx-badge-2.0.X]][osx-badge-2.0.X]
[Installer][osx-installer-2.0.X]
[tar.gz][osx-targz-2.0.X]
[Symbols (tar.gz)][osx-symbols-targz-2.0.X] |
+| **Linux (x64)** (for glibc based OS) | [![][linux-x64-badge-2.0.X]][linux-x64-badge-2.0.X]
[tar.gz][linux-x64-targz-2.0.X]
[Symbols (tar.gz)][linux-x64-symbols-targz-2.0.X] |
+| **Linux (armhf)** (for glibc based OS) | [![][linux-arm-badge-2.0.X]][linux-arm-badge-2.0.X]
[tar.gz][linux-arm-targz-2.0.X]
[Symbols (tar.gz)][linux-arm-symbols-targz-2.0.X] |
+| **Ubuntu 14.04 (x64)** | [![][ubuntu-14.04-badge-2.0.X]][ubuntu-14.04-badge-2.0.X]
[Host][ubuntu-14.04-host-2.0.X]
[Host FX Resolver][ubuntu-14.04-hostfxr-2.0.X]
[Shared Framework][ubuntu-14.04-sharedfx-2.0.X]
|
+| **Ubuntu 16.04 (x64)** | [![][ubuntu-16.04-badge-2.0.X]][ubuntu-16.04-badge-2.0.X]
[Host][ubuntu-16.04-host-2.0.X]
[Host FX Resolver][ubuntu-16.04-hostfxr-2.0.X]
[Shared Framework][ubuntu-16.04-sharedfx-2.0.X]
|
+| **Ubuntu 16.10 (x64)** | [![][ubuntu-16.10-badge-2.0.X]][ubuntu-16.10-badge-2.0.X]
[Host][ubuntu-16.10-host-2.0.X]
[Host FX Resolver][ubuntu-16.10-hostfxr-2.0.X]
[Shared Framework][ubuntu-16.10-sharedfx-2.0.X]
|
+| **Debian 8.2 (x64)** | [![][debian-8.2-badge-2.0.X]][debian-8.2-badge-2.0.X]
[Host][debian-8.2-host-2.0.X]
[Host FX Resolver][debian-8.2-hostfxr-2.0.X]
[Shared Framework][debian-8.2-sharedfx-2.0.X]
|
+| **RHEL 7.2 (x64)** | [![][rhel7-badge-2.0.X]][rhel7-badge-2.0.X]
[Host][rhel7-host-2.0.X]
[Host FX Resolver][rhel7-hostfxr-2.0.X]
[Shared Framework][rhel7-sharedfx-2.0.X]
|
*Note: Our .deb packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have 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 above.*
-[build-badge-master]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/3160/badge
-[build-master]: https://devdiv.visualstudio.com/DevDiv/_build/index?definitionId=3160&_a=completed
-
-[build-badge-1.X.X]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/4188/badge
-[build-1.X.X]: https://devdiv.visualstudio.com/DevDiv/_build/index?definitionId=4188&_a=completed
-
-[build-badge-1.0.X]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/4187/badge
-[build-1.0.X]: https://devdiv.visualstudio.com/DevDiv/_build/index?definitionId=4187&_a=completed
-
-
-[win-x64-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_win-x64_Release_version_badge.svg
-[win-x64-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.win.x64.version
-[win-x64-installer-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-win-x64.latest.exe
-[win-x64-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-win-x64.latest.zip
-[win-x64-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-win-x64.latest.zip
-
-[win-x64-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Windows_x64_Release_version_badge.svg
-[win-x64-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.win.x64.version
-[win-x64-installer-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-win-x64.latest.exe
-[win-x64-zip-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-win-x64.latest.zip
-
-[win-x64-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_Windows_x64_Release_version_badge.svg
-[win-x64-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.win.x64.version
-[win-x64-installer-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-win-x64.latest.exe
-[win-x64-zip-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-win-x64.latest.zip
-
-[win-x86-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_win-x86_Release_version_badge.svg
-[win-x86-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.win.x86.version
-[win-x86-installer-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-win-x86.latest.exe
-[win-x86-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-win-x86.latest.zip
-[win-x86-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-win-x86.latest.zip
-
-[win-x86-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Windows_x86_Release_version_badge.svg
-[win-x86-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.win.x86.version
-[win-x86-installer-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-win-x86.latest.exe
-[win-x86-zip-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-win-x86.latest.zip
-
-[win-x86-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_Windows_x86_Release_version_badge.svg
-[win-x86-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.win.x86.version
-[win-x86-installer-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-win-x86.latest.exe
-[win-x86-zip-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-win-x86.latest.zip
-
-[win-arm-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_win-arm_Release_version_badge.svg
-[win-arm-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.win.arm.version
-[win-arm-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-win-arm.latest.zip
-[win-arm-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-win-arm.latest.zip
-
-[win-arm64-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_win-arm64_Release_version_badge.svg
-[win-arm64-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.win.arm64.version
-[win-arm64-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-win-arm64.latest.zip
-[win-arm64-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-win-arm64.latest.zip
-
-[osx-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_osx-x64_Release_version_badge.svg
-[osx-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.osx.x64.version
-[osx-installer-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-osx-x64.latest.pkg
-[osx-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-osx-x64.latest.tar.gz
-[osx-symbols-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-osx-x64.latest.tar.gz
-
-[osx-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_OSX_x64_Release_version_badge.svg
-[osx-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.osx.x64.version
-[osx-installer-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-osx-x64.latest.pkg
-[osx-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-osx-x64.latest.tar.gz
-
-[osx-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_OSX_x64_Release_version_badge.svg
-[osx-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.osx.x64.version
-[osx-installer-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-osx-x64.latest.pkg
-[osx-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-osx-x64.latest.tar.gz
-
-
-[linux-x64-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_linux-x64_Release_version_badge.svg
-[linux-x64-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.linux.x64.version
-[linux-x64-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-linux-x64.latest.tar.gz
-[linux-x64-symbols-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-linux-x64.latest.tar.gz
-
-[linux-arm-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_linux-arm_Release_version_badge.svg
-[linux-arm-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.linux.arm.version
-[linux-arm-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-linux-arm.latest.tar.gz
-[linux-arm-symbols-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-linux-arm.latest.tar.gz
-
-[ubuntu-14.04-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_ubuntu.14.04-x64_Release_version_badge.svg
-[ubuntu-14.04-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.ubuntu.x64.version
-[ubuntu-14.04-host-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-host-ubuntu.14.04-x64.latest.deb
-[ubuntu-14.04-hostfxr-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-hostfxr-ubuntu.14.04-x64.latest.deb
-[ubuntu-14.04-sharedfx-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-ubuntu.14.04-x64.latest.deb
-
-[ubuntu-14.04-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Ubuntu_x64_Release_version_badge.svg
-[ubuntu-14.04-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.ubuntu.x64.version
-[ubuntu-14.04-host-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-host-ubuntu-x64.latest.deb
-[ubuntu-14.04-hostfxr-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-hostfxr-ubuntu-x64.latest.deb
-[ubuntu-14.04-sharedfx-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-sharedframework-ubuntu-x64.latest.deb
-[ubuntu-14.04-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-ubuntu-x64.latest.tar.gz
-
-[ubuntu-14.04-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_Ubuntu_x64_Release_version_badge.svg
-[ubuntu-14.04-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.ubuntu.x64.version
-[ubuntu-14.04-host-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-host-ubuntu-x64.latest.deb
-[ubuntu-14.04-hostfxr-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-hostfxr-ubuntu-x64.latest.deb
-[ubuntu-14.04-sharedfx-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-sharedframework-ubuntu-x64.latest.deb
-[ubuntu-14.04-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-ubuntu-x64.latest.tar.gz
-
-
-[ubuntu-16.04-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_ubuntu.16.04-x64_Release_version_badge.svg
-[ubuntu-16.04-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.ubuntu.16.04.x64.version
-[ubuntu-16.04-host-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-host-ubuntu.16.04-x64.latest.deb
-[ubuntu-16.04-hostfxr-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-hostfxr-ubuntu.16.04-x64.latest.deb
-[ubuntu-16.04-sharedfx-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-ubuntu.16.04-x64.latest.deb
-
-[ubuntu-16.04-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Ubuntu_16_04_x64_Release_version_badge.svg
-[ubuntu-16.04-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.ubuntu.16.04.x64.version
-[ubuntu-16.04-host-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-host-ubuntu.16.04-x64.latest.deb
-[ubuntu-16.04-hostfxr-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-hostfxr-ubuntu.16.04-x64.latest.deb
-[ubuntu-16.04-sharedfx-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-sharedframework-ubuntu.16.04-x64.latest.deb
-[ubuntu-16.04-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-ubuntu.16.04-x64.latest.tar.gz
-
-[ubuntu-16.04-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_Ubuntu_16_04_x64_Release_version_badge.svg
-[ubuntu-16.04-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.ubuntu.16.04.x64.version
-[ubuntu-16.04-host-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-host-ubuntu.16.04-x64.latest.deb
-[ubuntu-16.04-hostfxr-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-hostfxr-ubuntu.16.04-x64.latest.deb
-[ubuntu-16.04-sharedfx-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-sharedframework-ubuntu.16.04-x64.latest.deb
-[ubuntu-16.04-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-ubuntu.16.04-x64.latest.tar.gz
-
-
-[ubuntu-16.10-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_ubuntu.16.10-x64_Release_version_badge.svg
-[ubuntu-16.10-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.ubuntu.16.10.x64.version
-[ubuntu-16.10-host-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-host-ubuntu.16.10-x64.latest.deb
-[ubuntu-16.10-hostfxr-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-hostfxr-ubuntu.16.10-x64.latest.deb
-[ubuntu-16.10-sharedfx-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-ubuntu.16.10-x64.latest.deb
-
-[ubuntu-16.10-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Ubuntu_16_10_x64_Release_version_badge.svg
-[ubuntu-16.10-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.ubuntu.16.10.x64.version
-[ubuntu-16.10-host-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-host-ubuntu.16.10-x64.latest.deb
-[ubuntu-16.10-hostfxr-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-hostfxr-ubuntu.16.10-x64.latest.deb
-[ubuntu-16.10-sharedfx-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-sharedframework-ubuntu.16.10-x64.latest.deb
-[ubuntu-16.10-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-ubuntu.16.10-x64.latest.tar.gz
-
-
-[debian-8.2-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_debian.8-x64_Release_version_badge.svg
-[debian-8.2-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.debian.8.x64.version
-[debian-8.2-host-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-host-debian.8-x64.latest.deb
-[debian-8.2-hostfxr-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-hostfxr-debian.8-x64.latest.deb
-[debian-8.2-sharedfx-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-debian.8-x64.latest.deb
-
-[debian-8.2-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Debian_x64_Release_version_badge.svg
-[debian-8.2-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.debian.x64.version
-[debian-8.2-host-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-host-debian-x64.latest.deb
-[debian-8.2-hostfxr-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-hostfxr-debian-x64.latest.deb
-[debian-8.2-sharedfx-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-sharedframework-debian-x64.latest.deb
-[debian-8.2-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-debian-x64.latest.tar.gz
-
-[debian-8.2-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_Debian_x64_Release_version_badge.svg
-[debian-8.2-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.debian.x64.version
-[debian-8.2-host-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-host-debian-x64.latest.deb
-[debian-8.2-hostfxr-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-hostfxr-debian-x64.latest.deb
-[debian-8.2-sharedfx-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-sharedframework-debian-x64.latest.deb
-[debian-8.2-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-debian-x64.latest.tar.gz
-
-
-[centos-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_CentOS_x64_Release_version_badge.svg
-[centos-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.centos.x64.version
-[centos-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-centos-x64.latest.tar.gz
-
-[centos-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_CentOS_x64_Release_version_badge.svg
-[centos-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.centos.x64.version
-[centos-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-centos-x64.latest.tar.gz
-
-
-[rhel7-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_rhel.7-x64_Release_version_badge.svg
-[rhel7-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.rhel.7.x64.version
-[rhel7-host-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-host-rhel.7-x64.latest.rpm
-[rhel7-hostfxr-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-hostfxr-rhel.7-x64.latest.rpm
-[rhel7-sharedfx-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-rhel.7-x64.latest.rpm
-
-[rhel-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_RHEL_x64_Release_version_badge.svg
-[rhel-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.rhel.x64.version
-[rhel-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-rhel-x64.latest.tar.gz
-
-[rhel-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_RHEL_x64_Release_version_badge.svg
-[rhel-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.rhel.x64.version
-[rhel-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-rhel-x64.latest.tar.gz
-
-
-[fedora-23-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Fedora_23_x64_Release_version_badge.svg
-[fedora-23-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.fedora.23.x64.version
-[fedora-23-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-fedora.23-x64.latest.tar.gz
-
-[fedora-23-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_Fedora_23_x64_Release_version_badge.svg
-[fedora-23-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.fedora.23.x64.version
-[fedora-23-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-fedora.23-x64.latest.tar.gz
-
-
-[fedora-24-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Fedora_24_x64_Release_version_badge.svg
-[fedora-24-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.fedora.24.x64.version
-[fedora-24-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-fedora.24-x64.latest.tar.gz
-
-
-[opensuse-42.1-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_openSUSE_42_1_x64_Release_version_badge.svg
-[opensuse-42.1-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.opensuse.42.1.x64.version
-[opensuse-42.1-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-opensuse.42.1-x64.latest.tar.gz
+[build-badge-2.0.X]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6161/badge
+[build-2.0.X]: https://devdiv.visualstudio.com/DevDiv/_build/index?definitionId=6161&_a=completed
+
+[win-x64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_win-x64_Release_version_badge.svg
+[win-x64-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-x64.exe
+[win-x64-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-x64.zip
+[win-x64-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-win-x64.zip
+
+[win-x86-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_win-x86_Release_version_badge.svg
+[win-x86-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-x86.exe
+[win-x86-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-x86.zip
+[win-x86-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-win-x86.zip
+
+[win-arm-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_win-arm_Release_version_badge.svg
+[win-arm-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-arm.zip
+[win-arm-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-win-arm.zip
+
+[win-arm64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_win-arm64_Release_version_badge.svg
+[win-arm64-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-arm64.zip
+[win-arm64-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-win-arm64.zip
+
+[osx-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_osx-x64_Release_version_badge.svg
+[osx-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-osx-x64.pkg
+[osx-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-osx-x64.tar.gz
+[osx-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-osx-x64.tar.gz
+
+[linux-x64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_linux-x64_Release_version_badge.svg
+[linux-x64-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-linux-x64.tar.gz
+[linux-x64-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-linux-x64.tar.gz
+
+[linux-arm-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_linux-arm_Release_version_badge.svg
+[linux-arm-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-linux-arm.tar.gz
+[linux-arm-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-linux-arm.tar.gz
+
+[ubuntu-14.04-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_ubuntu.14.04-x64_Release_version_badge.svg
+[ubuntu-14.04-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-host-latest-ubuntu.14.04-x64.deb
+[ubuntu-14.04-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-hostfxr-latest-ubuntu.14.04-x64.deb
+[ubuntu-14.04-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-ubuntu.14.04-x64.deb
+
+[ubuntu-16.04-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_ubuntu.16.04-x64_Release_version_badge.svg
+[ubuntu-16.04-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-host-latest-ubuntu.16.04-x64.deb
+[ubuntu-16.04-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-hostfxr-latest-ubuntu.16.04-x64.deb
+[ubuntu-16.04-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-ubuntu.16.04-x64.deb
+
+[ubuntu-16.10-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_ubuntu.16.10-x64_Release_version_badge.svg
+[ubuntu-16.10-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-host-latest-ubuntu.16.10-x64.deb
+[ubuntu-16.10-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-hostfxr-latest-ubuntu.16.10-x64.deb
+[ubuntu-16.10-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-ubuntu.16.10-x64.deb
+
+[debian-8.2-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_debian.8-x64_Release_version_badge.svg
+[debian-8.2-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-host-latest-debian.8-x64.deb
+[debian-8.2-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-hostfxr-latest-debian.8-x64.deb
+[debian-8.2-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-debian.8-x64.deb
+
+[rhel7-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_rhel.7-x64_Release_version_badge.svg
+[rhel7-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-host-latest-rhel.7-x64.rpm
+[rhel7-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-hostfxr-latest-rhel.7-x64.rpm
+[rhel7-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-rhel.7-x64.rpm
# Debian daily feed
diff --git a/build.proj b/build.proj
index 47378ea946..0cadd7b6ab 100644
--- a/build.proj
+++ b/build.proj
@@ -6,7 +6,7 @@
true
-
+
true
@@ -42,13 +42,16 @@
netstandard1.3
net451
+ netstandard1.3
+ net45
-
+
-
+
+
diff --git a/buildpipeline/Core-Setup-Linux-Arm-BT.json b/buildpipeline/Core-Setup-Linux-Arm-BT.json
index 6457d98aac..0c75dfe9a7 100644
--- a/buildpipeline/Core-Setup-Linux-Arm-BT.json
+++ b/buildpipeline/Core-Setup-Linux-Arm-BT.json
@@ -141,7 +141,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DistroRid=$(PB_DistroRid) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)",
+ "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DistroRid=$(PB_DistroRid) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)",
"workingFolder": "$(PB_SourcesDirectory)",
"failOnStandardError": "false"
}
@@ -357,6 +357,9 @@
"PB_AzureAccountName": {
"value": "sourcebuild"
},
+ "PB_ContainerName": {
+ "value": "dotnet"
+ },
"PB_AzureAccessToken": {
"value": null,
"isSecret": true
@@ -382,6 +385,9 @@
"PB_ChecksumAzureAccountName": {
"value": "dotnetclichecksums"
},
+ "PB_ChecksumContainerName": {
+ "value": "dotnet"
+ },
"PB_ChecksumAzureAccessToken": {
"value": null,
"isSecret": true
diff --git a/buildpipeline/Core-Setup-Linux-BT.json b/buildpipeline/Core-Setup-Linux-BT.json
index a6af5ac610..35dc987f00 100644
--- a/buildpipeline/Core-Setup-Linux-BT.json
+++ b/buildpipeline/Core-Setup-Linux-BT.json
@@ -141,7 +141,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DistroRid=$(PB_DistroRid) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)",
+ "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DistroRid=$(PB_DistroRid) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)",
"workingFolder": "$(PB_SourcesDirectory)",
"failOnStandardError": "false"
}
@@ -760,6 +760,9 @@
"PB_ChecksumAzureAccountName": {
"value": "dotnetclichecksums"
},
+ "PB_ChecksumContainerName": {
+ "value": "dotnet"
+ },
"PB_ChecksumAzureAccessToken": {
"value": null,
"isSecret": true
@@ -834,6 +837,9 @@
"PB_AzureAccountName": {
"value": "sourcebuild"
},
+ "PB_ContainerName": {
+ "value": "dotnet"
+ },
"PB_AzureAccessToken": {
"value": null,
"isSecret": true
@@ -863,7 +869,7 @@
"value": "/flp:v=diag /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=false /p:ConfigurationGroup=$(BuildConfiguration) /p:OSGroup=Linux /p:OfficialBuildId=$(OfficialBuildId)"
},
"DistroSpecificMSBuildPublishArgs": {
- "value": "/p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) $(PB_DebianKeys)"
+ "value": "/p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) $(PB_DebianKeys)"
},
"PB_DebianKeys": {
"value": "/p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)"
diff --git a/buildpipeline/Core-Setup-OSX-BT.json b/buildpipeline/Core-Setup-OSX-BT.json
index 7872962e54..e3273cbb37 100644
--- a/buildpipeline/Core-Setup-OSX-BT.json
+++ b/buildpipeline/Core-Setup-OSX-BT.json
@@ -85,7 +85,7 @@
},
"inputs": {
"filename": "$(PB_SourcesDirectory)/Tools/msbuild.sh",
- "arguments": "$(PB_SourcesDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=OSX",
+ "arguments": "$(PB_SourcesDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=OSX",
"workingFolder": "$(PB_SourcesDirectory)",
"failOnStandardError": "false"
}
@@ -193,6 +193,9 @@
"PB_AzureAccountName": {
"value": "sourcebuild"
},
+ "PB_ContainerName": {
+ "value": "dotnet"
+ },
"PB_AzureAccessToken": {
"value": null,
"isSecret": true
@@ -200,6 +203,9 @@
"PB_ChecksumAzureAccountName": {
"value": "dotnetclichecksums"
},
+ "PB_ChecksumContainerName": {
+ "value": "dotnet"
+ },
"PB_ChecksumAzureAccessToken": {
"value": null,
"isSecret": true
diff --git a/buildpipeline/Core-Setup-Publish.json b/buildpipeline/Core-Setup-Publish.json
index 0727b5c392..cc68e64fde 100644
--- a/buildpipeline/Core-Setup-Publish.json
+++ b/buildpipeline/Core-Setup-Publish.json
@@ -117,7 +117,7 @@
"solution": "$(PB_SourcesDirectory)\\publish\\publish.proj",
"platform": "$(PB_TargetArchitecture)",
"configuration": "$(BuildConfiguration)",
- "msbuildArguments": "/p:Configuration=$(BuildConfiguration) $(PB_CommonMSBuildArgs) /p:NuGetFeedUrl=$(NUGET_FEED_URL) /p:NuGetSymbolsFeedUrl=$(NUGET_SYMBOLS_FEED_URL) /p:NuGetApiKey=$(NUGET_API_KEY) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:GitHubUser=$(PB_GitHubUser) /p:GitHubEmail=$(PB_GitHubEmail) /p:GitHubAuthToken=$(GITHUB_PASSWORD) /p:VersionsRepoOwner=$(PB_VersionsRepoOwner) /p:VersionsRepo=$(PB_VersionsRepo) /p:VersionsRepoPath=build-info/dotnet/$(PB_RepoName)/$(SourceBranch) /p:Finalize=true /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log",
+ "msbuildArguments": "/p:Configuration=$(BuildConfiguration) $(PB_CommonMSBuildArgs) /p:NuGetFeedUrl=$(NUGET_FEED_URL) /p:NuGetSymbolsFeedUrl=$(NUGET_SYMBOLS_FEED_URL) /p:NuGetApiKey=$(NUGET_API_KEY) /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:GitHubUser=$(PB_GitHubUser) /p:GitHubEmail=$(PB_GitHubEmail) /p:GitHubAuthToken=$(GITHUB_PASSWORD) /p:VersionsRepoOwner=$(PB_VersionsRepoOwner) /p:VersionsRepo=$(PB_VersionsRepo) /p:VersionsRepoPath=build-info/dotnet/$(PB_RepoName)/$(SourceBranch) /p:Finalize=true /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log",
"clean": "false",
"maximumCpuCount": "false",
"restoreNugetPackages": "false",
@@ -263,6 +263,9 @@
"PB_AzureAccountName": {
"value": "dotnetcli"
},
+ "PB_ContainerName": {
+ "value": "dotnet"
+ },
"PB_AzureAccessToken": {
"value": null,
"isSecret": true
@@ -270,6 +273,9 @@
"PB_ChecksumAzureAccountName": {
"value": "dotnetclichecksums"
},
+ "PB_ChecksumContainerName": {
+ "value": "dotnet"
+ },
"PB_ChecksumAzureAccessToken": {
"value": null,
"isSecret": true
diff --git a/buildpipeline/Core-Setup-Windows-Arm-BT.json b/buildpipeline/Core-Setup-Windows-Arm-BT.json
index c6d0e975b3..dfee20edd9 100644
--- a/buildpipeline/Core-Setup-Windows-Arm-BT.json
+++ b/buildpipeline/Core-Setup-Windows-Arm-BT.json
@@ -68,7 +68,7 @@
"definitionType": "task"
},
"inputs": {
- "signType": "$(PB_SignType)",
+ "signType": "real",
"zipSources": "false",
"version": "",
"feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json"
@@ -237,7 +237,7 @@
"msbuildLocation": "",
"platform": "$(PB_TargetArchitecture)",
"configuration": "$(BuildConfiguration)",
- "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken)",
+ "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken)",
"clean": "false",
"maximumCpuCount": "false",
"restoreNugetPackages": "false",
@@ -396,7 +396,7 @@
"allowOverride": true
},
"MsbuildSigningArguments": {
- "value": "/p:CertificateId=$(CertificateId) /v:detailed"
+ "value": "/p:CertificateId=$(CertificateId) /v:detailed /p:SignType=$(PB_SignType)"
},
"TeamName": {
"value": "DotNetCore"
@@ -414,6 +414,9 @@
"PB_ChecksumAzureAccountName": {
"value": "dotnetclichecksums"
},
+ "PB_ChecksumContainerName": {
+ "value": "dotnet"
+ },
"PB_ChecksumAzureAccessToken": {
"value": null,
"isSecret": true
@@ -424,6 +427,9 @@
"PB_AzureAccountName": {
"value": "sourcebuild"
},
+ "PB_ContainerName": {
+ "value": "dotnet"
+ },
"PB_AzureAccessToken": {
"value": null,
"isSecret": true
@@ -442,7 +448,8 @@
"value": "HEAD"
},
"PB_SignType": {
- "value": "real"
+ "value": "real",
+ "allowOverride": true
},
"PB_CommonMSBuildArgs": {
"value": "/p:DistroRid=$(PB_DistroRid) /p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild) /p:DisableCrossgen=true $(PB_AdditionalBuildArguments)"
diff --git a/buildpipeline/Core-Setup-Windows-BT.json b/buildpipeline/Core-Setup-Windows-BT.json
index 28b5d44391..a475737926 100644
--- a/buildpipeline/Core-Setup-Windows-BT.json
+++ b/buildpipeline/Core-Setup-Windows-BT.json
@@ -68,7 +68,7 @@
"definitionType": "task"
},
"inputs": {
- "signType": "$(PB_SignType)",
+ "signType": "real",
"zipSources": "false",
"version": "",
"feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json"
@@ -426,7 +426,7 @@
"msbuildLocation": "",
"platform": "$(PB_TargetArchitecture)",
"configuration": "$(BuildConfiguration)",
- "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:PublishRidAgnosticPackages=$(PB_PublishRidAgnosticPackages) /p:BuildFullPlatformManifest=$(PB_BuildFullPlatformManifest) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log",
+ "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:PublishRidAgnosticPackages=$(PB_PublishRidAgnosticPackages) /p:BuildFullPlatformManifest=$(PB_BuildFullPlatformManifest) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log",
"clean": "false",
"maximumCpuCount": "false",
"restoreNugetPackages": "false",
@@ -591,7 +591,7 @@
"allowOverride": true
},
"MsbuildSigningArguments": {
- "value": "/p:CertificateId=$(CertificateId) /v:detailed"
+ "value": "/p:CertificateId=$(CertificateId) /v:detailed /p:SignType=$(PB_SignType)"
},
"TeamName": {
"value": "DotNetCore"
@@ -615,6 +615,9 @@
"PB_AzureAccountName": {
"value": "sourcebuild"
},
+ "PB_ContainerName": {
+ "value": "dotnet"
+ },
"PB_AzureAccessToken": {
"value": null,
"isSecret": true
@@ -622,6 +625,9 @@
"PB_ChecksumAzureAccountName": {
"value": "dotnetclichecksums"
},
+ "PB_ChecksumContainerName": {
+ "value": "dotnet"
+ },
"PB_ChecksumAzureAccessToken": {
"value": null,
"isSecret": true
@@ -640,7 +646,8 @@
"value": "HEAD"
},
"PB_SignType": {
- "value": "real"
+ "value": "real",
+ "allowOverride": true
},
"PB_CommonMSBuildArgs": {
"value": "/p:DistroRid=$(PB_DistroRid) /p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild)"
diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json
index 99a5b6d1b8..f1ff01e699 100644
--- a/buildpipeline/pipeline.json
+++ b/buildpipeline/pipeline.json
@@ -31,22 +31,37 @@
}
},
{
- "Name": "Core-Setup-Linux-Arm-BT",
- "Parameters": {
- "PB_DistroRid": "ubuntu.14.04-arm",
- "PB_DockerTag": "ubuntu-14.04-cross-0cd4667-20172211042239",
- "PB_TargetArchitecture": "arm",
+ "Name": "Core-Setup-Linux-Arm-BT",
+ "Parameters": {
+ "PB_DistroRid": "rhel.6-x64",
+ "PB_DockerTag": "centos-6-c8c9b08-20174310104313",
+ "PB_TargetArchitecture": "x64",
+ "PB_AdditionalBuildArguments":"-TargetArchitecture=x64 -DistroRid=rhel.6-x64 -PortableBuild=false -strip-symbols",
+ "PB_PortableBuild": "false"
+ },
+ "ReportingParameters": {
+ "OperatingSystem": "RedHat6",
+ "Type": "build/product/",
+ "Platform": "x64"
+ }
+ },
+ {
+ "Name": "Core-Setup-Linux-Arm-BT",
+ "Parameters": {
+ "PB_DistroRid": "ubuntu.14.04-arm",
+ "PB_DockerTag": "ubuntu-14.04-cross-0cd4667-20172211042239",
+ "PB_TargetArchitecture": "arm",
"PB_AdditionalBuildArguments":"-TargetArchitecture=arm -DistroRid=linux-arm -DisableCrossgen=true -PortableBuild=true -SkipTests=true -CrossBuild=true -strip-symbols",
"PB_CrossBuildArgs": "-e ROOTFS_DIR ",
- "PB_PortableBuild": "true"
- },
- "ReportingParameters": {
- "SubType": "PortableBuild",
- "OperatingSystem": "Ubuntu 14.04",
- "Type": "build/product/",
- "Platform": "arm"
- }
- },
+ "PB_PortableBuild": "true"
+ },
+ "ReportingParameters": {
+ "SubType": "PortableBuild",
+ "OperatingSystem": "Ubuntu 14.04",
+ "Type": "build/product/",
+ "Platform": "arm"
+ }
+ },
{
"Name": "Core-Setup-OSX-BT",
"Parameters": {
diff --git a/dependencies.props b/dependencies.props
index b6e556309f..689803fec2 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -9,17 +9,17 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
- 99e7157bcbef063e89b0fe6a0f40ad509d8d8722
- 99e7157bcbef063e89b0fe6a0f40ad509d8d8722
+ 29a6592b687e8284ebba360327f48e9e6af5d0cd
+ 29a6592b687e8284ebba360327f48e9e6af5d0cd
99e7157bcbef063e89b0fe6a0f40ad509d8d8722
c1ea043aefee0ebcc56c298358953eaf26ff985a
- 2.0.0
- 4.4.0-preview3-25519-03
- 4.4.0-preview3-25519-03
- 2.0.0
+ 2.0.1
+ 4.4.2-servicing-25814-01
+ 4.4.0-preview3-25526-01
+ 2.0.3
$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)
2.0.0
1.4.1
diff --git a/dir.props b/dir.props
index 290911091f..acd8d75b83 100644
--- a/dir.props
+++ b/dir.props
@@ -13,7 +13,7 @@
2
0
- 0
+ 3
true
servicing
$(PreReleaseLabel)
@@ -73,6 +73,7 @@
$(PreReleaseLabel)-
$(VersionSuffix)$(BuildNumberMajor)-$(BuildNumberMinor)
+
-$(VersionSuffix)
$(MajorVersion).$(MinorVersion).$(PatchVersion)$(ProductVersionSuffix)
$(MajorVersion).$(MinorVersion).$(PatchVersion)
diff --git a/init-tools.sh b/init-tools.sh
index ddb8b75e4b..406324161f 100755
--- a/init-tools.sh
+++ b/init-tools.sh
@@ -33,6 +33,14 @@ OSName=$(uname -s)
Linux)
__DOTNET_PKG=dotnet-dev-linux-x64
OS=Linux
+
+ if [ -e /etc/redhat-release ]; then
+ redhatRelease=$(
-
-
+ DependsOnTargets="PublishCoreHostPackagesToFeed;FinalizeBuildInAzure;UpdateVersionsRepo" />
+
+
+
+
+
@@ -85,8 +95,13 @@
-
+ DependsOnTargets="GenerateDebRepoFiles"
+ Condition="'$(DebRepoId)' != '' AND
+ '$(DebRepoUser)' != '' AND
+ '$(DebRepoPass)' != '' AND
+ '$(DebRepoServer)' != ''">
+
-
+ Condition="'@(_MissingBlobNames)' == '' AND '$(NuGetFeedUrl)' != ''">
@@ -185,8 +199,7 @@
-
+ Condition="'$(PublishDebToolToFeed)' == 'true' AND '$(CliNuGetFeedUrl)' != ''">
diff --git a/run.cmd b/run.cmd
index 2f52e07d21..b513914af8 100644
--- a/run.cmd
+++ b/run.cmd
@@ -1,16 +1,21 @@
@if "%_echo%" neq "on" echo off
setlocal
-if not defined VisualStudioVersion (
- if defined VS140COMNTOOLS (
- call "%VS140COMNTOOLS%\VsDevCmd.bat"
- goto :Run
- )
- echo Error: Visual Studio 2015 required.
- echo Please see https://github.com/dotnet/core-setup/blob/master/Documentation/building/windows-instructions.md for build instructions.
+if defined VisualStudioVersion goto :Run
+
+set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
+if exist %_VSWHERE% (
+ for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
+)
+if not exist "%_VSCOMNTOOLS%" set _VSCOMNTOOLS=%VS140COMNTOOLS%
+if not exist "%_VSCOMNTOOLS%" (
+ echo Error: Visual Studio 2015 or 2017 required.
+ echo Please see https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/developer-guide.md for build instructions.
exit /b 1
)
+call "%_VSCOMNTOOLS%\VsDevCmd.bat"
+
:Run
:: We do not want to run the first-time experience.
set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
diff --git a/run.ps1 b/run.ps1
index c7cbb8d70b..5363d4ff9c 100644
--- a/run.ps1
+++ b/run.ps1
@@ -8,5 +8,6 @@ $initTools = Join-Path $PSScriptRoot "init-tools.cmd"
# execute the tool using the dotnet.exe host
$dotNetExe = Join-Path $toolsLocalPath "dotnetcli\dotnet.exe"
$runExe = Join-Path $toolsLocalPath "run.exe"
-& $dotNetExe $runExe $args
+$runConfig = Join-Path $PSScriptRoot "config.json"
+& $dotNetExe $runExe $runConfig $args
exit $LastExitCode
\ No newline at end of file
diff --git a/sign.proj b/sign.proj
index f99e762ee1..0487ae2ecd 100644
--- a/sign.proj
+++ b/sign.proj
@@ -19,9 +19,10 @@
$(BaseOutputRootPath)/
$(IntermediateOutputRootPath)
+
-
+
@@ -49,9 +50,10 @@
$(CertificateId)
+
-
+
@@ -64,9 +66,10 @@
$(CertificateId)
+
-
+
@@ -76,9 +79,10 @@
$(CertificateId)
+
-
+
@@ -88,6 +92,7 @@
$(CertificateId)
+
diff --git a/src/corehost/build.cmd b/src/corehost/build.cmd
index 4ef41becb8..2aa4f75702 100644
--- a/src/corehost/build.cmd
+++ b/src/corehost/build.cmd
@@ -41,32 +41,49 @@ shift
goto :Arg_Loop
:ToolsVersion
-:: Determine the tools version to pass to cmake/msbuild
-if not defined VisualStudioVersion (
- if defined VS140COMNTOOLS (
- goto :VS2015
- )
- goto :MissingVersion
-)
-if "%VisualStudioVersion%"=="14.0" (
+
+if defined VisualStudioVersion goto :RunVCVars
+
+set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
+if exist %_VSWHERE% (
+ for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
+)
+if not exist "%_VSCOMNTOOLS%" set _VSCOMNTOOLS=%VS140COMNTOOLS%
+if not exist "%_VSCOMNTOOLS%" goto :MissingVersion
+
+call "%_VSCOMNTOOLS%\VsDevCmd.bat"
+
+:RunVCVars
+if "%VisualStudioVersion%"=="15.0" (
+ goto :VS2017
+) else if "%VisualStudioVersion%"=="14.0" (
goto :VS2015
-)
+)
:MissingVersion
-:: Can't find VS 2013+
-echo Error: Visual Studio 2015 required
-echo Please see https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/developer-guide.md for build instructions.
+:: Can't find VS 2015 or 2017
+echo Error: Visual Studio 2015 or 2017 required
+echo Please see https://github.com/dotnet/corefx/tree/master/Documentation for build instructions.
exit /b 1
+:VS2017
+:: Setup vars for VS2017
+set __VSVersion=vs2017
+set __PlatformToolset=v141
+if NOT "%__BuildArch%" == "arm64" (
+ :: Set the environment for the native build
+ call "%VS150COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" %__VCBuildArch%
+)
+goto :SetupDirs
+
:VS2015
-:: Setup vars for VS2015
+:: Setup vars for VS2015build
set __VSVersion=vs2015
set __PlatformToolset=v140
-if NOT "%__BuildArch%" == "arm64" (
+if NOT "%__BuildArch%" == "arm64" (
:: Set the environment for the native build
- call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %__VCBuildArch%
+ call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %__VCBuildArch%
)
-goto :SetupDirs
:SetupDirs
:: Setup to cmake the native components
@@ -102,7 +119,7 @@ exit /b 1
:GenVSSolution
:: Regenerate the VS solution
-if /i "%__BuildArch%" == "arm64" (
+if /i "%__BuildArch%" == "arm64" (
REM arm64 builds currently use private toolset which has not been released yet
REM TODO, remove once the toolset is open.
call :PrivateToolSet
diff --git a/src/corehost/build.sh b/src/corehost/build.sh
index da6c3d0171..5b368d29bc 100755
--- a/src/corehost/build.sh
+++ b/src/corehost/build.sh
@@ -14,35 +14,38 @@ init_rid_plat()
else
if [ -e $ROOTFS_DIR/etc/os-release ]; then
source $ROOTFS_DIR/etc/os-release
- export __rid_plat="$ID.$VERSION_ID"
+ __rid_plat="$ID.$VERSION_ID"
fi
echo "__rid_plat is $__rid_plat"
fi
else
+ __rid_plat=""
if [ -e /etc/os-release ]; then
source /etc/os-release
-
if [[ "$ID" == "rhel" && $VERSION_ID = 7* ]]; then
- export __rid_plat="rhel.7"
+ __rid_plat="rhel.7"
elif [[ "$ID" == "centos" && "$VERSION_ID" = "7" ]]; then
- export __rid_plat="rhel.7"
+ __rid_plat="rhel.7"
else
- export __rid_plat="$ID.$VERSION_ID"
+ __rid_plat="$ID.$VERSION_ID"
+ fi
+ elif [ -e /etc/redhat-release ]; then
+ local redhatRelease=$(
$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../..'))/
- 2.0.0
+ 2.0.3
$(VersionPrefix)
true
true
diff --git a/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs b/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs
index ab16ce363a..936b0b4fbe 100644
--- a/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs
+++ b/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs
@@ -85,6 +85,8 @@ private static string GetDistroVersionId()
private static DistroInfo LoadDistroInfo()
{
+ DistroInfo result = null;
+
// Sample os-release file:
// NAME="Ubuntu"
// VERSION = "14.04.3 LTS, Trusty Tahr"
@@ -100,7 +102,7 @@ private static DistroInfo LoadDistroInfo()
if (File.Exists("/etc/os-release"))
{
var lines = File.ReadAllLines("/etc/os-release");
- var result = new DistroInfo();
+ result = new DistroInfo();
foreach (var line in lines)
{
if (line.StartsWith("ID=", StringComparison.Ordinal))
@@ -112,10 +114,30 @@ private static DistroInfo LoadDistroInfo()
result.VersionId = line.Substring(11).Trim('"', '\'');
}
}
+ }
+ else if (File.Exists("/etc/redhat-release"))
+ {
+ var lines = File.ReadAllLines("/etc/redhat-release");
+
+ if (lines.Length >= 1)
+ {
+ string line = lines[0];
+ if (line.StartsWith("Red Hat Enterprise Linux Server release 6.") ||
+ line.StartsWith("CentOS release 6."))
+ {
+ result = new DistroInfo();
+ result.Id = "rhel";
+ result.VersionId = "6";
+ }
+ }
+ }
- return NormalizeDistroInfo(result);
+ if (result != null)
+ {
+ result = NormalizeDistroInfo(result);
}
- return null;
+
+ return result;
}
// For some distros, we don't want to use the full version from VERSION_ID. One example is
diff --git a/src/managed/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs b/src/managed/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs
index 4500b42280..7cbafacbf2 100644
--- a/src/managed/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs
+++ b/src/managed/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs
@@ -45,9 +45,11 @@ public bool TryResolveAssemblyPaths(CompilationLibrary library, List ass
string.Equals(library.Type, "msbuildproject", StringComparison.OrdinalIgnoreCase);
var isPackage = string.Equals(library.Type, "package", StringComparison.OrdinalIgnoreCase);
+ var isReferenceAssembly = string.Equals(library.Type, "referenceassembly", StringComparison.OrdinalIgnoreCase);
if (!isProject &&
!isPackage &&
- !string.Equals(library.Type, "referenceassembly", StringComparison.OrdinalIgnoreCase))
+ !isReferenceAssembly &&
+ !string.Equals(library.Type, "reference", StringComparison.OrdinalIgnoreCase))
{
return false;
}
@@ -55,8 +57,8 @@ public bool TryResolveAssemblyPaths(CompilationLibrary library, List ass
var refsPath = Path.Combine(_basePath, RefsDirectoryName);
var isPublished = _fileSystem.Directory.Exists(refsPath);
- // Resolving reference assebmlies requires refs folder to exist
- if (!isProject && !isPackage && !isPublished)
+ // Resolving reference assemblies requires refs folder to exist
+ if (isReferenceAssembly && !isPublished)
{
return false;
}
diff --git a/src/pkg/packaging/deb/package.targets b/src/pkg/packaging/deb/package.targets
index 7e8b858676..44410c71db 100644
--- a/src/pkg/packaging/deb/package.targets
+++ b/src/pkg/packaging/deb/package.targets
@@ -12,8 +12,12 @@
+
+ --version-suffix $(VersionSuffix)
+
+
-
+
-
+
@@ -85,7 +89,7 @@
-
+
@@ -153,7 +157,7 @@
-
+
@@ -191,7 +195,7 @@
OverwriteReadOnlyFiles="True"
SkipUnchangedFiles="False"
UseHardlinksIfPossible="False" />
-
+
@@ -215,12 +219,12 @@
-
-
-
-
-
+
+
+
+
+
@@ -232,10 +236,10 @@
-
+
-
+
@@ -254,9 +258,9 @@
$(SharedFrameworkBrandName)
-
- $(LibIcuPackageName)
-
+
+ $(LibIcuPackageName)
+
diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj
index cfeea9717f..9102701c6f 100644
--- a/src/pkg/packaging/dir.proj
+++ b/src/pkg/packaging/dir.proj
@@ -2,7 +2,7 @@
-
+
GenerateVersionBadge;
@@ -26,7 +26,7 @@
-
-
+ Command='find %(OutDirs.Identity) -type f -name "*" -exec chmod 644 {} \;' />
+
+ Command='find %(OutDirs.Identity) -type f -name "*.so" -exec chmod 755 {} \;' />
-
-
+ Command='find %(OutDirs.Identity) -type f ! -name "*.*" -exec chmod 755 {} \;' />
+
+
-
+
-
+
-
+
@@ -129,10 +129,10 @@
-
-
-
+
@@ -164,20 +164,30 @@
+
+ false
+
+
+
+
+
+
+
+
--output $(PackagesOutDir)
--configuration $(ConfigurationGroup)
- --version-suffix $(VersionSuffix)
+ --version-suffix $(VersionSuffix)
-
+
diff --git a/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.0.props b/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.0.props
index fd7843f399..61e76a017d 100644
--- a/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.0.props
+++ b/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.0.props
@@ -13,13 +13,13 @@
4.0.1
- 1.0.5
+ 1.0.8
1.0.2
- 1.0.7
+ 1.0.10
10.0.1
@@ -28,7 +28,7 @@
1.6.0
- 4.0.1
+ 4.0.3
4.0.0
@@ -73,7 +73,7 @@
4.0.1
- 4.1.2
+ 4.1.3
4.0.0
@@ -82,7 +82,7 @@
4.0.11
- 4.0.1
+ 4.0.2
4.0.1
@@ -107,7 +107,7 @@
Compile
- 4.2.0
+ 4.2.1
4.0.0
@@ -116,7 +116,7 @@
4.0.0
- 4.1.0
+ 4.1.2
4.6.0
@@ -134,7 +134,10 @@
4.0.10
- 1.9.1
+ 1.9.2
+
+
+ 4.0.1
\ No newline at end of file
diff --git a/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props b/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props
index f18acc6891..6b56b751c9 100644
--- a/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props
+++ b/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props
@@ -2,7 +2,7 @@
- 1.9.1
+ 1.9.2
1.3.0
@@ -19,9 +19,12 @@
1.4.1
- 1.1.2
+ 1.1.5
+ 1.1.5
+
+
1.1.2
@@ -31,7 +34,7 @@
1.6.1
- 4.3.1
+ 4.3.2
4.3.0
@@ -76,7 +79,7 @@
4.3.0
- 4.3.2
+ 4.3.3
4.3.0
@@ -85,7 +88,7 @@
4.3.0
- 4.3.1
+ 4.3.2
4.3.0
@@ -110,7 +113,7 @@
Compile
- 4.3.0
+ 4.3.1
4.3.0
@@ -119,7 +122,10 @@
4.3.0
- 4.3.0
+ 4.3.2
+
+
+ 4.3.1
4.7.0
@@ -136,5 +142,14 @@
4.3.0
+
+ 4.3.1
+
+
+ 4.3.3
+
+
+ 4.3.1
+
\ No newline at end of file
diff --git a/src/pkg/projects/_.pdb b/src/pkg/projects/_.pdb
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/pkg/projects/dir.targets b/src/pkg/projects/dir.targets
index 8889edcc8d..8261c68b49 100644
--- a/src/pkg/projects/dir.targets
+++ b/src/pkg/projects/dir.targets
@@ -43,7 +43,7 @@
-
runtimes/$(PackageTargetRuntime)/native
true
diff --git a/src/pkg/projects/netcoreappRIDs.props b/src/pkg/projects/netcoreappRIDs.props
index 1f7736bd39..efc59265a3 100644
--- a/src/pkg/projects/netcoreappRIDs.props
+++ b/src/pkg/projects/netcoreappRIDs.props
@@ -17,6 +17,7 @@
+
x86
diff --git a/src/test/Microsoft.Extensions.DependencyModel.Tests/AppBaseResolverTests.cs b/src/test/Microsoft.Extensions.DependencyModel.Tests/AppBaseResolverTests.cs
index 0d3b8aa564..4f3b99efa8 100644
--- a/src/test/Microsoft.Extensions.DependencyModel.Tests/AppBaseResolverTests.cs
+++ b/src/test/Microsoft.Extensions.DependencyModel.Tests/AppBaseResolverTests.cs
@@ -89,6 +89,23 @@ public void ResolvesReferenceAssemblyType()
Assert.True(result);
}
+ [Fact]
+ public void ResolvesReferenceType()
+ {
+ var fileSystem = FileSystemMockBuilder
+ .Create()
+ .AddFiles(BasePathRefs, TestLibraryFactory.DefaultAssembly)
+ .Build();
+ var resolver = CreateResolver(fileSystem);
+ var library = TestLibraryFactory.Create(
+ TestLibraryFactory.ReferenceType,
+ assemblies: TestLibraryFactory.EmptyAssemblies);
+
+ var result = resolver.TryResolveAssemblyPaths(library, null);
+
+ Assert.True(result);
+ }
+
[Fact]
public void RequiresExistingRefsFolderForNonProjects()
{
@@ -129,6 +146,27 @@ public void ResolvesProjectWithoutRefsFolder()
assemblies.Should().Contain(Path.Combine(BasePath, TestLibraryFactory.SecondAssembly));
}
+ [Fact]
+ public void ResolvesDirectReferenceWithoutRefsFolder()
+ {
+ var fileSystem = FileSystemMockBuilder
+ .Create()
+ .AddFiles(BasePath, TestLibraryFactory.DefaultAssembly, TestLibraryFactory.SecondAssembly)
+ .Build();
+ var library = TestLibraryFactory.Create(
+ TestLibraryFactory.ReferenceType,
+ assemblies: TestLibraryFactory.TwoAssemblies);
+ var resolver = CreateResolver(fileSystem);
+ var assemblies = new List();
+
+ var result = resolver.TryResolveAssemblyPaths(library, assemblies);
+
+ Assert.True(result);
+ assemblies.Should().HaveCount(2);
+ assemblies.Should().Contain(Path.Combine(BasePath, TestLibraryFactory.DefaultAssembly));
+ assemblies.Should().Contain(Path.Combine(BasePath, TestLibraryFactory.SecondAssembly));
+ }
+
[Fact]
public void RequiresAllLibrariesToExist()
{
diff --git a/src/test/Microsoft.Extensions.DependencyModel.Tests/TestLibraryFactory.cs b/src/test/Microsoft.Extensions.DependencyModel.Tests/TestLibraryFactory.cs
index a1488583a3..e5e4e21b24 100644
--- a/src/test/Microsoft.Extensions.DependencyModel.Tests/TestLibraryFactory.cs
+++ b/src/test/Microsoft.Extensions.DependencyModel.Tests/TestLibraryFactory.cs
@@ -30,6 +30,7 @@ static class TestLibraryFactory
public static readonly string ProjectType = "project";
public static readonly string MsBuildProjectType = "msbuildproject";
public static readonly string ReferenceAssemblyType = "referenceassembly";
+ public static readonly string ReferenceType = "reference";
public static readonly string PackageType = "package";
public static CompilationLibrary Create(
diff --git a/src/test/TestUtils/TestProjectFixture.cs b/src/test/TestUtils/TestProjectFixture.cs
index ed4b94f570..09acb478d5 100644
--- a/src/test/TestUtils/TestProjectFixture.cs
+++ b/src/test/TestUtils/TestProjectFixture.cs
@@ -289,6 +289,8 @@ public TestProjectFixture StoreProject(
storeArgs.Add("--working-dir");
storeArgs.Add("store_workin_dir");
+ storeArgs.Add($"/p:MNAVersion={_repoDirectoriesProvider.MicrosoftNETCoreAppVersion}");
+
dotnet.Store(storeArgs.ToArray())
.WorkingDirectory(_testProject.ProjectDirectory)
.Environment("NUGET_PACKAGES", _repoDirectoriesProvider.NugetPackages)