From e575c1eea64f5b5e97c2a739ff625624d7808f12 Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 13 Jun 2016 11:37:44 -0700 Subject: [PATCH 01/19] Update README.md --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c65c9e632..a5a492d56 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ If you don't find your issue, please file one! However, given that this is a ver Build Status ------------ -|Ubuntu 14.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 |RHEL 7.2 | -|:------:|:------:|:------:|:------:|:------:|:------:|:------:| -|[![](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)| +|Ubuntu 14.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 |RHEL 7.2 |Ubuntu 16.04 |OpenSUSE 13.2 |Fedora 23| +|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| +|[![](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/3620/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3620)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3625/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3625)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3622/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3622)| Installers and Binaries ----------------------- @@ -44,6 +44,9 @@ You can download .NET Core as either an installer (MSI, PKG) or a zip (zip, gzip |**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)| |**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_16_04_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.ubuntu.16.04.x64.version)|N/A |N/A |[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) | +|**openSUSE 13.2**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/openSUSE_13_2_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.opensuse.13.2.x64.version)|N/A |N/A |[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-opensuse.13.2-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-opensuse.13.2-x64.latest.tar.gz) | +|**Fedora 23**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Fedora_23_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.fedora.23.x64.version)|N/A |N/A |[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-fedora.23-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-fedora.23-x64.latest.tar.gz) | Ubuntu Installers ---------- From 03905999b6da4bc572faf60d69b281a2a1dfb20b Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 13 Jun 2016 13:10:36 -0700 Subject: [PATCH 02/19] Moving Ubuntu 16.04 to be next to Ubuntu 14.04 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a5a492d56..d84b223df 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ If you don't find your issue, please file one! However, given that this is a ver Build Status ------------ -|Ubuntu 14.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 |RHEL 7.2 |Ubuntu 16.04 |OpenSUSE 13.2 |Fedora 23| +|Ubuntu 14.04 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 |RHEL 7.2 |OpenSUSE 13.2 |Fedora 23| |:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| -|[![](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/3620/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3620)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3625/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3625)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3622/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3622)| +|[![](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/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3620/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3620)|[![](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/3625/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3625)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3622/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3622)| Installers and Binaries ----------------------- @@ -40,11 +40,11 @@ You can download .NET Core as either an installer (MSI, PKG) or a zip (zip, gzip |**Windows x64**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Windows_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.win.x64.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-win-x64.latest.exe)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-dev-win-x64.latest.exe)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-win-x64.latest.zip)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-win-x64.latest.zip)| |**Windows x86**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Windows_x86_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.win.x86.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-win-x86.latest.exe)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-dev-win-x86.latest.exe)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-win-x86.latest.zip)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-win-x86.latest.zip)| |**Ubuntu 14.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.x64.version)|*See Below*|*See Below*|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-ubuntu-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-ubuntu-x64.latest.tar.gz)| +|**Ubuntu 16.04**|[![](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)|N/A |N/A |[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) | |**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)| |**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) | -|**Ubuntu 16.04**|[![](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)|N/A |N/A |[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) | |**openSUSE 13.2**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/openSUSE_13_2_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.opensuse.13.2.x64.version)|N/A |N/A |[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-opensuse.13.2-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-opensuse.13.2-x64.latest.tar.gz) | |**Fedora 23**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Fedora_23_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.fedora.23.x64.version)|N/A |N/A |[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-fedora.23-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-fedora.23-x64.latest.tar.gz) | From 96caa64b0f17a1159d00d198920a0c098337c68d Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 13 Jun 2016 14:21:12 -0700 Subject: [PATCH 03/19] Adding Oracle Linux and Linux Mint to the titles Adding Oracle Linux and Linux Mint to the titles next to their compatible binaries. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d84b223df..4153d4598 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ If you don't find your issue, please file one! However, given that this is a ver Build Status ------------ -|Ubuntu 14.04 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 |RHEL 7.2 |OpenSUSE 13.2 |Fedora 23| +|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 / Oracle Linux 7 |RHEL 7.2 |OpenSUSE 13.2 |Fedora 23| |:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| |[![](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/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3620/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3620)|[![](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/3625/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3625)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3622/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3622)| @@ -39,11 +39,11 @@ You can download .NET Core as either an installer (MSI, PKG) or a zip (zip, gzip |---------|:------:|:------:|:------:|:------:|:------:| |**Windows x64**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Windows_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.win.x64.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-win-x64.latest.exe)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-dev-win-x64.latest.exe)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-win-x64.latest.zip)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-win-x64.latest.zip)| |**Windows x86**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Windows_x86_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.win.x86.version)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-win-x86.latest.exe)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-dev-win-x86.latest.exe)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-win-x86.latest.zip)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-win-x86.latest.zip)| -|**Ubuntu 14.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.x64.version)|*See Below*|*See Below*|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-ubuntu-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-ubuntu-x64.latest.tar.gz)| +|**Ubuntu 14.04 / Linux Mint 17**|[![](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)|*See Below*|*See Below*|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-ubuntu-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-ubuntu-x64.latest.tar.gz)| |**Ubuntu 16.04**|[![](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)|N/A |N/A |[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) | |**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)| -|**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 / Oracle Linux 7**|[![](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) | |**openSUSE 13.2**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/openSUSE_13_2_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.opensuse.13.2.x64.version)|N/A |N/A |[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-opensuse.13.2-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-opensuse.13.2-x64.latest.tar.gz) | |**Fedora 23**|[![](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/Fedora_23_x64_Release_version_badge.svg)](https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.fedora.23.x64.version)|N/A |N/A |[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-fedora.23-x64.latest.tar.gz)|[Download](https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-dev-fedora.23-x64.latest.tar.gz) | From eab2494ed58a0cc5583d50eea75f924b8e60754a Mon Sep 17 00:00:00 2001 From: Lakshmi Priya Sekar Date: Tue, 14 Jun 2016 16:30:03 -0700 Subject: [PATCH 04/19] Remove showing firsttime eula for non verbs. --- src/dotnet/Program.cs | 15 ++++++++++---- src/dotnet/Telemetry.cs | 10 +++++++++- ...hatTheUserIsRunningDoNetForTheFirstTime.cs | 20 ++++++++++++++----- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index 7aeb94c89..6a2f8b751 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -55,11 +55,9 @@ namespace Microsoft.DotNet.Cli try { - ConfigureDotNetForFirstTimeUse(); - using (PerfTrace.Current.CaptureTiming()) { - return ProcessArgs(args, new Telemetry()); + return ProcessArgs(args); } } catch (GracefulException e) @@ -78,7 +76,7 @@ namespace Microsoft.DotNet.Cli } } - internal static int ProcessArgs(string[] args, ITelemetry telemetryClient) + internal static int ProcessArgs(string[] args, ITelemetry telemetryClient = null) { // CommandLineApplication is a bit restrictive, so we parse things ourselves here. Individual apps should use CLA. @@ -86,6 +84,7 @@ namespace Microsoft.DotNet.Cli var success = true; var command = string.Empty; var lastArg = 0; + for (; lastArg < args.Length; lastArg++) { if (IsArg(args[lastArg], "v", "verbose")) @@ -114,6 +113,8 @@ namespace Microsoft.DotNet.Cli } else { + ConfigureDotNetForFirstTimeUse(); + // It's the command, and we're done! command = args[lastArg]; break; @@ -125,6 +126,9 @@ namespace Microsoft.DotNet.Cli return 1; } + if (telemetryClient == null) + telemetryClient = new Telemetry(); + var appArgs = (lastArg + 1) >= args.Length ? Enumerable.Empty() : args.Skip(lastArg + 1).ToArray(); if (verbose.HasValue) @@ -178,6 +182,9 @@ namespace Microsoft.DotNet.Cli environmentProvider); dotnetConfigurer.Configure(); + + if (!File.Exists(Telemetry.TelemetrySentinel)) + File.Create(Telemetry.TelemetrySentinel); } } } diff --git a/src/dotnet/Telemetry.cs b/src/dotnet/Telemetry.cs index 838139b50..9b8e5acd4 100644 --- a/src/dotnet/Telemetry.cs +++ b/src/dotnet/Telemetry.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.IO; using System.Threading.Tasks; using Microsoft.ApplicationInsights; using Microsoft.DotNet.Cli.Utils; @@ -19,6 +20,8 @@ namespace Microsoft.DotNet.Cli private Dictionary _commonMeasurements = null; private Task _trackEventTask = null; + internal static readonly string TelemetrySentinel = Path.Combine(ApplicationEnvironment.ApplicationBasePath, $"{Product.Version}.dotnetTelemetry"); + private const string InstrumentationKey = "74cc1c9e-3e6e-4d05-b3fc-dde9101d0254"; private const string TelemetryOptout = "DOTNET_CLI_TELEMETRY_OPTOUT"; private const string TelemetryProfileEnvironmentVariable = "DOTNET_CLI_TELEMETRY_PROFILE"; @@ -32,7 +35,7 @@ namespace Microsoft.DotNet.Cli public Telemetry() { - Enabled = !Env.GetEnvironmentVariableAsBool(TelemetryOptout); + Enabled = !Env.GetEnvironmentVariableAsBool(TelemetryOptout) && PermissionExists(); if (!Enabled) { @@ -42,6 +45,11 @@ namespace Microsoft.DotNet.Cli //initialize in task to offload to parallel thread _trackEventTask = Task.Factory.StartNew(() => InitializeTelemetry()); } + + private bool PermissionExists() + { + return File.Exists(TelemetrySentinel); + } public void TrackEvent(string eventName, IDictionary properties, IDictionary measurements) { diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs index 5df9c2c8b..5756411ce 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs @@ -15,7 +15,8 @@ namespace Microsoft.DotNet.Tests { public class GivenThatTheUserIsRunningDotNetForTheFirstTime : TestBase { - private static CommandResult _firstDotnetUseCommandResult; + private static CommandResult _firstDotnetInfoUseCommandResult; + private static CommandResult _firstDotnetNewUseCommandResult; private static DirectoryInfo _nugetCacheFolder; static GivenThatTheUserIsRunningDotNetForTheFirstTime() @@ -28,7 +29,8 @@ namespace Microsoft.DotNet.Tests command.Environment["NUGET_PACKAGES"] = testNugetCache; command.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = ""; - _firstDotnetUseCommandResult = command.ExecuteWithCapturedOutput("new"); + _firstDotnetInfoUseCommandResult = command.ExecuteWithCapturedOutput("--info"); + _firstDotnetNewUseCommandResult = command.ExecuteWithCapturedOutput("new"); _nugetCacheFolder = new DirectoryInfo(testNugetCache); } @@ -36,7 +38,15 @@ namespace Microsoft.DotNet.Tests [Fact] public void Using_dotnet_for_the_first_time_succeeds() { - _firstDotnetUseCommandResult.Should().Pass(); + _firstDotnetNewUseCommandResult.Should().Pass(); + } + + [Fact] + public void Using_dotnet_for_the_first_time_with_non_verbs_doesnt_print_eula() + { + const string firstTimeUseWelcomeMessage = @".NET Command Line Tools"; + + _firstDotnetInfoUseCommandResult.StdOut.Should().StartWith(firstTimeUseWelcomeMessage); } [Fact] @@ -54,12 +64,12 @@ Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once."; - _firstDotnetUseCommandResult.StdOut.Should().StartWith(firstTimeUseWelcomeMessage); + _firstDotnetNewUseCommandResult.StdOut.Should().StartWith(firstTimeUseWelcomeMessage); } [Fact] public void It_restores_the_nuget_packages_to_the_nuget_cache_folder() - { + { _nugetCacheFolder.Should().HaveFile($"{GetDotnetVersion()}.dotnetSentinel"); } From 15a5c34149d8f72cc2f1985626cb19ed233b0bd3 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 15 Jun 2016 14:14:25 -0500 Subject: [PATCH 05/19] Add Serviceable assembly attribute and nuspec attributes for all shipping CLI assemblies. Fix #3345 --- build_projects/dotnet-cli-build/PackageTargets.cs | 1 + src/Microsoft.DotNet.Archive/Properties/AssemblyInfo.cs | 3 +++ src/Microsoft.DotNet.Cli.Utils/Properties/AssemblyInfo.cs | 4 +++- src/Microsoft.DotNet.Compiler.Common/Properties/Properties.cs | 4 +++- src/Microsoft.DotNet.Configurer/Properties/Properties.cs | 2 ++ src/Microsoft.DotNet.Files/Properties/AssemblyInfo.cs | 3 +++ .../Properties/Properties.cs | 4 +++- .../Properties/AssemblyInfo.cs | 3 +++ .../Properties/AssemblyInfo.cs | 3 +++ src/Microsoft.DotNet.ProjectModel/Properties/AssemblyInfo.cs | 1 + src/Microsoft.DotNet.TestFramework/Properties/AssemblyInfo.cs | 3 +++ .../Properties/Properties.cs | 4 +++- src/dotnet/Properties/AssemblyInfo.cs | 4 +++- 13 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 src/Microsoft.DotNet.Archive/Properties/AssemblyInfo.cs create mode 100644 src/Microsoft.DotNet.Files/Properties/AssemblyInfo.cs create mode 100644 src/Microsoft.DotNet.ProjectModel.Loader/Properties/AssemblyInfo.cs create mode 100644 src/Microsoft.DotNet.ProjectModel.Workspaces/Properties/AssemblyInfo.cs create mode 100644 src/Microsoft.DotNet.TestFramework/Properties/AssemblyInfo.cs diff --git a/build_projects/dotnet-cli-build/PackageTargets.cs b/build_projects/dotnet-cli-build/PackageTargets.cs index af80d1f0e..7514c78ae 100644 --- a/build_projects/dotnet-cli-build/PackageTargets.cs +++ b/build_projects/dotnet-cli-build/PackageTargets.cs @@ -230,6 +230,7 @@ namespace Microsoft.DotNet.Cli.Build dotnet.Pack( projectFile, "--no-build", + "--serviceable", "--build-base-path", packagingBuildBasePath, "--output", Dirs.Packages, "--configuration", configuration, diff --git a/src/Microsoft.DotNet.Archive/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.Archive/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..bd44bced5 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Reflection; + +[assembly: AssemblyMetadataAttribute("Serviceable", "True")] diff --git a/src/Microsoft.DotNet.Cli.Utils/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.Cli.Utils/Properties/AssemblyInfo.cs index 7766a7151..29547d803 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Properties/AssemblyInfo.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Properties/AssemblyInfo.cs @@ -1,3 +1,5 @@ +using System.Reflection; using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.DotNet.Cli.Utils.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file +[assembly: AssemblyMetadataAttribute("Serviceable", "True")] +[assembly: InternalsVisibleTo("Microsoft.DotNet.Cli.Utils.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Microsoft.DotNet.Compiler.Common/Properties/Properties.cs b/src/Microsoft.DotNet.Compiler.Common/Properties/Properties.cs index 233d59e67..046cd5ad1 100644 --- a/src/Microsoft.DotNet.Compiler.Common/Properties/Properties.cs +++ b/src/Microsoft.DotNet.Compiler.Common/Properties/Properties.cs @@ -1,3 +1,5 @@ -using System.Runtime.CompilerServices; +using System.Reflection; +using System.Runtime.CompilerServices; +[assembly: AssemblyMetadataAttribute("Serviceable", "True")] [assembly: InternalsVisibleTo("dotnet-compile.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file diff --git a/src/Microsoft.DotNet.Configurer/Properties/Properties.cs b/src/Microsoft.DotNet.Configurer/Properties/Properties.cs index a568b652e..54a364c16 100644 --- a/src/Microsoft.DotNet.Configurer/Properties/Properties.cs +++ b/src/Microsoft.DotNet.Configurer/Properties/Properties.cs @@ -1,3 +1,5 @@ +using System.Reflection; using System.Runtime.CompilerServices; +[assembly: AssemblyMetadataAttribute("Serviceable", "True")] [assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file diff --git a/src/Microsoft.DotNet.Files/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.Files/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..bd44bced5 --- /dev/null +++ b/src/Microsoft.DotNet.Files/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Reflection; + +[assembly: AssemblyMetadataAttribute("Serviceable", "True")] diff --git a/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs b/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs index b88d8953c..ceccc63e7 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs @@ -1,5 +1,7 @@ -using System.Runtime.CompilerServices; +using System.Reflection; +using System.Runtime.CompilerServices; +[assembly: AssemblyMetadataAttribute("Serviceable", "True")] [assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyModel, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.DotNet.Tools.Tests.Utilities, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyModel.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.ProjectModel.Loader/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..bd44bced5 --- /dev/null +++ b/src/Microsoft.DotNet.ProjectModel.Loader/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Reflection; + +[assembly: AssemblyMetadataAttribute("Serviceable", "True")] diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.ProjectModel.Workspaces/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..bd44bced5 --- /dev/null +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Reflection; + +[assembly: AssemblyMetadataAttribute("Serviceable", "True")] diff --git a/src/Microsoft.DotNet.ProjectModel/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.ProjectModel/Properties/AssemblyInfo.cs index c058faec1..736765643 100644 --- a/src/Microsoft.DotNet.ProjectModel/Properties/AssemblyInfo.cs +++ b/src/Microsoft.DotNet.ProjectModel/Properties/AssemblyInfo.cs @@ -25,4 +25,5 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("303677d5-7312-4c3f-baee-beb1a9bd9fe6")] +[assembly: AssemblyMetadataAttribute("Serviceable", "True")] [assembly: InternalsVisibleTo("Microsoft.DotNet.ProjectModel.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100039ac461fa5c82c7dd2557400c4fd4e9dcdf7ac47e3d572548c04cd4673e004916610f4ea5cbf86f2b1ca1cb824f2a7b3976afecfcf4eb72d9a899aa6786effa10c30399e6580ed848231fec48374e41b3acf8811931343fc2f73acf72dae745adbcb7063cc4b50550618383202875223fc75401351cd89c44bf9b50e7fa3796")] diff --git a/src/Microsoft.DotNet.TestFramework/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.TestFramework/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..bd44bced5 --- /dev/null +++ b/src/Microsoft.DotNet.TestFramework/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Reflection; + +[assembly: AssemblyMetadataAttribute("Serviceable", "True")] diff --git a/src/Microsoft.Extensions.DependencyModel/Properties/Properties.cs b/src/Microsoft.Extensions.DependencyModel/Properties/Properties.cs index db059877f..b8c122eba 100644 --- a/src/Microsoft.Extensions.DependencyModel/Properties/Properties.cs +++ b/src/Microsoft.Extensions.DependencyModel/Properties/Properties.cs @@ -1,3 +1,5 @@ -using System.Runtime.CompilerServices; +using System.Reflection; +using System.Runtime.CompilerServices; +[assembly: AssemblyMetadataAttribute("Serviceable", "True")] [assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyModel.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file diff --git a/src/dotnet/Properties/AssemblyInfo.cs b/src/dotnet/Properties/AssemblyInfo.cs index 07c3005ab..ffdc13024 100644 --- a/src/dotnet/Properties/AssemblyInfo.cs +++ b/src/dotnet/Properties/AssemblyInfo.cs @@ -1,3 +1,5 @@ +using System.Reflection; using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("dotnet.Tests")] \ No newline at end of file +[assembly: AssemblyMetadataAttribute("Serviceable", "True")] +[assembly: InternalsVisibleTo("dotnet.Tests")] From db7f68716b2909892ac3e9bca5805eaa73948cb5 Mon Sep 17 00:00:00 2001 From: Lakshmi Priya Sekar Date: Wed, 15 Jun 2016 12:59:42 -0700 Subject: [PATCH 06/19] Use NugetCache Sentinel for Telemetry setting. --- src/dotnet/Program.cs | 100 +++++++++--------- src/dotnet/Telemetry.cs | 20 ++-- ...hatTheUserIsRunningDoNetForTheFirstTime.cs | 16 +-- 3 files changed, 70 insertions(+), 66 deletions(-) diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index 6a2f8b751..7164727c8 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -84,50 +84,54 @@ namespace Microsoft.DotNet.Cli var success = true; var command = string.Empty; var lastArg = 0; - - for (; lastArg < args.Length; lastArg++) + using (INuGetCacheSentinel nugetCacheSentinel = new NuGetCacheSentinel()) { - if (IsArg(args[lastArg], "v", "verbose")) + for (; lastArg < args.Length; lastArg++) { - verbose = true; + if (IsArg(args[lastArg], "v", "verbose")) + { + verbose = true; + } + else if (IsArg(args[lastArg], "version")) + { + PrintVersion(); + return 0; + } + else if (IsArg(args[lastArg], "info")) + { + PrintInfo(); + return 0; + } + else if (IsArg(args[lastArg], "h", "help")) + { + HelpCommand.PrintHelp(); + return 0; + } + else if (args[lastArg].StartsWith("-")) + { + Reporter.Error.WriteLine($"Unknown option: {args[lastArg]}"); + success = false; + } + else + { + ConfigureDotNetForFirstTimeUse(nugetCacheSentinel); + + // It's the command, and we're done! + command = args[lastArg]; + break; + } } - else if (IsArg(args[lastArg], "version")) - { - PrintVersion(); - return 0; - } - else if (IsArg(args[lastArg], "info")) - { - PrintInfo(); - return 0; - } - else if (IsArg(args[lastArg], "h", "help")) + if (!success) { HelpCommand.PrintHelp(); - return 0; + return 1; } - else if (args[lastArg].StartsWith("-")) - { - Reporter.Error.WriteLine($"Unknown option: {args[lastArg]}"); - success = false; - } - else - { - ConfigureDotNetForFirstTimeUse(); - // It's the command, and we're done! - command = args[lastArg]; - break; + if (telemetryClient == null) + { + telemetryClient = new Telemetry(nugetCacheSentinel); } } - if (!success) - { - HelpCommand.PrintHelp(); - return 1; - } - - if (telemetryClient == null) - telemetryClient = new Telemetry(); var appArgs = (lastArg + 1) >= args.Length ? Enumerable.Empty() : args.Skip(lastArg + 1).ToArray(); @@ -164,28 +168,22 @@ namespace Microsoft.DotNet.Cli } - private static void ConfigureDotNetForFirstTimeUse() + private static void ConfigureDotNetForFirstTimeUse(INuGetCacheSentinel nugetCacheSentinel) { using (PerfTrace.Current.CaptureTiming()) { using (var nugetPackagesArchiver = new NuGetPackagesArchiver()) { - using (var nugetCacheSentinel = new NuGetCacheSentinel()) - { - var environmentProvider = new EnvironmentProvider(); - var commandFactory = new DotNetCommandFactory(); - var nugetCachePrimer = - new NuGetCachePrimer(commandFactory, nugetPackagesArchiver, nugetCacheSentinel); - var dotnetConfigurer = new DotnetFirstTimeUseConfigurer( - nugetCachePrimer, - nugetCacheSentinel, - environmentProvider); + var environmentProvider = new EnvironmentProvider(); + var commandFactory = new DotNetCommandFactory(); + var nugetCachePrimer = + new NuGetCachePrimer(commandFactory, nugetPackagesArchiver, nugetCacheSentinel); + var dotnetConfigurer = new DotnetFirstTimeUseConfigurer( + nugetCachePrimer, + nugetCacheSentinel, + environmentProvider); - dotnetConfigurer.Configure(); - - if (!File.Exists(Telemetry.TelemetrySentinel)) - File.Create(Telemetry.TelemetrySentinel); - } + dotnetConfigurer.Configure(); } } } diff --git a/src/dotnet/Telemetry.cs b/src/dotnet/Telemetry.cs index 9b8e5acd4..01cf8801c 100644 --- a/src/dotnet/Telemetry.cs +++ b/src/dotnet/Telemetry.cs @@ -8,6 +8,7 @@ using System.IO; using System.Threading.Tasks; using Microsoft.ApplicationInsights; using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Configurer; using Microsoft.DotNet.InternalAbstractions; namespace Microsoft.DotNet.Cli @@ -20,8 +21,6 @@ namespace Microsoft.DotNet.Cli private Dictionary _commonMeasurements = null; private Task _trackEventTask = null; - internal static readonly string TelemetrySentinel = Path.Combine(ApplicationEnvironment.ApplicationBasePath, $"{Product.Version}.dotnetTelemetry"); - private const string InstrumentationKey = "74cc1c9e-3e6e-4d05-b3fc-dde9101d0254"; private const string TelemetryOptout = "DOTNET_CLI_TELEMETRY_OPTOUT"; private const string TelemetryProfileEnvironmentVariable = "DOTNET_CLI_TELEMETRY_PROFILE"; @@ -33,9 +32,11 @@ namespace Microsoft.DotNet.Cli public bool Enabled { get; } - public Telemetry() + public Telemetry () : this(null) { } + + public Telemetry(INuGetCacheSentinel sentinel) { - Enabled = !Env.GetEnvironmentVariableAsBool(TelemetryOptout) && PermissionExists(); + Enabled = !Env.GetEnvironmentVariableAsBool(TelemetryOptout) && PermissionExists(sentinel); if (!Enabled) { @@ -45,10 +46,15 @@ namespace Microsoft.DotNet.Cli //initialize in task to offload to parallel thread _trackEventTask = Task.Factory.StartNew(() => InitializeTelemetry()); } - - private bool PermissionExists() + + private bool PermissionExists(INuGetCacheSentinel sentinel) { - return File.Exists(TelemetrySentinel); + if (sentinel == null) + { + return false; + } + + return sentinel.Exists(); } public void TrackEvent(string eventName, IDictionary properties, IDictionary measurements) diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs index 5756411ce..b2df620d2 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs @@ -15,8 +15,8 @@ namespace Microsoft.DotNet.Tests { public class GivenThatTheUserIsRunningDotNetForTheFirstTime : TestBase { - private static CommandResult _firstDotnetInfoUseCommandResult; - private static CommandResult _firstDotnetNewUseCommandResult; + private static CommandResult _firstDotnetNonVerbUseCommandResult; + private static CommandResult _firstDotnetVerbUseCommandResult; private static DirectoryInfo _nugetCacheFolder; static GivenThatTheUserIsRunningDotNetForTheFirstTime() @@ -29,8 +29,8 @@ namespace Microsoft.DotNet.Tests command.Environment["NUGET_PACKAGES"] = testNugetCache; command.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = ""; - _firstDotnetInfoUseCommandResult = command.ExecuteWithCapturedOutput("--info"); - _firstDotnetNewUseCommandResult = command.ExecuteWithCapturedOutput("new"); + _firstDotnetNonVerbUseCommandResult = command.ExecuteWithCapturedOutput("--info"); + _firstDotnetVerbUseCommandResult = command.ExecuteWithCapturedOutput("new"); _nugetCacheFolder = new DirectoryInfo(testNugetCache); } @@ -38,15 +38,15 @@ namespace Microsoft.DotNet.Tests [Fact] public void Using_dotnet_for_the_first_time_succeeds() { - _firstDotnetNewUseCommandResult.Should().Pass(); + _firstDotnetVerbUseCommandResult.Should().Pass(); } [Fact] public void Using_dotnet_for_the_first_time_with_non_verbs_doesnt_print_eula() { - const string firstTimeUseWelcomeMessage = @".NET Command Line Tools"; + const string firstTimeNonVerbUseMessage = @".NET Command Line Tools"; - _firstDotnetInfoUseCommandResult.StdOut.Should().StartWith(firstTimeUseWelcomeMessage); + _firstDotnetNonVerbUseCommandResult.StdOut.Should().StartWith(firstTimeNonVerbUseMessage); } [Fact] @@ -64,7 +64,7 @@ Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once."; - _firstDotnetNewUseCommandResult.StdOut.Should().StartWith(firstTimeUseWelcomeMessage); + _firstDotnetVerbUseCommandResult.StdOut.Should().StartWith(firstTimeUseWelcomeMessage); } [Fact] From 0ac44a414032f97817bc0890f47419492b1d95ae Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Thu, 16 Jun 2016 10:04:24 -0700 Subject: [PATCH 07/19] Fix Oracle Linux version in README.md Oracle Linux 7 -> Oracle Linux 7.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4153d4598..372b4736f 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ If you don't find your issue, please file one! However, given that this is a ver Build Status ------------ -|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 / Oracle Linux 7 |RHEL 7.2 |OpenSUSE 13.2 |Fedora 23| +|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 |OpenSUSE 13.2 |Fedora 23| |:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| |[![](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/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3620/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3620)|[![](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/3625/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3625)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3622/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3622)| From 0708fe095e5198a245bc483a2ee3b44183d1ebaf Mon Sep 17 00:00:00 2001 From: Senthil Date: Thu, 16 Jun 2016 16:49:41 -0700 Subject: [PATCH 08/19] Fix README to use hostfxr download links (#3622) Also fix a rebase error from b524fd079e6dcdd744faeb6061ccbfe99d1f810f#diff-04c6e90faac2675aa89e2176d2eec7d8 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 372b4736f..ee9a83ffc 100644 --- a/README.md +++ b/README.md @@ -51,13 +51,14 @@ You can download .NET Core as either an installer (MSI, PKG) or a zip (zip, gzip 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 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| |---------|:------:|:------:|:------:| |**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)| +|**Host Framework Resolver**|[![](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-hostfxr-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)| |**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)| @@ -65,7 +66,6 @@ Interested in .NET Core + ASP.NET Core 1.0 RC1 bits? ---------------------------------------------------- This toolchain is independent from the DNX-based .NET Core + ASP.NET Core 1.0 RC1 bits. If you are looking for .NET Core + ASP.NET Core 1.0 RC1 bits, you can find instructions on the http://get.asp.net/. ->>>>>>> Undoing documentation changes to include ubuntu16.04. Will add it back once we have VSO builds running happily and producing binaries for it. Docker ------ From 574a3c858eb69ad84b876766158fc96eadc20e7f Mon Sep 17 00:00:00 2001 From: Zlatko Knezevic Date: Fri, 17 Jun 2016 09:51:43 -0700 Subject: [PATCH 09/19] Remove the VS2012 CRT dependency from docs (#3632) --- Documentation/cli-prerequisites.md | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/cli-prerequisites.md b/Documentation/cli-prerequisites.md index 015787e36..765ef173a 100644 --- a/Documentation/cli-prerequisites.md +++ b/Documentation/cli-prerequisites.md @@ -13,7 +13,6 @@ On Windows, the only dependency is the VC++ Redistributable. Depending on the ve * [Visual C++ Redistributable for Visual Studio 2015](https://www.microsoft.com/en-us/download/details.aspx?id=48145) * Pre-Windows 10 * Please make sure that your Windows installation is up-to-date and includes hotfix [KB2533623] (https://support.microsoft.com/en-us/kb/2533623) installed through Windows Update. - * [Visual C++ Redistributable for Visual Studio 2012 Update 4](https://www.microsoft.com/en-us/download/confirmation.aspx?id=30679) ## Ubuntu Ubuntu distributions require the following libraries installed: From 1e9d529bc54ed49f33102199e109526ea9c6b3c4 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 21 Jun 2016 22:05:34 -0500 Subject: [PATCH 10/19] fix typo in dotnet-install file This was needed to rebuild the CLI with the updated Roslyn NuGet packages. Thanks goes to @akoken for the fix. --- scripts/obtain/dotnet-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index a6f721fdb..9e53e7303 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -668,4 +668,4 @@ else say "Binaries of dotnet can be found in $bin_path" fi -say "Installation finished successfuly." +say "Installation finished successfully." From 8fcfc2af05be6aa2bb932f95217790efb5015c88 Mon Sep 17 00:00:00 2001 From: Sridhar Periyasamy Date: Tue, 30 Aug 2016 09:52:35 -0700 Subject: [PATCH 11/19] Upgrade Corefx and coreclr references Microsoft.NetCore.App 1.0.0 => 1.0.1 Microsoft.NETCore.Runtime.CoreCLR 1.0.2 => 1.0.4 CLI Branding "Microsoft .NET Core 1.0.0 - SDK Preview" => "Microsoft .NET Core 1.0.1 - SDK 1.0.0 Preview 2-003122" List of changes - all project.jsons - dotnet new templates - and build projects files - shared-build-targets-utils\DependencyVersions.cs - CliDependencyVersions.cs --- .../project.json | 2 +- .../TestProjectWithUnresolvedDependency/project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../DthTestProjects/src/EmptyConsoleApp/project.json | 2 +- .../DthTestProjects/src/EmptyNetCoreApp/project.json | 2 +- .../src/FailReleaseProject/project.json | 2 +- .../src/IncompatiblePackageSample/project.json | 2 +- .../IncorrectGlobalJson/src/Project1/project.json | 2 +- .../TestPackages/ToolWithOutputName/project.json | 2 +- .../dotnet-dependency-context-test/project.json | 2 +- .../dotnet-dependency-tool-invoker/project.json | 2 +- .../dotnet-desktop-and-portable/project.json | 2 +- .../dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../dotnet-hello/v2/dotnet-hello/project.json | 2 +- TestAssets/TestPackages/dotnet-portable/project.json | 2 +- .../AppWithAppDependency/TestApp1/project.json | 2 +- .../AppWithAppDependency/TestApp2/project.json | 2 +- .../TestProjects/AppWithBomGlobalJson/project.json | 2 +- .../project.json | 2 +- .../AppWithDirectAndToolDependency/project.json | 2 +- .../TestProjects/AppWithDirectDependency/project.json | 2 +- .../AppWithDirectDependencyAndTypeBuild/project.json | 2 +- .../project.json | 2 +- .../AppWithOutputAssemblyName/project.json | 2 +- .../TestProjects/AppWithToolDependency/project.json | 2 +- TestAssets/TestProjects/CompileFail/project.json | 2 +- .../PortableApp_Standalone/project.json | 2 +- .../DependencyContextFromTool/project.json | 2 +- .../DependencyContextValidator/TestApp/project.json | 2 +- .../TestAppDeps/project.json | 2 +- .../TestAppPortable/project.json | 2 +- .../TestAppPortableDeps/project.json | 2 +- TestAssets/TestProjects/EndToEndTestApp/project.json | 2 +- .../FSharpTestProjects/CompileFailApp/project.json | 2 +- .../FSharpTestProjects/TestApp/project.json | 2 +- .../FSharpTestProjects/TestAppWithArgs/project.json | 2 +- .../KestrelSample/KestrelPortable/project.json | 2 +- .../KestrelSample/KestrelStandalone/project.json | 2 +- .../OutputStandardOutputAndError/project.json | 2 +- .../SingleTargetApp/project.json | 2 +- .../SingleTargetGraph/SingleTargetP0/project.json | 2 +- .../SingleTargetGraph/SingleTargetP1/project.json | 2 +- .../SingleTargetGraph/SingleTargetP2/project.json | 2 +- .../PerformanceTestProjects/TwoTargetApp/project.json | 4 ++-- .../TwoTargetGraph/TwoTargetP0/project.json | 4 ++-- .../TwoTargetGraph/TwoTargetP1/project.json | 2 +- .../TwoTargetGraph/TwoTargetP2/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP0/project.json | 4 ++-- .../TwoTargetGraphLarge/TwoTargetLargeP1/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP2/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP3/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP4/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP5/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP6/project.json | 2 +- .../PortableTests/PortableApp/project.json | 2 +- .../PortableAppCompilationContext/project.json | 2 +- .../PortableTests/PortableAppWithNative/project.json | 2 +- .../PortableTests/StandaloneApp/project.json | 2 +- .../MultipleFrameworkProject/project.json | 2 +- .../NetCoreAppOnlyProject/project.json | 2 +- .../TestProjects/ResourcesTests/TestApp/project.json | 2 +- .../RunTestsApps/TestAppMultiTarget/project.json | 2 +- .../TestAppCompilationContext/TestApp/project.json | 2 +- TestAssets/TestProjects/TestAppSimple/project.json | 2 +- TestAssets/TestProjects/TestAppWithArgs/project.json | 2 +- .../TestAppWithBuildDependency/App/project.json | 2 +- .../LibraryWithBuildDependency/project.json | 2 +- .../TestAppWithContentPackage/project.json | 2 +- .../TestProjects/TestAppWithContents/project.json | 2 +- .../TestAppWithLibrary/TestApp/project.json | 2 +- .../TestProjects/TestAppWithResourceDeps/project.json | 2 +- .../TestProjects/TestAppWithScripts/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestProjects/TestAppWithUnicodéPath/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestMicrosoftCSharpReference/project.json | 2 +- .../project.json | 2 +- .../TestProjects/TestMscorlibReference/project.json | 2 +- .../TestProjectContextBuildAllDedupe/project.json | 2 +- .../src/L0/project.json | 2 +- .../project.json | 2 +- .../TestProjects/TestProjectWithResource/project.json | 2 +- .../TestSimpleIncrementalApp/project.json | 2 +- .../TestProjects/TestSystemCoreReference/project.json | 2 +- .../TestProjects/TestSystemReference/project.json | 2 +- .../dotnet-cli-build/CliDependencyVersions.cs | 2 +- build_projects/dotnet-cli-build/DebTargets.cs | 2 +- build_projects/dotnet-cli-build/MsiTargets.cs | 4 ++-- build_projects/dotnet-cli-build/PkgTargets.cs | 2 +- build_projects/dotnet-cli-build/project.json | 2 +- .../shared-build-targets-utils/DependencyVersions.cs | 4 ++-- .../shared-build-targets-utils/Utils/Monikers.cs | 11 +++++++++-- build_projects/update-dependencies/project.json | 2 +- packaging/windows/clisdk/bundle.thm | 2 +- src/compilers/project.json | 2 +- src/dotnet-archive/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- .../dotnet-new/CSharp_Console/project.json.template | 2 +- .../dotnet-new/CSharp_Web/project.json.template | 2 +- .../dotnet-new/CSharp_xunittest/project.json.template | 2 +- .../dotnet-new/FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 2 +- test/ArgumentForwardingTests/project.json | 2 +- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 2 +- test/Kestrel.Tests/project.json | 2 +- test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- test/Microsoft.DotNet.ProjectModel.Tests/project.json | 2 +- .../project.json | 2 +- test/Performance/project.json | 2 +- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- test/crossgen.Tests/project.json | 2 +- test/dotnet-build.Tests/project.json | 2 +- test/dotnet-compile-fsc.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 2 +- test/dotnet-compile.UnitTests/project.json | 2 +- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 2 +- test/dotnet-projectmodel-server.Tests/project.json | 2 +- test/dotnet-publish.Tests/project.json | 2 +- test/dotnet-resgen.Tests/project.json | 2 +- test/dotnet-run.Tests/project.json | 2 +- test/dotnet-run.UnitTests/project.json | 2 +- test/dotnet-test.Tests/project.json | 2 +- test/dotnet-test.UnitTests/project.json | 2 +- test/dotnet.Tests/project.json | 2 +- tools/Archiver/project.json | 2 +- tools/MultiProjectValidator/project.json | 2 +- 134 files changed, 147 insertions(+), 140 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index 885607884..699fa2cc3 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } }, "imports": [ diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index 26475560f..793e4d3b3 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 6390ad290..51933d6eb 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0", + "Microsoft.NETCore.App": "1.0.1", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index a1827ad70..8af8af745 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index b20601e54..21258c472 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index 6bddf49a1..7e76daf88 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 6a03cc355..900630d0c 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0", + "Microsoft.NETCore.App": "1.0.1", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index 71152b304..aa4358d5b 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index c728ac1ea..ce5183de9 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index b42583346..7c0f30634 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index 02f977709..8bf2cd784 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index 6889f3f1d..f567ef2f4 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index 17cca0fd2..716a4a223 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index 79ad59bc8..0393240f3 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 587918c49..3b068108f 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index f4346ead4..fe9ce6357 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index 23295a370..9541e743a 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index c8fec215d..3004fec36 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index bb444a6c7..d514ca588 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0", + "version": "1.0.1", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index cffe971fe..403ebe73d 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0", + "Microsoft.NETCore.App": "1.0.1", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index d9d9fa091..f18b8124b 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0", + "Microsoft.NETCore.App": "1.0.1", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index 3f2f8a04c..5c24e70d9 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0", + "version": "1.0.1", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index 535efe2d1..4d050093e 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0", + "version": "1.0.1", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 98ce82ca2..2a4e3cc75 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 5f5ebe36d..61268b24e 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 7992d095a..bfc37d9c7 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index 23295a370..9541e743a 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index 828af60de..cbc889a43 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 5b51b8184..6aaca921d 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0", + "Microsoft.NETCore.App": "1.0.1", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index a1a559368..accb0b1e1 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0", + "Microsoft.NETCore.App": "1.0.1", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index 8183a28d3..53a013650 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index 045b78200..f7f8d0c71 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index a83d47689..8a58c83f6 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index e29c14026..8aba9aeba 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509", - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index 8127db1bc..95347fe60 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0", + "Microsoft.NETCore.App": "1.0.1", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index 0f1c4b84c..59f04e96a 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509", - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index 01dfc053a..9140a9729 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index 2c8661b5c..3c948d97f 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 7992d095a..bfc37d9c7 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index 31b344316..6b8b96058 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index ca8453bdc..cb916d694 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index 5bffe254f..2b9ba42f4 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 0a146084d..2f496524b 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index 658a0b73b..300a13690 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,14 +9,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } }, "netstandard1.6": { "dependencies": { "NETStandard.Library": "1.6.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.4" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index 525f7d864..13516bc65 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } }, "netstandard1.6": { "dependencies": { "NETStandard.Library": "1.6.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.4" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index 669221ffa..0cfbc0831 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index 39b763734..2f0604e40 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index 0d89fc2cf..3d60903c8 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } }, "netstandard1.6": { "dependencies": { "NETStandard.Library": "1.6.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.4" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index 21713ec18..948c96804 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index e9f6aeee1..cbb339ed3 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index 4a2e36e33..e43f21551 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index cb5a7f09c..4e413c82b 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index 39b763734..2f0604e40 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index 39b763734..2f0604e40 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } }, diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index 6fe0ce23c..bcb80b615 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index 5d37fd7dc..50b74a6c5 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index a66cc090e..f9a70e5d8 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index 423e4ed9b..454790817 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index 734eaa9a3..c08b304d5 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -15,7 +15,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Linq.Expressions": "4.1.0", "System.Runtime.Serialization.Primitives": "4.1.1" diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index 841f5b74d..1cd65de4b 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Linq.Expressions": "4.1.0", "System.Runtime.Serialization.Primitives": "4.1.1", diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index 9108a8d6d..f5956784e 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 642a05576..46bcf96b7 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0", + "version": "1.0.1", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index c9e62cb6c..f571a9645 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index 7992d095a..bfc37d9c7 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 7992d095a..bfc37d9c7 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index ea017ca5a..eaf17d17b 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index 974daa091..93e617cc1 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index aa869ee87..0611408e7 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0", + "Microsoft.NETCore.App": "1.0.1", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index e68525165..c71fdca4f 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index da12c491f..666d644b9 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index 4cfc1d190..5219be7eb 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0", + "Microsoft.NETCore.App": "1.0.1", "Microsoft.CSharp": "4.0.1", "System.Dynamic.Runtime": "4.0.11", "System.Reflection.Metadata": "1.3.0", diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index aaaf3f4f1..5f390a0fd 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index 24fe24f65..ebcc37c3a 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index 7992d095a..bfc37d9c7 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index da12c491f..666d644b9 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index c425f741c..0ea66e342 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 77ebea69b..54aca5c7d 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,7 +5,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" } }, "net451": { diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index ecff54208..c2afe07eb 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,7 +5,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" } }, "netcore50": { diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index 8c2cbdd57..7c7744afb 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index a71b16492..eeb295613 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0", + "version": "1.0.1", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 02b8a86b3..3591541a7 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 7992d095a..bfc37d9c7 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 7992d095a..bfc37d9c7 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index bd272bd57..26a817258 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index 14cdbb53e..cd3e6696a 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index 7d9a8b91b..3db447934 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" } }, "net451": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index c2b8a859b..c5d6572a1 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0"; + public static readonly string SharedFrameworkVersion = "1.0.1"; public static readonly string SharedHostVersion = "1.0.1"; public static readonly string HostFxrVersion = "1.0.1"; diff --git a/build_projects/dotnet-cli-build/DebTargets.cs b/build_projects/dotnet-cli-build/DebTargets.cs index 8a362ba6c..63b37eb8e 100644 --- a/build_projects/dotnet-cli-build/DebTargets.cs +++ b/build_projects/dotnet-cli-build/DebTargets.cs @@ -55,7 +55,7 @@ namespace Microsoft.DotNet.Cli.Build "-i", sdkPublishRoot, "-o", debFile, "-p", packageName, - "-b", Monikers.CLISdkBrandName, + "-b", Monikers.GetCLISdkBrandName(c), "-m", manPagesDir, "--framework-debian-package-name", sharedFxDebianPackageName, "--framework-nuget-name", Monikers.SharedFrameworkName, diff --git a/build_projects/dotnet-cli-build/MsiTargets.cs b/build_projects/dotnet-cli-build/MsiTargets.cs index 1e7ee4b21..cff55b55a 100644 --- a/build_projects/dotnet-cli-build/MsiTargets.cs +++ b/build_projects/dotnet-cli-build/MsiTargets.cs @@ -118,7 +118,7 @@ namespace Microsoft.DotNet.Cli.Build { var cliSdkRoot = c.BuildContext.Get("CLISDKRoot"); var upgradeCode = Utils.GenerateGuidFromName(SdkMsi).ToString().ToUpper(); - var cliSdkBrandName = $"'{Monikers.CLISdkBrandName}'"; + var cliSdkBrandName = $"'{Monikers.GetCLISdkBrandName(c)}'"; Cmd("powershell", "-NoProfile", "-NoLogo", Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatemsi.ps1"), @@ -133,7 +133,7 @@ namespace Microsoft.DotNet.Cli.Build public static BuildTargetResult GenerateCliSdkBundle(BuildTargetContext c) { var upgradeCode = Utils.GenerateGuidFromName(SdkBundle).ToString().ToUpper(); - var cliSdkBrandName = $"'{Monikers.CLISdkBrandName}'"; + var cliSdkBrandName = $"'{Monikers.GetCLISdkBrandName(c)}'"; Cmd("powershell", "-NoProfile", "-NoLogo", Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatebundle.ps1"), diff --git a/build_projects/dotnet-cli-build/PkgTargets.cs b/build_projects/dotnet-cli-build/PkgTargets.cs index 4f0e5b639..f863dc3b5 100644 --- a/build_projects/dotnet-cli-build/PkgTargets.cs +++ b/build_projects/dotnet-cli-build/PkgTargets.cs @@ -82,7 +82,7 @@ namespace Microsoft.DotNet.Cli.Build .Replace("{HostFxrComponentId}", HostFxrComponentId) .Replace("{CLISdkComponentId}", CLISdkComponentId) .Replace("{CLISdkNugetVersion}", CLISdkNugetVersion) - .Replace("{CLISdkBrandName}", Monikers.CLISdkBrandName) + .Replace("{CLISdkBrandName}", Monikers.GetCLISdkBrandName(c)) .Replace("{SharedFxBrandName}", Monikers.SharedFxBrandName) .Replace("{SharedHostBrandName}", Monikers.SharedHostBrandName) .Replace("{HostFxrBrandName}", Monikers.HostFxrBrandName); diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index ff78d04ec..82be317a7 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "NETStandard.Library": "1.6.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.4", "Microsoft.CSharp": "4.0.1", "System.Dynamic.Runtime": "4.0.11", "System.Reflection.Metadata": "1.3.0", diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 2a43aa7f8..f9d656ae8 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "1.0.2"; - public static readonly string JitVersion = "1.0.2"; + public static readonly string CoreCLRVersion = "1.0.4"; + public static readonly string JitVersion = "1.0.4"; } } diff --git a/build_projects/shared-build-targets-utils/Utils/Monikers.cs b/build_projects/shared-build-targets-utils/Utils/Monikers.cs index b9f8ef2d5..4ed4e47af 100644 --- a/build_projects/shared-build-targets-utils/Utils/Monikers.cs +++ b/build_projects/shared-build-targets-utils/Utils/Monikers.cs @@ -10,11 +10,18 @@ namespace Microsoft.DotNet.Cli.Build public class Monikers { public const string SharedFrameworkName = "Microsoft.NETCore.App"; - public const string CLISdkBrandName = "Microsoft .NET Core 1.0.0 - SDK Preview 2"; - public const string SharedFxBrandName = "Microsoft .NET Core 1.0.0 - Runtime"; + public const string SharedFxBrandName = "Microsoft .NET Core 1.0.1 - Runtime"; public const string SharedHostBrandName = "Microsoft .NET Core 1.0.0 - Host"; public const string HostFxrBrandName = "Microsoft .NET Core 1.0.0 - Host FX Resolver"; + private const string CLISdkBrandName = "Microsoft .NET Core 1.0.1 - SDK 1.0.0 Preview 2-{COMMIT_COUNT_STRING}"; + + public static string GetCLISdkBrandName(BuildTargetContext c) + { + string commitCountString = c.BuildContext.Get("BuildVersion").CommitCountString; + return CLISdkBrandName.Replace("{COMMIT_COUNT_STRING}", commitCountString); + } + public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version) { string rid = RuntimeEnvironment.GetRuntimeIdentifier(); diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 9c9d79edf..9efc5d8d7 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -7,7 +7,7 @@ "dependencies": { "NETStandard.Library": "1.6.0", "Microsoft.CSharp": "4.0.1", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.4", "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" diff --git a/packaging/windows/clisdk/bundle.thm b/packaging/windows/clisdk/bundle.thm index 9c962acdf..b5f877bf6 100644 --- a/packaging/windows/clisdk/bundle.thm +++ b/packaging/windows/clisdk/bundle.thm @@ -2,7 +2,7 @@ #(loc.Caption) Segoe UI - Segoe UI + Segoe UI Segoe UI Segoe UI Segoe UI diff --git a/src/compilers/project.json b/src/compilers/project.json index b2b6ed1b8..860d7f875 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Microsoft.CodeAnalysis.CSharp": "1.3.0", "Microsoft.Net.Compilers.netcore": "1.3.0", diff --git a/src/dotnet-archive/project.json b/src/dotnet-archive/project.json index cbd69d99f..e4734bd76 100644 --- a/src/dotnet-archive/project.json +++ b/src/dotnet-archive/project.json @@ -14,7 +14,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } }, "frameworks": { diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 1316b760b..14ae224ec 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index ce67b3a46..0e21757b8 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template index 18abd54fd..cf2a270c9 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0", + "version": "1.0.1", "type": "platform" }, "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0", diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template index eb7568bbe..b64555344 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template @@ -14,7 +14,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } }, "imports": [ diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index f2c366a2a..a23f5fa86 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index b832a23c1..bd600b350 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -48,7 +48,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Diagnostics.TraceSource": "4.0.0", "System.Diagnostics.TextWriterTraceListener": "4.0.0", diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 0e64842fd..5e997cfd3 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.ProjectModel": { diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index c80d2d28b..32e69eb25 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index f03e5cce3..b9f255dff 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.ProjectModel": { diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index 74a7a577e..78c528a17 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index e039ceef3..652f68466 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,7 +16,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Diagnostics.TraceSource": "4.0.0", "System.Runtime.Serialization.Primitives": "4.1.1", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 957e27589..3dcf5dea8 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/project.json b/test/Microsoft.DotNet.Configurer.UnitTests/project.json index 7ec1fe263..00e90a115 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/project.json +++ b/test/Microsoft.DotNet.Configurer.UnitTests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Diagnostics.TraceSource": "4.0.0", "Microsoft.DotNet.Configurer": { diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json index 92cb2447f..f784c03cd 100644 --- a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Microsoft.DotNet.ProjectModel.Loader": { "target": "project" diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index 83f4d79ed..3f3763dde 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.ProjectModel": { diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index 2a88f7308..216011da6 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Diagnostics.TraceSource": "4.0.0", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Performance/project.json b/test/Performance/project.json index 5eb477030..0fca614f1 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.ProjectModel": { diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 4bf28a4f4..65b3cd4d2 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index b71c3c37e..911a041e5 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index 0469b5ce0..6d9343725 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index 0ac5ff6e9..d276295f4 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 7da2ca9b7..b3b279507 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index 9079e8c82..fe81bc7ae 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index bd877015e..95de8f4e5 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index 0dad51a39..0a056df8a 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index 53784a3a6..b67a1858d 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index a6911a7ab..5a3586465 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "System.IO.Compression.ZipFile": "4.0.1", diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index c75556768..8eba735ce 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,7 +2,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "dotnet": { "target": "project" diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 05d468142..2eae75b51 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.TestFramework": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 88f4c8b8c..fccbd77ca 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 74a7a577e..78c528a17 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index ec9ab9148..029c94f03 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "dotnet": { diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 3066cbada..2c465124c 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Newtonsoft.Json": "9.0.1", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 182cde0fe..48cac3454 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "Newtonsoft.Json": "9.0.1", "dotnet": { diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 66c9d8fed..f479edd88 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" }, "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/tools/Archiver/project.json b/tools/Archiver/project.json index 899fd6995..15c00ff68 100644 --- a/tools/Archiver/project.json +++ b/tools/Archiver/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.Archive": { "target": "project" }, - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.1" }, "frameworks": { "netcoreapp1.0": {} diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 0edf465ca..821dd8458 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0", + "Microsoft.NETCore.App": "1.0.1", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From 01caa0fb4f2a8575b87c9b00ae5090859077c375 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 27 Jul 2016 08:31:37 -0700 Subject: [PATCH 12/19] Update MVC version to 1.0.1 We're shipping a new patch of all MVC packages in 1.0.1. This bumps up the version number of the MVC metapackage so that projects created with `dotnet new` get the latest version. --- src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template index cf2a270c9..8620a4c16 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template @@ -10,7 +10,7 @@ "Microsoft.AspNetCore.Diagnostics": "1.0.0", "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0", "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.0", + "Microsoft.AspNetCore.Mvc": "1.0.1", "Microsoft.AspNetCore.Razor.Tools": { "version": "1.0.0-preview2-final", "type": "build" From 0c10baa40d275dc2df0747454d5d45f06d341c9a Mon Sep 17 00:00:00 2001 From: cartermp Date: Tue, 5 Jul 2016 21:38:12 -0700 Subject: [PATCH 13/19] Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase) This updates the F# templates for dotnet-new to be compatible with Preview 2. --- .../dotnet-new/FSharp_Console/NuGet.Config | 12 ---------- .../FSharp_Console/project.json.template | 22 ++++-------------- .../commands/dotnet-new/FSharp_Lib/Library.fs | 5 ++++ .../FSharp_Lib/project.json.template | 23 +++++++++++++++++++ src/dotnet/commands/dotnet-new/Program.cs | 3 ++- src/dotnet/commands/dotnet-new/README.md | 1 + src/dotnet/project.json | 4 +++- 7 files changed, 39 insertions(+), 31 deletions(-) delete mode 100644 src/dotnet/commands/dotnet-new/FSharp_Console/NuGet.Config create mode 100644 src/dotnet/commands/dotnet-new/FSharp_Lib/Library.fs create mode 100644 src/dotnet/commands/dotnet-new/FSharp_Lib/project.json.template diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/NuGet.Config b/src/dotnet/commands/dotnet-new/FSharp_Console/NuGet.Config deleted file mode 100644 index c9fe7428b..000000000 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/NuGet.Config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index a23f5fa86..fa6415e8b 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -1,6 +1,7 @@ { "version": "1.0.0-*", "buildOptions": { + "debugType": "portable", "emitEntryPoint": true, "compilerName": "fsc", "compile": { @@ -9,18 +10,8 @@ ] } }, - "dependencies": { - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509" - }, "tools": { - "dotnet-compile-fsc": { - "version": "1.0.0-preview2-*", - "imports": [ - "dnxcore50", - "portable-net45+win81", - "netstandard1.3" - ] - } + "dotnet-compile-fsc":"1.0.0-preview2-*" }, "frameworks": { "netcoreapp1.0": { @@ -28,12 +19,9 @@ "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.1" - } - }, - "imports": [ - "portable-net45+win8", - "dnxcore50" - ] + }, + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160629" + } } } } diff --git a/src/dotnet/commands/dotnet-new/FSharp_Lib/Library.fs b/src/dotnet/commands/dotnet-new/FSharp_Lib/Library.fs new file mode 100644 index 000000000..ae53d091e --- /dev/null +++ b/src/dotnet/commands/dotnet-new/FSharp_Lib/Library.fs @@ -0,0 +1,5 @@ +namespace Library + +module Say = + let hello name = + printfn "Hello %s" name \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-new/FSharp_Lib/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Lib/project.json.template new file mode 100644 index 000000000..52746e87e --- /dev/null +++ b/src/dotnet/commands/dotnet-new/FSharp_Lib/project.json.template @@ -0,0 +1,23 @@ +{ + "version": "1.0.0-*", + "buildOptions": { + "debugType": "portable" + "compilerName": "fsc", + "compile": { + "includeFiles": [ + "Library.fs" + ] + } + }, + "tools": { + "dotnet-compile-fsc":"1.0.0-preview2-*" + }, + "frameworks": { + "netstandard1.6": { + "dependencies": { + "NETStandard.Library":"1.6.0", + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160629" + } + } + } +} \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-new/Program.cs b/src/dotnet/commands/dotnet-new/Program.cs index e22cce0d6..efc2bbd25 100644 --- a/src/dotnet/commands/dotnet-new/Program.cs +++ b/src/dotnet/commands/dotnet-new/Program.cs @@ -104,7 +104,7 @@ namespace Microsoft.DotNet.Tools.New { var csharp = new { Name = "C#", Alias = new[] { "c#", "cs", "csharp" }, TemplatePrefix = "CSharp", Templates = new[] { "Console", "Web", "Lib", "xunittest" } }; - var fsharp = new { Name = "F#", Alias = new[] { "f#", "fs", "fsharp" }, TemplatePrefix = "FSharp", Templates = new[] { "Console" } }; + var fsharp = new { Name = "F#", Alias = new[] { "f#", "fs", "fsharp" }, TemplatePrefix = "FSharp", Templates = new[] { "Console", "Lib" } }; string languageValue = lang.Value() ?? csharp.Name; @@ -152,3 +152,4 @@ namespace Microsoft.DotNet.Tools.New } } } + diff --git a/src/dotnet/commands/dotnet-new/README.md b/src/dotnet/commands/dotnet-new/README.md index fa1f474b0..ca91b1598 100644 --- a/src/dotnet/commands/dotnet-new/README.md +++ b/src/dotnet/commands/dotnet-new/README.md @@ -36,6 +36,7 @@ Type of the project. Valid values for C# are: Valid values for F# are: * `console` +* `lib` ## EXAMPLES diff --git a/src/dotnet/project.json b/src/dotnet/project.json index bd600b350..fa4ec23f8 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -7,8 +7,9 @@ "commands/dotnet-new/CSharp_Console.zip", "commands/dotnet-new/CSharp_Lib.zip", "commands/dotnet-new/CSharp_xunittest.zip", + "commands/dotnet-new/CSharp_Web.zip", "commands/dotnet-new/FSharp_Console.zip", - "commands/dotnet-new/CSharp_Web.zip" + "commands/dotnet-new/FSharp_Lib.zip" ] }, "compile": { @@ -17,6 +18,7 @@ "commands/dotnet-new/FSharp_Console/**", "commands/dotnet-new/CSharp_Web/**", "commands/dotnet-new/CSharp_Lib/**", + "commands/dotnet-new/FSharp_Lib/**", "commands/dotnet-new/CSharp_xunittest/**" ] } From 5d8aedebf3962267366f946d4ea556a2233a5260 Mon Sep 17 00:00:00 2001 From: cartermp Date: Thu, 7 Jul 2016 14:00:42 -0700 Subject: [PATCH 14/19] Don't print arguments in F# console app --- src/dotnet/commands/dotnet-new/FSharp_Console/Program.fs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/Program.fs b/src/dotnet/commands/dotnet-new/FSharp_Console/Program.fs index 7687e612f..d5fd26e80 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/Program.fs +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/Program.fs @@ -5,5 +5,4 @@ open System [] let main argv = printfn "Hello World!" - printfn "%A" argv 0 // return an integer exit code From 9646db0cc8946c216b4ff738e9c89b4b8ef7c215 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 27 Jul 2016 11:06:56 -0700 Subject: [PATCH 15/19] Update cshtml wildcard in publishOptions Updating the publishOptions wildcard that used to publish everything in the views folder to now publish all .cshtml files. The problem was that the old wildcard only included the Views folder and didn't include anything in the Areas/*/Views folders (used by views inside areas). This change makes things much simpler, all .csthml files are published. --- src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template index 8620a4c16..5ea95126b 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template @@ -94,7 +94,7 @@ "publishOptions": { "include": [ "wwwroot", - "Views", + "**/*.cshtml", "appsettings.json", "web.config" ] From 07b581f0913e0ae25712bb1908ef8a9f8fe2f328 Mon Sep 17 00:00:00 2001 From: cartermp Date: Tue, 12 Jul 2016 15:33:18 -0700 Subject: [PATCH 16/19] Add missing comma to F# lib project.json --- src/dotnet/commands/dotnet-new/FSharp_Lib/project.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-new/FSharp_Lib/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Lib/project.json.template index 52746e87e..7e88b72f9 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Lib/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Lib/project.json.template @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "buildOptions": { - "debugType": "portable" + "debugType": "portable", "compilerName": "fsc", "compile": { "includeFiles": [ From 6a1b41fac64093cebd4a8f14ec148e61325ed9cd Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 31 Aug 2016 13:15:21 -0700 Subject: [PATCH 17/19] Update version of routing to 1.0.1 This is needed because MVC still references 1.0.0. --- src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template index 5ea95126b..0caa7430b 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template @@ -15,6 +15,7 @@ "version": "1.0.0-preview2-final", "type": "build" }, + "Microsoft.AspNetCore.Routing": "1.0.1", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0", From 6bd5bfc3e5562f1dd6ac2646c0a816f0b0cd2c5d Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 31 Aug 2016 13:53:02 -0700 Subject: [PATCH 18/19] Update Kestrel to 1.0.1 --- src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template index 0caa7430b..8b97776fc 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template @@ -17,7 +17,7 @@ }, "Microsoft.AspNetCore.Routing": "1.0.1", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", "Microsoft.AspNetCore.StaticFiles": "1.0.0", "Microsoft.EntityFrameworkCore.Sqlite": "1.0.0", "Microsoft.EntityFrameworkCore.Tools": { From 5e173f38e97fc46063f82120c4ba8c90a9f6c083 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 31 Aug 2016 14:42:29 -0700 Subject: [PATCH 19/19] Update versions of EF and scaffolding tools --- .../commands/dotnet-new/CSharp_Web/project.json.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template index 8b97776fc..7da844f6d 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template @@ -19,7 +19,7 @@ "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.EntityFrameworkCore.Sqlite": "1.0.0", + "Microsoft.EntityFrameworkCore.Sqlite": "1.0.1", "Microsoft.EntityFrameworkCore.Tools": { "version": "1.0.0-preview2-final", "type": "build" @@ -32,11 +32,11 @@ "Microsoft.Extensions.Logging.Debug": "1.0.0", "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0", "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.0.0-preview2-final", + "version": "1.0.0-preview2-update1", "type": "build" }, "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": { - "version": "1.0.0-preview2-final", + "version": "1.0.0-preview2-update1", "type": "build" } },