Merge branch 'rel/1.0.1' into piotrpMSFT/bump/Roslyn
This commit is contained in:
Piotr Puszkiewicz
GitHub
commit
79704cc074
65 changed files with 553 additions and 277 deletions
|
|
@ -1 +1 @@
|
||||||
1.0.0-preview3-003930
|
1.0.0-preview2-1-003177
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
microsoft.dotnet.buildtools=1.0.26-prerelease-00926-02
|
microsoft.dotnet.buildtools=1.0.27-prerelease-01316-08
|
||||||
microsoft.dotnet.buildtools.run=1.0.0-prerelease-00807-04
|
microsoft.dotnet.buildtools.run=1.0.0-prerelease-00807-04
|
||||||
|
|
@ -37,6 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
|
||||||
EndProject
|
EndProject
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "package", "package", "{FD7D515A-D10F-4F49-B8AE-21CF7ED071AE}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "package", "package", "{FD7D515A-D10F-4F49-B8AE-21CF7ED071AE}"
|
||||||
ProjectSection(SolutionItems) = preProject
|
ProjectSection(SolutionItems) = preProject
|
||||||
|
build\package\dotnet-deb-tool-consumer.csproj = build\package\dotnet-deb-tool-consumer.csproj
|
||||||
build\package\Microsoft.DotNet.Cli.Archive.targets = build\package\Microsoft.DotNet.Cli.Archive.targets
|
build\package\Microsoft.DotNet.Cli.Archive.targets = build\package\Microsoft.DotNet.Cli.Archive.targets
|
||||||
build\package\Microsoft.DotNet.Cli.Installer.DEB.proj = build\package\Microsoft.DotNet.Cli.Installer.DEB.proj
|
build\package\Microsoft.DotNet.Cli.Installer.DEB.proj = build\package\Microsoft.DotNet.Cli.Installer.DEB.proj
|
||||||
build\package\Microsoft.DotNet.Cli.Installer.DEB.targets = build\package\Microsoft.DotNet.Cli.Installer.DEB.targets
|
build\package\Microsoft.DotNet.Cli.Installer.DEB.targets = build\package\Microsoft.DotNet.Cli.Installer.DEB.targets
|
||||||
|
|
|
||||||
136
README.md
136
README.md
|
|
@ -32,39 +32,48 @@ This project has adopted the code of conduct defined by the [Contributor Covenan
|
||||||
Build Status
|
Build Status
|
||||||
------------
|
------------
|
||||||
|
|
||||||
|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 |OpenSUSE 13.2 |Fedora 23|
|
|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Ubuntu 16.10 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 |OpenSUSE 13.2 |OpenSUSE 42.1 |Fedora 23|Fedora 24|
|
||||||
|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|
|
|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|
|
||||||
|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][debian-8.2-build-badge]][debian-8.2-build]|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][centos-build-badge]][centos-build]|[![][rhel-build-badge]][rhel-build]|[![][opensuse-13.2-build-badge]][opensuse-13.2-build]|[![][fedora-23-build-badge]][fedora-23-build]|
|
|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][ubuntu-16.10-build-badge]][ubuntu-16.10-build]|[![][debian-8.2-build-badge]][debian-8.2-build]|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][centos-build-badge]][centos-build]|[![][rhel-build-badge]][rhel-build]|[![][opensuse-13.2-build-badge]][opensuse-13.2-build]|[![][opensuse-42.1-build-badge]][opensuse-13.2-build]|[![][fedora-23-build-badge]][fedora-23-build]|[![][fedora-24-build-badge]][fedora-24-build]|
|
||||||
|
|
||||||
[win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5469/badge
|
[win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5566/badge
|
||||||
[win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5469
|
[win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5566
|
||||||
|
|
||||||
[win-x86-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5470/badge
|
[win-x86-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5568/badge
|
||||||
[win-x86-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5470
|
[win-x86-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5568
|
||||||
|
|
||||||
[ubuntu-14.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5467/badge
|
[ubuntu-14.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5562/badge
|
||||||
[ubuntu-14.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5467
|
[ubuntu-14.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5562
|
||||||
|
|
||||||
[ubuntu-16.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5468/badge
|
[ubuntu-16.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5564/badge
|
||||||
[ubuntu-16.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5468
|
[ubuntu-16.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5564
|
||||||
|
|
||||||
[debian-8.2-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5462/badge
|
[ubuntu-16.10-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5579/badge
|
||||||
[debian-8.2-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5462
|
[ubuntu-16.10-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5579
|
||||||
|
|
||||||
[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5465/badge
|
[debian-8.2-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5552/badge
|
||||||
[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5465
|
[debian-8.2-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5552
|
||||||
|
|
||||||
[centos-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5461/badge
|
[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5558/badge
|
||||||
[centos-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5461
|
[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5558
|
||||||
|
|
||||||
[rhel-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5466/badge
|
[centos-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5550/badge
|
||||||
[rhel-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5466
|
[centos-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5550
|
||||||
|
|
||||||
[opensuse-13.2-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5464/badge
|
[rhel-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5560/badge
|
||||||
[opensuse-13.2-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5464
|
[rhel-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5560
|
||||||
|
|
||||||
[fedora-23-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5463/badge
|
[opensuse-13.2-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5556/badge
|
||||||
[fedora-23-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5463
|
[opensuse-13.2-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5556
|
||||||
|
|
||||||
|
[opensuse-42.1-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5577/badge
|
||||||
|
[opensuse-42.1-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5577
|
||||||
|
|
||||||
|
[fedora-23-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5554/badge
|
||||||
|
[fedora-23-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5554
|
||||||
|
|
||||||
|
[fedora-24-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5575/badge
|
||||||
|
[fedora-24-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5575
|
||||||
|
|
||||||
Installers and Binaries
|
Installers and Binaries
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
@ -76,64 +85,79 @@ In order to download just the .NET Core runtime without the SDK, please visit ht
|
||||||
> **Note:** please be aware that below installers are the **latest bits**. If you
|
> **Note:** please be aware that below installers are the **latest bits**. If you
|
||||||
> want to install the latest released versions, please check out the [section above](#download-links).)
|
> want to install the latest released versions, please check out the [section above](#download-links).)
|
||||||
|
|
||||||
| Platform | rel/1.0.0<br>[![][version-badge]][version] |
|
| Platform | rel/1.0.1<br>[![][version-badge]][version] |
|
||||||
|----------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
|
|----------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
|
||||||
| **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]<br>[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] |
|
| **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]<br>[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] |
|
||||||
| **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]<br>[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] |
|
| **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]<br>[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]<br>*See Installer Note Below<br>[tar.gz][ubuntu-14.04-targz] - [Checksum][ubuntu-14.04-targz-checksum] |
|
| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]<br>*See Installer Note Below<br>[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]<br>*See Installer Note Below<br>[tar.gz][ubuntu-16.04-targz] - [Checksum][ubuntu-16.04-targz-checksum] |
|
| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]<br>*See Installer Note Below<br>[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]<br>*See Installer Note Below<br>[tar.gz][ubuntu-16.10-targz] - [Checksum][ubuntu-16.10-targz-checksum] |
|
||||||
| **Debian 8.2** | [tar.gz][debian-8.2-targz] - [Checksum][debian-8.2-targz-checksum] |
|
| **Debian 8.2** | [tar.gz][debian-8.2-targz] - [Checksum][debian-8.2-targz-checksum] |
|
||||||
| **Mac OS X** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]<br>[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] |
|
| **Mac OS X** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]<br>[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] |
|
||||||
| **CentOS 7.1 / Oracle Linux 7** | [tar.gz][centos-targz] - [Checksum][centos-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] |
|
| **RHEL 7.2** | [tar.gz][rhel-targz] - [Checksum][rhel-targz-checksum] |
|
||||||
| **openSUSE 13.2** | [tar.gz][opensuse-13.2-targz] - [Checksum][opensuse-13.2-targz-checksum] |
|
| **openSUSE 13.2** | [tar.gz][opensuse-13.2-targz] - [Checksum][opensuse-13.2-targz-checksum] |
|
||||||
|
| **openSUSE 42.1** | [tar.gz][opensuse-42.1-targz] - [Checksum][opensuse-42.1-targz-checksum] |
|
||||||
| **Fedora 23** | [tar.gz][fedora-23-targz] - [Checksum][fedora-23-targz-checksum] |
|
| **Fedora 23** | [tar.gz][fedora-23-targz] - [Checksum][fedora-23-targz-checksum] |
|
||||||
|
| **Fedora 24** | [tar.gz][fedora-24-targz] - [Checksum][fedora-24-targz-checksum] |
|
||||||
|
|
||||||
*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.*
|
*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.*
|
||||||
|
|
||||||
[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/latest.version
|
[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/latest.version
|
||||||
[comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.)
|
[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/rel-1.0.0/Windows_x64_Release_version_badge.svg
|
[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/Windows_x64_Release_version_badge.svg
|
||||||
|
|
||||||
[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-win-x64.latest.exe
|
[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x64.latest.exe
|
||||||
[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-win-x64.latest.exe.sha
|
[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x64.latest.exe.sha
|
||||||
[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-win-x64.latest.zip
|
[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x64.latest.zip
|
||||||
[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-win-x64.latest.zip.sha
|
[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x64.latest.zip.sha
|
||||||
|
|
||||||
[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-win-x86.latest.exe
|
[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x86.latest.exe
|
||||||
[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-win-x86.latest.exe.sha
|
[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x86.latest.exe.sha
|
||||||
[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-win-x86.latest.zip
|
[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x86.latest.zip
|
||||||
[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-win-x86.latest.zip.sha
|
[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x86.latest.zip.sha
|
||||||
|
|
||||||
[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-sdk-ubuntu-x64.latest.deb
|
[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu-x64.latest.deb
|
||||||
[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-sdk-ubuntu-x64.latest.deb.sha
|
[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu-x64.latest.deb.sha
|
||||||
[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-ubuntu-x64.latest.tar.gz
|
[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu-x64.latest.tar.gz
|
||||||
[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-ubuntu-x64.latest.tar.gz.sha
|
[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu-x64.latest.tar.gz.sha
|
||||||
|
|
||||||
[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-sdk-ubuntu.16.04-x64.latest.deb
|
[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu.16.04-x64.latest.deb
|
||||||
[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-sdk-ubuntu.16.04-x64.latest.deb.sha
|
[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu.16.04-x64.latest.deb.sha
|
||||||
[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz
|
[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz
|
||||||
[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha
|
[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha
|
||||||
|
|
||||||
[debian-8.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-debian-x64.latest.tar.gz
|
[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu.16.10-x64.latest.deb
|
||||||
[debian-8.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-debian-x64.latest.tar.gz.sha
|
[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu.16.10-x64.latest.deb.sha
|
||||||
|
[ubuntu-16.10-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz
|
||||||
|
[ubuntu-16.10-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz.sha
|
||||||
|
|
||||||
[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-osx-x64.latest.pkg
|
[debian-8.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-debian-x64.latest.tar.gz
|
||||||
[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-osx-x64.latest.pkg.sha
|
[debian-8.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-debian-x64.latest.tar.gz.sha
|
||||||
[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-osx-x64.latest.tar.gz
|
|
||||||
[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-osx-x64.latest.tar.gz.sha
|
|
||||||
|
|
||||||
[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-centos-x64.latest.tar.gz
|
[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-osx-x64.latest.pkg
|
||||||
[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-centos-x64.latest.tar.gz.sha
|
[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-osx-x64.latest.pkg.sha
|
||||||
|
[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-osx-x64.latest.tar.gz
|
||||||
|
[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-osx-x64.latest.tar.gz.sha
|
||||||
|
|
||||||
[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-rhel-x64.latest.tar.gz
|
[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-centos-x64.latest.tar.gz
|
||||||
[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-rhel-x64.latest.tar.gz.sha
|
[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-centos-x64.latest.tar.gz.sha
|
||||||
|
|
||||||
[opensuse-13.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-opensuse.13.2-x64.latest.tar.gz
|
[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-rhel-x64.latest.tar.gz
|
||||||
[opensuse-13.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-opensuse.13.2-x64.latest.tar.gz.sha
|
[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-rhel-x64.latest.tar.gz.sha
|
||||||
|
|
||||||
|
[opensuse-13.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-opensuse.13.2-x64.latest.tar.gz
|
||||||
|
[opensuse-13.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-opensuse.13.2-x64.latest.tar.gz.sha
|
||||||
|
|
||||||
|
[opensuse-42.1-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-opensuse.42.1-x64.latest.tar.gz
|
||||||
|
[opensuse-42.1-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-opensuse.42.1-x64.latest.tar.gz.sha
|
||||||
|
|
||||||
|
[fedora-23-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-fedora.23-x64.latest.tar.gz
|
||||||
|
[fedora-23-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-fedora.23-x64.latest.tar.gz.sha
|
||||||
|
|
||||||
|
[fedora-24-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-fedora.24-x64.latest.tar.gz
|
||||||
|
[fedora-24-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-fedora.24-x64.latest.tar.gz.sha
|
||||||
|
|
||||||
[fedora-23-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-fedora.23-x64.latest.tar.gz
|
|
||||||
[fedora-23-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-fedora.23-x64.latest.tar.gz.sha
|
|
||||||
|
|
||||||
Docker
|
Docker
|
||||||
------
|
------
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
|
<TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
|
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
|
||||||
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64</RuntimeIdentifiers>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
@ -11,11 +12,6 @@
|
||||||
<Version>1.0.0-*</Version>
|
<Version>1.0.0-*</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
|
||||||
<PackageReference Include="Microsoft.NETCore.App">
|
|
||||||
<Version>1.0.3</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
|
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="Microsoft.CSharp" />
|
<Reference Include="Microsoft.CSharp" />
|
||||||
|
|
@ -25,7 +21,4 @@
|
||||||
<Version>1.0.0-*</Version>
|
<Version>1.0.0-*</Version>
|
||||||
</DotNetCliToolReference>
|
</DotNetCliToolReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
|
||||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
<AssemblyName>AppWithRedirectsAndConfig</AssemblyName>
|
<AssemblyName>AppWithRedirectsAndConfig</AssemblyName>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
<AssemblyName>AppWithRedirectsNoConfig</AssemblyName>
|
<AssemblyName>AppWithRedirectsNoConfig</AssemblyName>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
|
<TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
|
||||||
<OutputType>Library</OutputType>
|
<OutputType>Library</OutputType>
|
||||||
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp1.0</PackageTargetFallback>
|
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp1.1</PackageTargetFallback>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
<AssemblyName>dotnet-throwingtool</AssemblyName>
|
<AssemblyName>dotnet-throwingtool</AssemblyName>
|
||||||
<PackageId>$(AssemblyName)</PackageId>
|
<PackageId>$(AssemblyName)</PackageId>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
@ -13,10 +13,4 @@
|
||||||
</BuiltProjectOutputGroupOutput>
|
</BuiltProjectOutputGroupOutput>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.NETCore.App">
|
|
||||||
<Version>1.0.3</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -2,15 +2,10 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.NETCore.App">
|
|
||||||
<Version>1.0.3</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<DotNetCliToolReference Include="dotnet-throwingtool">
|
<DotNetCliToolReference Include="dotnet-throwingtool">
|
||||||
<Version>1.0.0</Version>
|
<Version>1.0.0</Version>
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
<GeneratedPackageId>random-name</GeneratedPackageId>
|
<GeneratedPackageId>random-name</GeneratedPackageId>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
|
|
||||||
<DotNetCliToolReference Include="$(GeneratedPackageId)">
|
<DotNetCliToolReference Include="$(GeneratedPackageId)">
|
||||||
<Version>1.0.0</Version>
|
<Version>1.0.0</Version>
|
||||||
</DotNetCliToolReference>
|
</DotNetCliToolReference>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
<GeneratedPackageId>random-name</GeneratedPackageId>
|
<GeneratedPackageId>random-name</GeneratedPackageId>
|
||||||
<PackageId>$(GeneratedPackageId)</PackageId>
|
<PackageId>$(GeneratedPackageId)</PackageId>
|
||||||
<AssemblyName>dotnet-randompackage</AssemblyName>
|
<AssemblyName>dotnet-randompackage</AssemblyName>
|
||||||
|
|
@ -14,8 +14,4 @@
|
||||||
</BuiltProjectOutputGroupOutput>
|
</BuiltProjectOutputGroupOutput>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
<AssemblyName>dotnet-tool-with-output-name</AssemblyName>
|
<AssemblyName>dotnet-tool-with-output-name</AssemblyName>
|
||||||
<PackageId>ToolWithOutputName</PackageId>
|
<PackageId>ToolWithOutputName</PackageId>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
|
|
@ -12,13 +12,4 @@
|
||||||
</BuiltProjectOutputGroupOutput>
|
</BuiltProjectOutputGroupOutput>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
|
||||||
<PackageReference Include="Microsoft.NETCore.App">
|
|
||||||
<Version>1.0.4</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
|
||||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,11 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<VersionPrefix>1.0.0-rc</VersionPrefix>
|
<VersionPrefix>1.0.0-rc</VersionPrefix>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
<AssemblyName>dotnet-dependency-tool-invoker</AssemblyName>
|
<AssemblyName>dotnet-dependency-tool-invoker</AssemblyName>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
|
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
|
||||||
|
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
@ -22,9 +23,6 @@
|
||||||
</BuiltProjectOutputGroupOutput>
|
</BuiltProjectOutputGroupOutput>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NETCore.App">
|
|
||||||
<Version>1.0.4</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="NuGet.Frameworks">
|
<PackageReference Include="NuGet.Frameworks">
|
||||||
<Version>$(CLI_NuGet_Version)</Version>
|
<Version>$(CLI_NuGet_Version)</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
|
@ -32,8 +30,4 @@
|
||||||
<Version>$(SdkNugetVersion)</Version>
|
<Version>$(SdkNugetVersion)</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
|
||||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,18 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
|
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<VersionPrefix>1.0.0-rc</VersionPrefix>
|
<VersionPrefix>1.0.0-rc</VersionPrefix>
|
||||||
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
|
<TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks>
|
||||||
<AssemblyName>dotnet-desktop-and-portable</AssemblyName>
|
<AssemblyName>dotnet-desktop-and-portable</AssemblyName>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
|
||||||
<BuiltProjectOutputGroupOutput Include="$(ProjectRuntimeConfigFilePath)">
|
<BuiltProjectOutputGroupOutput Include="$(ProjectRuntimeConfigFilePath)">
|
||||||
<FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
|
<FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
|
||||||
</BuiltProjectOutputGroupOutput>
|
</BuiltProjectOutputGroupOutput>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
|
||||||
<PackageReference Include="Microsoft.NETCore.App">
|
|
||||||
<Version>1.0.4</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
|
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="Microsoft.CSharp" />
|
<Reference Include="Microsoft.CSharp" />
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,10 @@
|
||||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
<AssemblyName>dotnet-portable</AssemblyName>
|
<AssemblyName>dotnet-portable</AssemblyName>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
|
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
@ -12,14 +13,4 @@
|
||||||
<FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
|
<FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
|
||||||
</BuiltProjectOutputGroupOutput>
|
</BuiltProjectOutputGroupOutput>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
|
||||||
<PackageReference Include="Microsoft.NETCore.App">
|
|
||||||
<Version>1.0.4</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
|
||||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
@ -14,7 +15,4 @@
|
||||||
<Version>1.0.0</Version>
|
<Version>1.0.0</Version>
|
||||||
</DotNetCliToolReference>
|
</DotNetCliToolReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
</Project>
|
||||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
@ -17,7 +18,4 @@
|
||||||
<Version>1.0.0</Version>
|
<Version>1.0.0</Version>
|
||||||
</DotNetCliToolReference>
|
</DotNetCliToolReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
</Project>
|
||||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,18 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="ToolWithOutputName">
|
<PackageReference Include="ToolWithOutputName">
|
||||||
<Version>1.0.0</Version>
|
<Version>1.0.0</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.NETCore.App">
|
|
||||||
<Version>1.0.3</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<DotNetCliToolReference Include="dotnet-dependency-tool-invoker">
|
<DotNetCliToolReference Include="dotnet-dependency-tool-invoker">
|
||||||
<Version>1.0.0-*</Version>
|
<Version>1.0.0-*</Version>
|
||||||
</DotNetCliToolReference>
|
</DotNetCliToolReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
</Project>
|
||||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
|
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,10 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.NETCore.App">
|
|
||||||
<Version>1.0.3</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<DotNetCliToolReference Include="dotnet-portable">
|
<DotNetCliToolReference Include="dotnet-portable">
|
||||||
<Version>1.0.0</Version>
|
<Version>1.0.0</Version>
|
||||||
|
|
@ -17,7 +13,4 @@
|
||||||
<Version>1.0.0</Version>
|
<Version>1.0.0</Version>
|
||||||
</DotNetCliToolReference>
|
</DotNetCliToolReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
</Project>
|
||||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
|
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;fedora.24-x64;opensuse.13.2-x64;opensuse.42.1-x64</RuntimeIdentifiers>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,11 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
|
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NETCore.App">
|
|
||||||
<Version>1.0.3</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="dotnet-portable">
|
<PackageReference Include="dotnet-portable">
|
||||||
<Version>1.0.0</Version>
|
<Version>1.0.0</Version>
|
||||||
<PrivateAssets>All</PrivateAssets>
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,11 @@
|
||||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
|
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NETCore.App">
|
|
||||||
<Version>1.0.3</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="MSTest.TestFramework">
|
<PackageReference Include="MSTest.TestFramework">
|
||||||
<Version>1.0.6-preview</Version>
|
<Version>1.0.6-preview</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,11 @@
|
||||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
|
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NETCore.App">
|
|
||||||
<Version>1.0.3</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk">
|
<PackageReference Include="Microsoft.NET.Test.Sdk">
|
||||||
<Version>$(CLI_TestPlatform_Version)</Version>
|
<Version>$(CLI_TestPlatform_Version)</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
# Each line is expected to be in the format "[Name]=[Value]".
|
# Each line is expected to be in the format "[Name]=[Value]".
|
||||||
MAJOR_VERSION=1
|
MAJOR_VERSION=1
|
||||||
MINOR_VERSION=0
|
MINOR_VERSION=0
|
||||||
PATCH_VERSION=0
|
PATCH_VERSION=1
|
||||||
RELEASE_SUFFIX=rc4
|
RELEASE_SUFFIX=rc4
|
||||||
CHANNEL=rel-1.0.0
|
CHANNEL=rel-1.0.1
|
||||||
BRANCH_NAME=rel/1.0.0
|
BRANCH_NAME=rel/1.0.1
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<SdkBrandName>.NET Core SDK 1.0.0 ($(Architecture)) Installer</SdkBrandName>
|
<SdkBrandName>.NET Core SDK 1.0.1</SdkBrandName>
|
||||||
<SharedFrameworkBrandName>Microsoft .NET Core 1.0.4 - Runtime</SharedFrameworkBrandName>
|
<SharedFrameworkBrandName>Microsoft .NET Core 1.1.1 - Runtime</SharedFrameworkBrandName>
|
||||||
<SharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</SharedHostBrandName>
|
<SharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</SharedHostBrandName>
|
||||||
<HostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</HostFxrBrandName>
|
<HostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</HostFxrBrandName>
|
||||||
|
|
||||||
<AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.1.1 - Runtime</AdditionalSharedFrameworkBrandName>
|
<AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.0.4 - Runtime</AdditionalSharedFrameworkBrandName>
|
||||||
<AdditionalSharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</AdditionalSharedHostBrandName>
|
<AdditionalSharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</AdditionalSharedHostBrandName>
|
||||||
<AdditionalHostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</AdditionalHostFxrBrandName>
|
<AdditionalHostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</AdditionalHostFxrBrandName>
|
||||||
|
|
||||||
<SharedFrameworkNugetName>Microsoft.NETCore.App</SharedFrameworkNugetName>
|
<SharedFrameworkNugetName>Microsoft.NETCore.App</SharedFrameworkNugetName>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
||||||
|
|
@ -95,7 +95,12 @@
|
||||||
<BundleExtension Condition=" '$(OSName)' == 'osx' ">$(InstallerExtension)</BundleExtension>
|
<BundleExtension Condition=" '$(OSName)' == 'osx' ">$(InstallerExtension)</BundleExtension>
|
||||||
<BundleExtension Condition=" '$(OSName)' == 'ubuntu' ">$(InstallerExtension)</BundleExtension>
|
<BundleExtension Condition=" '$(OSName)' == 'ubuntu' ">$(InstallerExtension)</BundleExtension>
|
||||||
|
|
||||||
<ProductMonikerRid Condition=" '$(Rid)' == 'ubuntu.16.04-x64' Or '$(Rid)' == 'fedora.23-x64' Or '$(Rid)' == 'opensuse.13.2-x64' ">$(Rid)</ProductMonikerRid>
|
<ProductMonikerRid Condition=" '$(Rid)' == 'ubuntu.16.04-x64' Or
|
||||||
|
'$(Rid)' == 'ubuntu.16.10-x64' Or
|
||||||
|
'$(Rid)' == 'fedora.23-x64' Or
|
||||||
|
'$(Rid)' == 'fedora.24-x64' Or
|
||||||
|
'$(Rid)' == 'opensuse.13.2-x64' Or
|
||||||
|
'$(Rid)' == 'opensuse.42.1-x64' ">$(Rid)</ProductMonikerRid>
|
||||||
<ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
|
<ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
|
||||||
|
|
||||||
<DynamicLibPrefix>lib</DynamicLibPrefix>
|
<DynamicLibPrefix>lib</DynamicLibPrefix>
|
||||||
|
|
@ -127,8 +132,16 @@
|
||||||
<CombinedFrameworkHostCompressedFileName>dotnet-$(ProductMonikerRid).$(SharedFrameworkVersion)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
|
<CombinedFrameworkHostCompressedFileName>dotnet-$(ProductMonikerRid).$(SharedFrameworkVersion)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Additional Shared Framework to be installed -->
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
<HasAdditionalSharedFramework Condition="'$(Rid)' != 'ubuntu.16.10-x64' AND
|
||||||
|
'$(Rid)' != 'fedora.24-x64' AND
|
||||||
|
'$(Rid)' != 'opensuse.42.1-x64'">true</HasAdditionalSharedFramework>
|
||||||
|
<IncludeAdditionalSharedFrameworks Condition=" '$(IncludeAdditionalSharedFrameworks)' == '' AND '$(HasAdditionalSharedFramework)' == 'true' ">true</IncludeAdditionalSharedFrameworks>
|
||||||
|
<IncludeAdditionalSharedFrameworks Condition=" '$(IncludeAdditionalSharedFrameworks)' == '' ">false</IncludeAdditionalSharedFrameworks>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<!-- Additional Shared Framework to be installed -->
|
||||||
|
<PropertyGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' == 'true' ">
|
||||||
<AdditionalCoreSetupChannel>preview</AdditionalCoreSetupChannel>
|
<AdditionalCoreSetupChannel>preview</AdditionalCoreSetupChannel>
|
||||||
<AdditionalSharedFrameworkVersion>1.0.4</AdditionalSharedFrameworkVersion>
|
<AdditionalSharedFrameworkVersion>1.0.4</AdditionalSharedFrameworkVersion>
|
||||||
<AdditionalSharedHostVersion>1.0.1</AdditionalSharedHostVersion>
|
<AdditionalSharedHostVersion>1.0.1</AdditionalSharedHostVersion>
|
||||||
|
|
@ -193,7 +206,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- Additional Shared Framework to be installed -->
|
<!-- Additional Shared Framework to be installed -->
|
||||||
<PropertyGroup>
|
<PropertyGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' != 'false' ">
|
||||||
<AdditionalCoreSetupBlobRootUrlWithChannel>$(CoreSetupBlobRootUrl)$(AdditionalCoreSetupChannel)</AdditionalCoreSetupBlobRootUrlWithChannel>
|
<AdditionalCoreSetupBlobRootUrlWithChannel>$(CoreSetupBlobRootUrl)$(AdditionalCoreSetupChannel)</AdditionalCoreSetupBlobRootUrlWithChannel>
|
||||||
<AdditionalSharedFrameworkArchiveBlobRootUrl>$(AdditionalCoreSetupBlobRootUrlWithChannel)/Binaries/$(AdditionalSharedFrameworkVersion)</AdditionalSharedFrameworkArchiveBlobRootUrl>
|
<AdditionalSharedFrameworkArchiveBlobRootUrl>$(AdditionalCoreSetupBlobRootUrlWithChannel)/Binaries/$(AdditionalSharedFrameworkVersion)</AdditionalSharedFrameworkArchiveBlobRootUrl>
|
||||||
<AdditionalCoreSetupInstallerBlobRootUrl>$(AdditionalCoreSetupBlobRootUrlWithChannel)/Installers</AdditionalCoreSetupInstallerBlobRootUrl>
|
<AdditionalCoreSetupInstallerBlobRootUrl>$(AdditionalCoreSetupBlobRootUrlWithChannel)/Installers</AdditionalCoreSetupInstallerBlobRootUrl>
|
||||||
|
|
@ -201,7 +214,7 @@
|
||||||
<AdditionalCombinedSharedHostAndFrameworkArchive>$(AdditionalCoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive</AdditionalCombinedSharedHostAndFrameworkArchive>
|
<AdditionalCombinedSharedHostAndFrameworkArchive>$(AdditionalCoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive</AdditionalCombinedSharedHostAndFrameworkArchive>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' != 'false' ">
|
||||||
<_DownloadAndExtractItem Include="AdditionalCombinedSharedHostAndFrameworkArchive"
|
<_DownloadAndExtractItem Include="AdditionalCombinedSharedHostAndFrameworkArchive"
|
||||||
Condition="!Exists('$(AdditionalCombinedSharedHostAndFrameworkArchive)')">
|
Condition="!Exists('$(AdditionalCombinedSharedHostAndFrameworkArchive)')">
|
||||||
<Url>$(AdditionalSharedFrameworkArchiveBlobRootUrl)/$(AdditionalCombinedFrameworkHostCompressedFileName)</Url>
|
<Url>$(AdditionalSharedFrameworkArchiveBlobRootUrl)/$(AdditionalCombinedFrameworkHostCompressedFileName)</Url>
|
||||||
|
|
|
||||||
|
|
@ -45,11 +45,10 @@
|
||||||
<ReplaceFileContents
|
<ReplaceFileContents
|
||||||
InputFile="$(DebianConfigTemplateFile)"
|
InputFile="$(DebianConfigTemplateFile)"
|
||||||
DestinationFile="$(DebianConfigJsonFile)"
|
DestinationFile="$(DebianConfigJsonFile)"
|
||||||
ReplacementPatterns="@(DebianConfigTokenValues -> '%(Identity)')"
|
ReplacementItems="@(DebianConfigTokenValues)" />
|
||||||
ReplacementStrings="@(DebianConfigTokenValues -> '%(ReplacementString)')" />
|
|
||||||
|
|
||||||
<!-- Build SDK Deb package -->
|
<!-- Build SDK Deb package -->
|
||||||
<DotNetDebTool ToolPath="$(Stage0PjDirectory)"
|
<DotNetDebTool ToolPath="$(Stage0Directory)"
|
||||||
InputDirectory="$(LayoutDirectory)"
|
InputDirectory="$(LayoutDirectory)"
|
||||||
OutputDirectory="$(DotNetDebToolOutputDirectory)"
|
OutputDirectory="$(DotNetDebToolOutputDirectory)"
|
||||||
PackageName="$(SdkDebianPackageName)"
|
PackageName="$(SdkDebianPackageName)"
|
||||||
|
|
@ -75,8 +74,10 @@
|
||||||
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
|
||||||
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
|
||||||
|
|
||||||
<Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)"
|
||||||
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)" />
|
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||||
|
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)"
|
||||||
|
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||||
|
|
||||||
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
@ -90,9 +91,12 @@
|
||||||
Outputs="$(DebianTestResultsXmlFile)" >
|
Outputs="$(DebianTestResultsXmlFile)" >
|
||||||
|
|
||||||
<!-- Install Dependencies and SDK Packages -->
|
<!-- Install Dependencies and SDK Packages -->
|
||||||
<Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedHostInstallerFile)" />
|
<Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedHostInstallerFile)"
|
||||||
<Exec Command="sudo dpkg -i $(AdditionalDownloadedHostFxrInstallerFile)" />
|
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||||
<Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedFrameworkInstallerFile)" />
|
<Exec Command="sudo dpkg -i $(AdditionalDownloadedHostFxrInstallerFile)"
|
||||||
|
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||||
|
<Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedFrameworkInstallerFile)"
|
||||||
|
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||||
|
|
||||||
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
|
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
|
||||||
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
|
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
|
||||||
|
|
@ -113,8 +117,10 @@
|
||||||
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
|
||||||
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
|
||||||
|
|
||||||
<Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)"
|
||||||
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)" />
|
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||||
|
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)"
|
||||||
|
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||||
|
|
||||||
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
@ -148,23 +154,19 @@
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="PrepareDotnetDebTool"
|
<Target Name="PrepareDotnetDebTool"
|
||||||
DependsOnTargets="WriteDotnetDebToolProjectJson;">
|
DependsOnTargets="WriteDotnetDebToolProject">
|
||||||
|
|
||||||
<DotNetRestorePj FallbackSource="$(DotnetDebToolPackageSource)"
|
<DotNetRestore ToolPath="$(Stage0Directory)"
|
||||||
ToolPath="$(Stage0PjDirectory)"
|
WorkingDirectory="$(DotnetDebToolDir)" />
|
||||||
WorkingDirectory="$(DotnetDebToolDir)" />
|
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="WriteDotnetDebToolProjectJson"
|
<Target Name="WriteDotnetDebToolProject"
|
||||||
Inputs="$(MSBuildThisFile);$(MSBuildThisFileDirectory)/Microsoft.DotNet.Cli.Installer.DEB.props"
|
Inputs="$(MSBuildThisFileDirectory)/$(DotnetDebToolConsumerProjectName)"
|
||||||
Outputs="$(DotnetDebToolDir)/project.json">
|
Outputs="$(DotnetDebToolDir)/$(DotnetDebToolConsumerProjectName)">
|
||||||
|
|
||||||
<MakeDir Condition=" !Exists($(DotnetDebToolDir)) "
|
<Copy SourceFiles="$(MSBuildThisFileDirectory)/$(DotnetDebToolConsumerProjectName)"
|
||||||
Directories="$(DotnetDebToolDir)" />
|
DestinationFiles="$(DotnetDebToolDir)/$(DotnetDebToolConsumerProjectName)" />
|
||||||
|
|
||||||
<WriteLinesToFile File="$(DotnetDebToolDir)/project.json"
|
|
||||||
Lines="@(DotnetDebToolProjectJsonLines)"
|
|
||||||
Overwrite="True" />
|
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="TestDebuild">
|
<Target Name="TestDebuild">
|
||||||
|
|
|
||||||
|
|
@ -4,22 +4,10 @@
|
||||||
DependsOnTargets="Init">
|
DependsOnTargets="Init">
|
||||||
<!-- dotnet deb-tool -->
|
<!-- dotnet deb-tool -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<DotnetDebToolPackageId>dotnet-deb-tool</DotnetDebToolPackageId>
|
<DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer.csproj</DotnetDebToolConsumerProjectName>
|
||||||
<DotnetDebToolVersion Condition=" '$(DotnetDebToolVersion)' == '' ">1.0.0-*</DotnetDebToolVersion>
|
|
||||||
<DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer</DotnetDebToolConsumerProjectName>
|
|
||||||
<DotnetDebToolDir>$(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName)</DotnetDebToolDir>
|
<DotnetDebToolDir>$(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName)</DotnetDebToolDir>
|
||||||
<DotnetDebToolPackageSource Condition=" '$(DotnetDebToolPackageSource)' == '' "></DotnetDebToolPackageSource>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<DotnetDebToolProjectJsonLines Include="{" />
|
|
||||||
<DotnetDebToolProjectJsonLines Include="%20%20%20%20"version": "1.0.0-*"," />
|
|
||||||
<DotnetDebToolProjectJsonLines Include="%20%20%20%20"name": "$(DotnetDebToolConsumerProjectName)"," />
|
|
||||||
<DotnetDebToolProjectJsonLines Include="%20%20%20%20"frameworks": { "netcoreapp1.0": {}, "netcoreapp1.1": {} }," />
|
|
||||||
<DotnetDebToolProjectJsonLines Include="%20%20%20%20"tools": {"$(DotnetDebToolPackageId)": "$(DotnetDebToolVersion)" }" />
|
|
||||||
<DotnetDebToolProjectJsonLines Include="}" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<!-- constants -->
|
<!-- constants -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
|
<DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
|
||||||
|
|
@ -93,8 +81,14 @@
|
||||||
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%">
|
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%">
|
||||||
<ReplacementString>$(SharedFxDebianPackageName)</ReplacementString>
|
<ReplacementString>$(SharedFxDebianPackageName)</ReplacementString>
|
||||||
</DebianConfigTokenValues>
|
</DebianConfigTokenValues>
|
||||||
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME_ADDITIONAL%">
|
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%"
|
||||||
<ReplacementString>$(AdditionalSharedFxDebianPackageName)</ReplacementString>
|
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'">
|
||||||
|
<ReplacementString>,
|
||||||
|
"$(AdditionalSharedFxDebianPackageName)" : {}</ReplacementString>
|
||||||
|
</DebianConfigTokenValues>
|
||||||
|
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%"
|
||||||
|
Condition="'$(IncludeAdditionalSharedFrameworks)' != 'true'">
|
||||||
|
<ReplacementString></ReplacementString>
|
||||||
</DebianConfigTokenValues>
|
</DebianConfigTokenValues>
|
||||||
<DebianConfigTokenValues Include="%SDK_NUGET_VERSION%">
|
<DebianConfigTokenValues Include="%SDK_NUGET_VERSION%">
|
||||||
<ReplacementString>$(SdkVersion)</ReplacementString>
|
<ReplacementString>$(SdkVersion)</ReplacementString>
|
||||||
|
|
|
||||||
8
build/package/dotnet-deb-tool-consumer.csproj
Normal file
8
build/package/dotnet-deb-tool-consumer.csproj
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<DotNetCliToolReference Include="dotnet-deb-tool" Version="2.0.0-*" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -50,12 +50,15 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
{ "Windows_x64", false },
|
{ "Windows_x64", false },
|
||||||
{ "Ubuntu_x64", false },
|
{ "Ubuntu_x64", false },
|
||||||
{ "Ubuntu_16_04_x64", false },
|
{ "Ubuntu_16_04_x64", false },
|
||||||
|
{ "Ubuntu_16_10_x64", false },
|
||||||
{ "RHEL_x64", false },
|
{ "RHEL_x64", false },
|
||||||
{ "OSX_x64", false },
|
{ "OSX_x64", false },
|
||||||
{ "Debian_x64", false },
|
{ "Debian_x64", false },
|
||||||
{ "CentOS_x64", false },
|
{ "CentOS_x64", false },
|
||||||
{ "Fedora_23_x64", false },
|
{ "Fedora_23_x64", false },
|
||||||
{ "openSUSE_13_2_x64", false }
|
{ "Fedora_24_x64", false },
|
||||||
|
{ "openSUSE_13_2_x64", false },
|
||||||
|
{ "openSUSE_42_1_x64", false },
|
||||||
};
|
};
|
||||||
|
|
||||||
var versionBadgeName = $"{Monikers.GetBadgeMoniker()}";
|
var versionBadgeName = $"{Monikers.GetBadgeMoniker()}";
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,12 @@ using Microsoft.Build.Framework;
|
||||||
namespace Microsoft.DotNet.Cli.Build
|
namespace Microsoft.DotNet.Cli.Build
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reads contents of an input file, and searches for each ReplacementPattern passed in.
|
/// Reads contents of an input file, and searches for each replacement passed in.
|
||||||
|
///
|
||||||
|
/// When ReplacementItems is matched, it will replace the Include/ItemSpec with the corresponding
|
||||||
|
/// ReplacementString metadata value. This can be useful if the ReplacementString is a value that
|
||||||
|
/// cannot be represented by ITaskItem.ItemSpec (like string.Empty).
|
||||||
|
///
|
||||||
/// When a ReplacementPattern is matched it will replace it with the string of the corresponding (by index)
|
/// When a ReplacementPattern is matched it will replace it with the string of the corresponding (by index)
|
||||||
/// item in ReplacementStrings.
|
/// item in ReplacementStrings.
|
||||||
///
|
///
|
||||||
|
|
@ -27,14 +32,23 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
[Required]
|
[Required]
|
||||||
public string DestinationFile { get; set; }
|
public string DestinationFile { get; set; }
|
||||||
|
|
||||||
[Required]
|
public ITaskItem[] ReplacementItems { get; set; }
|
||||||
|
|
||||||
public ITaskItem[] ReplacementPatterns { get; set; }
|
public ITaskItem[] ReplacementPatterns { get; set; }
|
||||||
|
|
||||||
[Required]
|
|
||||||
public ITaskItem[] ReplacementStrings { get; set; }
|
public ITaskItem[] ReplacementStrings { get; set; }
|
||||||
|
|
||||||
public override bool Execute()
|
public override bool Execute()
|
||||||
{
|
{
|
||||||
|
if (ReplacementItems == null && ReplacementPatterns == null && ReplacementStrings == null)
|
||||||
|
{
|
||||||
|
throw new Exception($"ReplaceFileContents was called with no replacement values. Either pass ReplacementItems or ReplacementPatterns/ReplacementStrings properties.");
|
||||||
|
}
|
||||||
|
|
||||||
|
ReplacementItems = ReplacementItems ?? Array.Empty<ITaskItem>();
|
||||||
|
ReplacementPatterns = ReplacementPatterns ?? Array.Empty<ITaskItem>();
|
||||||
|
ReplacementStrings = ReplacementStrings ?? Array.Empty<ITaskItem>();
|
||||||
|
|
||||||
if (ReplacementPatterns.Length != ReplacementStrings.Length)
|
if (ReplacementPatterns.Length != ReplacementStrings.Length)
|
||||||
{
|
{
|
||||||
throw new Exception($"Expected {nameof(ReplacementPatterns)} (length {ReplacementPatterns.Length}) and {nameof(ReplacementStrings)} (length {ReplacementStrings.Length}) to have the same length.");
|
throw new Exception($"Expected {nameof(ReplacementPatterns)} (length {ReplacementPatterns.Length}) and {nameof(ReplacementStrings)} (length {ReplacementStrings.Length}) to have the same length.");
|
||||||
|
|
@ -57,6 +71,14 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
{
|
{
|
||||||
var outText = inputFileText;
|
var outText = inputFileText;
|
||||||
|
|
||||||
|
foreach (var replacementItem in ReplacementItems)
|
||||||
|
{
|
||||||
|
var replacementPattern = replacementItem.ItemSpec;
|
||||||
|
var replacementString = replacementItem.GetMetadata("ReplacementString");
|
||||||
|
|
||||||
|
outText = outText.Replace(replacementPattern, replacementString);
|
||||||
|
}
|
||||||
|
|
||||||
for (int i=0; i<ReplacementPatterns.Length; ++i)
|
for (int i=0; i<ReplacementPatterns.Length; ++i)
|
||||||
{
|
{
|
||||||
var replacementPattern = ReplacementPatterns[i].ItemSpec;
|
var replacementPattern = ReplacementPatterns[i].ItemSpec;
|
||||||
|
|
|
||||||
|
|
@ -15,10 +15,16 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
{
|
{
|
||||||
case "ubuntu.16.04-x64":
|
case "ubuntu.16.04-x64":
|
||||||
return "Ubuntu_16_04_x64";
|
return "Ubuntu_16_04_x64";
|
||||||
|
case "ubuntu.16.10-x64":
|
||||||
|
return "Ubuntu_16_10_x64";
|
||||||
case "fedora.23-x64":
|
case "fedora.23-x64":
|
||||||
return "Fedora_23_x64";
|
return "Fedora_23_x64";
|
||||||
|
case "fedora.24-x64":
|
||||||
|
return "Fedora_24_x64";
|
||||||
case "opensuse.13.2-x64":
|
case "opensuse.13.2-x64":
|
||||||
return "openSUSE_13_2_x64";
|
return "openSUSE_13_2_x64";
|
||||||
|
case "opensuse.42.1-x64":
|
||||||
|
return "openSUSE_42_1_x64";
|
||||||
}
|
}
|
||||||
|
|
||||||
return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}";
|
return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}";
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||||
<AssemblyName>update-dependencies</AssemblyName>
|
<AssemblyName>update-dependencies</AssemblyName>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;fedora.24-x64;opensuse.13.2-x64;opensuse.42.1-x64</RuntimeIdentifiers>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,6 @@
|
||||||
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
|
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
|
||||||
|
|
||||||
|
|
||||||
<CliVersionPrefix>1.0.0</CliVersionPrefix>
|
<CliVersionPrefix>1.0.1</CliVersionPrefix>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ def project = GithubProject
|
||||||
def branch = GithubBranchName
|
def branch = GithubBranchName
|
||||||
def isPR = true
|
def isPR = true
|
||||||
|
|
||||||
def platformList = ['Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'Fedora23:x64:Debug', 'OpenSUSE13.2:x64:Debug']
|
def platformList = ['Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'Ubuntu16.10:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'Fedora23:x64:Debug', 'Fedora24:x64:Release', 'OpenSUSE13.2:x64:Debug', 'OpenSUSE42.1:x64:Debug']
|
||||||
|
|
||||||
def static getBuildJobName(def configuration, def os, def architecture) {
|
def static getBuildJobName(def configuration, def os, def architecture) {
|
||||||
return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase()
|
return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase()
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
"debian_dependencies":{
|
"debian_dependencies":{
|
||||||
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {},
|
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%
|
||||||
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME_ADDITIONAL%" : {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
</Component>
|
</Component>
|
||||||
<Component Id="SetupRegistry_x86_RC2_Compat_Key" Directory="TARGETDIR" Win64="no">
|
<Component Id="SetupRegistry_x86_RC2_Compat_Key" Directory="TARGETDIR" Win64="no">
|
||||||
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.Platform)\sdk">
|
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.Platform)\sdk">
|
||||||
<RegistryValue Action="write" Name="1.0.0-rc4" Type="integer" Value="1" KeyPath="yes"/>
|
<RegistryValue Action="write" Name="1.0.1-rc4" Type="integer" Value="1" KeyPath="yes"/>
|
||||||
</RegistryKey>
|
</RegistryKey>
|
||||||
</Component>
|
</Component>
|
||||||
</ComponentGroup>
|
</ComponentGroup>
|
||||||
|
|
|
||||||
|
|
@ -103,8 +103,8 @@ if ($LastExitCode -ne 0)
|
||||||
# install the post-PJnistic stage0
|
# install the post-PJnistic stage0
|
||||||
$dotnetInstallPath = Join-Path $toolsLocalPath "dotnet-install.ps1"
|
$dotnetInstallPath = Join-Path $toolsLocalPath "dotnet-install.ps1"
|
||||||
|
|
||||||
Write-Host "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
|
Write-Host "$dotnetInstallPath -Channel ""rel-1.0.1"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
|
||||||
Invoke-Expression "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
|
Invoke-Expression "$dotnetInstallPath -Channel ""rel-1.0.1"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
|
||||||
if ($LastExitCode -ne 0)
|
if ($LastExitCode -ne 0)
|
||||||
{
|
{
|
||||||
Write-Output "The .NET CLI installation failed with exit code $LastExitCode"
|
Write-Output "The .NET CLI installation failed with exit code $LastExitCode"
|
||||||
|
|
|
||||||
|
|
@ -155,7 +155,8 @@ if [ ! -f $bootStrapperPath ]; then
|
||||||
chmod u+x $bootStrapperPath
|
chmod u+x $bootStrapperPath
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$bootStrapperPath --repositoryRoot "$REPOROOT" --toolsLocalPath "$toolsLocalPath" --cliInstallPath $DOTNET_INSTALL_DIR_PJ --architecture $ARCHITECTURE > bootstrap.log
|
echo "installing build_tools: $bootStrapperPath --repositoryRoot \"$REPOROOT\" --toolsLocalPath \"$toolsLocalPath\" --cliInstallPath $DOTNET_INSTALL_DIR_PJ --architecture $ARCHITECTURE"
|
||||||
|
$bootStrapperPath --repositoryRoot "$REPOROOT" --toolsLocalPath "$toolsLocalPath" --cliInstallPath $DOTNET_INSTALL_DIR_PJ --architecture $ARCHITECTURE --verbose
|
||||||
|
|
||||||
if [ $? != 0 ]; then
|
if [ $? != 0 ]; then
|
||||||
echo "run-build: Error: Boot-strapping failed with exit code $?, see bootstrap.log for more information." >&2
|
echo "run-build: Error: Boot-strapping failed with exit code $?, see bootstrap.log for more information." >&2
|
||||||
|
|
@ -163,8 +164,8 @@ if [ $? != 0 ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# now execute the script
|
# now execute the script
|
||||||
echo "installing CLI: $dotnetInstallPath --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
|
echo "installing CLI: $dotnetInstallPath --channel \"rel-1.0.1\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
|
||||||
$dotnetInstallPath --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
|
$dotnetInstallPath --channel "rel-1.0.1" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
|
||||||
if [ $? != 0 ]; then
|
if [ $? != 0 ]; then
|
||||||
echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2
|
echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2
|
||||||
exit $?
|
exit $?
|
||||||
|
|
|
||||||
28
scripts/docker/fedora.24/Dockerfile
Normal file
28
scripts/docker/fedora.24/Dockerfile
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
FROM fedora:24
|
||||||
|
|
||||||
|
RUN dnf install -y bash git cmake wget which python clang-3.8.0-1.fc24.x86_64 llvm-devel-3.8.0-1.fc24.x86_64 make libicu-devel lldb-devel.x86_64 \
|
||||||
|
libunwind-devel.x86_64 lttng-ust-devel.x86_64 uuid-devel libuuid-devel tar glibc-locale-source zlib-devel libcurl-devel \
|
||||||
|
krb5-devel openssl-devel autoconf libtool hostname
|
||||||
|
|
||||||
|
RUN dnf upgrade -y nss
|
||||||
|
|
||||||
|
RUN dnf clean all
|
||||||
|
|
||||||
|
# Set a different rid to publish buildtools for, until we update to a version which
|
||||||
|
# natively supports fedora.24-x64
|
||||||
|
ENV __PUBLISH_RID=fedora.23-x64
|
||||||
|
|
||||||
|
# Setup User to match Host User, and give superuser permissions
|
||||||
|
ARG USER_ID=0
|
||||||
|
RUN useradd -m code_executor -u ${USER_ID} -g wheel
|
||||||
|
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||||
|
|
||||||
|
# With the User Change, we need to change permissions on these directories
|
||||||
|
RUN chmod -R a+rwx /usr/local
|
||||||
|
RUN chmod -R a+rwx /home
|
||||||
|
|
||||||
|
# Set user to the one we just created
|
||||||
|
USER ${USER_ID}
|
||||||
|
|
||||||
|
# Set working directory
|
||||||
|
WORKDIR /opt/code
|
||||||
50
scripts/docker/opensuse.42.1/Dockerfile
Normal file
50
scripts/docker/opensuse.42.1/Dockerfile
Normal file
|
|
@ -0,0 +1,50 @@
|
||||||
|
#
|
||||||
|
# Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||||
|
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||||
|
#
|
||||||
|
|
||||||
|
FROM opensuse:42.1
|
||||||
|
|
||||||
|
# Install the base toolchain we need to build anything (clang, cmake, make and the like)
|
||||||
|
# this does not include libraries that we need to compile different projects, we'd like
|
||||||
|
# them in a different layer.
|
||||||
|
RUN zypper -n install binutils \
|
||||||
|
cmake \
|
||||||
|
which \
|
||||||
|
gcc \
|
||||||
|
llvm-clang \
|
||||||
|
tar \
|
||||||
|
ncurses-utils \
|
||||||
|
curl \
|
||||||
|
git \
|
||||||
|
sudo && \
|
||||||
|
ln -s /usr/bin/clang++ /usr/bin/clang++-3.5 && \
|
||||||
|
zypper clean -a
|
||||||
|
|
||||||
|
# Dependencies of CoreCLR and CoreFX.
|
||||||
|
|
||||||
|
RUN zypper -n install --force-resolution \
|
||||||
|
libunwind \
|
||||||
|
libicu \
|
||||||
|
lttng-ust \
|
||||||
|
libuuid1 \
|
||||||
|
libopenssl1_0_0 \
|
||||||
|
libcurl4 \
|
||||||
|
krb5 && \
|
||||||
|
zypper clean -a
|
||||||
|
|
||||||
|
# Setup User to match Host User, and give superuser permissions
|
||||||
|
ARG USER_ID=0
|
||||||
|
RUN useradd -m code_executor -u ${USER_ID} -g wheel
|
||||||
|
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||||
|
|
||||||
|
# With the User Change, we need to change permissions on these directories
|
||||||
|
RUN chmod -R a+rwx /usr/local
|
||||||
|
RUN chmod -R a+rwx /home
|
||||||
|
RUN chmod -R 755 /usr/lib/sudo
|
||||||
|
|
||||||
|
# Set user to the one we just created
|
||||||
|
USER ${USER_ID}
|
||||||
|
|
||||||
|
# Set working directory
|
||||||
|
WORKDIR /opt/code
|
||||||
63
scripts/docker/ubuntu.16.10/Dockerfile
Normal file
63
scripts/docker/ubuntu.16.10/Dockerfile
Normal file
|
|
@ -0,0 +1,63 @@
|
||||||
|
#
|
||||||
|
# Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||||
|
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||||
|
#
|
||||||
|
|
||||||
|
# Dockerfile that creates a container suitable to build dotnet-cli
|
||||||
|
FROM ubuntu:16.10
|
||||||
|
|
||||||
|
# Misc Dependencies for build
|
||||||
|
RUN apt-get update && \
|
||||||
|
apt-get -qqy install \
|
||||||
|
curl \
|
||||||
|
unzip \
|
||||||
|
gettext \
|
||||||
|
sudo && \
|
||||||
|
apt-get clean && \
|
||||||
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib)
|
||||||
|
RUN apt-get update && \
|
||||||
|
apt-get -qqy install \
|
||||||
|
libunwind8 \
|
||||||
|
libkrb5-3 \
|
||||||
|
libicu57 \
|
||||||
|
liblttng-ust0 \
|
||||||
|
libssl1.0.0 \
|
||||||
|
zlib1g \
|
||||||
|
libuuid1 \
|
||||||
|
liblldb-3.5 && \
|
||||||
|
apt-get clean && \
|
||||||
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Install Build Prereqs
|
||||||
|
RUN apt-get update && \
|
||||||
|
apt-get -qqy install \
|
||||||
|
debhelper \
|
||||||
|
build-essential \
|
||||||
|
devscripts \
|
||||||
|
git \
|
||||||
|
cmake \
|
||||||
|
clang-3.5 && \
|
||||||
|
apt-get clean && \
|
||||||
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Use clang as c++ compiler
|
||||||
|
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100
|
||||||
|
RUN update-alternatives --set c++ /usr/bin/clang++-3.5
|
||||||
|
|
||||||
|
# Setup User to match Host User, and give superuser permissions
|
||||||
|
ARG USER_ID=0
|
||||||
|
RUN useradd -m code_executor -u ${USER_ID} -g sudo
|
||||||
|
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||||
|
|
||||||
|
# With the User Change, we need to change permissions on these directories
|
||||||
|
RUN chmod -R a+rwx /usr/local
|
||||||
|
RUN chmod -R a+rwx /home
|
||||||
|
RUN chmod -R 755 /usr/lib/sudo
|
||||||
|
|
||||||
|
# Set user to the one we just created
|
||||||
|
USER ${USER_ID}
|
||||||
|
|
||||||
|
# Set working directory
|
||||||
|
WORKDIR /opt/code
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||||
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using NuGet.Frameworks;
|
||||||
using NuGet.ProjectModel;
|
using NuGet.ProjectModel;
|
||||||
|
|
||||||
namespace Microsoft.DotNet.Cli.Utils
|
namespace Microsoft.DotNet.Cli.Utils
|
||||||
|
|
@ -22,6 +23,8 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
|
|
||||||
string FullOutputPath { get; }
|
string FullOutputPath { get; }
|
||||||
|
|
||||||
|
NuGetFramework DotnetCliToolTargetFramework { get; }
|
||||||
|
|
||||||
Dictionary<string, string> EnvironmentVariables { get; }
|
Dictionary<string, string> EnvironmentVariables { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -13,6 +13,8 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
{
|
{
|
||||||
internal class MSBuildProject : IProject
|
internal class MSBuildProject : IProject
|
||||||
{
|
{
|
||||||
|
private static readonly NuGetFramework s_toolPackageFramework = FrameworkConstants.CommonFrameworks.NetCoreApp10;
|
||||||
|
|
||||||
private Project _project;
|
private Project _project;
|
||||||
|
|
||||||
private string _projectRoot;
|
private string _projectRoot;
|
||||||
|
|
@ -60,6 +62,25 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public NuGetFramework DotnetCliToolTargetFramework
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
var frameworkString = _project
|
||||||
|
.AllEvaluatedProperties
|
||||||
|
.FirstOrDefault(p => p.Name.Equals("DotnetCliToolTargetFramework"))
|
||||||
|
?.EvaluatedValue;
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(frameworkString))
|
||||||
|
{
|
||||||
|
return s_toolPackageFramework;
|
||||||
|
}
|
||||||
|
|
||||||
|
return NuGetFramework.Parse(frameworkString);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public Dictionary<string, string> EnvironmentVariables
|
public Dictionary<string, string> EnvironmentVariables
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,6 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
{
|
{
|
||||||
private const string ProjectToolsCommandResolverName = "projecttoolscommandresolver";
|
private const string ProjectToolsCommandResolverName = "projecttoolscommandresolver";
|
||||||
|
|
||||||
private static readonly NuGetFramework s_toolPackageFramework = FrameworkConstants.CommonFrameworks.NetCoreApp10;
|
|
||||||
|
|
||||||
private static readonly CommandResolutionStrategy s_commandResolutionStrategy =
|
private static readonly CommandResolutionStrategy s_commandResolutionStrategy =
|
||||||
CommandResolutionStrategy.ProjectToolsPackage;
|
CommandResolutionStrategy.ProjectToolsPackage;
|
||||||
|
|
||||||
|
|
@ -133,8 +131,14 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
ProjectToolsCommandResolverName,
|
ProjectToolsCommandResolverName,
|
||||||
string.Join(Environment.NewLine, possiblePackageRoots.Select((p) => $"- {p}"))));
|
string.Join(Environment.NewLine, possiblePackageRoots.Select((p) => $"- {p}"))));
|
||||||
|
|
||||||
|
var toolPackageFramework = project.DotnetCliToolTargetFramework;
|
||||||
|
|
||||||
string nugetPackagesRoot;
|
string nugetPackagesRoot;
|
||||||
var toolLockFile = GetToolLockFile(toolLibraryRange, possiblePackageRoots, out nugetPackagesRoot);
|
var toolLockFile = GetToolLockFile(
|
||||||
|
toolLibraryRange,
|
||||||
|
toolPackageFramework,
|
||||||
|
possiblePackageRoots,
|
||||||
|
out nugetPackagesRoot);
|
||||||
|
|
||||||
if (toolLockFile == null)
|
if (toolLockFile == null)
|
||||||
{
|
{
|
||||||
|
|
@ -147,7 +151,7 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
toolLockFile.Path));
|
toolLockFile.Path));
|
||||||
|
|
||||||
var toolLibrary = toolLockFile.Targets
|
var toolLibrary = toolLockFile.Targets
|
||||||
.FirstOrDefault(t => s_toolPackageFramework == t.TargetFramework)
|
.FirstOrDefault(t => toolPackageFramework == t.TargetFramework)
|
||||||
?.Libraries.FirstOrDefault(
|
?.Libraries.FirstOrDefault(
|
||||||
l => StringComparer.OrdinalIgnoreCase.Equals(l.Name, toolLibraryRange.Name));
|
l => StringComparer.OrdinalIgnoreCase.Equals(l.Name, toolLibraryRange.Name));
|
||||||
if (toolLibrary == null)
|
if (toolLibrary == null)
|
||||||
|
|
@ -161,7 +165,11 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
|
|
||||||
var depsFileRoot = Path.GetDirectoryName(toolLockFile.Path);
|
var depsFileRoot = Path.GetDirectoryName(toolLockFile.Path);
|
||||||
|
|
||||||
var depsFilePath = GetToolDepsFilePath(toolLibraryRange, toolLockFile, depsFileRoot);
|
var depsFilePath = GetToolDepsFilePath(
|
||||||
|
toolLibraryRange,
|
||||||
|
toolPackageFramework,
|
||||||
|
toolLockFile,
|
||||||
|
depsFileRoot);
|
||||||
|
|
||||||
var normalizedNugetPackagesRoot = PathUtility.EnsureNoTrailingDirectorySeparator(nugetPackagesRoot);
|
var normalizedNugetPackagesRoot = PathUtility.EnsureNoTrailingDirectorySeparator(nugetPackagesRoot);
|
||||||
|
|
||||||
|
|
@ -203,12 +211,13 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
|
|
||||||
private LockFile GetToolLockFile(
|
private LockFile GetToolLockFile(
|
||||||
SingleProjectInfo toolLibrary,
|
SingleProjectInfo toolLibrary,
|
||||||
|
NuGetFramework framework,
|
||||||
IEnumerable<string> possibleNugetPackagesRoot,
|
IEnumerable<string> possibleNugetPackagesRoot,
|
||||||
out string nugetPackagesRoot)
|
out string nugetPackagesRoot)
|
||||||
{
|
{
|
||||||
foreach (var packagesRoot in possibleNugetPackagesRoot)
|
foreach (var packagesRoot in possibleNugetPackagesRoot)
|
||||||
{
|
{
|
||||||
if (TryGetToolLockFile(toolLibrary, packagesRoot, out LockFile lockFile))
|
if (TryGetToolLockFile(toolLibrary, framework, packagesRoot, out LockFile lockFile))
|
||||||
{
|
{
|
||||||
nugetPackagesRoot = packagesRoot;
|
nugetPackagesRoot = packagesRoot;
|
||||||
return lockFile;
|
return lockFile;
|
||||||
|
|
@ -221,11 +230,12 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
|
|
||||||
private bool TryGetToolLockFile(
|
private bool TryGetToolLockFile(
|
||||||
SingleProjectInfo toolLibrary,
|
SingleProjectInfo toolLibrary,
|
||||||
|
NuGetFramework framework,
|
||||||
string nugetPackagesRoot,
|
string nugetPackagesRoot,
|
||||||
out LockFile lockFile)
|
out LockFile lockFile)
|
||||||
{
|
{
|
||||||
lockFile = null;
|
lockFile = null;
|
||||||
var lockFilePath = GetToolLockFilePath(toolLibrary, nugetPackagesRoot);
|
var lockFilePath = GetToolLockFilePath(toolLibrary, framework, nugetPackagesRoot);
|
||||||
|
|
||||||
if (!File.Exists(lockFilePath))
|
if (!File.Exists(lockFilePath))
|
||||||
{
|
{
|
||||||
|
|
@ -248,6 +258,7 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
|
|
||||||
private string GetToolLockFilePath(
|
private string GetToolLockFilePath(
|
||||||
SingleProjectInfo toolLibrary,
|
SingleProjectInfo toolLibrary,
|
||||||
|
NuGetFramework framework,
|
||||||
string nugetPackagesRoot)
|
string nugetPackagesRoot)
|
||||||
{
|
{
|
||||||
var toolPathCalculator = new ToolPathCalculator(nugetPackagesRoot);
|
var toolPathCalculator = new ToolPathCalculator(nugetPackagesRoot);
|
||||||
|
|
@ -255,11 +266,12 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
return toolPathCalculator.GetBestLockFilePath(
|
return toolPathCalculator.GetBestLockFilePath(
|
||||||
toolLibrary.Name,
|
toolLibrary.Name,
|
||||||
VersionRange.Parse(toolLibrary.Version),
|
VersionRange.Parse(toolLibrary.Version),
|
||||||
s_toolPackageFramework);
|
framework);
|
||||||
}
|
}
|
||||||
|
|
||||||
private string GetToolDepsFilePath(
|
private string GetToolDepsFilePath(
|
||||||
SingleProjectInfo toolLibrary,
|
SingleProjectInfo toolLibrary,
|
||||||
|
NuGetFramework framework,
|
||||||
LockFile toolLockFile,
|
LockFile toolLockFile,
|
||||||
string depsPathRoot)
|
string depsPathRoot)
|
||||||
{
|
{
|
||||||
|
|
@ -272,24 +284,26 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
ProjectToolsCommandResolverName,
|
ProjectToolsCommandResolverName,
|
||||||
depsJsonPath));
|
depsJsonPath));
|
||||||
|
|
||||||
EnsureToolJsonDepsFileExists(toolLockFile, depsJsonPath, toolLibrary);
|
EnsureToolJsonDepsFileExists(toolLockFile, framework, depsJsonPath, toolLibrary);
|
||||||
|
|
||||||
return depsJsonPath;
|
return depsJsonPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void EnsureToolJsonDepsFileExists(
|
private void EnsureToolJsonDepsFileExists(
|
||||||
LockFile toolLockFile,
|
LockFile toolLockFile,
|
||||||
|
NuGetFramework framework,
|
||||||
string depsPath,
|
string depsPath,
|
||||||
SingleProjectInfo toolLibrary)
|
SingleProjectInfo toolLibrary)
|
||||||
{
|
{
|
||||||
if (!File.Exists(depsPath))
|
if (!File.Exists(depsPath))
|
||||||
{
|
{
|
||||||
GenerateDepsJsonFile(toolLockFile, depsPath, toolLibrary);
|
GenerateDepsJsonFile(toolLockFile, framework, depsPath, toolLibrary);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void GenerateDepsJsonFile(
|
internal void GenerateDepsJsonFile(
|
||||||
LockFile toolLockFile,
|
LockFile toolLockFile,
|
||||||
|
NuGetFramework framework,
|
||||||
string depsPath,
|
string depsPath,
|
||||||
SingleProjectInfo toolLibrary)
|
SingleProjectInfo toolLibrary)
|
||||||
{
|
{
|
||||||
|
|
@ -298,7 +312,7 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
depsPath));
|
depsPath));
|
||||||
|
|
||||||
var dependencyContext = new DepsJsonBuilder()
|
var dependencyContext = new DepsJsonBuilder()
|
||||||
.Build(toolLibrary, null, toolLockFile, s_toolPackageFramework, null);
|
.Build(toolLibrary, null, toolLockFile, framework, null);
|
||||||
|
|
||||||
var tempDepsFile = Path.GetTempFileName();
|
var tempDepsFile = Path.GetTempFileName();
|
||||||
using (var fileStream = File.Open(tempDepsFile, FileMode.Open, FileAccess.Write))
|
using (var fileStream = File.Open(tempDepsFile, FileMode.Open, FileAccess.Write))
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||||
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.tasks" />
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
|
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
|
||||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
|
|
@ -36,7 +37,16 @@
|
||||||
<ProjectReference Include="..\tool_msbuild\tool_msbuild.csproj" />
|
<ProjectReference Include="..\tool_msbuild\tool_msbuild.csproj" />
|
||||||
<ProjectReference Include="..\tool_nuget\tool_nuget.csproj" />
|
<ProjectReference Include="..\tool_nuget\tool_nuget.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
|
||||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
<Target Name="RetargetVSTestConsole"
|
||||||
</PropertyGroup>
|
AfterTargets="Publish">
|
||||||
|
<PropertyGroup>
|
||||||
|
<VSTestRuntimeConfigPath>$(PublishDir)/vstest.console.runtimeconfig.json</VSTestRuntimeConfigPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ReplaceFileContents
|
||||||
|
InputFile="$(VSTestRuntimeConfigPath)"
|
||||||
|
DestinationFile="$(VSTestRuntimeConfigPath)"
|
||||||
|
ReplacementPatterns="1.0.0"
|
||||||
|
ReplacementStrings="1.1.0" />
|
||||||
|
</Target>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
|
||||||
{
|
{
|
||||||
string projectDirectory = directory.Path;
|
string projectDirectory = directory.Path;
|
||||||
|
|
||||||
string newArgs = "console --debug:ephemeral-hive";
|
string newArgs = "console -f netcoreapp1.1 --debug:ephemeral-hive";
|
||||||
new NewCommandShim()
|
new NewCommandShim()
|
||||||
.WithWorkingDirectory(projectDirectory)
|
.WithWorkingDirectory(projectDirectory)
|
||||||
.Execute(newArgs)
|
.Execute(newArgs)
|
||||||
|
|
@ -112,7 +112,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
|
||||||
new DotnetCommand()
|
new DotnetCommand()
|
||||||
.WithWorkingDirectory(testProjectDirectory)
|
.WithWorkingDirectory(testProjectDirectory)
|
||||||
.ExecuteWithCapturedOutput(
|
.ExecuteWithCapturedOutput(
|
||||||
$"-d dependency-tool-invoker -c {configuration} -f netcoreapp1.0 portable")
|
$"-d dependency-tool-invoker -c {configuration} -f netcoreapp1.1 portable")
|
||||||
.Should().Pass()
|
.Should().Pass()
|
||||||
.And.HaveStdOutContaining("Hello Portable World!");;
|
.And.HaveStdOutContaining("Hello Portable World!");;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -189,7 +189,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
|
||||||
.Should().Pass();
|
.Should().Pass();
|
||||||
|
|
||||||
var factory = new ProjectDependenciesCommandFactory(
|
var factory = new ProjectDependenciesCommandFactory(
|
||||||
FrameworkConstants.CommonFrameworks.NetCoreApp10,
|
FrameworkConstants.CommonFrameworks.NetCoreApp11,
|
||||||
configuration,
|
configuration,
|
||||||
null,
|
null,
|
||||||
null,
|
null,
|
||||||
|
|
@ -198,7 +198,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
|
||||||
var command = factory.Create("dotnet-tool-with-output-name", null);
|
var command = factory.Create("dotnet-tool-with-output-name", null);
|
||||||
|
|
||||||
command.CommandArgs.Should().Contain(
|
command.CommandArgs.Should().Contain(
|
||||||
Path.Combine("toolwithoutputname", "1.0.0", "lib", "netcoreapp1.0", "dotnet-tool-with-output-name.dll"));
|
Path.Combine("toolwithoutputname", "1.0.0", "lib", "netcoreapp1.1", "dotnet-tool-with-output-name.dll"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
|
||||||
CommandName = "dotnet-portable",
|
CommandName = "dotnet-portable",
|
||||||
Configuration = "Debug",
|
Configuration = "Debug",
|
||||||
ProjectDirectory = MSBuildTestProjectInstance.Root.FullName,
|
ProjectDirectory = MSBuildTestProjectInstance.Root.FullName,
|
||||||
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
|
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp11
|
||||||
};
|
};
|
||||||
|
|
||||||
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
|
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
|
||||||
|
|
@ -83,7 +83,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
|
||||||
CommandName = "dotnet-portable",
|
CommandName = "dotnet-portable",
|
||||||
Configuration = "Debug",
|
Configuration = "Debug",
|
||||||
ProjectDirectory = MSBuildTestProjectInstance.Root.FullName,
|
ProjectDirectory = MSBuildTestProjectInstance.Root.FullName,
|
||||||
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
|
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp11
|
||||||
};
|
};
|
||||||
|
|
||||||
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
|
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
|
||||||
|
|
@ -109,7 +109,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
|
||||||
CommandName = "nonexistent-command",
|
CommandName = "nonexistent-command",
|
||||||
CommandArguments = null,
|
CommandArguments = null,
|
||||||
ProjectDirectory = MSBuildTestProjectInstance.Root.FullName,
|
ProjectDirectory = MSBuildTestProjectInstance.Root.FullName,
|
||||||
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
|
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp11
|
||||||
};
|
};
|
||||||
|
|
||||||
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
|
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
|
||||||
|
|
@ -135,7 +135,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
|
||||||
CommandName = "dotnet-portable",
|
CommandName = "dotnet-portable",
|
||||||
Configuration = "Debug",
|
Configuration = "Debug",
|
||||||
ProjectDirectory = testInstance.Root.FullName,
|
ProjectDirectory = testInstance.Root.FullName,
|
||||||
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10,
|
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp11,
|
||||||
OutputPath = outputDir.FullName
|
OutputPath = outputDir.FullName
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tests
|
||||||
public class GivenAProjectToolsCommandResolver : TestBase
|
public class GivenAProjectToolsCommandResolver : TestBase
|
||||||
{
|
{
|
||||||
private static readonly NuGetFramework s_toolPackageFramework =
|
private static readonly NuGetFramework s_toolPackageFramework =
|
||||||
FrameworkConstants.CommonFrameworks.NetCoreApp10;
|
FrameworkConstants.CommonFrameworks.NetCoreApp11;
|
||||||
|
|
||||||
private const string TestProjectName = "AppWithToolDependency";
|
private const string TestProjectName = "AppWithToolDependency";
|
||||||
|
|
||||||
|
|
@ -279,6 +279,7 @@ namespace Microsoft.DotNet.Tests
|
||||||
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
||||||
projectToolsCommandResolver.GenerateDepsJsonFile(
|
projectToolsCommandResolver.GenerateDepsJsonFile(
|
||||||
lockFile,
|
lockFile,
|
||||||
|
s_toolPackageFramework,
|
||||||
depsJsonFile,
|
depsJsonFile,
|
||||||
new SingleProjectInfo("dotnet-portable", "1.0.0", Enumerable.Empty<ResourceAssemblyInfo>()));
|
new SingleProjectInfo("dotnet-portable", "1.0.0", Enumerable.Empty<ResourceAssemblyInfo>()));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
// 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.DotNet.PlatformAbstractions;
|
||||||
|
|
||||||
|
namespace Microsoft.DotNet.Tools.Test.Utilities
|
||||||
|
{
|
||||||
|
public static class EnvironmentInfo
|
||||||
|
{
|
||||||
|
public static bool HasSharedFramework(string framework)
|
||||||
|
{
|
||||||
|
if (framework == "netcoreapp1.0")
|
||||||
|
{
|
||||||
|
string rid = RuntimeEnvironment.GetRuntimeIdentifier();
|
||||||
|
switch (rid)
|
||||||
|
{
|
||||||
|
case "fedora.24-x64":
|
||||||
|
case "opensuse.42.1-x64":
|
||||||
|
case "ubuntu.16.10-x64":
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
// 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 Xunit;
|
||||||
|
|
||||||
|
namespace Microsoft.DotNet.Tools.Test.Utilities
|
||||||
|
{
|
||||||
|
public class RequiresSpecificFrameworkFactAttribute : FactAttribute
|
||||||
|
{
|
||||||
|
public RequiresSpecificFrameworkFactAttribute(string framework)
|
||||||
|
{
|
||||||
|
if (!EnvironmentInfo.HasSharedFramework(framework))
|
||||||
|
{
|
||||||
|
this.Skip = $"This test requires a shared framework that isn't present: {framework}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
|
||||||
|
|
||||||
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
||||||
|
|
||||||
var outputDll = testInstance.Root.GetDirectory("bin", configuration, "netcoreapp1.0")
|
var outputDll = testInstance.Root.GetDirectory("bin", configuration, "netcoreapp1.1")
|
||||||
.GetFile($"{testAppName}.dll");
|
.GetFile($"{testAppName}.dll");
|
||||||
|
|
||||||
var outputRunCommand = new TestCommand("dotnet");
|
var outputRunCommand = new TestCommand("dotnet");
|
||||||
|
|
@ -46,7 +46,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
|
||||||
string dir = "pkgs";
|
string dir = "pkgs";
|
||||||
string args = $"--packages {dir}";
|
string args = $"--packages {dir}";
|
||||||
|
|
||||||
string newArgs = $"console -o \"{rootPath}\" --debug:ephemeral-hive";
|
string newArgs = $"console -f netcoreapp1.1 -o \"{rootPath}\" --debug:ephemeral-hive";
|
||||||
new NewCommandShim()
|
new NewCommandShim()
|
||||||
.WithWorkingDirectory(rootPath)
|
.WithWorkingDirectory(rootPath)
|
||||||
.Execute(newArgs)
|
.Execute(newArgs)
|
||||||
|
|
@ -65,7 +65,12 @@ namespace Microsoft.DotNet.Cli.Build.Tests
|
||||||
.Execute()
|
.Execute()
|
||||||
.Should().Pass();
|
.Should().Pass();
|
||||||
|
|
||||||
var outputDll = Directory.EnumerateFiles(Path.Combine(rootPath, "bin"), "*.dll", SearchOption.AllDirectories).Single(x => !x.Contains("DiaSymReader"));
|
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
||||||
|
|
||||||
|
var outputDll = Directory.EnumerateFiles(
|
||||||
|
Path.Combine(rootPath, "bin", configuration, "netcoreapp1.1"), "*.dll",
|
||||||
|
SearchOption.TopDirectoryOnly)
|
||||||
|
.Single();
|
||||||
|
|
||||||
var outputRunCommand = new TestCommand("dotnet");
|
var outputRunCommand = new TestCommand("dotnet");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -431,6 +431,12 @@ namespace Microsoft.DotNet.Migration.Tests
|
||||||
.Execute("build -c Debug")
|
.Execute("build -c Debug")
|
||||||
.Should().Pass();
|
.Should().Pass();
|
||||||
|
|
||||||
|
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
|
||||||
|
{
|
||||||
|
// running the app requires netcoreapp1.0
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var cmd = new DotnetCommand()
|
var cmd = new DotnetCommand()
|
||||||
.WithWorkingDirectory(projectDirectory)
|
.WithWorkingDirectory(projectDirectory)
|
||||||
.ExecuteWithCapturedOutput("run -c Debug");
|
.ExecuteWithCapturedOutput("run -c Debug");
|
||||||
|
|
@ -483,6 +489,12 @@ namespace Microsoft.DotNet.Migration.Tests
|
||||||
.Execute("build -c Debug")
|
.Execute("build -c Debug")
|
||||||
.Should().Pass();
|
.Should().Pass();
|
||||||
|
|
||||||
|
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
|
||||||
|
{
|
||||||
|
// running the app requires netcoreapp1.0
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var cmd = new DotnetCommand()
|
var cmd = new DotnetCommand()
|
||||||
.WithWorkingDirectory(projectDirectory)
|
.WithWorkingDirectory(projectDirectory)
|
||||||
.ExecuteWithCapturedOutput("run -c Debug");
|
.ExecuteWithCapturedOutput("run -c Debug");
|
||||||
|
|
@ -534,6 +546,12 @@ namespace Microsoft.DotNet.Migration.Tests
|
||||||
.Execute("build -c Debug")
|
.Execute("build -c Debug")
|
||||||
.Should().Pass();
|
.Should().Pass();
|
||||||
|
|
||||||
|
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
|
||||||
|
{
|
||||||
|
// running the app requires netcoreapp1.0
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var cmd = new DotnetCommand()
|
var cmd = new DotnetCommand()
|
||||||
.WithWorkingDirectory(projectDirectory)
|
.WithWorkingDirectory(projectDirectory)
|
||||||
.ExecuteWithCapturedOutput("run -c Debug");
|
.ExecuteWithCapturedOutput("run -c Debug");
|
||||||
|
|
|
||||||
|
|
@ -492,7 +492,7 @@ namespace Microsoft.DotNet.Migration.Tests
|
||||||
}
|
}
|
||||||
|
|
||||||
outputsIdentical.Should().BeTrue();
|
outputsIdentical.Should().BeTrue();
|
||||||
|
|
||||||
VerifyAllMSBuildOutputsRunnable(projectDirectory);
|
VerifyAllMSBuildOutputsRunnable(projectDirectory);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -543,7 +543,7 @@ namespace Microsoft.DotNet.Migration.Tests
|
||||||
.And.Contain("Migration failed.");
|
.And.Contain("Migration failed.");
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[RequiresSpecificFrameworkFact("netcoreapp1.0")]
|
||||||
public void ItMigratesAndPublishesProjectsWithRuntimes()
|
public void ItMigratesAndPublishesProjectsWithRuntimes()
|
||||||
{
|
{
|
||||||
var projectName = "PJTestAppSimple";
|
var projectName = "PJTestAppSimple";
|
||||||
|
|
@ -745,6 +745,12 @@ namespace Microsoft.DotNet.Migration.Tests
|
||||||
|
|
||||||
private void VerifyAllMSBuildOutputsRunnable(DirectoryInfo projectDirectory)
|
private void VerifyAllMSBuildOutputsRunnable(DirectoryInfo projectDirectory)
|
||||||
{
|
{
|
||||||
|
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
|
||||||
|
{
|
||||||
|
// running the apps requires netcoreapp1.0
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var dllFileName = Path.GetFileName(projectDirectory.FullName) + ".dll";
|
var dllFileName = Path.GetFileName(projectDirectory.FullName) + ".dll";
|
||||||
|
|
||||||
var runnableDlls = projectDirectory
|
var runnableDlls = projectDirectory
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,13 @@ namespace Microsoft.DotNet.New.Tests
|
||||||
string projectType,
|
string projectType,
|
||||||
bool useNuGetConfigForAspNet)
|
bool useNuGetConfigForAspNet)
|
||||||
{
|
{
|
||||||
|
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 = TestAssetsManager.CreateTestDirectory(identifier: $"{language}_{projectType}").Path;
|
string rootPath = TestAssetsManager.CreateTestDirectory(identifier: $"{language}_{projectType}").Path;
|
||||||
|
|
||||||
new TestCommand("dotnet") { WorkingDirectory = rootPath }
|
new TestCommand("dotnet") { WorkingDirectory = rootPath }
|
||||||
|
|
|
||||||
|
|
@ -29,11 +29,11 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
|
||||||
|
|
||||||
new PublishCommand()
|
new PublishCommand()
|
||||||
.WithWorkingDirectory(testProjectDirectory)
|
.WithWorkingDirectory(testProjectDirectory)
|
||||||
.Execute("--framework netcoreapp1.0")
|
.Execute("--framework netcoreapp1.1")
|
||||||
.Should().Pass();
|
.Should().Pass();
|
||||||
|
|
||||||
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
||||||
var outputDll = Path.Combine(testProjectDirectory, "bin", configuration, "netcoreapp1.0", "publish", $"{testAppName}.dll");
|
var outputDll = Path.Combine(testProjectDirectory, "bin", configuration, "netcoreapp1.1", "publish", $"{testAppName}.dll");
|
||||||
|
|
||||||
new TestCommand("dotnet")
|
new TestCommand("dotnet")
|
||||||
.ExecuteWithCapturedOutput(outputDll)
|
.ExecuteWithCapturedOutput(outputDll)
|
||||||
|
|
@ -56,7 +56,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
|
||||||
var rid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier();
|
var rid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier();
|
||||||
|
|
||||||
new PublishCommand()
|
new PublishCommand()
|
||||||
.WithFramework("netcoreapp1.0")
|
.WithFramework("netcoreapp1.1")
|
||||||
.WithRuntime(rid)
|
.WithRuntime(rid)
|
||||||
.WithWorkingDirectory(testProjectDirectory)
|
.WithWorkingDirectory(testProjectDirectory)
|
||||||
//Workaround for https://github.com/dotnet/cli/issues/4501
|
//Workaround for https://github.com/dotnet/cli/issues/4501
|
||||||
|
|
@ -67,7 +67,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
|
||||||
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
||||||
|
|
||||||
var outputProgram = testProjectDirectory
|
var outputProgram = testProjectDirectory
|
||||||
.GetDirectory("bin", configuration, "netcoreapp1.0", rid, "publish", $"{testAppName}{Constants.ExeSuffix}")
|
.GetDirectory("bin", configuration, "netcoreapp1.1", rid, "publish", $"{testAppName}{Constants.ExeSuffix}")
|
||||||
.FullName;
|
.FullName;
|
||||||
|
|
||||||
new TestCommand(outputProgram)
|
new TestCommand(outputProgram)
|
||||||
|
|
@ -85,7 +85,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
|
||||||
string dir = "pkgs";
|
string dir = "pkgs";
|
||||||
string args = $"--packages {dir}";
|
string args = $"--packages {dir}";
|
||||||
|
|
||||||
string newArgs = $"console -o \"{rootPath}\"";
|
string newArgs = $"console -f netcoreapp1.1 -o \"{rootPath}\"";
|
||||||
new NewCommandShim()
|
new NewCommandShim()
|
||||||
.WithWorkingDirectory(rootPath)
|
.WithWorkingDirectory(rootPath)
|
||||||
.Execute(newArgs)
|
.Execute(newArgs)
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests
|
||||||
|
|
||||||
new RunCommand()
|
new RunCommand()
|
||||||
.WithWorkingDirectory(testProjectDirectory)
|
.WithWorkingDirectory(testProjectDirectory)
|
||||||
.ExecuteWithCapturedOutput("--framework netcoreapp1.0")
|
.ExecuteWithCapturedOutput("--framework netcoreapp1.1")
|
||||||
.Should().Pass()
|
.Should().Pass()
|
||||||
.And.HaveStdOutContaining("Hello World!");
|
.And.HaveStdOutContaining("Hello World!");
|
||||||
}
|
}
|
||||||
|
|
@ -123,7 +123,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests
|
||||||
string dir = "pkgs";
|
string dir = "pkgs";
|
||||||
string args = $"--packages {dir}";
|
string args = $"--packages {dir}";
|
||||||
|
|
||||||
string newArgs = $"console -o \"{rootPath}\"";
|
string newArgs = $"console -f netcoreapp1.1 -o \"{rootPath}\"";
|
||||||
new NewCommandShim()
|
new NewCommandShim()
|
||||||
.WithWorkingDirectory(rootPath)
|
.WithWorkingDirectory(rootPath)
|
||||||
.Execute(newArgs)
|
.Execute(newArgs)
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@ namespace Microsoft.DotNet.Cli.Test.Tests
|
||||||
|
|
||||||
string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
||||||
string expectedError = Path.Combine(testProjectDirectory, "bin",
|
string expectedError = Path.Combine(testProjectDirectory, "bin",
|
||||||
configuration, "netcoreapp1.0", "VSTestDotNetCore.dll");
|
configuration, "netcoreapp1.1", "VSTestDotNetCore.dll");
|
||||||
expectedError = "The test source file " + "\"" + expectedError + "\"" + " provided was not found.";
|
expectedError = "The test source file " + "\"" + expectedError + "\"" + " provided was not found.";
|
||||||
|
|
||||||
// Call test
|
// Call test
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ namespace Microsoft.DotNet.Cli.VSTest.Tests
|
||||||
.Should().Pass();
|
.Should().Pass();
|
||||||
|
|
||||||
var outputDll = testRoot
|
var outputDll = testRoot
|
||||||
.GetDirectory("bin", configuration, "netcoreapp1.0")
|
.GetDirectory("bin", configuration, "netcoreapp1.1")
|
||||||
.GetFile($"{testAppName}.dll");
|
.GetFile($"{testAppName}.dll");
|
||||||
|
|
||||||
var argsForVstest = $"\"{outputDll.FullName}\" {TestBase.ConsoleLoggerOutputNormal}";
|
var argsForVstest = $"\"{outputDll.FullName}\" {TestBase.ConsoleLoggerOutputNormal}";
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ namespace Microsoft.DotNet.Tests
|
||||||
.WithSourceFiles()
|
.WithSourceFiles()
|
||||||
.WithRestoreFiles();
|
.WithRestoreFiles();
|
||||||
|
|
||||||
const string framework = ".NETCoreApp,Version=v1.0";
|
const string framework = ".NETCoreApp,Version=v1.1";
|
||||||
|
|
||||||
new BuildCommand()
|
new BuildCommand()
|
||||||
.WithProjectDirectory(testInstance.Root)
|
.WithProjectDirectory(testInstance.Root)
|
||||||
|
|
@ -289,7 +289,7 @@ namespace Microsoft.DotNet.Tests
|
||||||
.WithRestoreFiles();
|
.WithRestoreFiles();
|
||||||
|
|
||||||
var assetsFile = new DirectoryInfo(new RepoDirectoriesProvider().NugetPackages)
|
var assetsFile = new DirectoryInfo(new RepoDirectoriesProvider().NugetPackages)
|
||||||
.GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp1.0")
|
.GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp1.1")
|
||||||
.GetFile("project.assets.json");
|
.GetFile("project.assets.json");
|
||||||
|
|
||||||
var stopWatch = Stopwatch.StartNew();
|
var stopWatch = Stopwatch.StartNew();
|
||||||
|
|
@ -319,7 +319,7 @@ namespace Microsoft.DotNet.Tests
|
||||||
.WithRestoreFiles();
|
.WithRestoreFiles();
|
||||||
|
|
||||||
var assetsFile = new DirectoryInfo(new RepoDirectoriesProvider().NugetPackages)
|
var assetsFile = new DirectoryInfo(new RepoDirectoriesProvider().NugetPackages)
|
||||||
.GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp1.0")
|
.GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp1.1")
|
||||||
.GetFile("project.assets.json");
|
.GetFile("project.assets.json");
|
||||||
|
|
||||||
var stopWatch = Stopwatch.StartNew();
|
var stopWatch = Stopwatch.StartNew();
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.10-x64;rhel.7-x64</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;fedora.24-x64;opensuse.13.2-x64;opensuse.42.1-x64;osx.10.10-x64;rhel.7-x64</RuntimeIdentifiers>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="**\*.cs" />
|
<Compile Include="**\*.cs" />
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue