From 17ea7b2d13025c1deaadc2a92e9de9326218d128 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 1 Jun 2017 12:38:51 -0700 Subject: [PATCH 01/72] The README links at https://github.com/dotnet/cli/tree/release/2.0.0#installers-and-binaries need to be updated --- README.md | 64 +++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index edc0ac633..a93cfe2ac 100644 --- a/README.md +++ b/README.md @@ -86,47 +86,47 @@ In order to download just the .NET Core runtime without the SDK, please visit ht [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) [version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg -[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.exe -[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.exe.sha -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.zip -[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x64.latest.zip.sha +[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x64.exe +[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x64.exe.sha +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x64.zip +[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x64.zip.sha -[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.exe -[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.exe.sha -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.zip -[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-win-x86.latest.zip.sha +[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x86.exe +[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x86.exe.sha +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x86.zip +[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x86.zip.sha -[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu-x64.latest.deb -[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu-x64.latest.deb.sha -[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu-x64.latest.tar.gz -[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu-x64.latest.tar.gz.sha +[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb +[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb.sha +[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz +[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha -[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu.16.04-x64.latest.deb -[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu.16.04-x64.latest.deb.sha -[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz -[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha +[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb +[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha +[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz +[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha -[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu.16.10-x64.latest.deb -[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-ubuntu.16.10-x64.latest.deb.sha -[ubuntu-16.10-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz -[ubuntu-16.10-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz.sha +[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb +[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha +[ubuntu-16.10-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz +[ubuntu-16.10-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha -[debian-8-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-debian-x64.latest.tar.gz -[debian-8-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-debian-x64.latest.tar.gz.sha +[debian-8-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz +[debian-8-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha -[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.pkg -[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.pkg.sha -[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.tar.gz -[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-osx-x64.latest.tar.gz.sha +[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-osx-x64.pkg +[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-osx-x64.pkg.sha +[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-osx-x64.tar.gz +[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-osx-x64.tar.gz.sha -[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-centos-x64.latest.tar.gz -[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-centos-x64.latest.tar.gz.sha +[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz +[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha -[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-rhel-x64.latest.tar.gz -[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-rhel-x64.latest.tar.gz.sha +[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz +[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha -[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-linux-x64.latest.tar.gz -[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-linux-x64.latest.tar.gz.sha +[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz +[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha # Debian daily feed From 641bbd712cf06d8e02b4d48f90ae04bed2bcc497 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 1 Jun 2017 14:25:12 -0700 Subject: [PATCH 02/72] Consolidating the Linux tar.gz's --- README.md | 49 ++++++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index a93cfe2ac..d9fd401bb 100644 --- a/README.md +++ b/README.md @@ -71,14 +71,16 @@ In order to download just the .NET Core runtime without the SDK, please visit ht | -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | -| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
*See Installer Note Below
[tar.gz][ubuntu-14.04-targz] - [Checksum][ubuntu-14.04-targz-checksum] | -| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]
*See Installer Note Below
[tar.gz][ubuntu-16.04-targz] - [Checksum][ubuntu-16.04-targz-checksum] | -| **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]
*See Installer Note Below
[tar.gz][ubuntu-16.10-targz] - [Checksum][ubuntu-16.10-targz-checksum] | -| **Debian 8** | [tar.gz][debian-8-targz] - [Checksum][debian-8-targz-checksum] | -| **macOS** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | -| **CentOS 7.1 / Oracle Linux 7** | [tar.gz][centos-targz] - [Checksum][centos-targz-checksum] | -| **RHEL 7.2** | [tar.gz][rhel-targz] - [Checksum][rhel-targz-checksum] | +| **Mac OS X** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | | **Linux x64** | [tar.gz][linux-targz] - [Checksum][linux-targz-checksum] | +| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
*See Installer Note Below
[tar.gz] - See Linux x64 | +| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]
*See Installer Note Below
[tar.gz] - See Linux x64 | +| **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]
*See Installer Note Below
[tar.gz] - See Linux x64 | +| **Debian 8** | [tar.gz] - See Linux x64 | +| **CentOS 7.1 / Oracle Linux 7** | [tar.gz] - See Linux x64 | +| **RHEL 7.2** | [tar.gz] - See Linux x64 | +| **Fedora 24** | [tar.gz] - See Linux x64 | +| **OpenSUSE 42.1** | [tar.gz] - See Linux x64 | *Note: 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 the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* @@ -96,38 +98,23 @@ In order to download just the .NET Core runtime without the SDK, please visit ht [win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x86.zip [win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x86.zip.sha -[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb -[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb.sha -[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz -[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha - -[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb -[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha -[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz -[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha - -[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb -[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha -[ubuntu-16.10-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz -[ubuntu-16.10-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha - -[debian-8-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz -[debian-8-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha - [osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-osx-x64.pkg [osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-osx-x64.pkg.sha [osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-osx-x64.tar.gz [osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-osx-x64.tar.gz.sha -[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz -[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha - -[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz -[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha - [linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz [linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha +[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb +[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb.sha + +[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb +[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha + +[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb +[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha + # Debian daily feed Newest SDK binaries for 2.0.0 in debian feed may be delayed due to external issues by up to 24h. From bd10a090f55ca0834f6eb5ef703f3ca923a62a63 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 1 Jun 2017 14:29:50 -0700 Subject: [PATCH 03/72] Formating... --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d9fd401bb..72552b6ee 100644 --- a/README.md +++ b/README.md @@ -73,14 +73,14 @@ In order to download just the .NET Core runtime without the SDK, please visit ht | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | | **Mac OS X** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | | **Linux x64** | [tar.gz][linux-targz] - [Checksum][linux-targz-checksum] | -| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
*See Installer Note Below
[tar.gz] - See Linux x64 | -| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]
*See Installer Note Below
[tar.gz] - See Linux x64 | -| **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]
*See Installer Note Below
[tar.gz] - See Linux x64 | -| **Debian 8** | [tar.gz] - See Linux x64 | -| **CentOS 7.1 / Oracle Linux 7** | [tar.gz] - See Linux x64 | -| **RHEL 7.2** | [tar.gz] - See Linux x64 | -| **Fedora 24** | [tar.gz] - See Linux x64 | -| **OpenSUSE 42.1** | [tar.gz] - See Linux x64 | +| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
*See Installer Note Below
tar.gz - **See Linux x64** | +| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** | +| **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** | +| **Debian 8** | tar.gz - See **Linux x64** | +| **CentOS 7.1 / Oracle Linux 7** | tar.gz - See **Linux x64** | +| **RHEL 7.2** | tar.gz - See **Linux x64** | +| **Fedora 24** | tar.gz - See **Linux x64** | +| **OpenSUSE 42.1** | tar.gz - See **Linux x64** | *Note: 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 the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* From 22cf8ff662aeeb64b288a5e12e7cf67627f587e4 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 1 Jun 2017 14:33:04 -0700 Subject: [PATCH 04/72] Formatting; part 2... --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 72552b6ee..ce69969fe 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | | **Mac OS X** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | | **Linux x64** | [tar.gz][linux-targz] - [Checksum][linux-targz-checksum] | -| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
*See Installer Note Below
tar.gz - **See Linux x64** | +| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** | | **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** | | **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** | | **Debian 8** | tar.gz - See **Linux x64** | From 2cfad18b0b746f0368ef0d221cecd888e7a9f956 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Thu, 1 Jun 2017 17:38:20 -0700 Subject: [PATCH 05/72] This updates the F# compiler to the latest nuget published build. --- build/DependencyVersions.props | 2 +- src/tool_fsharp/tool_fsc.csproj | 23 +++---------------- .../GivenThatIWantANewAppWithSpecifiedType.cs | 11 ++++----- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 9d4077a58..d10b3ff42 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -5,7 +5,7 @@ 15.3.0-preview-000246-05 2.3.0-beta2-61716-09 1.6.0-beta2-25304 - 1.0.0-rc-170511-0 + 4.2.0-rc-170531-0 2.0.0-preview2-20170531-2 4.3.0-preview2-4082 2.0.0-rel-20170518-512 diff --git a/src/tool_fsharp/tool_fsc.csproj b/src/tool_fsharp/tool_fsc.csproj index ba8924741..f0802d639 100644 --- a/src/tool_fsharp/tool_fsc.csproj +++ b/src/tool_fsharp/tool_fsc.csproj @@ -12,8 +12,7 @@ - - + @@ -35,25 +34,9 @@ SectionName="%(AssetsToRemoveFromDeps.SectionName)" AssetPath="%(AssetsToRemoveFromDeps.Identity)" /> - diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index ce6d8aff0..b39fb458b 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -23,12 +23,11 @@ namespace Microsoft.DotNet.New.Tests [InlineData("C#", "web", false)] [InlineData("C#", "mvc", false)] [InlineData("C#", "webapi", false)] - // Uncomment the test below once https://github.com/dotnet/netcorecli-fsc/issues/92 is fixed. - //[InlineData("F#", "console", false)] - //[InlineData("F#", "classlib", false)] - //[InlineData("F#", "mstest", false)] - //[InlineData("F#", "xunit", false)] - //[InlineData("F#", "mvc", true)] + [InlineData("F#", "console", false)] + [InlineData("F#", "classlib", false)] + [InlineData("F#", "mstest", false)] + [InlineData("F#", "xunit", false)] + [InlineData("F#", "mvc", true)] public void TemplateRestoresAndBuildsWithoutWarnings( string language, string projectType, From 5d85223f2b92b64ce1827f757fc128f21fead977 Mon Sep 17 00:00:00 2001 From: "Ashish Jain (NUGET)" Date: Thu, 1 Jun 2017 17:55:51 -0700 Subject: [PATCH 06/72] Updated NuGet version for VS 15.3 preview3 release --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index bed91539b..31347d2ed 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -5,7 +5,7 @@ 15.3.0-preview-000246-05 2.0.0-rc5-61427-04 1.1.0-alpha-20170525-2 - 4.3.0-preview2-4082 + 4.3.0-preview2-4095 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta1-20170202-111 From ae128648d53fad970dddb81436e890c73c19e2bc Mon Sep 17 00:00:00 2001 From: "Ashish Jain (NUGET)" Date: Thu, 1 Jun 2017 18:01:12 -0700 Subject: [PATCH 07/72] Updated NuGet version for VS15.3 preview3 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 9d4077a58..c1dff750f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -7,7 +7,7 @@ 1.6.0-beta2-25304 1.0.0-rc-170511-0 2.0.0-preview2-20170531-2 - 4.3.0-preview2-4082 + 4.3.0-preview2-4095 2.0.0-rel-20170518-512 15.3.0-preview-20170601-03 $(CLI_SharedFrameworkVersion) From 682eb7a37fe1b9d01bb58593b511d1f21426bdcc Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Thu, 1 Jun 2017 20:14:09 -0700 Subject: [PATCH 08/72] chmod RunFsc.sh on unix --- src/redist/redist.csproj | 1 + src/tool_fsharp/tool_fsc.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index dadf1dc82..2710a3973 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -226,6 +226,7 @@ + + PreserveNewest PreserveNewest From f6d040a3fa75e62e0bda8b96620666af3c4acc7a Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 1 Jun 2017 20:56:19 -0700 Subject: [PATCH 09/72] Updating the SDK to one built with the same NuGet --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index c1dff750f..d7b00a785 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -6,7 +6,7 @@ 2.3.0-beta2-61716-09 1.6.0-beta2-25304 1.0.0-rc-170511-0 - 2.0.0-preview2-20170531-2 + 2.0.0-preview2-20170602-1 4.3.0-preview2-4095 2.0.0-rel-20170518-512 15.3.0-preview-20170601-03 From 718b049ae95fd4f85cf595cb6491dbe3150ae65c Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 1 Jun 2017 21:31:14 -0700 Subject: [PATCH 10/72] Fixing test failure. NuGet changed how they display the error message. --- .../GivenDotnetMSBuildBuildsProjects.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs b/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs index 117f34bae..2199060cd 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs @@ -109,11 +109,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests result.Should().Fail(); - result.StdOut.Should() - .ContainVisuallySameFragment( -@"Feeds used: - /usr/local/bin - https://api.nuget.org/v3/index.json"); + result.StdOut.Should().ContainVisuallySameFragment(@"source(s): /usr/local/bin, nuget.org"); } [Fact] From 6d84f6db77c9ddb163341fad85fe8241a796d58a Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 1 Jun 2017 21:32:20 -0700 Subject: [PATCH 11/72] Fixing test failure. NuGet changed how they display the error message. --- .../GivenDotnetMSBuildBuildsProjects.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs b/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs index 51e7017b1..4c5cf322e 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs @@ -105,11 +105,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests result.Should().Fail(); - result.StdOut.Should() - .ContainVisuallySameFragment( -@"Feeds used: - /usr/local/bin - https://api.nuget.org/v3/index.json"); + result.StdOut.Should().ContainVisuallySameFragment(@"source(s): /usr/local/bin, nuget.org"); } [Fact] From a52f63854bbf0427bc2b61c916af530ab85d9b12 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Fri, 2 Jun 2017 06:26:42 +0000 Subject: [PATCH 12/72] Update CoreSetup to preview2-25402-02 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d7b00a785..264857f7f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview2-25331-01 + 2.0.0-preview2-25402-02 15.3.0-preview-000246-05 2.3.0-beta2-61716-09 1.6.0-beta2-25304 @@ -16,8 +16,8 @@ 1.0.0-beta2-20170531-247 1.0.0-beta2-20170531-247 1.0.0-beta2-20170531-247 - 2.0.0-preview2-25331-01 - 2.0.0-preview2-25331-01 + 2.0.0-preview2-25402-02 + 2.0.0-preview2-25402-02 0.1.0-alpha-142 1.2.1-alpha-002130 0.2.0 From c45dd3bf826919257a33063a4433f3deb13c26ef Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 2 Jun 2017 09:18:24 -0500 Subject: [PATCH 13/72] Fix dotnet store tests for new error message. --- .../GivenDotnetStoresAndPublishesProjects.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs b/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs index f9cb595d5..79d19c5e7 100644 --- a/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs +++ b/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs @@ -102,7 +102,10 @@ namespace Microsoft.DotNet.Cli.Publish.Tests new DotnetCommand() .ExecuteWithCapturedOutput(outputDll) .Should().Fail() - .And.HaveStdErrContaining($"Error: assembly specified in the dependencies manifest was not found probably due to missing runtime store associated with {targetManifestFileName} -- package: 'NuGet.Configuration',"); + .And.HaveStdErrContaining($"Error:{Environment.NewLine}" + + $" An assembly specified in the application dependencies manifest (NuGetConfigDependentProject.deps.json) was not found:{Environment.NewLine}" + + $" package: 'NuGet.Configuration', version: '4.3.0-beta1-2418'{Environment.NewLine}" + + " path: 'lib/netstandard1.3/NuGet.Configuration.dll'"); } [Fact] From 7079f047f6f0394d4a35e2fa770ca4996c236449 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 2 Jun 2017 11:05:57 -0500 Subject: [PATCH 14/72] Revert "Temporarily change the runtime deb pkg name to unblock the integration." This reverts commit f70959040275aac383d9c6a98df5b595360ab4ce. --- build/package/Installer.DEB.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index abfef33a5..8ca327338 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -29,10 +29,10 @@ $(SdkVersion) dotnet-dev-$(SdkDebianPackageVersion) $(SharedFrameworkVersion) - dotnet-runtime-$(SharedFxDebianPackageVersion)-$(CoreSetupRid) + dotnet-runtime-$(SharedFxDebianPackageVersion) $(SharedFxDebianPackageName.ToLower()) $(HostFxrVersion) - dotnet-hostfxr-$(HostFxrDebianPackageVersion)-$(CoreSetupRid) + dotnet-hostfxr-$(HostFxrDebianPackageVersion) $(HostFxrDebianPackageName.ToLower()) dotnet-host From 906bde83ec9e66a83ef2566375bad743b6f71127 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 2 Jun 2017 09:12:31 -0700 Subject: [PATCH 15/72] todays compiler --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d10b3ff42..138cc0ae9 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -5,7 +5,7 @@ 15.3.0-preview-000246-05 2.3.0-beta2-61716-09 1.6.0-beta2-25304 - 4.2.0-rc-170531-0 + 4.2.0-rc-170602-0 2.0.0-preview2-20170531-2 4.3.0-preview2-4082 2.0.0-rel-20170518-512 From 093c8ecfca3c085ffe0232d676107f112039df23 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Fri, 2 Jun 2017 13:57:08 -0700 Subject: [PATCH 16/72] Update to SetupCrossgen 142 - Coherence 25368, add support for timestamped stores for the MSI --- NuGet.Config | 2 +- build/BundledRuntimes.props | 5 +++-- build/DependencyVersions.props | 9 +++++---- test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config | 2 +- test/dotnet-new.Tests/NuGet.tempaspnetpatch.config | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index 14d2b4959..e216f45e7 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -6,7 +6,7 @@ - + diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 9d925e277..4484c7dc8 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -38,11 +38,12 @@ $(OSName) linux - -$(AspNetCoreCoherenceTimestamp) + -$(AspNetCoreCoherenceTimestamp) + -$(AspNetCoherenceLabel)$(AspNetCoreRuntimeStoreSuffix) Build.RS.$(AspNetCoreRuntimeInstallerArchiveFileNameOSToken)$(AspNetCoreRuntimeInstallerArchiveSuffix)$(ArchiveExtension) $(PackagesDirectory)/$(AspNetCoreRuntimeInstallerArchiveFileName) - AspNetCorePackageStoreLib$(Architecture).wixlib + AspNetCorePackageStoreLib$(Architecture)$(AspNetCoreRuntimeStoreSuffix).wixlib $(PackagesDirectory)/$(AspNetCoreRuntimeInstallerWixLibFileName) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 264857f7f..72ce3a131 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -14,8 +14,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170531-247 - 1.0.0-beta2-20170531-247 - 1.0.0-beta2-20170531-247 + 1.0.0-beta2-20170602-250 + 1.0.0-beta2-20170602-250 2.0.0-preview2-25402-02 2.0.0-preview2-25402-02 0.1.0-alpha-142 @@ -24,8 +24,9 @@ timestamped - dev-134 - preview2-25332 + 2.0.0-preview2-139 + preview2 + 25345 diff --git a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config index f38551286..33b9693d5 100644 --- a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config +++ b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config @@ -6,6 +6,6 @@ - + \ No newline at end of file diff --git a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config index f38551286..33b9693d5 100644 --- a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config +++ b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config @@ -6,6 +6,6 @@ - + \ No newline at end of file From 15cd450ba514722f8b08ae925a0ad183b95e985b Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Fri, 2 Jun 2017 14:09:00 -0700 Subject: [PATCH 17/72] Fix SetupCrossgen version --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 72ce3a131..4a7938ffc 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -24,7 +24,7 @@ timestamped - 2.0.0-preview2-139 + 2.0.0-preview2-142 preview2 25345 From 96f91902937f9c6418acff81e9788dbe01cd621e Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Fri, 2 Jun 2017 14:09:32 -0700 Subject: [PATCH 18/72] Fix Coherence version --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 4a7938ffc..daa36985b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -26,7 +26,7 @@ timestamped 2.0.0-preview2-142 preview2 - 25345 + 25368 From 808ff7c6dbec232062f8f835a0061e0b99443cd9 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Fri, 2 Jun 2017 17:04:57 -0700 Subject: [PATCH 19/72] Add restore force option --- .../commands/dotnet-restore/LocalizableStrings.cs | 3 +++ src/dotnet/commands/dotnet-restore/Program.cs | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs b/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs index ac3d8b115..c06b6b6b3 100644 --- a/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs @@ -33,5 +33,8 @@ public const string CmdIgnoreFailedSourcesOptionDescription = "Treat package source failures as warnings."; public const string CmdNoDependenciesOptionDescription = "Set this flag to ignore project to project references and only restore the root project"; + + public const string CmdForceRestoreOptionDescription = "Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json."; + } } diff --git a/src/dotnet/commands/dotnet-restore/Program.cs b/src/dotnet/commands/dotnet-restore/Program.cs index fca6f25b8..53e138fb8 100644 --- a/src/dotnet/commands/dotnet-restore/Program.cs +++ b/src/dotnet/commands/dotnet-restore/Program.cs @@ -69,6 +69,11 @@ namespace Microsoft.DotNet.Tools.Restore "--no-dependencies", LocalizableStrings.CmdNoDependenciesOptionDescription, CommandOptionType.NoValue); + + var forceOption = cmd.Option( + $"-f|--force", + LocalizableStrings.CmdForceRestoreOptionDescription, + CommandOptionType.NoValue); CommandOption verbosityOption = MSBuildForwardingApp.AddVerbosityOption(cmd); @@ -120,6 +125,11 @@ namespace Microsoft.DotNet.Tools.Restore { msbuildArgs.Add($"/p:RestoreRecursive=false"); } + + if(forceOption.HasValue()) + { + msbuildArgs.Add($"/p:RestoreForce=true"); + } if (verbosityOption.HasValue()) { From 123b3d2a44b70416fba8cc57c3eb13ee6eedd28d Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Fri, 2 Jun 2017 21:35:46 -0700 Subject: [PATCH 20/72] Minor template fixes --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index daa36985b..72955c58c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -14,8 +14,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170531-247 - 1.0.0-beta2-20170602-250 - 1.0.0-beta2-20170602-250 + 1.0.0-beta2-20170602-251 + 1.0.0-beta2-20170602-251 2.0.0-preview2-25402-02 2.0.0-preview2-25402-02 0.1.0-alpha-142 From 1bf77524805ac5bcc891aa3411350abe7a672579 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 5 Jun 2017 09:54:28 -0700 Subject: [PATCH 21/72] Renaming "dotnet-dev" to "dotnet-sdk"; therefore: renaming "dotnet-sdk" to "dotnet-sdk -internal". Pinning the install scripts to a unrenamed version so the build will not break on the 'latest'. Note: This is part 1 of a 2 part change --- build/Branding.props | 4 ++-- run-build.ps1 | 4 ++-- run-build.sh | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index e7f4ce95d..fba4e341a 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -14,9 +14,9 @@ '$(Rid)' == 'opensuse.42.1-x64' ">$(Rid) $(OSName)-$(Architecture) - dotnet-sdk + dotnet-sdk-internal dotnet-sdk-debug - dotnet-dev + dotnet-sdk dotnet-runtime-sdk $(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid) diff --git a/run-build.ps1 b/run-build.ps1 index d3bb1152b..82b44bad5 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -80,8 +80,8 @@ $env:VSTEST_TRACE_BUILD=1 # install a stage0 $dotnetInstallPath = Join-Path $RepoRoot "scripts\obtain\dotnet-install.ps1" -Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" -Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview2-006341" +Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview2-006341" if ($LastExitCode -ne 0) { Write-Output "The .NET CLI installation failed with exit code $LastExitCode" diff --git a/run-build.sh b/run-build.sh index a7ce1daad..7670df98a 100755 --- a/run-build.sh +++ b/run-build.sh @@ -155,7 +155,8 @@ export VSTEST_TRACE_BUILD=1 DOTNET_MULTILEVEL_LOOKUP=0 # Install a stage 0 -(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) +(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --version "2.0.0-preview2-006341" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) + EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then echo "run-build: Error: installing stage0 with exit code $EXIT_CODE." >&2 From 78a0b7560d404a8a1ca5885d23d24afa12c88528 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 5 Jun 2017 10:48:12 -0700 Subject: [PATCH 22/72] Renaming "dotnet-dev" to "dotnet-sdk" for DEB targets. --- build/package/Installer.DEB.targets | 4 ++-- build/publish/PublishDebian.targets | 2 +- packaging/deb/dotnet-debian_config.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 8ca327338..c43a7efd4 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -3,7 +3,7 @@ - dotnet-dev-$(SdkVersion) + dotnet-sdk-$(SdkVersion) @@ -27,7 +27,7 @@ $(SdkVersion) - dotnet-dev-$(SdkDebianPackageVersion) + dotnet-sdk-$(SdkDebianPackageVersion) $(SharedFrameworkVersion) dotnet-runtime-$(SharedFxDebianPackageVersion) $(SharedFxDebianPackageName.ToLower()) diff --git a/build/publish/PublishDebian.targets b/build/publish/PublishDebian.targets index c920baf81..28a943529 100644 --- a/build/publish/PublishDebian.targets +++ b/build/publish/PublishDebian.targets @@ -1,7 +1,7 @@ - dotnet-dev-$(SdkVersion) + dotnet-sdk-$(SdkVersion) diff --git a/packaging/deb/dotnet-debian_config.json b/packaging/deb/dotnet-debian_config.json index 22e5beb77..86adb7537 100644 --- a/packaging/deb/dotnet-debian_config.json +++ b/packaging/deb/dotnet-debian_config.json @@ -2,7 +2,7 @@ "maintainer_name":"Microsoft", "maintainer_email": "dotnetcore@microsoft.com", - "package_name": "dotnet-dev-%SDK_NUGET_VERSION%", + "package_name": "dotnet-sdk-%SDK_NUGET_VERSION%", "install_root": "/usr/share/dotnet", "short_description": "%CLI_SDK_BRAND_NAME%", From b0648b1809a99796fc100feced154786d2e04aba Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 5 Jun 2017 11:50:56 -0700 Subject: [PATCH 23/72] Stop producing the 'dotnet-runtime-sdk' packages. https://github.com/dotnet/cli/issues/6718 --- build/Branding.props | 2 -- build/package/Layout.targets | 17 ----------------- 2 files changed, 19 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index fba4e341a..96068e439 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -17,12 +17,10 @@ dotnet-sdk-internal dotnet-sdk-debug dotnet-sdk - dotnet-runtime-sdk $(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid) $(ArtifactNameSdkDebug)-$(SdkVersion)-$(ProductMonikerRid) $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid) - $(ArtifactNameCombinedFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid) diff --git a/build/package/Layout.targets b/build/package/Layout.targets index fa43e2ef5..b9361c55d 100644 --- a/build/package/Layout.targets +++ b/build/package/Layout.targets @@ -3,7 +3,6 @@ $(LayoutDirectory)/$(ArtifactNameSdkDebug) $(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk) - $(LayoutDirectory)/$(ArtifactNameCombinedFrameworkSdk) @@ -12,10 +11,6 @@ - - - - @@ -35,11 +30,6 @@ Path2="%(CombinedHostHostFxrFrameworkSdkInput.Identity)" > - - - @@ -64,13 +54,6 @@ $(ArtifactNameCombinedHostHostFxrFrameworkSdk) - - @(CombinedFrameworkSdkInput) - @(CombinedFrameworkSdkOutputFiles -> '$(CombinedFrameworkSdkOutputDirectory)/%(Identity)') - $(ArtifactNameWithVersionCombinedFrameworkSdk) - $(ArtifactNameCombinedFrameworkSdk) - - From 0f10cf5973e9d60224bee56f50bf97d73d1fd2b0 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 5 Jun 2017 16:31:35 -0700 Subject: [PATCH 24/72] Updating the links to blob storage. --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index ce69969fe..ffdafdcf2 100644 --- a/README.md +++ b/README.md @@ -88,23 +88,23 @@ In order to download just the .NET Core runtime without the SDK, please visit ht [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) [version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg -[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x64.exe -[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x64.exe.sha -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x64.zip -[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x64.zip.sha +[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe +[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe.sha +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip +[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip.sha -[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x86.exe -[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x86.exe.sha -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x86.zip -[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-win-x86.zip.sha +[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe +[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe.sha +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip +[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip.sha -[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-osx-x64.pkg -[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-osx-x64.pkg.sha -[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-osx-x64.tar.gz -[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-osx-x64.tar.gz.sha +[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg +[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg.sha +[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz +[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz.sha -[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz -[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-dev-latest-linux-x64.tar.gz.sha +[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz +[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz.sha [ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb [ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb.sha From 7e0747ec89d0c196d2bb529843c9053003b37817 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 24 May 2017 16:52:14 +0100 Subject: [PATCH 25/72] Bundle SPA templates package --- build/BundledTemplates.props | 1 + build/DependencyVersions.props | 1 + .../GivenThatIWantANewAppWithSpecifiedType.cs | 37 ++++++++++++------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index 59606c8b5..549508206 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -5,5 +5,6 @@ + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3d4b67036..afa4a3511 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -21,6 +21,7 @@ 0.1.0-alpha-142 1.2.1-alpha-002130 0.2.0 + 1.0.0-preview-000249 timestamped diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index b39fb458b..8a1c9daaf 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -16,22 +16,26 @@ namespace Microsoft.DotNet.New.Tests public class GivenThatIWantANewAppWithSpecifiedType : TestBase { [Theory] - [InlineData("C#", "console", false)] - [InlineData("C#", "classlib", false)] - [InlineData("C#", "mstest", false)] - [InlineData("C#", "xunit", false)] - [InlineData("C#", "web", false)] - [InlineData("C#", "mvc", false)] - [InlineData("C#", "webapi", false)] - [InlineData("F#", "console", false)] - [InlineData("F#", "classlib", false)] - [InlineData("F#", "mstest", false)] - [InlineData("F#", "xunit", false)] - [InlineData("F#", "mvc", true)] + [InlineData("C#", "console", false, false)] + [InlineData("C#", "classlib", false, false)] + [InlineData("C#", "mstest", false, false)] + [InlineData("C#", "xunit", false, false)] + [InlineData("C#", "web", false, false)] + [InlineData("C#", "mvc", false, false)] + [InlineData("C#", "webapi", false, false)] + [InlineData("C#", "angular", false, true)] + [InlineData("C#", "react", false, true)] + [InlineData("C#", "reactredux", false, true)] + [InlineData("F#", "console", false, false)] + [InlineData("F#", "classlib", false, false)] + [InlineData("F#", "mstest", false, false)] + [InlineData("F#", "xunit", false, false)] + [InlineData("F#", "mvc", true, false)] public void TemplateRestoresAndBuildsWithoutWarnings( string language, string projectType, - bool useNuGetConfigForAspNet) + bool useNuGetConfigForAspNet, + bool skipSpaWebpackSteps) { if (language == "F#" && !EnvironmentInfo.HasSharedFramework("netcoreapp1.0")) { @@ -52,6 +56,13 @@ namespace Microsoft.DotNet.New.Tests File.Copy(configFile.FullName, Path.Combine(rootPath, "NuGet.Config")); } + if (skipSpaWebpackSteps) + { + // Not all CI machines have Node installed, so the build would fail if we tried + // to run Webpack. Bypass this by making it appear that Webpack already ran. + Directory.CreateDirectory(Path.Combine(rootPath, "wwwroot", "dist")); + } + new TestCommand("dotnet") .WithWorkingDirectory(rootPath) .Execute($"restore") From 4cdbd93ce65c4f24a976f5e9d686294fd84227ef Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Tue, 6 Jun 2017 17:02:32 +0000 Subject: [PATCH 26/72] Update CoreSetup to preview2-25406-03 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index afa4a3511..3abf870a7 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview2-25402-02 + 2.0.0-preview2-25406-03 15.3.0-preview-000246-05 2.3.0-beta2-61716-09 1.6.0-beta2-25304 @@ -16,8 +16,8 @@ 1.0.0-beta2-20170531-247 1.0.0-beta2-20170602-251 1.0.0-beta2-20170602-251 - 2.0.0-preview2-25402-02 - 2.0.0-preview2-25402-02 + 2.0.0-preview2-25406-03 + 2.0.0-preview2-25406-03 0.1.0-alpha-142 1.2.1-alpha-002130 0.2.0 From eb3beef3464a037f69e48cf92cdf25098e7c940e Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 6 Jun 2017 15:26:04 -0700 Subject: [PATCH 27/72] Updates to DEB packaging and publishing. --- Documentation/specs/cli-installation-scenarios.md | 4 ++-- build/package/Installer.DEB.targets | 2 +- build/publish/PublishDebian.targets | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/specs/cli-installation-scenarios.md b/Documentation/specs/cli-installation-scenarios.md index b547116cd..49be32fd6 100644 --- a/Documentation/specs/cli-installation-scenarios.md +++ b/Documentation/specs/cli-installation-scenarios.md @@ -126,8 +126,8 @@ Below table shows the mapping between the channels, branches and feeds for the D | Channel | Branch | Debian feed | Debian package name | NuGet version | NuGet feed | |------------ |----------- |------------- |--------------------- |--------------- |--------------------------------------- | | Future | master | Development | dotnet-future | 1.0.0-dev-* | https://dotnet.myget.org/f/dotnet-cli | -| Preview | rel/ | Development | dotnet-dev- | 1.0.0-beta-* | https://dotnet.myget.org/f/dotnet-cli | -| Production | rel/ | Production | dotnet-dev- | 1.0.0 | https://api.nuget.org/v3/index.json | +| Preview | rel/ | Development | dotnet-sdk- | 1.0.0-beta-* | https://dotnet.myget.org/f/dotnet-cli | +| Production | rel/ | Production | dotnet-sdk- | 1.0.0 | https://api.nuget.org/v3/index.json | ## Funnels and discovery mechanisms for CLI bits diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index c43a7efd4..7c762764b 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -52,7 +52,7 @@ $(PackagesDirectory) - $(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension) + $(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(IntermediateDirectory)/debian/sdk $(SdkDebianIntermediateDirectory)/deb-tool-output diff --git a/build/publish/PublishDebian.targets b/build/publish/PublishDebian.targets index 28a943529..1f83c84d7 100644 --- a/build/publish/PublishDebian.targets +++ b/build/publish/PublishDebian.targets @@ -5,7 +5,7 @@ - $(DotnetBlobRootUrl)/$(Product)/$(FullNugetVersion)/$(ArtifactNameWithVersionSdk)$(InstallerExtension) + $(DotnetBlobRootUrl)/$(Product)/$(FullNugetVersion)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(SdkDebianIntermediateDirectory)/package_upload.json 1 From 5a1c401331650918329adbfd6093b2aca941da04 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 6 Jun 2017 16:06:38 -0700 Subject: [PATCH 28/72] Moving the pinned version of the SDK for installation forward from "2.0.0-preview2-006341" to "2.0.0-preview2-006349" --- run-build.ps1 | 4 ++-- run-build.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/run-build.ps1 b/run-build.ps1 index 82b44bad5..e37226c4e 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -80,8 +80,8 @@ $env:VSTEST_TRACE_BUILD=1 # install a stage0 $dotnetInstallPath = Join-Path $RepoRoot "scripts\obtain\dotnet-install.ps1" -Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview2-006341" -Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview2-006341" +Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview2-006349" +Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview2-006349" if ($LastExitCode -ne 0) { Write-Output "The .NET CLI installation failed with exit code $LastExitCode" diff --git a/run-build.sh b/run-build.sh index 7670df98a..2bb5b7b69 100755 --- a/run-build.sh +++ b/run-build.sh @@ -155,7 +155,7 @@ export VSTEST_TRACE_BUILD=1 DOTNET_MULTILEVEL_LOOKUP=0 # Install a stage 0 -(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --version "2.0.0-preview2-006341" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) +(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --version "2.0.0-preview2-006349" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then From da15436ca8a842daf1f405c56677176dd8e8169c Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 6 Jun 2017 16:30:06 -0700 Subject: [PATCH 29/72] Update to SetupCrossgen 158 - Coherence 25487 --- build/DependencyVersions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3abf870a7..a1a870886 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -13,9 +13,9 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170531-247 - 1.0.0-beta2-20170602-251 - 1.0.0-beta2-20170602-251 + 1.0.0-beta2-20170606-253 + 1.0.0-beta2-20170606-253 + 1.0.0-beta2-20170606-253 2.0.0-preview2-25406-03 2.0.0-preview2-25406-03 0.1.0-alpha-142 @@ -25,9 +25,9 @@ timestamped - 2.0.0-preview2-142 + 2.0.0-preview2-158 preview2 - 25368 + 25487 From a08ebb95a080ed5458d6a9dccc06728c8244ee9e Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 6 Jun 2017 21:47:58 -0700 Subject: [PATCH 30/72] Generate equivalent of resx .Designer.cs in build --- build/GenerateResxSource.targets | 45 ++++++++++++++ .../dotnet-cli-build/GenerateResxSource.cs | 58 +++++++++++++++++++ dir.props | 1 + 3 files changed, 104 insertions(+) create mode 100644 build/GenerateResxSource.targets create mode 100644 build_projects/dotnet-cli-build/GenerateResxSource.cs diff --git a/build/GenerateResxSource.targets b/build/GenerateResxSource.targets new file mode 100644 index 000000000..8323e9305 --- /dev/null +++ b/build/GenerateResxSource.targets @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + %(EmbeddedResource.Namespace).%(EmbeddedResource.Filename) + + + + + + + + + + + + + $(IntermediateOutputPath)%(EmbeddedResourceSG.ManifestResourceName).cs + + + + + diff --git a/build_projects/dotnet-cli-build/GenerateResxSource.cs b/build_projects/dotnet-cli-build/GenerateResxSource.cs new file mode 100644 index 000000000..05cbca9a1 --- /dev/null +++ b/build_projects/dotnet-cli-build/GenerateResxSource.cs @@ -0,0 +1,58 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using System.IO; +using System.Linq; +using System.Text; +using System.Xml.Linq; + +namespace Microsoft.DotNet.Cli.Build +{ + public class GenerateResxSource : Task + { + + [Required] + public string ResxFile { get; set; } + + [Required] + public string ResourceName { get; set; } + + [Required] + public string SourceOutputPath { get; set; } + + public override bool Execute() + { + var source = new StringBuilder(); + void _(string line) { source.AppendLine(line); } + + string @namespace = Path.GetFileNameWithoutExtension(ResourceName); + string @class = Path.GetExtension(ResourceName).TrimStart('.'); + + _($"using System;"); + _($"using System.Globalization;"); + _($"using System.Reflection;"); + _($"using System.Resources;"); + _($""); + _($"namespace {@namespace}"); + _($"{{"); + _($" internal static class {@class}"); + _($" {{"); + _($" internal static CultureInfo Culture {{ get; set; }}"); + _($" internal static ResourceManager ResourceManager {{ get; }} = new ResourceManager(\"{ResourceName}\", typeof({@class}).GetTypeInfo().Assembly);"); + + foreach (var key in XDocument.Load(ResxFile) + .Descendants("data") + .Select(n => n.Attribute("name").Value)) + { + _($" internal static string {key} => ResourceManager.GetString(\"{key}\", Culture);"); + } + _($" }}"); + _($"}}"); + + File.WriteAllText(SourceOutputPath, source.ToString()); + return true; + } + } +} diff --git a/dir.props b/dir.props index a7e587dfb..2daa217c5 100644 --- a/dir.props +++ b/dir.props @@ -41,4 +41,5 @@ + From 132f70c5e05b6628a3f0a4ba15d95e686a87c8b7 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 6 Jun 2017 21:50:58 -0700 Subject: [PATCH 31/72] Convert LocalizableStrings.cs to resx --- .../LocalizableStrings.cs | 32 -- .../LocalizableStrings.resx | 153 +++++ .../Microsoft.DotNet.Cli.Sln.Internal.csproj | 4 + .../LocalizableStrings.cs | 100 ---- .../LocalizableStrings.resx | 259 +++++++++ .../Microsoft.DotNet.Cli.Utils.csproj | 4 + .../DotnetFirstTimeUseConfigurer.cs | 2 +- .../LocalizableStrings.cs | 24 - .../LocalizableStrings.resx | 138 +++++ .../Microsoft.DotNet.Configurer.csproj | 4 + src/dotnet/CommandLine/HelpMessageStrings.cs | 2 +- src/dotnet/CommandLine/LocalizableStrings.cs | 50 -- .../CommandLine/LocalizableStrings.resx | 183 ++++++ src/dotnet/CommonLocalizableStrings.cs | 199 ------- src/dotnet/CommonLocalizableStrings.resx | 523 ++++++++++++++++++ .../commands/dotnet-add/LocalizableStrings.cs | 10 - .../dotnet-add/LocalizableStrings.resx | 123 ++++ .../dotnet-add-package/LocalizableStrings.cs | 38 -- .../LocalizableStrings.resx | 165 ++++++ .../dotnet-add-proj/LocalizableStrings.cs | 14 - .../dotnet-add-proj/LocalizableStrings.resx | 129 +++++ .../LocalizableStrings.cs | 16 - .../LocalizableStrings.resx | 132 +++++ .../dotnet-build/LocalizableStrings.cs | 20 - .../dotnet-build/LocalizableStrings.resx | 138 +++++ .../dotnet-clean/LocalizableStrings.cs | 16 - .../dotnet-clean/LocalizableStrings.resx | 132 +++++ .../dotnet-help/LocalizableStrings.cs | 102 ---- .../dotnet-help/LocalizableStrings.resx | 261 +++++++++ .../dotnet-list/LocalizableStrings.cs | 10 - .../dotnet-list/LocalizableStrings.resx | 123 ++++ .../dotnet-list-proj/LocalizableStrings.cs | 12 - .../dotnet-list-proj/LocalizableStrings.resx | 126 +++++ .../LocalizableStrings.cs | 14 - .../LocalizableStrings.resx | 130 +++++ .../dotnet-migrate/LocalizableStrings.cs | 67 --- .../dotnet-migrate/LocalizableStrings.resx | 206 +++++++ .../dotnet-msbuild/LocalizableStrings.cs | 10 - .../dotnet-msbuild/LocalizableStrings.resx | 123 ++++ .../dotnet-pack/LocalizableStrings.cs | 28 - .../dotnet-pack/LocalizableStrings.resx | 150 +++++ .../dotnet-publish/LocalizableStrings.cs | 24 - .../dotnet-publish/LocalizableStrings.resx | 144 +++++ .../dotnet-remove/LocalizableStrings.cs | 10 - .../dotnet-remove/LocalizableStrings.resx | 123 ++++ .../LocalizableStrings.cs | 17 - .../LocalizableStrings.resx | 132 +++++ .../dotnet-remove-proj/LocalizableStrings.cs | 14 - .../LocalizableStrings.resx | 129 +++++ .../LocalizableStrings.cs | 16 - .../LocalizableStrings.resx | 132 +++++ .../dotnet-restore/LocalizableStrings.cs | 40 -- .../dotnet-restore/LocalizableStrings.resx | 168 ++++++ .../commands/dotnet-run/LocalizableStrings.cs | 56 -- .../dotnet-run/LocalizableStrings.resx | 199 +++++++ .../commands/dotnet-sln/LocalizableStrings.cs | 27 - .../dotnet-sln/LocalizableStrings.resx | 153 +++++ .../dotnet-store/LocalizableStrings.cs | 34 -- .../dotnet-store/LocalizableStrings.resx | 159 ++++++ .../dotnet-test/LocalizableStrings.cs | 80 --- .../dotnet-test/LocalizableStrings.resx | 219 ++++++++ src/dotnet/dotnet.csproj | 25 + 62 files changed, 4791 insertions(+), 1082 deletions(-) delete mode 100644 src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.cs create mode 100644 src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.resx delete mode 100644 src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.cs create mode 100644 src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx delete mode 100644 src/Microsoft.DotNet.Configurer/LocalizableStrings.cs create mode 100644 src/Microsoft.DotNet.Configurer/LocalizableStrings.resx delete mode 100644 src/dotnet/CommandLine/LocalizableStrings.cs create mode 100644 src/dotnet/CommandLine/LocalizableStrings.resx delete mode 100644 src/dotnet/CommonLocalizableStrings.cs create mode 100644 src/dotnet/CommonLocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-add/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-add/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-add/dotnet-add-proj/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-add/dotnet-add-proj/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-build/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-build/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-clean/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-clean/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-help/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-help/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-list/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-list/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-list/dotnet-list-proj/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-list/dotnet-list-proj/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-list/dotnet-list-reference/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-list/dotnet-list-reference/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-migrate/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-migrate/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-msbuild/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-msbuild/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-pack/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-pack/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-publish/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-publish/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-remove/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-remove/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-remove/dotnet-remove-package/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-remove/dotnet-remove-package/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-remove/dotnet-remove-proj/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-remove/dotnet-remove-proj/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-restore/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-restore/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-run/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-run/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-sln/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-sln/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-store/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-store/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-test/LocalizableStrings.cs create mode 100644 src/dotnet/commands/dotnet-test/LocalizableStrings.resx diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.cs b/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.cs deleted file mode 100644 index 013260ed8..000000000 --- a/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.cs +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Cli.Sln.Internal -{ - internal class LocalizableStrings - { - // {0} is the line number - // {1} is the error message details - public const string ErrorMessageFormatString = "Invalid format in line {0}: {1}"; - - public const string ProjectParsingErrorFormatString = "Project section is missing '{0}' when parsing the line starting at position {1}"; - - public const string InvalidPropertySetFormatString = "Property set is missing '{0}'"; - - public const string GlobalSectionMoreThanOnceError = "Global section specified more than once"; - - public const string GlobalSectionNotClosedError = "Global section not closed"; - - public const string FileHeaderMissingVersionError = "File header is missing version"; - - public const string FileHeaderMissingError = "Expected file header not found"; - - public const string ProjectSectionNotClosedError = "Project section not closed"; - - public const string InvalidSectionTypeError = "Invalid section type: {0}"; - - public const string SectionIdMissingError = "Section id missing"; - - public const string ClosingSectionTagNotFoundError = "Closing section tag not found"; - } -} diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.resx b/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.resx new file mode 100644 index 000000000..205037931 --- /dev/null +++ b/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.resx @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Invalid format in line {0}: {1} + + + Project section is missing '{0}' when parsing the line starting at position {1} + + + Property set is missing '{0}' + + + Global section specified more than once + + + Global section not closed + + + File header is missing version + + + Expected file header not found + + + Project section not closed + + + Invalid section type: {0} + + + Section id missing + + + Closing section tag not found + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj index 1b4b8d348..fab4bb6bf 100644 --- a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj +++ b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj @@ -12,6 +12,10 @@ true + + + + diff --git a/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.cs b/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.cs deleted file mode 100644 index 3b2f17829..000000000 --- a/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.cs +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Cli.Utils -{ - internal class LocalizableStrings - { - public const string MalformedText = "Malformed command text '{0}'"; - - public const string BuildOutputPathDoesNotExist = "outputpathresolver: {0} does not exist"; - - public const string AttemptingToFindCommand = "{0}: attempting to find command {1} in {2}"; - - public const string FailedToFindToolAssembly = "{0}: failed to find toolAssembly for {1}"; - - public const string FailedToFindCommandPath = "{0}: failed to find commandPath {1}"; - - public const string UnableToLocateDotnetMultiplexer = "Unable to locate dotnet multiplexer"; - - public const string LookingForPreferCliRuntimeFile = "{0}: Looking for prefercliruntime file at `{1}`"; - - public const string IgnoringPreferCLIRuntimeFile = "{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})"; - - public const string CouldNotFindToolRuntimeConfigFile = "{0}: Could not find runtimeconfig.json file for tool {1}"; - - public const string AttemptingToResolve = "{0}: attempting to resolve {1}"; - - public const string DidNotFindAMatchingProject = "{0}: Did not find a matching project {1}."; - - public const string InvalidCommandResolverArguments = "{0}: invalid commandResolverArguments"; - - public const string DoesNotExist = "{0}: {1} does not exist"; - - public const string AmbiguousCommandName = "Ambiguous command name: {0}"; - - public const string ToolLibraryFound = "{0}: tool library found {1}"; - - public const string MSBuildExePath = "{0}: MSBUILD_EXE_PATH = {1}"; - - public const string MSBuildProjectPath = "{0}: MSBuild project path = {1}"; - - public const string MultipleProjectFilesFound = "Specify which project file to use because this '{0}' contains more than one project file."; - - public const string DidNotFindProject = "{0}: ProjectFactory did not find Project."; - - public const string ResolvingCommandSpec = "{0}: resolving commandspec from {1} Tool Libraries."; - - public const string FailedToResolveCommandSpec = "{0}: failed to resolve commandspec from library."; - - public const string AttemptingToResolveCommandSpec = "{0}: Attempting to resolve command spec from tool {1}"; - - public const string NuGetPackagesRoot = "{0}: nuget packages root:\n{1}"; - - public const string FoundToolLockFile = "{0}: found tool lockfile at : {1}"; - - public const string LibraryNotFoundInLockFile = "{0}: library not found in lock file."; - - public const string AttemptingToCreateCommandSpec = "{0}: attempting to create commandspec"; - - public const string CommandSpecIsNull = "{0}: commandSpec is null."; - - public const string ExpectDepsJsonAt = "{0}: expect deps.json at: {1}"; - - public const string GeneratingDepsJson = "Generating deps.json at: {0}"; - - public const string UnableToGenerateDepsJson = "unable to generate deps.json, it may have been already generated: {0}"; - - public const string DepsJsonGeneratorProjectNotSet = "Unable to find deps.json generator project."; - - public const string UnableToDeleteTemporaryDepsJson = "unable to delete temporary deps.json file: {0}"; - - public const string VersionForPackageCouldNotBeResolved = "Version for package `{0}` could not be resolved."; - - public const string FileNotFound = "File not found `{0}`."; - - public const string ProjectNotRestoredOrRestoreFailed = "The project may not have been restored or restore failed - run `dotnet restore`"; - - public const string NoExecutableFoundMatchingCommand = "No executable found matching command \"{0}\""; - - public const string CommandAssembliesNotFound = "The command executable for \"{0}\" was not found. The project may not have been restored or restore failed - run `dotnet restore`"; - - public const string WaitingForDebuggerToAttach = "Waiting for debugger to attach. Press ENTER to continue"; - - public const string ProcessId = "Process ID: {0}"; - - public const string CouldNotAccessAssetsFile = "Could not access assets file."; - - public const string DotNetCommandLineTools = ".NET Command Line Tools"; - - public const string WriteLineForwarderSetPreviously = "WriteLine forwarder set previously"; - - public const string AlreadyCapturingStream = "Already capturing stream!"; - - public const string RunningFileNameArguments = "Running {0} {1}"; - - public const string ProcessExitedWithCode = "< {0} exited with {1} in {2} ms."; - - public const string UnableToInvokeMemberNameAfterCommand = "Unable to invoke {0} after the command has been run"; - } -} diff --git a/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx b/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx new file mode 100644 index 000000000..0fe90333b --- /dev/null +++ b/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Malformed command text '{0}' + + + outputpathresolver: {0} does not exist + + + {0}: attempting to find command {1} in {2} + + + {0}: failed to find toolAssembly for {1} + + + {0}: failed to find commandPath {1} + + + Unable to locate dotnet multiplexer + + + {0}: Looking for prefercliruntime file at `{1}` + + + {0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2}) + + + {0}: Could not find runtimeconfig.json file for tool {1} + + + {0}: attempting to resolve {1} + + + {0}: Did not find a matching project {1}. + + + {0}: invalid commandResolverArguments + + + {0}: {1} does not exist + + + Ambiguous command name: {0} + + + {0}: tool library found {1} + + + {0}: MSBUILD_EXE_PATH = {1} + + + {0}: MSBuild project path = {1} + + + Specify which project file to use because this '{0}' contains more than one project file. + + + {0}: ProjectFactory did not find Project. + + + {0}: resolving commandspec from {1} Tool Libraries. + + + {0}: failed to resolve commandspec from library. + + + {0}: Attempting to resolve command spec from tool {1} + + + {0}: nuget packages root: +{1} + + + {0}: found tool lockfile at : {1} + + + {0}: library not found in lock file. + + + {0}: attempting to create commandspec + + + {0}: commandSpec is null. + + + {0}: expect deps.json at: {1} + + + Generating deps.json at: {0} + + + unable to generate deps.json, it may have been already generated: {0} + + + Unable to find deps.json generator project. + + + unable to delete temporary deps.json file: {0} + + + Version for package `{0}` could not be resolved. + + + File not found `{0}`. + + + The project may not have been restored or restore failed - run `dotnet restore` + + + No executable found matching command "{0}" + + + The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore` + + + Waiting for debugger to attach. Press ENTER to continue + + + Process ID: {0} + + + Could not access assets file. + + + .NET Command Line Tools + + + WriteLine forwarder set previously + + + Already capturing stream! + + + Running {0} {1} + + + < {0} exited with {1} in {2} ms. + + + Unable to invoke {0} after the command has been run + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index 7d230f361..b29251ca9 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -11,6 +11,10 @@ true + + + + diff --git a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs index c6081d14e..fd46cf972 100644 --- a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs +++ b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs @@ -35,7 +35,7 @@ namespace Microsoft.DotNet.Configurer private void PrintFirstTimeUseNotice() { - const string firstTimeUseWelcomeMessage = LocalizableStrings.FirstTimeWelcomeMessage; + string firstTimeUseWelcomeMessage = LocalizableStrings.FirstTimeWelcomeMessage; Reporter.Output.WriteLine(); Reporter.Output.WriteLine(firstTimeUseWelcomeMessage); diff --git a/src/Microsoft.DotNet.Configurer/LocalizableStrings.cs b/src/Microsoft.DotNet.Configurer/LocalizableStrings.cs deleted file mode 100644 index 5fe83556d..000000000 --- a/src/Microsoft.DotNet.Configurer/LocalizableStrings.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Configurer -{ - internal class LocalizableStrings - { - public const string FirstTimeWelcomeMessage = @"Welcome to .NET Core! ---------------------- -Learn more about .NET Core @ https://aka.ms/dotnet-docs. Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. - -Telemetry --------------- -The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. -You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. -You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - -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."; - - public const string FailedToPrimeCacheError = "Failed to prime the NuGet cache. {0} failed with: {1}"; - } -} diff --git a/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx b/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx new file mode 100644 index 000000000..15ada4de5 --- /dev/null +++ b/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Welcome to .NET Core! +--------------------- +Learn more about .NET Core @ https://aka.ms/dotnet-docs. Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. + +Telemetry +-------------- +The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. +You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. +You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. + +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. + + + Failed to prime the NuGet cache. {0} failed with: {1} + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj index 03775be47..92026b83f 100644 --- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj +++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj @@ -12,6 +12,10 @@ git://github.com/dotnet/cli + + + + diff --git a/src/dotnet/CommandLine/HelpMessageStrings.cs b/src/dotnet/CommandLine/HelpMessageStrings.cs index 09551d2e6..3bbd0e21a 100644 --- a/src/dotnet/CommandLine/HelpMessageStrings.cs +++ b/src/dotnet/CommandLine/HelpMessageStrings.cs @@ -5,6 +5,6 @@ namespace Microsoft.DotNet.Cli.CommandLine { internal class HelpMessageStrings { - internal const string MSBuildAdditionalArgsHelpText = LocalizableStrings.MSBuildAdditionalArgsHelpText; + internal static string MSBuildAdditionalArgsHelpText => LocalizableStrings.MSBuildAdditionalArgsHelpText; } } diff --git a/src/dotnet/CommandLine/LocalizableStrings.cs b/src/dotnet/CommandLine/LocalizableStrings.cs deleted file mode 100644 index ff01edf1b..000000000 --- a/src/dotnet/CommandLine/LocalizableStrings.cs +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Cli.CommandLine -{ - internal class LocalizableStrings - { - public const string LastArgumentMultiValueError = "The last argument '{0}' accepts multiple values. No more argument can be added."; - - public const string OptionRequiresSingleValueWhichIsMissing = "Required value for option '{0}' was not provided."; - - public const string UnexpectedValueForOptionError = "Unexpected value '{0}' for option '{1}'"; - - public const string UnexpectedArgumentError = "Unrecognized {0} '{1}'"; - - public const string ResponseFileNotFoundError = "Response file '{0}' doesn't exist."; - - public const string ShowHelpInfo = "Show help information"; - - public const string ShowVersionInfo = "Show version information"; - - public const string ShowHintInfo = "Specify --{0} for a list of available options and commands."; - - public const string UsageHeader = "Usage:"; - - public const string UsageArgumentsToken = " [arguments]"; - - public const string UsageArgumentsHeader = "Arguments:"; - - public const string UsageOptionsToken = " [options]"; - - public const string UsageOptionsHeader = "Options:"; - - public const string UsageCommandToken = " [command]"; - - public const string UsageCommandsHeader = "Commands:"; - - public const string UsageCommandsDetailHelp = "Use \"{0} [command] --help\" for more information about a command."; - - public const string UsageCommandArgs = " [args]"; - - public const string UsageCommandAdditionalArgs = " [[--] ...]]"; - - public const string UsageCommandsAdditionalArgsHeader = "Additional Arguments:"; - - public const string InvalidTemplateError = "Invalid template pattern '{0}'"; - - public const string MSBuildAdditionalArgsHelpText = "Any extra options that should be passed to MSBuild. See 'dotnet msbuild -h' for available options."; - } -} diff --git a/src/dotnet/CommandLine/LocalizableStrings.resx b/src/dotnet/CommandLine/LocalizableStrings.resx new file mode 100644 index 000000000..0859e0db6 --- /dev/null +++ b/src/dotnet/CommandLine/LocalizableStrings.resx @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + The last argument '{0}' accepts multiple values. No more argument can be added. + + + Required value for option '{0}' was not provided. + + + Unexpected value '{0}' for option '{1}' + + + Unrecognized {0} '{1}' + + + Response file '{0}' doesn't exist. + + + Show help information + + + Show version information + + + Specify --{0} for a list of available options and commands. + + + Usage: + + + [arguments] + + + Arguments: + + + [options] + + + Options: + + + [command] + + + Commands: + + + Use "{0} [command] --help" for more information about a command. + + + [args] + + + [[--] <additional arguments>...]] + + + Additional Arguments: + + + Invalid template pattern '{0}' + + + Any extra options that should be passed to MSBuild. See 'dotnet msbuild -h' for available options. + + \ No newline at end of file diff --git a/src/dotnet/CommonLocalizableStrings.cs b/src/dotnet/CommonLocalizableStrings.cs deleted file mode 100644 index 666ed56f4..000000000 --- a/src/dotnet/CommonLocalizableStrings.cs +++ /dev/null @@ -1,199 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools -{ - internal class CommonLocalizableStrings - { - public const string UnsupportedProjectType = "Unsupported project type. Please check with your sdk provider."; - public const string ProjectAlreadyHasAreference = "Project already has a reference to `{0}`."; - public const string ProjectReferenceCouldNotBeFound = "Project reference `{0}` could not be found."; - public const string ProjectReferenceRemoved = "Project reference `{0}` removed."; - - // Project related - public const string Project = "Project"; - public const string ProjectFile = "Project file"; - public const string Reference = "Reference"; - public const string ProjectReference = "Project reference"; - public const string ProjectReferenceOneOrMore = "Project reference(s)"; - public const string PackageReference = "Package reference"; - public const string P2P = "Project to Project"; - public const string P2PReference = "Project to Project reference"; - public const string Package = "Package"; - public const string Solution = "Solution"; - public const string SolutionFile = "Solution file"; - public const string Executable = "Executable"; - public const string Library = "Library"; - public const string Program = "Program"; - public const string Application = "Application"; - public const string ReferenceAddedToTheProject = "Reference `{0}` added to the project."; - - // Verbs - public const string Add = "Add"; - public const string Remove = "Remove"; - public const string Delete = "Delete"; - public const string Update = "Update"; - public const string New = "New"; - public const string List = "List"; - public const string Load = "Load"; - public const string Save = "Save"; - public const string Find = "Find"; - - // Other - public const string Error = "Error"; - public const string Warning = "Warning"; - - public const string File = "File"; - public const string Directory = "Directory"; - - public const string Type = "Type"; - public const string Value = "Value"; - public const string Group = "Group"; - - // General sentences"; - public const string XAddedToY = "{0} added to {1}."; - public const string XRemovedFromY = "{0} removed from {1}."; - public const string XDeletedFromY = "{0} deleted from {1}."; - public const string XSuccessfullyUpdated = "{0} successfully updated."; - - // General errors - /// Invalid - public const string XIsInvalid = "{0} is invalid."; - public const string XYFoundButInvalid = "{0} `{1}` found but is invalid."; - public const string XFoundButInvalid = "`{0}` found but is invalid."; - public const string OperationInvalid = "Operation is invalid."; - public const string OperationXInvalid = "Operation {0} is invalid."; - - /// Not Found - public const string XNotFound = "{0} not found."; - public const string XOrYNotFound = "{0} or {1} not found."; - public const string XOrYNotFoundInZ = "{0} or {1} not found in `{2}`."; - public const string FileNotFound = "File `{0}` not found."; - - /// Does not exist - public const string XDoesNotExist = "{0} does not exist."; - public const string XYDoesNotExist = "{0} `{1}` does not exist."; - - /// Duplicate - public const string MoreThanOneXFound = "More than one {0} found."; - public const string XAlreadyContainsY = "{0} already contains {1}."; - public const string XAlreadyContainsYZ = "{0} already contains {1} `{2}`."; - public const string XAlreadyHasY = "{0} already has {1}."; - public const string XAlreadyHasYZ = "{0} already has {1} `{2}`."; - - /// Other - public const string XWasNotExpected = "{0} was not expected."; - public const string XNotProvided = "{0} not provided."; - public const string SpecifyAtLeastOne = "Please specify at least one {0}."; - public const string CouldNotConnectWithTheServer = "Could not connect with the server."; - - // Command Line Parsing - public const string RequiredArgumentIsInvalid = "Required argument {0} is invalid."; - public const string OptionIsInvalid = "Option {0} is invalid."; - public const string ArgumentIsInvalid = "Argument {0} is invalid."; - public const string RequiredArgumentNotPassed = "Required argument {0} was not provided."; - public const string RequiredCommandNotPassed = "Required command was not provided."; - - // dotnet - /// Project - public const string CouldNotFindAnyProjectInDirectory = "Could not find any project in `{0}`."; - public const string CouldNotFindProjectOrDirectory = "Could not find project or directory `{0}`."; - public const string MoreThanOneProjectInDirectory = "Found more than one project in `{0}`. Please specify which one to use."; - public const string FoundInvalidProject = "Found a project `{0}` but it is invalid."; - public const string InvalidProject = "Invalid project `{0}`."; - public const string InvalidProjectWithExceptionMessage = "Invalid project `{0}`. {1}."; - - /// Solution - public const string CouldNotFindSolutionIn = "Specified solution file {0} does not exist, or there is no solution file in the directory."; - public const string CouldNotFindSolutionOrDirectory = "Could not find solution or directory `{0}`."; - public const string MoreThanOneSolutionInDirectory = "Found more than one solution file in {0}. Please specify which one to use."; - public const string InvalidSolutionFormatString = "Invalid solution `{0}`. {1}."; // {0} is the solution path, {1} is already localized details on the failure - public const string SolutionDoesNotExist = "Specified solution file {0} does not exist, or there is no solution file in the directory."; - - /// add p2p - public const string ReferenceDoesNotExist = "Reference {0} does not exist."; - public const string ReferenceIsInvalid = "Reference `{0}` is invalid."; - public const string SpecifyAtLeastOneReferenceToAdd = "You must specify at least one reference to add."; - public const string ProjectAlreadyHasAReference = "Project {0} already has a reference `{1}`."; - - /// add package - public const string PackageReferenceDoesNotExist = "Package reference `{0}` does not exist."; - public const string PackageReferenceIsInvalid = "Package reference `{0}` is invalid."; - public const string SpecifyAtLeastOnePackageReferenceToAdd = "You must specify at least one package to add."; - public const string PackageReferenceAddedToTheProject = "Package reference `{0}` added to the project."; - public const string ProjectAlreadyHasAPackageReference = "Project {0} already has a reference `{1}`."; - public const string PleaseSpecifyVersion = "Please specify a version of the package."; - - /// add sln - public const string ProjectDoesNotExist = "Project `{0}` does not exist."; - public const string ProjectIsInvalid = "Project `{0}` is invalid."; - public const string SpecifyAtLeastOneProjectToAdd = "You must specify at least one project to add."; - public const string ProjectAddedToTheSolution = "Project `{0}` added to the solution."; - public const string SolutionAlreadyContainsProject = "Solution {0} already contains project {1}."; - - /// del p2p - public const string ReferenceNotFoundInTheProject = "Specified reference {0} does not exist in project {1}."; - public const string ReferenceRemoved = "Reference `{0}` deleted from the project."; - public const string SpecifyAtLeastOneReferenceToRemove = "You must specify at least one reference to remove."; - public const string ReferenceDeleted = "Reference `{0}` deleted."; - - /// del pkg - public const string PackageReferenceNotFoundInTheProject = "Package reference `{0}` could not be found in the project."; - public const string PackageReferenceRemoved = "Reference `{0}` deleted from the project."; - public const string SpecifyAtLeastOnePackageReferenceToRemove = "You must specify at least one package reference to remove."; - public const string PackageReferenceDeleted = "Package reference `{0}` deleted."; - - /// del sln - public const string ProjectNotFoundInTheSolution = "Project `{0}` could not be found in the solution."; - public const string ProjectRemoved = "Project `{0}` removed from solution."; - public const string SpecifyAtLeastOneProjectToRemove = "You must specify at least one project to remove."; - public const string ProjectDeleted = "Project `{0}` deleted from solution."; - - /// list - public const string NoReferencesFound = "There are no {0} references in project {1}. ;; {0} is the type of the item being requested (project, package, p2p) and {1} is the object operated on (a project file or a solution file). "; - public const string NoProjectsFound = "No projects found in the solution."; - - /// arguments - public const string ArgumentsProjectOrSolutionDescription = "The project or solution to operation on. If a file is not specified, the current directory is searched."; - - /// sln - public const string ArgumentsProjectDescription = "The project file to operate on. If a file is not specified, the command will search the current directory for one."; - public const string ArgumentsSolutionDescription = "Solution file to operate on. If not specified, the command will search the current directory for one."; - public const string CmdSlnFile = "SLN_FILE"; - public const string CmdProjectFile = "PROJECT"; - - /// commands - public const string CmdFramework = "FRAMEWORK"; - - /// update pkg - public const string PleaseSpecifyNewVersion = "Please specify new version of the package."; - public const string PleaseSpecifyWhichPackageToUpdate = "Please specify which package to update."; - public const string NothingToUpdate = "Nothing to update."; - public const string EverythingUpToDate = "Everything is already up-to-date."; - public const string PackageVersionUpdatedTo = "Version of package `{0}` updated to `{1}`."; - public const string PackageVersionUpdated = "Version of package `{0}` updated."; - public const string CouldNotUpdateTheVersion = "Could not update the version of the package `{0}`."; - - /// new - public const string TemplateCreatedSuccessfully = "The template {0} created successfully. Please run \"dotnet restore\" to get started!"; - public const string TemplateInstalledSuccesfully = "The template {0} installed successfully. You can use \"dotnet new {0}\" to get started with the new template."; - public const string TemplateCreateError = "Template {0} could not be created. Error returned was: {1}."; - public const string TemplateInstallError = "Template {0} could not be installed. Error returned was: {1}."; - public const string SpecifiedNameExists = "Specified name {0} already exists. Please specify a different name."; - public const string SpecifiedAliasExists = "Specified alias {0} already exists. Please specify a different alias."; - public const string MandatoryParameterMissing = "Mandatory parameter {0} missing for template {1}. "; - - public const string ProjectNotCompatibleWithFrameworks = "Project `{0}` cannot be added due to incompatible targeted frameworks between the two projects. Please review the project you are trying to add and verify that is compatible with the following targets:"; - public const string ProjectDoesNotTargetFramework = "Project `{0}` does not target framework `{1}`."; - public const string ProjectCouldNotBeEvaluated = "Project `{0}` could not be evaluated. Evaluation failed with following error:\n{1}."; - - /// common options - public const string VerbosityOptionDescription = "Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]."; - public const string FrameworkOptionDescription = "Target framework to publish for. The target framework has to be specified in the project file."; - public const string RuntimeOptionDescription = "Publish the project for a given runtime. This is used when creating self-contained deployment. Default is to publish a framework-dependent app."; - public const string ConfigurationOptionDescription = "Configuration to use for building the project. Default for most projects is \"Debug\"."; - public const string CmdVersionSuffixDescription = "Defines the value for the $(VersionSuffix) property in the project."; - - public const string ShowHelpDescription = "Show help information."; - } -} diff --git a/src/dotnet/CommonLocalizableStrings.resx b/src/dotnet/CommonLocalizableStrings.resx new file mode 100644 index 000000000..708b0daf3 --- /dev/null +++ b/src/dotnet/CommonLocalizableStrings.resx @@ -0,0 +1,523 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Unsupported project type. Please check with your sdk provider. + + + Project already has a reference to `{0}`. + + + Project reference `{0}` could not be found. + + + Project reference `{0}` removed. + + + Project + + + Project file + + + Reference + + + Project reference + + + Project reference(s) + + + Package reference + + + Project to Project + + + Project to Project reference + + + Package + + + Solution + + + Solution file + + + Executable + + + Library + + + Program + + + Application + + + Reference `{0}` added to the project. + + + Add + + + Remove + + + Delete + + + Update + + + New + + + List + + + Load + + + Save + + + Find + + + Error + + + Warning + + + File + + + Directory + + + Type + + + Value + + + Group + + + {0} added to {1}. + + + {0} removed from {1}. + + + {0} deleted from {1}. + + + {0} successfully updated. + + + {0} is invalid. + + + {0} `{1}` found but is invalid. + + + `{0}` found but is invalid. + + + Operation is invalid. + + + Operation {0} is invalid. + + + {0} not found. + + + {0} or {1} not found. + + + {0} or {1} not found in `{2}`. + + + File `{0}` not found. + + + {0} does not exist. + + + {0} `{1}` does not exist. + + + More than one {0} found. + + + {0} already contains {1}. + + + {0} already contains {1} `{2}`. + + + {0} already has {1}. + + + {0} already has {1} `{2}`. + + + {0} was not expected. + + + {0} not provided. + + + Please specify at least one {0}. + + + Could not connect with the server. + + + Required argument {0} is invalid. + + + Option {0} is invalid. + + + Argument {0} is invalid. + + + Required argument {0} was not provided. + + + Required command was not provided. + + + Could not find any project in `{0}`. + + + Could not find project or directory `{0}`. + + + Found more than one project in `{0}`. Please specify which one to use. + + + Found a project `{0}` but it is invalid. + + + Invalid project `{0}`. + + + Invalid project `{0}`. {1}. + + + Specified solution file {0} does not exist, or there is no solution file in the directory. + + + Could not find solution or directory `{0}`. + + + Found more than one solution file in {0}. Please specify which one to use. + + + Invalid solution `{0}`. {1}. + + + Specified solution file {0} does not exist, or there is no solution file in the directory. + + + Reference {0} does not exist. + + + Reference `{0}` is invalid. + + + You must specify at least one reference to add. + + + Project {0} already has a reference `{1}`. + + + Package reference `{0}` does not exist. + + + Package reference `{0}` is invalid. + + + You must specify at least one package to add. + + + Package reference `{0}` added to the project. + + + Project {0} already has a reference `{1}`. + + + Please specify a version of the package. + + + Project `{0}` does not exist. + + + Project `{0}` is invalid. + + + You must specify at least one project to add. + + + Project `{0}` added to the solution. + + + Solution {0} already contains project {1}. + + + Specified reference {0} does not exist in project {1}. + + + Reference `{0}` deleted from the project. + + + You must specify at least one reference to remove. + + + Reference `{0}` deleted. + + + Package reference `{0}` could not be found in the project. + + + Reference `{0}` deleted from the project. + + + You must specify at least one package reference to remove. + + + Package reference `{0}` deleted. + + + Project `{0}` could not be found in the solution. + + + Project `{0}` removed from solution. + + + You must specify at least one project to remove. + + + Project `{0}` deleted from solution. + + + There are no {0} references in project {1}. ;; {0} is the type of the item being requested (project, package, p2p) and {1} is the object operated on (a project file or a solution file). + + + No projects found in the solution. + + + The project or solution to operation on. If a file is not specified, the current directory is searched. + + + The project file to operate on. If a file is not specified, the command will search the current directory for one. + + + Solution file to operate on. If not specified, the command will search the current directory for one. + + + SLN_FILE + + + PROJECT + + + FRAMEWORK + + + Please specify new version of the package. + + + Please specify which package to update. + + + Nothing to update. + + + Everything is already up-to-date. + + + Version of package `{0}` updated to `{1}`. + + + Version of package `{0}` updated. + + + Could not update the version of the package `{0}`. + + + The template {0} created successfully. Please run "dotnet restore" to get started! + + + The template {0} installed successfully. You can use "dotnet new {0}" to get started with the new template. + + + Template {0} could not be created. Error returned was: {1}. + + + Template {0} could not be installed. Error returned was: {1}. + + + Specified name {0} already exists. Please specify a different name. + + + Specified alias {0} already exists. Please specify a different alias. + + + Mandatory parameter {0} missing for template {1}. + + + Project `{0}` cannot be added due to incompatible targeted frameworks between the two projects. Please review the project you are trying to add and verify that is compatible with the following targets: + + + Project `{0}` does not target framework `{1}`. + + + Project `{0}` could not be evaluated. Evaluation failed with following error: +{1}. + + + Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]. + + + Target framework to publish for. The target framework has to be specified in the project file. + + + Publish the project for a given runtime. This is used when creating self-contained deployment. Default is to publish a framework-dependent app. + + + Configuration to use for building the project. Default for most projects is "Debug". + + + Defines the value for the $(VersionSuffix) property in the project. + + + Show help information. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/LocalizableStrings.cs b/src/dotnet/commands/dotnet-add/LocalizableStrings.cs deleted file mode 100644 index cca914239..000000000 --- a/src/dotnet/commands/dotnet-add/LocalizableStrings.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Add -{ - internal class LocalizableStrings - { - public const string NetAddCommand = ".NET Add Command"; - } -} diff --git a/src/dotnet/commands/dotnet-add/LocalizableStrings.resx b/src/dotnet/commands/dotnet-add/LocalizableStrings.resx new file mode 100644 index 000000000..0e0a56115 --- /dev/null +++ b/src/dotnet/commands/dotnet-add/LocalizableStrings.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Add Command + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs deleted file mode 100644 index a4514f2e0..000000000 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Add.PackageReference -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET Add Package reference Command"; - - public const string AppDescription = "Command to add package reference"; - - public const string CmdPackageDescription = "The package reference to add."; - - public const string SpecifyExactlyOnePackageReference = "Please specify one package reference to add."; - - public const string CmdFrameworkDescription = "Adds reference only when targeting a specific framework."; - - public const string CmdNoRestoreDescription = "Adds reference without performing restore preview and compatibility check."; - - public const string CmdSourceDescription = "Specifies NuGet package sources to use during the restore."; - - public const string CmdPackageDirectoryDescription = "Restores the packages to the specified directory."; - - public const string CmdVersionDescription = "Version for the package to be added."; - - public const string CmdDGFileException = "Unable to create dependency graph file for project '{0}'. Cannot add package reference."; - - public const string CmdPackage = "PACKAGE_NAME"; - - public const string CmdVersion = "VERSION"; - - public const string CmdFramework = "FRAMEWORK"; - - public const string CmdSource = "SOURCE"; - - public const string CmdPackageDirectory = "PACKAGE_DIRECTORY"; - } -} diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx new file mode 100644 index 000000000..c18e94039 --- /dev/null +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Add Package reference Command + + + Command to add package reference + + + The package reference to add. + + + Please specify one package reference to add. + + + Adds reference only when targeting a specific framework. + + + Adds reference without performing restore preview and compatibility check. + + + Specifies NuGet package sources to use during the restore. + + + Restores the packages to the specified directory. + + + Version for the package to be added. + + + Unable to create dependency graph file for project '{0}'. Cannot add package reference. + + + PACKAGE_NAME + + + VERSION + + + FRAMEWORK + + + SOURCE + + + PACKAGE_DIRECTORY + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-proj/LocalizableStrings.cs b/src/dotnet/commands/dotnet-add/dotnet-add-proj/LocalizableStrings.cs deleted file mode 100644 index a3cc25377..000000000 --- a/src/dotnet/commands/dotnet-add/dotnet-add-proj/LocalizableStrings.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Add.ProjectToSolution -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET Add Project to Solution Command"; - - public const string AppDescription = "Command to add project to solution"; - - public const string AppHelpText = "Projects to add to solution"; - } -} diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-proj/LocalizableStrings.resx b/src/dotnet/commands/dotnet-add/dotnet-add-proj/LocalizableStrings.resx new file mode 100644 index 000000000..a5810e897 --- /dev/null +++ b/src/dotnet/commands/dotnet-add/dotnet-add-proj/LocalizableStrings.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Add Project to Solution Command + + + Command to add project to solution + + + Projects to add to solution + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.cs b/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.cs deleted file mode 100644 index 0e87d24bd..000000000 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Add.ProjectToProjectReference -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET Add Project to Project reference Command"; - - public const string AppDescription = "Command to add project to project reference"; - - public const string AppHelpText = "Project to project references to add"; - - public const string CmdFrameworkDescription = "Add reference only when targeting a specific framework"; - } -} diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.resx b/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.resx new file mode 100644 index 000000000..3dc5538e3 --- /dev/null +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Add Project to Project reference Command + + + Command to add project to project reference + + + Project to project references to add + + + Add reference only when targeting a specific framework + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-build/LocalizableStrings.cs b/src/dotnet/commands/dotnet-build/LocalizableStrings.cs deleted file mode 100644 index 61fe7574c..000000000 --- a/src/dotnet/commands/dotnet-build/LocalizableStrings.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Build -{ - internal class LocalizableStrings - { - public const string AppDescription = "Builder for the .NET Platform. Delegates to the MSBuild 'Build' target in the project file."; - - public const string AppFullName = ".NET Builder"; - - public const string NoDependenciesOptionDescription = "Set this flag to ignore project-to-project references and only build the root project"; - - public const string NoIncrementialOptionDescription = "Disables incremental build."; - - public const string OutputOptionDescription = "Output directory in which to place built artifacts."; - - public const string OutputOptionName = "OUTPUT_DIR"; - } -} diff --git a/src/dotnet/commands/dotnet-build/LocalizableStrings.resx b/src/dotnet/commands/dotnet-build/LocalizableStrings.resx new file mode 100644 index 000000000..418c52506 --- /dev/null +++ b/src/dotnet/commands/dotnet-build/LocalizableStrings.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Builder for the .NET Platform. Delegates to the MSBuild 'Build' target in the project file. + + + .NET Builder + + + Set this flag to ignore project-to-project references and only build the root project + + + Disables incremental build. + + + Output directory in which to place built artifacts. + + + OUTPUT_DIR + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-clean/LocalizableStrings.cs b/src/dotnet/commands/dotnet-clean/LocalizableStrings.cs deleted file mode 100644 index 8cd76c8a9..000000000 --- a/src/dotnet/commands/dotnet-clean/LocalizableStrings.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Clean -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET Clean Command"; - - public const string AppDescription = "Command to clean previously generated build outputs."; - - public const string CmdOutputDir = "OUTPUT_DIR"; - - public const string CmdOutputDirDescription = "Directory in which the build outputs have been placed."; - } -} diff --git a/src/dotnet/commands/dotnet-clean/LocalizableStrings.resx b/src/dotnet/commands/dotnet-clean/LocalizableStrings.resx new file mode 100644 index 000000000..96c19f35b --- /dev/null +++ b/src/dotnet/commands/dotnet-clean/LocalizableStrings.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Clean Command + + + Command to clean previously generated build outputs. + + + OUTPUT_DIR + + + Directory in which the build outputs have been placed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/LocalizableStrings.cs b/src/dotnet/commands/dotnet-help/LocalizableStrings.cs deleted file mode 100644 index 375676f1c..000000000 --- a/src/dotnet/commands/dotnet-help/LocalizableStrings.cs +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Help -{ - internal class LocalizableStrings - { - public const string Usage = "Usage"; - - public const string Arguments = "Arguments"; - - public const string CommandDefinition = "The command to execute"; - - public const string ArgumentsDefinition = "Arguments to pass to the command"; - - public const string HostOptionsDefinition = "Options specific to dotnet (host)"; - - public const string OptionsDescription = "Options common to all commands"; - - public const string CommonOptions = "Common options"; - - public const string DiagnosticsDefinition = "Enable diagnostic output"; - - public const string HelpDefinition = "Show help."; - - public const string HostOptions = "Host options (passed before the command)"; - - public const string VersionDescription = "Display .NET CLI Version Number"; - - public const string InfoDescription = "Display .NET CLI Info"; - - public const string Commands = "SDK commands"; - - public const string NewDefinition = "Initialize .NET projects."; - - public const string RestoreDefinition = "Restore dependencies specified in the .NET project."; - - public const string BuildDefinition = "Builds a .NET project."; - - public const string PublishDefinition = "Publishes a .NET project for deployment (including the runtime)."; - - public const string RunDefinition = "Compiles and immediately executes a .NET project."; - - public const string TestDefinition = "Runs unit tests using the test runner specified in the project."; - - public const string PackDefinition = "Creates a NuGet package."; - - public const string MigrateDefinition = "Migrates a project.json based project to a msbuild based project."; - - public const string ProjectModificationCommands = "Project modification commands"; - - public const string AddDefinition = "Add reference to the project."; - - public const string RemoveDefinition = "Remove reference from the project."; - - public const string ListDefinition = "List reference in the project."; - - public const string AdvancedCommands = "Advanced Commands"; - - public const string NugetDefinition = "Provides additional NuGet commands."; - - public const string MsBuildDefinition = "Runs Microsoft Build Engine (MSBuild)."; - - public const string VsTestDefinition = "Runs Microsoft Test Execution Command Line Tool."; - - public const string CleanDefinition = "Clean build output(s)."; - - public const string SlnDefinition = "Modify solution (SLN) files."; - - public const string CommandDoesNotExist = "Specified command '{0}' is not a valid CLI command. Please specify a valid CLI commands. For more information, run dotnet help."; - - public const string AppFullName = ".NET CLI help utility"; - - public const string AppDescription = "Utility to get more detailed help about each of the CLI commands."; - - public const string CommandArgumentName = "COMMAND_NAME"; - - public const string CommandArgumentDescription = "CLI command for which to view more detailed help."; - - public const string PathToApplicationDefinition = "The path to an application .dll file to execute."; - - public const string SDKVersionCommandDefinition = "Display .NET Core SDK version."; - - public const string SDKInfoCommandDefinition = "Display .NET Core information."; - - public const string SDKDiagnosticsCommandDefinition = "Enable diagnostic output."; - - public const string RunDotnetCommandHelpForMore = "Run 'dotnet COMMAND --help' for more information on a command."; - - public const string AdditionalprobingpathDefinition = "Path containing probing policy and assemblies to probe for."; - - public const string DepsfilDefinition = "Path to .deps.json file."; - - public const string RuntimeconfigDefinition = "Path to .runtimeconfig.json file."; - - public const string FxVersionDefinition = "Version of the installed Shared Framework to use to run the application."; - - public const string RollForwardOnNoCandidateFxDefinition = "Roll forward on no candidate shared framework is enabled."; - - public const string AdditionalDeps = "Path to additonal deps.json file."; - } -} diff --git a/src/dotnet/commands/dotnet-help/LocalizableStrings.resx b/src/dotnet/commands/dotnet-help/LocalizableStrings.resx new file mode 100644 index 000000000..5552d40c5 --- /dev/null +++ b/src/dotnet/commands/dotnet-help/LocalizableStrings.resx @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Usage + + + Arguments + + + The command to execute + + + Arguments to pass to the command + + + Options specific to dotnet (host) + + + Options common to all commands + + + Common options + + + Enable diagnostic output + + + Show help. + + + Host options (passed before the command) + + + Display .NET CLI Version Number + + + Display .NET CLI Info + + + SDK commands + + + Initialize .NET projects. + + + Restore dependencies specified in the .NET project. + + + Builds a .NET project. + + + Publishes a .NET project for deployment (including the runtime). + + + Compiles and immediately executes a .NET project. + + + Runs unit tests using the test runner specified in the project. + + + Creates a NuGet package. + + + Migrates a project.json based project to a msbuild based project. + + + Project modification commands + + + Add reference to the project. + + + Remove reference from the project. + + + List reference in the project. + + + Advanced Commands + + + Provides additional NuGet commands. + + + Runs Microsoft Build Engine (MSBuild). + + + Runs Microsoft Test Execution Command Line Tool. + + + Clean build output(s). + + + Modify solution (SLN) files. + + + Specified command '{0}' is not a valid CLI command. Please specify a valid CLI commands. For more information, run dotnet help. + + + .NET CLI help utility + + + Utility to get more detailed help about each of the CLI commands. + + + COMMAND_NAME + + + CLI command for which to view more detailed help. + + + The path to an application .dll file to execute. + + + Display .NET Core SDK version. + + + Display .NET Core information. + + + Enable diagnostic output. + + + Run 'dotnet COMMAND --help' for more information on a command. + + + Path containing probing policy and assemblies to probe for. + + + Path to <application>.deps.json file. + + + Path to <application>.runtimeconfig.json file. + + + Version of the installed Shared Framework to use to run the application. + + + Roll forward on no candidate shared framework is enabled. + + + Path to additonal deps.json file. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/LocalizableStrings.cs b/src/dotnet/commands/dotnet-list/LocalizableStrings.cs deleted file mode 100644 index 66425450d..000000000 --- a/src/dotnet/commands/dotnet-list/LocalizableStrings.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.List -{ - internal class LocalizableStrings - { - public const string NetListCommand = ".NET List Command"; - } -} diff --git a/src/dotnet/commands/dotnet-list/LocalizableStrings.resx b/src/dotnet/commands/dotnet-list/LocalizableStrings.resx new file mode 100644 index 000000000..41c12481c --- /dev/null +++ b/src/dotnet/commands/dotnet-list/LocalizableStrings.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET List Command + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-proj/LocalizableStrings.cs b/src/dotnet/commands/dotnet-list/dotnet-list-proj/LocalizableStrings.cs deleted file mode 100644 index e18cea956..000000000 --- a/src/dotnet/commands/dotnet-list/dotnet-list-proj/LocalizableStrings.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.List.ProjectsInSolution -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET Projects in Solution viewer"; - - public const string AppDescription = "Command to list projects in a solution"; - } -} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-proj/LocalizableStrings.resx b/src/dotnet/commands/dotnet-list/dotnet-list-proj/LocalizableStrings.resx new file mode 100644 index 000000000..a7913dc1d --- /dev/null +++ b/src/dotnet/commands/dotnet-list/dotnet-list-proj/LocalizableStrings.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Projects in Solution viewer + + + Command to list projects in a solution + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-reference/LocalizableStrings.cs b/src/dotnet/commands/dotnet-list/dotnet-list-reference/LocalizableStrings.cs deleted file mode 100644 index 4bf2d2a83..000000000 --- a/src/dotnet/commands/dotnet-list/dotnet-list-reference/LocalizableStrings.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.List.ProjectToProjectReferences -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET Core Project-to-Project dependency viewer"; - - public const string AppDescription = "Command to list project to project references"; - - public const string NoReferencesFound = "There are no {0} references in project {1}.\n{0} is the type of the item being requested (project, package, p2p) and {1} is the object operated on (a project file or a solution file). "; - } -} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-reference/LocalizableStrings.resx b/src/dotnet/commands/dotnet-list/dotnet-list-reference/LocalizableStrings.resx new file mode 100644 index 000000000..5536ff5ef --- /dev/null +++ b/src/dotnet/commands/dotnet-list/dotnet-list-reference/LocalizableStrings.resx @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Core Project-to-Project dependency viewer + + + Command to list project to project references + + + There are no {0} references in project {1}. +{0} is the type of the item being requested (project, package, p2p) and {1} is the object operated on (a project file or a solution file). + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-migrate/LocalizableStrings.cs b/src/dotnet/commands/dotnet-migrate/LocalizableStrings.cs deleted file mode 100644 index 08ad32f28..000000000 --- a/src/dotnet/commands/dotnet-migrate/LocalizableStrings.cs +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Migrate -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET Migrate Command"; - - public const string AppDescription = "Command used to migrate project.json projects to msbuild"; - - public const string CmdProjectArgument = "PROJECT_JSON/GLOBAL_JSON/SOLUTION_FILE/PROJECT_DIR"; - public const string CmdProjectArgumentDescription = -@"The path to one of the following: - - a project.json file to migrate. - - a global.json file, it will migrate the folders specified in global.json. - - a solution.sln file, it will migrate the projects referenced in the solution. - - a directory to migrate, it will recursively search for project.json files to migrate. -Defaults to current directory if nothing is specified."; - - public const string CmdTemplateDescription = "Base MSBuild template to use for migrated app. The default is the project included in dotnet new."; - - public const string CmdVersionDescription = "The version of the SDK package that will be referenced in the migrated app. The default is the version of the SDK in dotnet new."; - - public const string CmdXprojFileDescription = "The path to the xproj file to use. Required when there is more than one xproj in a project directory."; - - public const string CmdSkipProjectReferencesDescription = "Skip migrating project references. By default, project references are migrated recursively."; - - public const string CmdReportFileDescription = "Output migration report to the given file in addition to the console."; - - public const string CmdReportOutputDescription = "Output migration report file as json rather than user messages."; - - public const string CmdSkipBackupDescription = "Skip moving project.json, global.json, and *.xproj to a `backup` directory after successful migration."; - - public const string MigrationFailedError = "Migration failed."; - - public const string MigrationAdditionalHelp = "The project migration has finished. Please visit https://aka.ms/coremigration to report any issues you've encountered or ask for help."; - - public const string MigrationReportSummary = "Summary"; - - public const string MigrationReportTotalProjects = "Total Projects: {0}"; - - public const string MigrationReportSucceededProjects = "Succeeded Projects: {0}"; - - public const string MigrationReportFailedProjects = "Failed Projects: {0}"; - - public const string ProjectMigrationSucceeded = "Project {0} migration succeeded ({1})."; - - public const string ProjectMigrationFailed = "Project {0} migration failed ({1})."; - - public const string MigrationFailedToFindProjectInGlobalJson = "Unable to find any projects in global.json."; - - public const string MigrationUnableToFindProjects = "Unable to find any projects in {0}."; - - public const string MigrationProjectJsonNotFound = "No project.json file found in '{0}'."; - - public const string MigrationInvalidProjectArgument = "Invalid project argument - '{0}' is not a project.json, global.json, or solution.sln file and a directory named '{0}' doesn't exist."; - - public const string MigratonUnableToFindProjectJson = "Unable to find project.json file at {0}."; - - public const string MigrationUnableToFindGlobalJson = "Unable to find global settings file at {0}."; - - public const string MigrationUnableToFindSolutionFile = "Unable to find the solution file at {0}."; - - public const string MigrateFilesBackupLocation = "Files backed up to {0}"; - } -} diff --git a/src/dotnet/commands/dotnet-migrate/LocalizableStrings.resx b/src/dotnet/commands/dotnet-migrate/LocalizableStrings.resx new file mode 100644 index 000000000..b86e0da0d --- /dev/null +++ b/src/dotnet/commands/dotnet-migrate/LocalizableStrings.resx @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Migrate Command + + + Command used to migrate project.json projects to msbuild + + + PROJECT_JSON/GLOBAL_JSON/SOLUTION_FILE/PROJECT_DIR + + + The path to one of the following: + - a project.json file to migrate. + - a global.json file, it will migrate the folders specified in global.json. + - a solution.sln file, it will migrate the projects referenced in the solution. + - a directory to migrate, it will recursively search for project.json files to migrate. +Defaults to current directory if nothing is specified. + + + Base MSBuild template to use for migrated app. The default is the project included in dotnet new. + + + The version of the SDK package that will be referenced in the migrated app. The default is the version of the SDK in dotnet new. + + + The path to the xproj file to use. Required when there is more than one xproj in a project directory. + + + Skip migrating project references. By default, project references are migrated recursively. + + + Output migration report to the given file in addition to the console. + + + Output migration report file as json rather than user messages. + + + Skip moving project.json, global.json, and *.xproj to a `backup` directory after successful migration. + + + Migration failed. + + + The project migration has finished. Please visit https://aka.ms/coremigration to report any issues you've encountered or ask for help. + + + Summary + + + Total Projects: {0} + + + Succeeded Projects: {0} + + + Failed Projects: {0} + + + Project {0} migration succeeded ({1}). + + + Project {0} migration failed ({1}). + + + Unable to find any projects in global.json. + + + Unable to find any projects in {0}. + + + No project.json file found in '{0}'. + + + Invalid project argument - '{0}' is not a project.json, global.json, or solution.sln file and a directory named '{0}' doesn't exist. + + + Unable to find project.json file at {0}. + + + Unable to find global settings file at {0}. + + + Unable to find the solution file at {0}. + + + Files backed up to {0} + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-msbuild/LocalizableStrings.cs b/src/dotnet/commands/dotnet-msbuild/LocalizableStrings.cs deleted file mode 100644 index dae4177ba..000000000 --- a/src/dotnet/commands/dotnet-msbuild/LocalizableStrings.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.MSBuild -{ - internal class LocalizableStrings - { - public const string VerbosityOptionDescription = "Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"; - } -} diff --git a/src/dotnet/commands/dotnet-msbuild/LocalizableStrings.resx b/src/dotnet/commands/dotnet-msbuild/LocalizableStrings.resx new file mode 100644 index 000000000..e1c8a7c9f --- /dev/null +++ b/src/dotnet/commands/dotnet-msbuild/LocalizableStrings.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs b/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs deleted file mode 100644 index 28d37315d..000000000 --- a/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Pack -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET Core NuGet Package Packer"; - - public const string AppDescription = "pack for msbuild"; - - public const string CmdOutputDir = "OUTPUT_DIR"; - - public const string CmdOutputDirDescription = "Directory in which to place built packages."; - - public const string CmdNoBuildOptionDescription = "Skip building the project prior to packing. By default, the project will be built."; - - public const string CmdIncludeSymbolsDescription = "Include packages with symbols in addition to regular packages in output directory."; - - public const string CmdIncludeSourceDescription = "Include PDBs and source files. Source files go into the src folder in the resulting nuget package"; - - public const string CmdServiceableDescription = "Set the serviceable flag in the package. For more information, please see https://aka.ms/nupkgservicing."; - - public const string CmdArgumentProject = "PROJECT"; - - public const string CmdArgumentDescription = "The project to pack, defaults to the project file in the current directory. Can be a path to any project file"; - } -} diff --git a/src/dotnet/commands/dotnet-pack/LocalizableStrings.resx b/src/dotnet/commands/dotnet-pack/LocalizableStrings.resx new file mode 100644 index 000000000..d297d15e2 --- /dev/null +++ b/src/dotnet/commands/dotnet-pack/LocalizableStrings.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Core NuGet Package Packer + + + pack for msbuild + + + OUTPUT_DIR + + + Directory in which to place built packages. + + + Skip building the project prior to packing. By default, the project will be built. + + + Include packages with symbols in addition to regular packages in output directory. + + + Include PDBs and source files. Source files go into the src folder in the resulting nuget package + + + Set the serviceable flag in the package. For more information, please see https://aka.ms/nupkgservicing. + + + PROJECT + + + The project to pack, defaults to the project file in the current directory. Can be a path to any project file + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs b/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs deleted file mode 100644 index a1ebc0a2b..000000000 --- a/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Publish -{ - internal class LocalizableStrings - { - public const string AppDescription = "Publisher for the .NET Platform"; - - public const string FrameworkOption = "FRAMEWORK"; - - public const string FrameworkOptionDescription = "Target framework to publish for. The target framework has to be specified in the project file."; - - public const string OutputOption = "OUTPUT_DIR"; - - public const string OutputOptionDescription = "Output directory in which to place the published artifacts."; - - public const string ManifestOption = "manifest.xml"; - - public const string ManifestOptionDescription = "The path to a target manifest file that contains the list of packages to be excluded from the publish step."; - - public const string SelfContainedOptionDescription = "Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. Defaults to 'true' if a runtime identifier is specified."; - } -} diff --git a/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx b/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx new file mode 100644 index 000000000..e11675be8 --- /dev/null +++ b/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Publisher for the .NET Platform + + + FRAMEWORK + + + Target framework to publish for. The target framework has to be specified in the project file. + + + OUTPUT_DIR + + + Output directory in which to place the published artifacts. + + + manifest.xml + + + The path to a target manifest file that contains the list of packages to be excluded from the publish step. + + + Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. Defaults to 'true' if a runtime identifier is specified. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-remove/LocalizableStrings.cs b/src/dotnet/commands/dotnet-remove/LocalizableStrings.cs deleted file mode 100644 index 5f88aa844..000000000 --- a/src/dotnet/commands/dotnet-remove/LocalizableStrings.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Remove -{ - internal class LocalizableStrings - { - public const string NetRemoveCommand = ".NET Remove Command"; - } -} diff --git a/src/dotnet/commands/dotnet-remove/LocalizableStrings.resx b/src/dotnet/commands/dotnet-remove/LocalizableStrings.resx new file mode 100644 index 000000000..1f2a8221a --- /dev/null +++ b/src/dotnet/commands/dotnet-remove/LocalizableStrings.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Remove Command + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-package/LocalizableStrings.cs b/src/dotnet/commands/dotnet-remove/dotnet-remove-package/LocalizableStrings.cs deleted file mode 100644 index 55186bf11..000000000 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-package/LocalizableStrings.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Remove.PackageReference -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET Remove Package reference Command."; - - public const string AppDescription = "Command to remove package reference."; - - public const string AppHelpText = "Package reference to remove."; - - public const string SpecifyExactlyOnePackageReference = "Please specify only one package reference to remove."; - - } -} diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-package/LocalizableStrings.resx b/src/dotnet/commands/dotnet-remove/dotnet-remove-package/LocalizableStrings.resx new file mode 100644 index 000000000..969e55a2d --- /dev/null +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-package/LocalizableStrings.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Remove Package reference Command. + + + Command to remove package reference. + + + Package reference to remove. + + + Please specify only one package reference to remove. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-proj/LocalizableStrings.cs b/src/dotnet/commands/dotnet-remove/dotnet-remove-proj/LocalizableStrings.cs deleted file mode 100644 index 50d12b8c0..000000000 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-proj/LocalizableStrings.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Remove.ProjectFromSolution -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET Remove Project from Solution Command"; - - public const string AppDescription = "Command to remove projects from a solution"; - - public const string AppHelpText = "Projects to remove from a solution"; - } -} diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-proj/LocalizableStrings.resx b/src/dotnet/commands/dotnet-remove/dotnet-remove-proj/LocalizableStrings.resx new file mode 100644 index 000000000..8b30c41cf --- /dev/null +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-proj/LocalizableStrings.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Remove Project from Solution Command + + + Command to remove projects from a solution + + + Projects to remove from a solution + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.cs b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.cs deleted file mode 100644 index de954c2d8..000000000 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Remove.ProjectToProjectReference -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET Remove Project to Project reference Command"; - - public const string AppDescription = "Command to remove project to project reference"; - - public const string AppHelpText = "Project to project references to remove"; - - public const string CmdFrameworkDescription = "Remove reference only when targeting a specific framework"; - } -} diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.resx b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.resx new file mode 100644 index 000000000..7952e0f6b --- /dev/null +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Remove Project to Project reference Command + + + Command to remove project to project reference + + + Project to project references to remove + + + Remove reference only when targeting a specific framework + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs b/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs deleted file mode 100644 index e502c8fc8..000000000 --- a/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Restore -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET dependency restorer"; - - public const string AppDescription = "restore for msbuild"; - - public const string CmdArgument = "PROJECT"; - - public const string CmdArgumentDescription = "Optional path to a project file or MSBuild arguments."; - - public const string CmdSourceOption = "SOURCE"; - - public const string CmdSourceOptionDescription = "Specifies a NuGet package source to use during the restore."; - - public const string CmdRuntimeOption = "RUNTIME_IDENTIFIER"; - - public const string CmdRuntimeOptionDescription = "Target runtime to restore packages for."; - - public const string CmdPackagesOption = "PACKAGES_DIRECTORY"; - - public const string CmdPackagesOptionDescription = "Directory to install packages in."; - - public const string CmdDisableParallelOptionDescription = "Disables restoring multiple projects in parallel."; - - public const string CmdConfigFileOption = "FILE"; - - public const string CmdConfigFileOptionDescription = "The NuGet configuration file to use."; - - public const string CmdNoCacheOptionDescription = "Do not cache packages and http requests."; - - public const string CmdIgnoreFailedSourcesOptionDescription = "Treat package source failures as warnings."; - - public const string CmdNoDependenciesOptionDescription = "Set this flag to ignore project to project references and only restore the root project."; - } -} diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx new file mode 100644 index 000000000..6ffdc38b3 --- /dev/null +++ b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET dependency restorer + + + restore for msbuild + + + PROJECT + + + Optional path to a project file or MSBuild arguments. + + + SOURCE + + + Specifies a NuGet package source to use during the restore. + + + RUNTIME_IDENTIFIER + + + Target runtime to restore packages for. + + + PACKAGES_DIRECTORY + + + Directory to install packages in. + + + Disables restoring multiple projects in parallel. + + + FILE + + + The NuGet configuration file to use. + + + Do not cache packages and http requests. + + + Treat package source failures as warnings. + + + Set this flag to ignore project to project references and only restore the root project. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-run/LocalizableStrings.cs b/src/dotnet/commands/dotnet-run/LocalizableStrings.cs deleted file mode 100644 index bf700eece..000000000 --- a/src/dotnet/commands/dotnet-run/LocalizableStrings.cs +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Run -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET Run Command"; - - public const string AppDescription = "Command used to run .NET apps"; - - public const string CommandOptionNoBuildDescription = "Skip building the project prior to running. By default, the project will be built."; - - public const string CommandOptionFrameworkDescription = "Build and run the app using the specified framework. The framework has to be specified in the project file. "; - - public const string CommandOptionNoBuild = "Do not build the project before running."; - - public const string CommandOptionProjectDescription = "The path to the project file to run (defaults to the current directory if there is only one project)."; - - public const string CommandOptionLaunchProfileDescription = "The name of the launch profile (if any) to use when launching the application."; - - public const string CommandOptionNoLaunchProfileDescription = "Do not attempt to use launchSettings.json to configure the application."; - - public const string RunCommandException = "The build failed. Please fix the build errors and run again."; - - public const string RunCommandExceptionUnableToRunSpecifyFramework = "Unable to run your project\nYour project targets multiple frameworks. Please specify which framework to run using '{0}'."; - - public const string RunCommandExceptionUnableToRun = "Unable to run your project.\nPlease ensure you have a runnable project type and ensure '{0}' supports this project.\nA runnable project should target a runnable TFM (for instance, netcoreapp2.0) and have OutputType 'Exe'.\nThe current {1} is '{2}'."; - - public const string RunCommandExceptionNoProjects = "Couldn't find a project to run. Ensure a project exists in {0}, or pass the path to the project using {1}."; - - public const string RunCommandExceptionMultipleProjects = "Specify which project file to use because {0} contains more than one project file."; - - public const string RunCommandAdditionalArgsHelpText = "Arguments passed to the application that is being run."; - - public const string RunCommandExceptionCouldNotLocateALaunchSettingsFile = "The specified launch profile could not be located."; - - public const string RunCommandExceptionCouldNotApplyLaunchSettings = "The launch profile \"{0}\" could not be applied.\n{1}"; - - public const string DefaultLaunchProfileDisplayName = "(Default)"; - - public const string UsingLaunchSettingsFromMessage = "Using launch settings from {0}..."; - - public const string LaunchProfileIsNotAJsonObject = "Launch profile is not a JSON object."; - - public const string LaunchProfileHandlerCannotBeLocated = "The launch profile type '{0}' is not supported."; - - public const string UsableLaunchProfileCannotBeLocated = "A usable launch profile could not be located."; - - public const string UnexpectedExceptionProcessingLaunchSettings = "An unexpected exception occurred while processing launch settings:\n{0}"; - - public const string LaunchProfilesCollectionIsNotAJsonObject = "The 'profiles' property of the launch settings document is not a JSON object."; - - public const string DeserializationExceptionMessage = "An error was encountered when reading launchSettings.json.\n{0}"; - } -} diff --git a/src/dotnet/commands/dotnet-run/LocalizableStrings.resx b/src/dotnet/commands/dotnet-run/LocalizableStrings.resx new file mode 100644 index 000000000..976312b28 --- /dev/null +++ b/src/dotnet/commands/dotnet-run/LocalizableStrings.resx @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Run Command + + + Command used to run .NET apps + + + Skip building the project prior to running. By default, the project will be built. + + + Build and run the app using the specified framework. The framework has to be specified in the project file. + + + Do not build the project before running. + + + The path to the project file to run (defaults to the current directory if there is only one project). + + + The name of the launch profile (if any) to use when launching the application. + + + Do not attempt to use launchSettings.json to configure the application. + + + The build failed. Please fix the build errors and run again. + + + Unable to run your project +Your project targets multiple frameworks. Please specify which framework to run using '{0}'. + + + Unable to run your project. +Please ensure you have a runnable project type and ensure '{0}' supports this project. +A runnable project should target a runnable TFM (for instance, netcoreapp2.0) and have OutputType 'Exe'. +The current {1} is '{2}'. + + + Couldn't find a project to run. Ensure a project exists in {0}, or pass the path to the project using {1}. + + + Specify which project file to use because {0} contains more than one project file. + + + Arguments passed to the application that is being run. + + + The specified launch profile could not be located. + + + The launch profile "{0}" could not be applied. +{1} + + + (Default) + + + Using launch settings from {0}... + + + Launch profile is not a JSON object. + + + The launch profile type '{0}' is not supported. + + + A usable launch profile could not be located. + + + An unexpected exception occurred while processing launch settings: +{0} + + + The 'profiles' property of the launch settings document is not a JSON object. + + + An error was encountered when reading launchSettings.json. +{0} + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-sln/LocalizableStrings.cs b/src/dotnet/commands/dotnet-sln/LocalizableStrings.cs deleted file mode 100644 index 4e7fef500..000000000 --- a/src/dotnet/commands/dotnet-sln/LocalizableStrings.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Sln -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET modify solution file command"; - - public const string AppDescription = "Command to add, remove, and list projects from the solution (SLN) file."; - - public const string AppHelpText = "Projects to add or to remove from the solution."; - - public const string AddAppFullName = ".NET Add project(s) to a solution file Command"; - public const string AddSubcommandHelpText = "Add one or more specified projects to the solution."; - - public const string RemoveAppFullName = ".NET Remove project(s) from a solution file Command"; - public const string RemoveSubcommandHelpText = "Remove the specified project(s) from the solution. The project is not impacted."; - - public const string ListAppFullName = ".NET List project(s) in a solution file Command"; - public const string ListSubcommandHelpText = "List all projects in the solution."; - - public const string CreateAppFullName = ".NET Create a solution file Command"; - public const string CreateSubcommandHelpText = "Create a solution file."; - - } -} diff --git a/src/dotnet/commands/dotnet-sln/LocalizableStrings.resx b/src/dotnet/commands/dotnet-sln/LocalizableStrings.resx new file mode 100644 index 000000000..942139ebe --- /dev/null +++ b/src/dotnet/commands/dotnet-sln/LocalizableStrings.resx @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET modify solution file command + + + Command to add, remove, and list projects from the solution (SLN) file. + + + Projects to add or to remove from the solution. + + + .NET Add project(s) to a solution file Command + + + Add one or more specified projects to the solution. + + + .NET Remove project(s) from a solution file Command + + + Remove the specified project(s) from the solution. The project is not impacted. + + + .NET List project(s) in a solution file Command + + + List all projects in the solution. + + + .NET Create a solution file Command + + + Create a solution file. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-store/LocalizableStrings.cs b/src/dotnet/commands/dotnet-store/LocalizableStrings.cs deleted file mode 100644 index 164d42aba..000000000 --- a/src/dotnet/commands/dotnet-store/LocalizableStrings.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Store -{ - internal class LocalizableStrings - { - public const string AppDescription = "Stores the specified assemblies for the .NET Platform. By default, these will be optimized for the target runtime and framework."; - - public const string ProjectManifest = "PROJECT_MANIFEST"; - - public const string ProjectManifestDescription = "The XML file that contains the list of packages to be stored."; - - public const string OutputOption = "OUTPUT_DIR"; - - public const string OutputOptionDescription = "Output directory in which to store the given assemblies."; - - public const string FrameworkVersionOption = "FrameworkVersion"; - - public const string FrameworkVersionOptionDescription = "The Microsoft.NETCore.App package version that will be used to run the assemblies."; - - public const string SkipOptimizationOptionDescription = "Skips the optimization phase."; - - public const string SkipSymbolsOptionDescription = "Skips creating symbol files which can be used for profiling the optimized assemblies."; - - public const string IntermediateWorkingDirOption = "IntermediateWorkingDir"; - - public const string IntermediateWorkingDirOptionDescription = "The directory used by the command to execute."; - - public const string SpecifyManifests = "Specify at least one manifest with --manifest."; - - public const string IntermediateDirExists = "Intermediate working directory {0} already exists. Remove {0} or specify another directory with -w."; - } -} diff --git a/src/dotnet/commands/dotnet-store/LocalizableStrings.resx b/src/dotnet/commands/dotnet-store/LocalizableStrings.resx new file mode 100644 index 000000000..0b1b56e8b --- /dev/null +++ b/src/dotnet/commands/dotnet-store/LocalizableStrings.resx @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Stores the specified assemblies for the .NET Platform. By default, these will be optimized for the target runtime and framework. + + + PROJECT_MANIFEST + + + The XML file that contains the list of packages to be stored. + + + OUTPUT_DIR + + + Output directory in which to store the given assemblies. + + + FrameworkVersion + + + The Microsoft.NETCore.App package version that will be used to run the assemblies. + + + Skips the optimization phase. + + + Skips creating symbol files which can be used for profiling the optimized assemblies. + + + IntermediateWorkingDir + + + The directory used by the command to execute. + + + Specify at least one manifest with --manifest. + + + Intermediate working directory {0} already exists. Remove {0} or specify another directory with -w. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/LocalizableStrings.cs b/src/dotnet/commands/dotnet-test/LocalizableStrings.cs deleted file mode 100644 index fbe9ba5c0..000000000 --- a/src/dotnet/commands/dotnet-test/LocalizableStrings.cs +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Tools.Test -{ - internal class LocalizableStrings - { - public const string AppFullName = ".NET Test Driver"; - - public const string AppDescription = "Test Driver for the .NET Platform"; - - public const string CmdArgProject = "PROJECT"; - - public const string CmdArgDescription = "The project to test. Defaults to the current directory."; - - public const string CmdSettingsFile = "SETTINGS_FILE"; - - public const string CmdSettingsDescription = "Settings to use when running tests."; - - public const string CmdListTestsDescription = @"Lists discovered tests"; - - public const string CmdTestCaseFilterExpression = "EXPRESSION"; - - public const string CmdTestCaseFilterDescription = @"Run tests that match the given expression. - Examples: - Run tests with priority set to 1: --filter ""Priority = 1"" - Run a test with the specified full name: --filter ""FullyQualifiedName=Namespace.ClassName.MethodName"" - Run tests that contain the specified name: --filter ""FullyQualifiedName~Namespace.Class"" - More info on filtering support: https://aka.ms/vstest-filtering - "; - - public const string CmdTestAdapterPathDescription = @"Use custom adapters from the given path in the test run. - Example: --test-adapter-path "; - - public const string CmdTestAdapterPath = "PATH_TO_ADAPTER"; - - public const string CmdLoggerOption = "LoggerUri/FriendlyName"; - - public const string CmdLoggerDescription = @"Specify a logger for test results. - Example: --logger ""trx[;LogFileName=]"" - More info on logger arguments support:https://aka.ms/vstest-report"; - - public const string CmdConfiguration = "CONFIGURATION"; - - public const string CmdConfigDescription = "Configuration to use for building the project. Default for most projects is \"Debug\"."; - - public const string CmdFramework = "FRAMEWORK"; - - public const string CmdFrameworkDescription = @"Looks for test binaries for a specific framework"; - - public const string CmdOutputDir = "OUTPUT_DIR"; - - public const string CmdOutputDescription = @"Directory in which to find the binaries to be run"; - - public const string CmdPathToLogFile = "PATH_TO_FILE"; - - public const string CmdPathTologFileDescription = @"Enable verbose logs for test platform. - Logs are written to the provided file."; - - public const string CmdNoBuildDescription = @"Do not build project before testing."; - - public const string CmdResultsDirectoryDescription = @"The directory where the test results are going to be placed. The specified directory will be created if it does not exist. - Example: --results-directory "; - - public const string CmdPathToResultsDirectory = "PATH_TO_RESULTS_DIRECTORY"; - - public const string RunSettingsArgumentsDescription = @" - -RunSettings arguments: - Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after ""-- "". Note the space after --. - Use a space to separate multiple[name] =[value]. - More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments - Example: dotnet test -- MSTest.DeploymentEnabled=false MSTest.MapInconclusiveToFailed=True"; - - public const string cmdCollectFriendlyName = "DATA_COLLECTOR_FRIENDLY_NAME"; - - public const string cmdCollectDescription = @"Enables data collector for the test run. - More info here : https://aka.ms/vstest-collect"; - } -} diff --git a/src/dotnet/commands/dotnet-test/LocalizableStrings.resx b/src/dotnet/commands/dotnet-test/LocalizableStrings.resx new file mode 100644 index 000000000..1ff6b6d07 --- /dev/null +++ b/src/dotnet/commands/dotnet-test/LocalizableStrings.resx @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + .NET Test Driver + + + Test Driver for the .NET Platform + + + PROJECT + + + The project to test. Defaults to the current directory. + + + SETTINGS_FILE + + + Settings to use when running tests. + + + Lists discovered tests + + + EXPRESSION + + + Run tests that match the given expression. + Examples: + Run tests with priority set to 1: --filter "Priority = 1" + Run a test with the specified full name: --filter "FullyQualifiedName=Namespace.ClassName.MethodName" + Run tests that contain the specified name: --filter "FullyQualifiedName~Namespace.Class" + More info on filtering support: https://aka.ms/vstest-filtering + + + + Use custom adapters from the given path in the test run. + Example: --test-adapter-path <PATH_TO_ADAPTER> + + + PATH_TO_ADAPTER + + + LoggerUri/FriendlyName + + + Specify a logger for test results. + Example: --logger "trx[;LogFileName=<Defaults to unique file name>]" + More info on logger arguments support:https://aka.ms/vstest-report + + + CONFIGURATION + + + Configuration to use for building the project. Default for most projects is "Debug". + + + FRAMEWORK + + + Looks for test binaries for a specific framework + + + OUTPUT_DIR + + + Directory in which to find the binaries to be run + + + PATH_TO_FILE + + + Enable verbose logs for test platform. + Logs are written to the provided file. + + + Do not build project before testing. + + + The directory where the test results are going to be placed. The specified directory will be created if it does not exist. + Example: --results-directory <PATH_TO_RESULTS_DIRECTORY> + + + PATH_TO_RESULTS_DIRECTORY + + + + +RunSettings arguments: + Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. + Use a space to separate multiple[name] =[value]. + More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments + Example: dotnet test -- MSTest.DeploymentEnabled=false MSTest.MapInconclusiveToFailed=True + + + DATA_COLLECTOR_FRIENDLY_NAME + + + Enables data collector for the test run. + More info here : https://aka.ms/vstest-collect + + \ No newline at end of file diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 397741eae..67f099dd9 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -15,6 +15,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From dcbdc46b4473b866597dca45077b7b4c2a9bc646 Mon Sep 17 00:00:00 2001 From: Justin Emgarten Date: Wed, 7 Jun 2017 01:45:15 -0700 Subject: [PATCH 32/72] Updating NuGet to 4.3.0-preview3-4146 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3abf870a7..8ca4d2413 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -7,7 +7,7 @@ 1.6.0-beta2-25304 4.2.0-rc-170602-0 2.0.0-preview2-20170602-1 - 4.3.0-preview2-4095 + 4.3.0-preview3-4146 2.0.0-rel-20170518-512 15.3.0-preview-20170601-03 $(CLI_SharedFrameworkVersion) From 2ef5470bb0b489b6849e89902135394eaf958be2 Mon Sep 17 00:00:00 2001 From: Justin Emgarten Date: Wed, 7 Jun 2017 01:47:24 -0700 Subject: [PATCH 33/72] Updating NuGet to 4.3.0-preview3-4146 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 31347d2ed..140b26274 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -5,7 +5,7 @@ 15.3.0-preview-000246-05 2.0.0-rc5-61427-04 1.1.0-alpha-20170525-2 - 4.3.0-preview2-4095 + 4.3.0-preview3-4146 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta1-20170202-111 From ce61070a6993603e99ea3aa09d6cd09b84f8b0eb Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 7 Jun 2017 10:18:05 -0700 Subject: [PATCH 34/72] Updates to install scripts to consume the renaming packages at blob storage. Unpinning the CLI build from a specific version. --- run-build.ps1 | 4 ++-- run-build.sh | 2 +- scripts/obtain/dotnet-install.ps1 | 2 +- scripts/obtain/dotnet-install.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/run-build.ps1 b/run-build.ps1 index e37226c4e..d3bb1152b 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -80,8 +80,8 @@ $env:VSTEST_TRACE_BUILD=1 # install a stage0 $dotnetInstallPath = Join-Path $RepoRoot "scripts\obtain\dotnet-install.ps1" -Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview2-006349" -Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview2-006349" +Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" if ($LastExitCode -ne 0) { Write-Output "The .NET CLI installation failed with exit code $LastExitCode" diff --git a/run-build.sh b/run-build.sh index 2bb5b7b69..31497fb16 100755 --- a/run-build.sh +++ b/run-build.sh @@ -155,7 +155,7 @@ export VSTEST_TRACE_BUILD=1 DOTNET_MULTILEVEL_LOOKUP=0 # Install a stage 0 -(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --version "2.0.0-preview2-006349" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) +(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then diff --git a/scripts/obtain/dotnet-install.ps1 b/scripts/obtain/dotnet-install.ps1 index c7bd09a56..f4869d690 100644 --- a/scripts/obtain/dotnet-install.ps1 +++ b/scripts/obtain/dotnet-install.ps1 @@ -253,7 +253,7 @@ function Get-Download-Link([string]$AzureFeed, [string]$Channel, [string]$Specif $PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/dotnet-runtime-$SpecificVersion-win-$CLIArchitecture.zip" } else { - $PayloadURL = "$AzureFeed/Sdk/$SpecificVersion/dotnet-dev-$SpecificVersion-win-$CLIArchitecture.zip" + $PayloadURL = "$AzureFeed/Sdk/$SpecificVersion/dotnet-sdk-$SpecificVersion-win-$CLIArchitecture.zip" } Say-Verbose "Constructed primary payload URL: $PayloadURL" diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index 83ad96d17..c4d0c5850 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -400,7 +400,7 @@ construct_download_link() { if [ "$shared_runtime" = true ]; then download_link="$azure_feed/Runtime/$specific_version/dotnet-runtime-$specific_version-$osname-$normalized_architecture.tar.gz" else - download_link="$azure_feed/Sdk/$specific_version/dotnet-dev-$specific_version-$osname-$normalized_architecture.tar.gz" + download_link="$azure_feed/Sdk/$specific_version/dotnet-sdk-$specific_version-$osname-$normalized_architecture.tar.gz" fi echo "$download_link" From 967d8193e961cedfb02dbe84e4c353e80a799a2e Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Wed, 7 Jun 2017 18:24:15 +0000 Subject: [PATCH 35/72] Update CoreSetup to preview2-25407-01 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 197b08f34..5259a3442 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview2-25406-03 + 2.0.0-preview2-25407-01 15.3.0-preview-000246-05 2.3.0-beta2-61716-09 1.6.0-beta2-25304 @@ -16,8 +16,8 @@ 1.0.0-beta2-20170606-253 1.0.0-beta2-20170606-253 1.0.0-beta2-20170606-253 - 2.0.0-preview2-25406-03 - 2.0.0-preview2-25406-03 + 2.0.0-preview2-25407-01 + 2.0.0-preview2-25407-01 0.1.0-alpha-142 1.2.1-alpha-002130 0.2.0 From d1e7e3d77d0ca1aacb41c30171fb4584e1026078 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Wed, 7 Jun 2017 11:48:40 -0700 Subject: [PATCH 36/72] Add force restore option --- src/dotnet/commands/dotnet-restore/LocalizableStrings.resx | 3 +++ src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx index 6ffdc38b3..877cfa218 100644 --- a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx @@ -165,4 +165,7 @@ Set this flag to ignore project to project references and only restore the root project. + + Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs b/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs index f42acad6b..a50c464a3 100644 --- a/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs +++ b/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs @@ -60,6 +60,11 @@ namespace Microsoft.DotNet.Cli LocalizableStrings.CmdNoDependenciesOptionDescription, Accept.NoArguments() .ForwardAs("/p:RestoreRecursive=false")), + Create.Option( + "-f|--force", + LocalizableStrings.CmdForceRestoreOptionDescription, + Accept.NoArguments() + .ForwardAs("/p:RestoreForce=true")), CommonOptions.VerbosityOption()); } } \ No newline at end of file From 947271f8ec1b94806495dc150cde74410faf610a Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Wed, 7 Jun 2017 14:13:58 -0500 Subject: [PATCH 37/72] MSBuild 15.3.378 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 197b08f34..9caf551a6 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.0.0-preview2-25406-03 - 15.3.0-preview-000246-05 + 15.3.0-preview-000378-01 2.3.0-beta2-61716-09 1.6.0-beta2-25304 4.2.0-rc-170602-0 From 8b18eb2bd17c826cc5e6b994638110fd34764b7b Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Wed, 7 Jun 2017 14:13:58 -0500 Subject: [PATCH 38/72] MSBuild 15.3.378 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 140b26274..661765df5 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 1.1.2 - 15.3.0-preview-000246-05 + 15.3.0-preview-000378-01 2.0.0-rc5-61427-04 1.1.0-alpha-20170525-2 4.3.0-preview3-4146 From 1f85f5d9d1c050efc18de8e4578ef4d6afa9d268 Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 7 Jun 2017 14:16:34 -0700 Subject: [PATCH 39/72] Updating the version of the migration library This is to avoid a bunch of downgrade warnings due to NuGet. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5259a3442..d549d6444 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -19,7 +19,7 @@ 2.0.0-preview2-25407-01 2.0.0-preview2-25407-01 0.1.0-alpha-142 - 1.2.1-alpha-002130 + 1.2.1-alpha-002133 0.2.0 1.0.0-preview-000249 From ff0c65e8a6a941dc06646e4d34dbaf3bbc2326bb Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 7 Jun 2017 14:49:32 -0700 Subject: [PATCH 40/72] Update Microsoft.Net.SDK version to 2.0.0-preview2-20170607-3. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5259a3442..406e019a2 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -6,7 +6,7 @@ 2.3.0-beta2-61716-09 1.6.0-beta2-25304 4.2.0-rc-170602-0 - 2.0.0-preview2-20170602-1 + 2.0.0-preview2-20170607-3 4.3.0-preview3-4146 2.0.0-rel-20170518-512 15.3.0-preview-20170601-03 From 3a61ba1d2076e0f81fe7d675008bf943c36a1eba Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 7 Jun 2017 17:27:34 -0700 Subject: [PATCH 41/72] Add Microsoft.NET.Build.Extensions and corresponding DLLs in CLI layout --- Microsoft.DotNet.Cli.sln | 5 ++- build/DependencyVersions.props | 4 +- build/MSBuildExtensions.targets | 44 ++++++++++++++++++- ...undledSdks.proj => RestoreDependency.proj} | 25 ++++++----- build/sdks/sdks.csproj | 2 +- src/redist/redist.csproj | 13 ++++-- 6 files changed, 72 insertions(+), 21 deletions(-) rename build/{BundledSdks.proj => RestoreDependency.proj} (50%) diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index f1fed5401..26d5ac266 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26419.0 +VisualStudioVersion = 15.0.26510.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}" EndProject @@ -30,7 +30,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4 build\BuildDefaults.props = build\BuildDefaults.props build\BuildInfo.targets = build\BuildInfo.targets build\BundledRuntimes.props = build\BundledRuntimes.props - build\BundledSdks.proj = build\BundledSdks.proj build\BundledSdks.props = build\BundledSdks.props build\BundledTemplates.proj = build\BundledTemplates.proj build\BundledTemplates.props = build\BundledTemplates.props @@ -48,10 +47,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4 build\InstallerInfo.props = build\InstallerInfo.props build\Microsoft.DotNet.Cli.tasks = build\Microsoft.DotNet.Cli.tasks build\MSBuildExtensions.props = build\MSBuildExtensions.props + build\MSBuildExtensions.targets = build\MSBuildExtensions.targets build\OutputDirectories.props = build\OutputDirectories.props build\Package.targets = build\Package.targets build\Prepare.targets = build\Prepare.targets build\Publish.targets = build\Publish.targets + build\RestoreDependency.proj = build\RestoreDependency.proj build\sdks\sdks.csproj = build\sdks\sdks.csproj build\Signing.proj = build\Signing.proj build\Stage0.props = build\Stage0.props diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5259a3442..e1121ab67 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -6,8 +6,10 @@ 2.3.0-beta2-61716-09 1.6.0-beta2-25304 4.2.0-rc-170602-0 - 2.0.0-preview2-20170602-1 + 2.0.0-preview2-20170606-4 4.3.0-preview3-4146 + 2.0.0-preview2-20170606-4 + 2.0.0-preview2-25331-02 2.0.0-rel-20170518-512 15.3.0-preview-20170601-03 $(CLI_SharedFrameworkVersion) diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index b8d2d97e9..a335fde66 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -1,12 +1,54 @@ + DependsOnTargets="GenerateBundledVersionsProps;RestoreMSBuildExtensionsPackages"> + + + + + + + Microsoft.NET.Build.Extensions + 15.0 + $(NuGetPackagesDir)/$(MSBuildExtensionsPackageName.ToLower())/$(CLI_MSBuildExtensions_Version.ToLower()) + + NETStandard.Library.NETFramework + $(NuGetPackagesDir)/$(NETStandardLibraryNETFrameworkPackageName.ToLower())/$(CLI_NETStandardLibraryNETFrameworkVersion.ToLower()) + + + + + + + + + + + CLIBuildDll=$(CLIBuildDll); + NuGetPackagesDir=$(NuGetPackagesDir); + DependencyPackageName=%(ExtensionPackageToRestore.Identity); + DependencyPackageVersion=%(ExtensionPackageToRestore.Version); + Stage0Directory=$(Stage0Directory) + + + + + + + + Microsoft.NETCoreSdk.BundledVersions.props diff --git a/build/BundledSdks.proj b/build/RestoreDependency.proj similarity index 50% rename from build/BundledSdks.proj rename to build/RestoreDependency.proj index 4408ca0a4..f1c571477 100644 --- a/build/BundledSdks.proj +++ b/build/RestoreDependency.proj @@ -9,37 +9,38 @@ - - + - + + AdditionalParameters="/p:DependencyPackageName=$(DependencyPackageName) /p:DependencyPackageVersion=$(DependencyPackageVersion)" /> - + - $(NuGetPackagesDir)/$(SdkPackageName.ToLower())/$(SdkPackageVersion.ToLower()) + $(NuGetPackagesDir)/$(DependencyPackageName.ToLower())/$(DependencyPackageVersion.ToLower()) diff --git a/build/sdks/sdks.csproj b/build/sdks/sdks.csproj index 4c8158628..b7c9941c0 100755 --- a/build/sdks/sdks.csproj +++ b/build/sdks/sdks.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 2710a3973..dd4781066 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -112,9 +112,14 @@ DependsOnTargets="GenerateMSBuildExtensions" AfterTargets="Publish" BeforeTargets="GenerateCliRuntimeConfigurationFiles"> + + + $(PublishDir)/%(MSBuildExtensionsContent.DeploymentSubpath)%(RecursiveDir)%(Filename)%(Extension) + + + DestinationFiles="%(MSBuildExtensionsContent.DestinationPath)" /> $(PublishDir)/runtimes/any/native @@ -140,13 +145,13 @@ - + CLIBuildDll=$(CLIBuildDll); NuGetPackagesDir=$(NuGetPackagesDir); SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity); - SdkPackageName=%(BundledSdk.Identity); - SdkPackageVersion=%(BundledSdk.Version); + DependencyPackageName=%(BundledSdk.Identity); + DependencyPackageVersion=%(BundledSdk.Version); Stage0Directory=$(Stage0Directory) From 3fcad733b39963a73913539891be9d207f2d7b69 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 7 Jun 2017 17:33:01 -0700 Subject: [PATCH 42/72] Updating the 1.1.0 branding to preview1, from rc4, which we inherited from 1.0 when we branched. And updating the SDK version. --- branchinfo.txt | 2 +- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- packaging/windows/clisdk/registrykeys.wxs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/branchinfo.txt b/branchinfo.txt index d138bff9b..890a7e809 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -4,6 +4,6 @@ MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_VERSION=0 -RELEASE_SUFFIX=rc4 +RELEASE_SUFFIX=preview1 CHANNEL=rel-1.1.0 BRANCH_NAME=rel/1.1.0 diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 140b26274..16cce027f 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -4,7 +4,7 @@ 1.1.2 15.3.0-preview-000246-05 2.0.0-rc5-61427-04 - 1.1.0-alpha-20170525-2 + 1.1.0-alpha-20170607-4 4.3.0-preview3-4146 1.0.0-alpha-20170516-2-509 15.0.0 diff --git a/packaging/windows/clisdk/registrykeys.wxs b/packaging/windows/clisdk/registrykeys.wxs index 9db1d2115..0510d67f0 100644 --- a/packaging/windows/clisdk/registrykeys.wxs +++ b/packaging/windows/clisdk/registrykeys.wxs @@ -10,7 +10,7 @@ - + From dd76fec56482825a1aa3566a5be66b93c9579e22 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 1 Jun 2017 21:25:06 -0700 Subject: [PATCH 43/72] Implicit restore for build, pack, publish, run and test. --- src/dotnet/CommonOptions.cs | 6 +++ src/dotnet/commands/RestoringCommand.cs | 40 +++++++++++++++++++ .../commands/dotnet-build/BuildCommand.cs | 13 ++++-- .../dotnet-build/BuildCommandParser.cs | 1 + .../dotnet-msbuild/MSBuildForwardingApp.cs | 2 +- .../commands/dotnet-pack/PackCommand.cs | 13 +++--- .../commands/dotnet-pack/PackCommandParser.cs | 1 + src/dotnet/commands/dotnet-publish/Program.cs | 11 +++-- .../dotnet-publish/PublishCommandParser.cs | 1 + src/dotnet/commands/dotnet-run/RunCommand.cs | 9 ++++- .../commands/dotnet-run/RunCommandParser.cs | 4 +- src/dotnet/commands/dotnet-test/Program.cs | 10 +++-- .../commands/dotnet-test/TestCommandParser.cs | 1 + 13 files changed, 91 insertions(+), 21 deletions(-) create mode 100644 src/dotnet/commands/RestoringCommand.cs diff --git a/src/dotnet/CommonOptions.cs b/src/dotnet/CommonOptions.cs index 06047fcd3..e3103b64c 100644 --- a/src/dotnet/CommonOptions.cs +++ b/src/dotnet/CommonOptions.cs @@ -65,5 +65,11 @@ namespace Microsoft.DotNet.Cli public static ArgumentsRule DefaultToCurrentDirectory(this ArgumentsRule rule) => rule.With(defaultValue: () => PathUtility.EnsureTrailingSlash(Directory.GetCurrentDirectory())); + + public static Option NoRestoreOption() => + Create.Option( + "--no-restore", + CommonLocalizableStrings.NoRestoreDescription, + Accept.NoArguments()); } } \ No newline at end of file diff --git a/src/dotnet/commands/RestoringCommand.cs b/src/dotnet/commands/RestoringCommand.cs new file mode 100644 index 000000000..944457260 --- /dev/null +++ b/src/dotnet/commands/RestoringCommand.cs @@ -0,0 +1,40 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Collections.Generic; +using System.Linq; +using Microsoft.DotNet.Tools.MSBuild; +using Microsoft.DotNet.Tools.Restore; + +namespace Microsoft.DotNet.Tools +{ + public class RestoringCommand : MSBuildForwardingApp + { + private bool NoRestore { get; } + + private IEnumerable ArgsToForward { get; } + + public RestoringCommand(IEnumerable msbuildArgs, bool noRestore, string msbuildPath = null) + : base(msbuildArgs, msbuildPath) + { + NoRestore = noRestore; + ArgsToForward = msbuildArgs; + } + + public override int Execute() + { + if (ShouldRunImplicitRestore) + { + int exitCode = RestoreCommand.Run(ArgsToForward.ToArray()); + if (exitCode != 0) + { + return exitCode; + } + } + + return base.Execute(); + } + + private bool ShouldRunImplicitRestore => !NoRestore; + } +} \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-build/BuildCommand.cs b/src/dotnet/commands/dotnet-build/BuildCommand.cs index 691d5ef21..95539c662 100644 --- a/src/dotnet/commands/dotnet-build/BuildCommand.cs +++ b/src/dotnet/commands/dotnet-build/BuildCommand.cs @@ -2,18 +2,21 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Collections.Generic; +using System.Linq; using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Tools.MSBuild; +using Microsoft.DotNet.Tools; using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Tools.Restore; using Parser = Microsoft.DotNet.Cli.Parser; namespace Microsoft.DotNet.Tools.Build { - public class BuildCommand : MSBuildForwardingApp + public class BuildCommand : RestoringCommand { - public BuildCommand(IEnumerable msbuildArgs, string msbuildPath = null) - : base(msbuildArgs, msbuildPath) + public BuildCommand(IEnumerable msbuildArgs, bool noRestore, string msbuildPath = null) + : base(msbuildArgs, noRestore, msbuildPath) { } @@ -44,7 +47,9 @@ namespace Microsoft.DotNet.Tools.Build msbuildArgs.Add($"/clp:Summary"); - return new BuildCommand(msbuildArgs, msbuildPath); + bool noRestore = appliedBuildOptions.HasOption("--no-restore"); + + return new BuildCommand(msbuildArgs, noRestore, msbuildPath); } public static int Run(string[] args) diff --git a/src/dotnet/commands/dotnet-build/BuildCommandParser.cs b/src/dotnet/commands/dotnet-build/BuildCommandParser.cs index eaa00740f..d911db785 100644 --- a/src/dotnet/commands/dotnet-build/BuildCommandParser.cs +++ b/src/dotnet/commands/dotnet-build/BuildCommandParser.cs @@ -37,6 +37,7 @@ namespace Microsoft.DotNet.Cli LocalizableStrings.NoDependenciesOptionDescription, Accept.NoArguments() .ForwardAs("/p:BuildProjectReferences=false")), + CommonOptions.NoRestoreOption(), CommonOptions.VerbosityOption()); } } \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs b/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs index b3edf4abe..dbf81dd6e 100644 --- a/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs +++ b/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs @@ -58,7 +58,7 @@ namespace Microsoft.DotNet.Tools.MSBuild return ret; } - public int Execute() + public virtual int Execute() { return GetProcessStartInfo().Execute(); } diff --git a/src/dotnet/commands/dotnet-pack/PackCommand.cs b/src/dotnet/commands/dotnet-pack/PackCommand.cs index 2821c23d8..0c7146356 100644 --- a/src/dotnet/commands/dotnet-pack/PackCommand.cs +++ b/src/dotnet/commands/dotnet-pack/PackCommand.cs @@ -5,16 +5,17 @@ using System.Collections.Generic; using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Tools.MSBuild; +using Microsoft.DotNet.Tools; using Microsoft.DotNet.Cli; using System.Diagnostics; using Parser = Microsoft.DotNet.Cli.Parser; namespace Microsoft.DotNet.Tools.Pack { - public class PackCommand : MSBuildForwardingApp + public class PackCommand : RestoringCommand { - public PackCommand(IEnumerable msbuildArgs, string msbuildPath = null) - : base(msbuildArgs, msbuildPath) + public PackCommand(IEnumerable msbuildArgs, bool noRestore, string msbuildPath = null) + : base(msbuildArgs, noRestore, msbuildPath) { } @@ -30,14 +31,16 @@ namespace Microsoft.DotNet.Tools.Pack var msbuildArgs = new List() { - "/t:pack" + "/t:pack" }; msbuildArgs.AddRange(parsedPack.OptionValuesToBeForwarded()); msbuildArgs.AddRange(parsedPack.Arguments); - return new PackCommand(msbuildArgs, msbuildPath); + bool noRestore = parsedPack.HasOption("--no-restore"); + + return new PackCommand(msbuildArgs, noRestore, msbuildPath); } public static int Run(string[] args) diff --git a/src/dotnet/commands/dotnet-pack/PackCommandParser.cs b/src/dotnet/commands/dotnet-pack/PackCommandParser.cs index 56be1ee3d..1e1b708ab 100644 --- a/src/dotnet/commands/dotnet-pack/PackCommandParser.cs +++ b/src/dotnet/commands/dotnet-pack/PackCommandParser.cs @@ -39,6 +39,7 @@ namespace Microsoft.DotNet.Cli "-s|--serviceable", LocalizableStrings.CmdServiceableDescription, Accept.NoArguments().ForwardAs("/p:Serviceable=true")), + CommonOptions.NoRestoreOption(), CommonOptions.VerbosityOption()); } } \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/Program.cs b/src/dotnet/commands/dotnet-publish/Program.cs index 8c8fbc9cf..d4337e107 100644 --- a/src/dotnet/commands/dotnet-publish/Program.cs +++ b/src/dotnet/commands/dotnet-publish/Program.cs @@ -5,15 +5,16 @@ using System.Collections.Generic; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Tools; using Microsoft.DotNet.Tools.MSBuild; using Parser = Microsoft.DotNet.Cli.Parser; namespace Microsoft.DotNet.Tools.Publish { - public class PublishCommand : MSBuildForwardingApp + public class PublishCommand : RestoringCommand { - private PublishCommand(IEnumerable msbuildArgs, string msbuildPath = null) - : base(msbuildArgs, msbuildPath) + private PublishCommand(IEnumerable msbuildArgs, bool noRestore, string msbuildPath = null) + : base(msbuildArgs, noRestore, msbuildPath) { } @@ -37,7 +38,9 @@ namespace Microsoft.DotNet.Tools.Publish msbuildArgs.AddRange(appliedPublishOption.Arguments); - return new PublishCommand(msbuildArgs, msbuildPath); + bool noRestore = appliedPublishOption.HasOption("--no-restore"); + + return new PublishCommand(msbuildArgs, noRestore, msbuildPath); } public static int Run(string[] args) diff --git a/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs b/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs index 600d4c459..ef167402c 100644 --- a/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs +++ b/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs @@ -41,6 +41,7 @@ namespace Microsoft.DotNet.Cli string value = o.Arguments.Any() ? o.Arguments.Single() : "true"; return $"/p:SelfContained={value}"; })), + CommonOptions.NoRestoreOption(), CommonOptions.VerbosityOption()); } } \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-run/RunCommand.cs b/src/dotnet/commands/dotnet-run/RunCommand.cs index 3401f1ac1..11e137f88 100644 --- a/src/dotnet/commands/dotnet-run/RunCommand.cs +++ b/src/dotnet/commands/dotnet-run/RunCommand.cs @@ -7,6 +7,7 @@ using System.IO; using System.Linq; using Microsoft.Build.Evaluation; using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Tools; using Microsoft.DotNet.Tools.MSBuild; using Microsoft.DotNet.Tools.Run.LaunchSettings; @@ -19,6 +20,7 @@ namespace Microsoft.DotNet.Tools.Run public bool NoBuild { get; private set; } public string Project { get; private set; } public IReadOnlyCollection Args { get; private set; } + public bool NoRestore { get; private set; } private List _args; private bool ShouldBuild => !NoBuild; @@ -55,6 +57,7 @@ namespace Microsoft.DotNet.Tools.Run string project, string launchProfile, bool noLaunchProfile, + bool noRestore, IReadOnlyCollection args) { Configuration = configuration; @@ -64,6 +67,7 @@ namespace Microsoft.DotNet.Tools.Run LaunchProfile = launchProfile; NoLaunchProfile = noLaunchProfile; Args = args; + NoRestore = noRestore; } public RunCommand MakeNewWithReplaced(string configuration = null, @@ -72,6 +76,7 @@ namespace Microsoft.DotNet.Tools.Run string project = null, string launchProfile = null, bool? noLaunchProfile = null, + bool? noRestore = null, IReadOnlyCollection args = null) { return new RunCommand( @@ -81,6 +86,7 @@ namespace Microsoft.DotNet.Tools.Run project ?? this.Project, launchProfile ?? this.LaunchProfile, noLaunchProfile ?? this.NoLaunchProfile, + noRestore ?? this.NoRestore, args ?? this.Args ); } @@ -142,8 +148,7 @@ namespace Microsoft.DotNet.Tools.Run buildArgs.Add($"/p:TargetFramework={Framework}"); } - var buildResult = new MSBuildForwardingApp(buildArgs).Execute(); - + var buildResult = new RestoringCommand(buildArgs, NoRestore).Execute(); if (buildResult != 0) { Reporter.Error.WriteLine(); diff --git a/src/dotnet/commands/dotnet-run/RunCommandParser.cs b/src/dotnet/commands/dotnet-run/RunCommandParser.cs index ec0839c88..e608bd4d5 100644 --- a/src/dotnet/commands/dotnet-run/RunCommandParser.cs +++ b/src/dotnet/commands/dotnet-run/RunCommandParser.cs @@ -23,6 +23,7 @@ namespace Microsoft.DotNet.Cli project: o.SingleArgumentOrDefault("--project"), launchProfile: o.SingleArgumentOrDefault("--launch-profile"), noLaunchProfile: o.HasOption("--no-launch-profile"), + noRestore: o.HasOption("--no-restore"), args: o.Arguments )), options: new[] @@ -45,7 +46,8 @@ namespace Microsoft.DotNet.Cli Create.Option( "--no-build", LocalizableStrings.CommandOptionNoBuildDescription, - Accept.NoArguments()) + Accept.NoArguments()), + CommonOptions.NoRestoreOption(), }); } } \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/Program.cs b/src/dotnet/commands/dotnet-test/Program.cs index a7f9a0380..805639d9e 100644 --- a/src/dotnet/commands/dotnet-test/Program.cs +++ b/src/dotnet/commands/dotnet-test/Program.cs @@ -14,10 +14,10 @@ using Parser = Microsoft.DotNet.Cli.Parser; namespace Microsoft.DotNet.Tools.Test { - public class TestCommand : MSBuildForwardingApp + public class TestCommand : RestoringCommand { - public TestCommand(IEnumerable msbuildArgs, string msbuildPath = null) - : base(msbuildArgs, msbuildPath) + public TestCommand(IEnumerable msbuildArgs, bool noRestore, string msbuildPath = null) + : base(msbuildArgs, noRestore, msbuildPath) { } @@ -65,7 +65,9 @@ namespace Microsoft.DotNet.Tools.Test } } - return new TestCommand(msbuildArgs, msbuildPath); + bool noRestore = parsedTest.HasOption("--no-restore"); + + return new TestCommand(msbuildArgs, noRestore, msbuildPath); } public static int Run(string[] args) diff --git a/src/dotnet/commands/dotnet-test/TestCommandParser.cs b/src/dotnet/commands/dotnet-test/TestCommandParser.cs index a17aa20a7..c8b830f54 100644 --- a/src/dotnet/commands/dotnet-test/TestCommandParser.cs +++ b/src/dotnet/commands/dotnet-test/TestCommandParser.cs @@ -81,6 +81,7 @@ namespace Microsoft.DotNet.Cli Accept.OneOrMoreArguments() .With(name: LocalizableStrings.cmdCollectFriendlyName) .ForwardAsSingle(o => $"/p:VSTestCollect=\"{string.Join(";", o.Arguments)}\"")), + CommonOptions.NoRestoreOption(), CommonOptions.VerbosityOption()); private static string GetSemiColonEsacpedstring(string arg) From 3231295acf2cdd51832315ff26d721e33298770f Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 2 Jun 2017 23:32:53 -0700 Subject: [PATCH 44/72] Fixing a bug in the restore option where specifying verbosity through /v was not entirely honored. Adding tests for implicit restore for all the affected commands. Fixing an issue where the command target was being passed to the restore command during implicit restore. Adding restore params to all commands with implicit restore. Also, implicitly set the restore output to quiet. Adding tests for the no-restore option. --- src/dotnet/commands/RestoringCommand.cs | 25 ++- .../dotnet-build/BuildCommandParser.cs | 59 ++++--- .../commands/dotnet-pack/PackCommandParser.cs | 70 +++++--- .../dotnet-publish/PublishCommandParser.cs | 74 +++++---- src/dotnet/commands/dotnet-restore/Program.cs | 11 +- .../dotnet-restore/RestoreCommandParser.cs | 50 ++++-- src/dotnet/commands/dotnet-run/RunCommand.cs | 15 +- .../commands/dotnet-run/RunCommandParser.cs | 21 ++- .../commands/dotnet-test/TestCommandParser.cs | 154 ++++++++++-------- .../GivenDotnetBuildBuildsCsproj.cs | 31 +++- test/dotnet-pack.Tests/PackTests.cs | 31 +++- .../GivenDotnetPublishPublishesProjects.cs | 35 +++- .../GivenDotnetRunRunsCsProj.cs | 36 +++- ...enDotnetTestBuildsAndRunsTestfromCsproj.cs | 42 ++++- 14 files changed, 475 insertions(+), 179 deletions(-) diff --git a/src/dotnet/commands/RestoringCommand.cs b/src/dotnet/commands/RestoringCommand.cs index 944457260..89e4afa5b 100644 --- a/src/dotnet/commands/RestoringCommand.cs +++ b/src/dotnet/commands/RestoringCommand.cs @@ -14,6 +14,27 @@ namespace Microsoft.DotNet.Tools private IEnumerable ArgsToForward { get; } + private IEnumerable ArgsToForwardToRestore + { + get + { + var restoreArguments = ArgsToForward.Where(a => + !a.StartsWith("/t:") && + !a.StartsWith("/target:") && + !a.StartsWith("/ConsoleLoggerParameters:") && + !a.StartsWith("/clp:")); + + if (!restoreArguments.Any(a => a.StartsWith("/v:") || a.StartsWith("/verbosity:"))) + { + restoreArguments = restoreArguments.Concat(new string[] { "/v:q" }); + } + + return restoreArguments; + } + } + + private bool ShouldRunImplicitRestore => !NoRestore; + public RestoringCommand(IEnumerable msbuildArgs, bool noRestore, string msbuildPath = null) : base(msbuildArgs, msbuildPath) { @@ -25,7 +46,7 @@ namespace Microsoft.DotNet.Tools { if (ShouldRunImplicitRestore) { - int exitCode = RestoreCommand.Run(ArgsToForward.ToArray()); + int exitCode = RestoreCommand.Run(ArgsToForwardToRestore.ToArray()); if (exitCode != 0) { return exitCode; @@ -34,7 +55,5 @@ namespace Microsoft.DotNet.Tools return base.Execute(); } - - private bool ShouldRunImplicitRestore => !NoRestore; } } \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-build/BuildCommandParser.cs b/src/dotnet/commands/dotnet-build/BuildCommandParser.cs index d911db785..60b1a4b1c 100644 --- a/src/dotnet/commands/dotnet-build/BuildCommandParser.cs +++ b/src/dotnet/commands/dotnet-build/BuildCommandParser.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using System.Collections.Generic; using System.Linq; using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Tools; @@ -18,26 +19,42 @@ namespace Microsoft.DotNet.Cli .With(name: CommonLocalizableStrings.CmdProjectFile, description: "The MSBuild project file to build. If a project file is not specified, MSBuild searches the current working directory for a file that has a file extension that ends in `proj` and uses that file."), - CommonOptions.HelpOption(), - Create.Option( - "-o|--output", - LocalizableStrings.OutputOptionDescription, - Accept.ExactlyOneArgument() - .With(name: LocalizableStrings.OutputOptionName) - .ForwardAsSingle(o => $"/p:OutputPath={o.Arguments.Single()}")), - CommonOptions.FrameworkOption(), - CommonOptions.RuntimeOption(), - CommonOptions.ConfigurationOption(), - CommonOptions.VersionSuffixOption(), - Create.Option( - "--no-incremental", - LocalizableStrings.NoIncrementialOptionDescription), - Create.Option( - "--no-dependencies", - LocalizableStrings.NoDependenciesOptionDescription, - Accept.NoArguments() - .ForwardAs("/p:BuildProjectReferences=false")), - CommonOptions.NoRestoreOption(), - CommonOptions.VerbosityOption()); + FullBuildOptions + ); + + private static Option[] FullBuildOptions + { + get + { + var fullBuildOptions = new List - \ No newline at end of file + diff --git a/build/Branding.props b/build/Branding.props index 96068e439..07cf66d29 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -13,14 +13,21 @@ '$(Rid)' == 'fedora.24-x64' OR '$(Rid)' == 'opensuse.42.1-x64' ">$(Rid) $(OSName)-$(Architecture) + $(HostRid) + $(HostOSName)-$(Architecture) dotnet-sdk-internal dotnet-sdk-debug dotnet-sdk $(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid) + + $(ArtifactNameSdkDebug)-$(SdkVersion)-$(ProductMonikerRid) $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid) - + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(HostMonikerRid) diff --git a/build/BuildInfo.targets b/build/BuildInfo.targets index 751f10737..fa7089b57 100644 --- a/build/BuildInfo.targets +++ b/build/BuildInfo.targets @@ -1,4 +1,23 @@ + + + + linux-x64 + x64 + linux + linux + + + + + $(HostRid) + x64 + $(HostOSName) + $(HostOSPlatform) + + + + @@ -7,14 +26,8 @@ - - - $(HostRid) - x64 - $(HostOSName) - $(HostOSPlatform) - - + + <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Rid>$(Rid)</Rid> diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 4484c7dc8..cd058b4de 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -1,7 +1,7 @@ - $(Rid) - $(ProductMonikerRid) + $(HostRid) + $(HostMonikerRid) -internal diff --git a/build/FileExtensions.props b/build/FileExtensions.props index cc9f7e79c..a6c6fca35 100644 --- a/build/FileExtensions.props +++ b/build/FileExtensions.props @@ -1,23 +1,23 @@ - .zip - .tar.gz + .zip + .tar.gz - .msi - .pkg - .deb + .msi + .pkg + .deb - .exe - $(InstallerExtension) - $(InstallerExtension) + .exe + $(InstallerExtension) + $(InstallerExtension) lib - + .so - .dll - .dylib + .dll + .dylib .exe diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 9310623cc..32721227c 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -10,11 +10,11 @@ TestDebuild; BuildSdkDeb; TestSdkDeb;" - Condition=" '$(OSName)' == 'ubuntu' OR '$(OSName)' == 'debian' " + Condition=" '$(HostOSName)' == 'ubuntu' OR '$(HostOSName)' == 'debian' " Outputs="@(GeneratedInstallers)"/> + From c89618603a7a3bbca0ea3ca582d169066775fe3c Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 7 Jun 2017 14:43:48 -0700 Subject: [PATCH 47/72] Changing the parser description for commands that have implicit restore. --- src/dotnet/CommonLocalizableStrings.resx | 3 + .../commands/CommandWithRestoreOptions.cs | 39 +++++ src/dotnet/commands/RestoringCommand.cs | 27 ++-- .../dotnet-build/BuildCommandParser.cs | 60 +++---- .../commands/dotnet-pack/PackCommandParser.cs | 72 ++++----- .../dotnet-publish/PublishCommandParser.cs | 76 ++++----- .../dotnet-restore/RestoreCommandParser.cs | 36 ++--- .../commands/dotnet-run/RunCommandParser.cs | 19 +-- .../commands/dotnet-test/TestCommandParser.cs | 150 ++++++++---------- 9 files changed, 225 insertions(+), 257 deletions(-) create mode 100644 src/dotnet/commands/CommandWithRestoreOptions.cs diff --git a/src/dotnet/CommonLocalizableStrings.resx b/src/dotnet/CommonLocalizableStrings.resx index 708b0daf3..a2f5c3270 100644 --- a/src/dotnet/CommonLocalizableStrings.resx +++ b/src/dotnet/CommonLocalizableStrings.resx @@ -520,4 +520,7 @@ Show help information. + + Does not do an implicit restore when executing the command. + \ No newline at end of file diff --git a/src/dotnet/commands/CommandWithRestoreOptions.cs b/src/dotnet/commands/CommandWithRestoreOptions.cs new file mode 100644 index 000000000..aaf9748d5 --- /dev/null +++ b/src/dotnet/commands/CommandWithRestoreOptions.cs @@ -0,0 +1,39 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Collections.Generic; +using System.Linq; +using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.CommandLine; +using Microsoft.DotNet.Tools.MSBuild; +using Microsoft.DotNet.Tools.Restore; + +namespace Microsoft.DotNet.Tools +{ + public static class CreateWithRestoreOptions + { + public static Command Command( + string name, + string help, + ArgumentsRule arguments, + params Option[] options) + { + return Create.Command(name, help, arguments, RestoreCommandParser.AddImplicitRestoreOptions(options)); + } + + public static Command Command( + string name, + string help, + ArgumentsRule arguments, + bool treatUnmatchedTokensAsErrors, + params Option[] options) + { + return Create.Command( + name, + help, + arguments, + treatUnmatchedTokensAsErrors, + RestoreCommandParser.AddImplicitRestoreOptions(options)); + } + } +} \ No newline at end of file diff --git a/src/dotnet/commands/RestoringCommand.cs b/src/dotnet/commands/RestoringCommand.cs index 89e4afa5b..67c114577 100644 --- a/src/dotnet/commands/RestoringCommand.cs +++ b/src/dotnet/commands/RestoringCommand.cs @@ -14,23 +14,20 @@ namespace Microsoft.DotNet.Tools private IEnumerable ArgsToForward { get; } - private IEnumerable ArgsToForwardToRestore + private IEnumerable ArgsToForwardToRestore() { - get + var restoreArguments = ArgsToForward.Where(a => + !a.StartsWith("/t:") && + !a.StartsWith("/target:") && + !a.StartsWith("/ConsoleLoggerParameters:") && + !a.StartsWith("/clp:")); + + if (!restoreArguments.Any(a => a.StartsWith("/v:") || a.StartsWith("/verbosity:"))) { - var restoreArguments = ArgsToForward.Where(a => - !a.StartsWith("/t:") && - !a.StartsWith("/target:") && - !a.StartsWith("/ConsoleLoggerParameters:") && - !a.StartsWith("/clp:")); - - if (!restoreArguments.Any(a => a.StartsWith("/v:") || a.StartsWith("/verbosity:"))) - { - restoreArguments = restoreArguments.Concat(new string[] { "/v:q" }); - } - - return restoreArguments; + restoreArguments = restoreArguments.Concat(new string[] { "/v:q" }); } + + return restoreArguments; } private bool ShouldRunImplicitRestore => !NoRestore; @@ -46,7 +43,7 @@ namespace Microsoft.DotNet.Tools { if (ShouldRunImplicitRestore) { - int exitCode = RestoreCommand.Run(ArgsToForwardToRestore.ToArray()); + int exitCode = RestoreCommand.Run(ArgsToForwardToRestore().ToArray()); if (exitCode != 0) { return exitCode; diff --git a/src/dotnet/commands/dotnet-build/BuildCommandParser.cs b/src/dotnet/commands/dotnet-build/BuildCommandParser.cs index 60b1a4b1c..76da0258e 100644 --- a/src/dotnet/commands/dotnet-build/BuildCommandParser.cs +++ b/src/dotnet/commands/dotnet-build/BuildCommandParser.cs @@ -12,49 +12,33 @@ namespace Microsoft.DotNet.Cli internal static class BuildCommandParser { public static Command Build() => - Create.Command( + CreateWithRestoreOptions.Command( "build", LocalizableStrings.AppFullName, Accept.ZeroOrMoreArguments() .With(name: CommonLocalizableStrings.CmdProjectFile, description: "The MSBuild project file to build. If a project file is not specified, MSBuild searches the current working directory for a file that has a file extension that ends in `proj` and uses that file."), - FullBuildOptions - ); - - private static Option[] FullBuildOptions - { - get - { - var fullBuildOptions = new List From 3f606e545e56b331e5787ec9f876750f3703d4c2 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 8 Jun 2017 12:10:40 +0100 Subject: [PATCH 49/72] Update SpaTemplateVersion to 1.0.0-preview-000286 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a78a19083..5ff235da0 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -21,7 +21,7 @@ 0.1.0-alpha-142 1.2.1-alpha-002133 0.2.0 - 1.0.0-preview-000249 + 1.0.0-preview-000286 timestamped From a35d2947dae62513a018c67fa302a7a677f30425 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 8 Jun 2017 00:12:42 -0700 Subject: [PATCH 50/72] Fix for win and mac --- build/BackwardsCompatibilityRuntimes.props | 6 ++-- build/BuildInfo.targets | 35 +++++++++------------- build/BundledRuntimes.props | 8 ++--- 3 files changed, 21 insertions(+), 28 deletions(-) diff --git a/build/BackwardsCompatibilityRuntimes.props b/build/BackwardsCompatibilityRuntimes.props index 528d27c75..e63013084 100644 --- a/build/BackwardsCompatibilityRuntimes.props +++ b/build/BackwardsCompatibilityRuntimes.props @@ -5,13 +5,13 @@ 1.1.0 1.1.0 - dotnet-host-$(HostMonikerRid).$(BackwardsCompatibility110SharedHostVersion)$(OSName) + dotnet-host-$(HostMonikerRid).$(BackwardsCompatibility110SharedHostVersion)$(InstallerExtension) $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName) - dotnet-hostfxr-$(HostMonikerRid).$(BackwardsCompatibility110HostFxrVersion)$(OSName) + dotnet-hostfxr-$(HostMonikerRid).$(BackwardsCompatibility110HostFxrVersion)$(InstallerExtension) $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName) - dotnet-sharedframework-$(HostMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(OSName) + dotnet-sharedframework-$(HostMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(InstallerExtension) $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName) dotnet-$(HostMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(ArchiveExtension) diff --git a/build/BuildInfo.targets b/build/BuildInfo.targets index fa7089b57..df28e1980 100644 --- a/build/BuildInfo.targets +++ b/build/BuildInfo.targets @@ -1,23 +1,4 @@ - - - - linux-x64 - x64 - linux - linux - - - - - $(HostRid) - x64 - $(HostOSName) - $(HostOSPlatform) - - - - @@ -26,8 +7,20 @@ - - + + + True + $(HostRid) + x64 + $(HostOSName) + $(HostOSPlatform) + + linux-x64 + x64 + linux + linux + + <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Rid>$(Rid)</Rid> diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index cd058b4de..2d79fa46f 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -4,7 +4,7 @@ $(HostMonikerRid) - -internal + -internal dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension) @@ -34,8 +34,8 @@ $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeVersion) - $(OSName)$(Architecture) - $(OSName) + $(HostOSName)$(Architecture) + $(HostOSName) linux -$(AspNetCoreCoherenceTimestamp) @@ -43,7 +43,7 @@ Build.RS.$(AspNetCoreRuntimeInstallerArchiveFileNameOSToken)$(AspNetCoreRuntimeInstallerArchiveSuffix)$(ArchiveExtension) $(PackagesDirectory)/$(AspNetCoreRuntimeInstallerArchiveFileName) - AspNetCorePackageStoreLib$(Architecture)$(AspNetCoreRuntimeStoreSuffix).wixlib + AspNetCorePackageStoreLib$(Architecture)$(AspNetCoreRuntimeStoreSuffix).wixlib $(PackagesDirectory)/$(AspNetCoreRuntimeInstallerWixLibFileName) From bc24634f8cea2459ea1df7be6f4367578967da3c Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 8 Jun 2017 13:33:17 -0700 Subject: [PATCH 51/72] Add comment clarifying why net* folders from Microsoft.NET.Build.Extensions package are excluded --- build/MSBuildExtensions.targets | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index a335fde66..ed4d4addc 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -5,10 +5,20 @@ + + + From ac8a4644501c3ec526d8d6d4b3ab4d9a0b5ed028 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 8 Jun 2017 15:25:32 -0700 Subject: [PATCH 52/72] Update to SDK and MS.NET.Build.Extensions versions with latest fixes, fix RestoreDependency.proj to work when SdkLayoutDirectory isn't set --- build/DependencyVersions.props | 4 ++-- build/RestoreDependency.proj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e1121ab67..339737cd5 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -6,9 +6,9 @@ 2.3.0-beta2-61716-09 1.6.0-beta2-25304 4.2.0-rc-170602-0 - 2.0.0-preview2-20170606-4 + 2.0.0-preview2-20170608-2 4.3.0-preview3-4146 - 2.0.0-preview2-20170606-4 + 2.0.0-preview2-20170608-2 2.0.0-preview2-25331-02 2.0.0-rel-20170518-512 15.3.0-preview-20170601-03 diff --git a/build/RestoreDependency.proj b/build/RestoreDependency.proj index f1c571477..142f5e929 100644 --- a/build/RestoreDependency.proj +++ b/build/RestoreDependency.proj @@ -1,4 +1,4 @@ - + From c19ff8cc1357e266119d1bc8d62354a7252ec697 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 8 Jun 2017 15:40:22 -0700 Subject: [PATCH 53/72] Add test for consuming .NET Standard 2.0 library from .NET Framework 4.6.1 project --- .../TestApp/Program.cs | 15 +++++++ .../TestApp/TestApp.csproj | 12 ++++++ .../TestLibrary/Helper.cs | 24 +++++++++++ .../TestLibrary/TestLibrary.csproj | 7 ++++ .../GivenNetFrameworkSupportsNetStandard2.cs | 40 +++++++++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestApp/Program.cs create mode 100644 TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestApp/TestApp.csproj create mode 100644 TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestLibrary/Helper.cs create mode 100644 TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestLibrary/TestLibrary.csproj create mode 100644 test/EndToEnd/GivenNetFrameworkSupportsNetStandard2.cs diff --git a/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestApp/Program.cs b/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestApp/Program.cs new file mode 100644 index 000000000..a168da37c --- /dev/null +++ b/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestApp/Program.cs @@ -0,0 +1,15 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; + +namespace TestApp +{ + class Program + { + public static void Main(string[] args) + { + Console.WriteLine(TestLibrary.Helper.GetMessage()); + } + } +} diff --git a/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestApp/TestApp.csproj b/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestApp/TestApp.csproj new file mode 100644 index 000000000..4f3707aba --- /dev/null +++ b/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestApp/TestApp.csproj @@ -0,0 +1,12 @@ + + + + Exe + net461 + + + + + + + diff --git a/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestLibrary/Helper.cs b/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestLibrary/Helper.cs new file mode 100644 index 000000000..67b32cfdb --- /dev/null +++ b/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestLibrary/Helper.cs @@ -0,0 +1,24 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; + +namespace TestLibrary +{ + public static class Helper + { + /// + /// Gets the message from the helper. This comment is here to help test XML documentation file generation, please do not remove it. + /// + /// A message + public static string GetMessage() + { + return "This string came from the test library!"; + } + + public static void SayHi() + { + Console.WriteLine("Hello there!"); + } + } +} \ No newline at end of file diff --git a/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestLibrary/TestLibrary.csproj b/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestLibrary/TestLibrary.csproj new file mode 100644 index 000000000..9f5c4f4ab --- /dev/null +++ b/TestAssets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestLibrary/TestLibrary.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.0 + + + diff --git a/test/EndToEnd/GivenNetFrameworkSupportsNetStandard2.cs b/test/EndToEnd/GivenNetFrameworkSupportsNetStandard2.cs new file mode 100644 index 000000000..97398a685 --- /dev/null +++ b/test/EndToEnd/GivenNetFrameworkSupportsNetStandard2.cs @@ -0,0 +1,40 @@ +using FluentAssertions; +using Microsoft.DotNet.TestFramework; +using Microsoft.DotNet.Tools.Test.Utilities; +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; + +namespace EndToEnd +{ + public class GivenNetFrameworkSupportsNetStandard2 : TestBase + { + [WindowsOnlyFact] + public void ANET461ProjectCanReferenceANETStandardProject() + { + var _testInstance = TestAssets.Get(TestAssetKinds.DesktopTestProjects, "NETFrameworkReferenceNETStandard20") + .CreateInstance() + .WithSourceFiles(); + + string projectDirectory = Path.Combine(_testInstance.Root.FullName, "TestApp"); + + new RestoreCommand() + .WithWorkingDirectory(projectDirectory) + .Execute() + .Should().Pass(); + + new BuildCommand() + .WithWorkingDirectory(projectDirectory) + .Execute() + .Should().Pass(); + + new RunCommand() + .WithWorkingDirectory(projectDirectory) + .ExecuteWithCapturedOutput() + .Should().Pass() + .And.HaveStdOutContaining("This string came from the test library!"); + + } + } +} From 0e0c31a6c40326602c98266798975a0b0d3a6d92 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Thu, 8 Jun 2017 16:26:09 -0700 Subject: [PATCH 54/72] Update to template build 256 to fix Web Auth scenarios --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 6b7eddf6e..97f492fcb 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -14,8 +14,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170608-254 - 1.0.0-beta2-20170608-254 - 1.0.0-beta2-20170608-254 + 1.0.0-beta2-20170608-256 + 1.0.0-beta2-20170608-256 2.0.0-preview2-25407-01 2.0.0-preview2-25407-01 0.1.0-alpha-142 From 0b19d6889e97d7a023718285cf630fe85bad3676 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 8 Jun 2017 15:51:27 -0700 Subject: [PATCH 55/72] Updating the vstest.console to use the same runtime that is shipping with the CLI. --- .../dotnet-cli-build/ReplaceFileContents.cs | 4 +++- src/redist/redist.csproj | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/build_projects/dotnet-cli-build/ReplaceFileContents.cs b/build_projects/dotnet-cli-build/ReplaceFileContents.cs index 504175559..b0baf4179 100644 --- a/build_projects/dotnet-cli-build/ReplaceFileContents.cs +++ b/build_projects/dotnet-cli-build/ReplaceFileContents.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using System.Text.RegularExpressions; using Microsoft.Build.Utilities; using Microsoft.Build.Framework; @@ -84,7 +85,8 @@ namespace Microsoft.DotNet.Cli.Build var replacementPattern = ReplacementPatterns[i].ItemSpec; var replacementString = ReplacementStrings[i].ItemSpec; - outText = outText.Replace(replacementPattern, replacementString); + var regex = new Regex(replacementPattern); + outText = regex.Replace(outText, replacementString); } return outText; diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 2710a3973..c5a766bdd 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -264,4 +264,18 @@ + + + + $(PublishDir)/vstest.console.runtimeconfig.json + "version": ".*" + "version": "$(CLI_SharedFrameworkVersion)" + + + From 253a6c5adda1db454694bf3462e3159b7a777150 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 8 Jun 2017 17:00:01 -0700 Subject: [PATCH 56/72] Turning off implicit restore when publishing the build project. --- build.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.proj b/build.proj index ac36138fb..bac606d59 100644 --- a/build.proj +++ b/build.proj @@ -20,7 +20,7 @@ DependsOnTargets="MSBuildWorkaroundTarget; RestoreDotnetCliBuildFramework"> - From c5790924ad38ffe24f18d9bf755c76a5b8c18086 Mon Sep 17 00:00:00 2001 From: Arun Mahapatra Date: Fri, 9 Jun 2017 09:02:46 +0530 Subject: [PATCH 57/72] Update test platform to 15.3.0-preview-20170609-02. Fixes: https://github.com/Microsoft/vstest/issues/847 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 6b7eddf6e..efc3d30d9 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ 2.0.0-preview2-20170602-1 4.3.0-preview3-4146 2.0.0-rel-20170518-512 - 15.3.0-preview-20170601-03 + 15.3.0-preview-20170609-02 $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) From 858e443b1e61582975e5abe15f014c9fab77bf3a Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 9 Jun 2017 00:38:36 -0700 Subject: [PATCH 58/72] Don't try to CrossGen .NET Framework support DLLs --- src/redist/redist.csproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index dd4781066..06cc93db4 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -194,6 +194,12 @@ + + + + + + From e2520d8df1cb6599f66b93d156acfcacc8b3f0d1 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Fri, 9 Jun 2017 18:47:34 +0200 Subject: [PATCH 59/72] empty commit From 56d03c10e6fc344d1bd09b6b6ba50d3a05b71e8e Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Fri, 9 Jun 2017 20:07:33 +0200 Subject: [PATCH 60/72] reenable smoke test of F# templates --- .../GivenThatIWantANewAppWithSpecifiedType.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index 8a1c9daaf..5e12f441c 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -37,13 +37,6 @@ namespace Microsoft.DotNet.New.Tests bool useNuGetConfigForAspNet, bool skipSpaWebpackSteps) { - if (language == "F#" && !EnvironmentInfo.HasSharedFramework("netcoreapp1.0")) - { - // F# requires netcoreapp1.0 to be present in order to build - // https://github.com/dotnet/netcorecli-fsc/issues/76 - return; - } - string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName; new TestCommand("dotnet") { WorkingDirectory = rootPath } From 9cd4e5a956d24524b64ec60beeb46c01b73fe671 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 9 Jun 2017 11:18:46 -0700 Subject: [PATCH 61/72] Add Microsoft.NET.Build.Extensions files to package for VS insertion --- build/MSBuildExtensions.targets | 20 +++++ build/Microsoft.DotNet.Cli.tasks | 1 + build/OutputDirectories.props | 3 +- build/package/Installer.MSI.targets | 11 ++- .../GenerateMSBuildExtensionsSWR.cs | 81 +++++++++++++++++++ 5 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 build_projects/dotnet-cli-build/GenerateMSBuildExtensionsSWR.cs diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index ed4d4addc..3a2479958 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -3,6 +3,8 @@ DependsOnTargets="GenerateBundledVersionsProps;RestoreMSBuildExtensionsPackages"> + + + + + + + + $(MSBuildExtensionsLayoutDirectory)/%(VSMSBuildExtensionsContent.DeploymentSubpath)%(RecursiveDir)%(Filename)%(Extension) + + + diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks index 2107f2546..901a48f84 100644 --- a/build/Microsoft.DotNet.Cli.tasks +++ b/build/Microsoft.DotNet.Cli.tasks @@ -19,6 +19,7 @@ + diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props index ac291e14b..42e7d255a 100644 --- a/build/OutputDirectories.props +++ b/build/OutputDirectories.props @@ -17,6 +17,7 @@ $(RepoRoot)/artifacts/testpackages/ $(OutputDirectory)/dotnet$(ExeExtension) $(IntermediateDirectory)/GeneratedMSBuildExtensions - $(IntermediateDirectory)/MSBuildSdkResolver + $(IntermediateDirectory)/MSBuildExtensionsLayout + $(MSBuildExtensionsLayoutDirectory)/MSBuildSdkResolver diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets index 7154f10d6..44f930c8b 100644 --- a/build/package/Installer.MSI.targets +++ b/build/package/Installer.MSI.targets @@ -22,6 +22,7 @@ $(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec $(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg + $(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.swr @@ -146,16 +147,20 @@ + Outputs="$(SdkMSBuildExtensionsNupkgFile);$(SdkMSBuildExtensionsSwrFile)"> + + + !Path.GetExtension(f).Equals(".pdb", StringComparison.OrdinalIgnoreCase)) + .ToList(); + if (files.Any()) + { + sb.Append(@"folder ""InstallDir:\"); + sb.Append(swrInstallDir); + sb.AppendLine(@"\"""); + + foreach (var file in files) + { + sb.Append(@" file source=""!(bindpath.sources)\Redist\Common\NetCoreSDK\MSBuildExtensions\"); + sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); + sb.AppendLine("\""); + } + + sb.AppendLine(); + } + + foreach (var subfolder in Directory.GetDirectories(sourceFolder)) + { + string subfolderName = Path.GetFileName(subfolder); + string newRelativeSourcePath = Path.Combine(relativeSourcePath, subfolderName); + string newSwrInstallDir = Path.Combine(swrInstallDir, subfolderName); + + AddFolder(sb, newRelativeSourcePath, newSwrInstallDir); + } + } + + readonly string SWR_HEADER = @"use vs + +package name=Microsoft.Net.Core.SDK.MSBuildExtensions + version=$(Version) + vs.package.branch=$(VsSingletonPackageBranch) + vs.package.internalRevision=$(PackageInternalRevision) + +"; + } +} From dfe5a0681816ffc636f5a257d8ac11b8802632c8 Mon Sep 17 00:00:00 2001 From: Ankit Mishra Date: Fri, 9 Jun 2017 12:01:21 -0700 Subject: [PATCH 62/72] Updating NuGet version to Preview3-4154 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 78ad03a21..c9394096f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -7,7 +7,7 @@ 1.6.0-beta2-25304 4.2.0-rc-170602-0 2.0.0-preview2-20170608-2 - 4.3.0-preview3-4146 + 4.3.0-preview3-4154 2.0.0-preview2-20170608-2 2.0.0-preview2-25331-02 2.0.0-rel-20170518-512 From 49ebc73ffca106b7d660bbe43201ac281ade6e0e Mon Sep 17 00:00:00 2001 From: Ankit Mishra Date: Fri, 9 Jun 2017 12:39:10 -0700 Subject: [PATCH 63/72] Changing NuGet version to Preview3-4154 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index d05be95cd..4b29ad70d 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -5,7 +5,7 @@ 15.3.0-preview-000378-01 2.0.0-rc5-61427-04 1.1.0-alpha-20170607-4 - 4.3.0-preview3-4146 + 4.3.0-preview3-4154 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta1-20170202-111 From 00eadc6e8f6ce6ab983b570b138c6c61ff6d3b1c Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Fri, 9 Jun 2017 23:09:21 +0200 Subject: [PATCH 64/72] test pack command --- .../TestProjects/FSharpTestAppSimple/Program.fs | 10 ++++++++++ .../FSharpTestAppSimple/TestAppSimple.fsproj | 15 +++++++++++++++ test/dotnet-pack.Tests/PackTests.cs | 8 +++++--- 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 TestAssets/TestProjects/FSharpTestAppSimple/Program.fs create mode 100644 TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj diff --git a/TestAssets/TestProjects/FSharpTestAppSimple/Program.fs b/TestAssets/TestProjects/FSharpTestAppSimple/Program.fs new file mode 100644 index 000000000..65479d645 --- /dev/null +++ b/TestAssets/TestProjects/FSharpTestAppSimple/Program.fs @@ -0,0 +1,10 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +module ConsoleApplication.Program + +open System + +[] +let main argv = + printfn "Hello World!" + 0 diff --git a/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj b/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj new file mode 100644 index 000000000..e504e9b9d --- /dev/null +++ b/TestAssets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj @@ -0,0 +1,15 @@ + + + + + netcoreapp2.0 + Exe + + true + + + + + + + diff --git a/test/dotnet-pack.Tests/PackTests.cs b/test/dotnet-pack.Tests/PackTests.cs index 117b6bcc8..cceb09ec1 100644 --- a/test/dotnet-pack.Tests/PackTests.cs +++ b/test/dotnet-pack.Tests/PackTests.cs @@ -157,10 +157,12 @@ namespace Microsoft.DotNet.Tools.Pack.Tests .And.Contain(e => e.FullName == "lib/netstandard1.5/MyLibrary.pdb"); } - [Fact] - public void PackWorksWithLocalProject() + [Theory] + [InlineData("C#", "TestAppSimple")] + [InlineData("F#", "FSharpTestAppSimple")] + public void PackWorksWithLocalProject(string language, string projectName) { - var testInstance = TestAssets.Get("TestAppSimple") + var testInstance = TestAssets.Get(projectName) .CreateInstance() .WithSourceFiles() .WithRestoreFiles(); From aa712fb02e080434fed03e1c42fb1bb7070796bb Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 9 Jun 2017 15:32:59 -0700 Subject: [PATCH 65/72] Update MSBuild to 15.3.0-preview-000384-01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index c9394096f..33122d884 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.0.0-preview2-25407-01 - 15.3.0-preview-000378-01 + 15.3.0-preview-000384-01 2.3.0-beta2-61716-09 1.6.0-beta2-25304 4.2.0-rc-170602-0 From 00c5872009154f3508e3a63be2834d9e380830e1 Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 9 Jun 2017 15:33:57 -0700 Subject: [PATCH 66/72] Updating MSBuild to 15.3.0-preview-000384-01 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 4b29ad70d..679027f5b 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 1.1.2 - 15.3.0-preview-000378-01 + 15.3.0-preview-000384-01 2.0.0-rc5-61427-04 1.1.0-alpha-20170607-4 4.3.0-preview3-4154 From 9659749eebd07819267d85c2b3826eded89346c9 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 9 Jun 2017 18:18:55 -0700 Subject: [PATCH 67/72] Update version of SDK and MS.NET.Build.Extensions, adapt to layout change --- build/DependencyVersions.props | 9 +++++++-- build/MSBuildExtensions.targets | 8 ++++---- src/redist/redist.csproj | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 78ad03a21..78f77b319 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -6,9 +6,14 @@ 2.3.0-beta2-61716-09 1.6.0-beta2-25304 4.2.0-rc-170602-0 - 2.0.0-preview2-20170608-2 + + + 2.0.0-preview2-20170610-3 + $(CLI_NETSDK_Version) + 4.3.0-preview3-4146 - 2.0.0-preview2-20170608-2 2.0.0-preview2-25331-02 2.0.0-rel-20170518-512 15.3.0-preview-20170609-02 diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index 3a2479958..fcc987cda 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -16,26 +16,26 @@ we generate it. --> + Exclude="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\net*\**" /> + DeploymentSubpath="Microsoft/Microsoft.NET.Build.Extensions/" /> + DeploymentSubpath="msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/" /> $(MSBuildExtensionsLayoutDirectory)/%(VSMSBuildExtensionsContent.DeploymentSubpath)%(RecursiveDir)%(Filename)%(Extension) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 418b90f51..1394361be 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -196,10 +196,10 @@ - + - + From 79a57990ff0266c41f92a4d67bf7822e9d33ff9c Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 9 Jun 2017 18:58:53 -0700 Subject: [PATCH 68/72] Don't include .NET Core MS.NET.Build.Extensions tasks for .NET Framework and vice versa --- build/MSBuildExtensions.targets | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index fcc987cda..c6dd9f7ae 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -17,6 +17,9 @@ --> + + + @@ -31,6 +34,10 @@ + + + + Date: Sat, 10 Jun 2017 01:51:35 -0700 Subject: [PATCH 69/72] Update to SetupCrossgen 183 - Coherence 25615 --- build/DependencyVersions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index c9394096f..fabcb27de 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -16,8 +16,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170608-254 - 1.0.0-beta2-20170608-256 - 1.0.0-beta2-20170608-256 + 1.0.0-beta2-20170610-257 + 1.0.0-beta2-20170610-257 2.0.0-preview2-25407-01 2.0.0-preview2-25407-01 0.1.0-alpha-142 @@ -27,9 +27,9 @@ timestamped - 2.0.0-preview2-168 + 2.0.0-preview2-183 preview2 - 25571 + 25615 From ce8318a6726bd9ad13f9f3d89de60000209b6e5a Mon Sep 17 00:00:00 2001 From: Livar Date: Sun, 11 Jun 2017 00:10:47 -0700 Subject: [PATCH 70/72] Another update to msbuild. To 15.3.0-preview-000385-01. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 33122d884..9bad36248 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.0.0-preview2-25407-01 - 15.3.0-preview-000384-01 + 15.3.0-preview-000385-01 2.3.0-beta2-61716-09 1.6.0-beta2-25304 4.2.0-rc-170602-0 From d1d5743cc7cdd5f0dbb1f4497033c3211d7978d9 Mon Sep 17 00:00:00 2001 From: Livar Date: Sun, 11 Jun 2017 00:11:13 -0700 Subject: [PATCH 71/72] Another update to MSBuild. To 15.3.0-preview-000385-01. --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 679027f5b..037e01639 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 1.1.2 - 15.3.0-preview-000384-01 + 15.3.0-preview-000385-01 2.0.0-rc5-61427-04 1.1.0-alpha-20170607-4 4.3.0-preview3-4154 From a8a86c774796db078133a34ac2ab057f1a610663 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Sun, 11 Jun 2017 20:54:18 -0700 Subject: [PATCH 72/72] Updating the signing project to reflect the new location of the resolver. --- build/Signing.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Signing.proj b/build/Signing.proj index b896366db..16357a121 100644 --- a/build/Signing.proj +++ b/build/Signing.proj @@ -17,7 +17,7 @@ $(BaseOutputDirectory)/stage2 $(BaseOutputDirectory)/stage2compilation $(BaseOutputDirectory)/packages - $(BaseOutputDirectory)/intermediate/MSBuildSdkResolver + $(BaseOutputDirectory)/intermediate/MSBuildExtensionsLayout/MSBuildSdkResolver