mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into UpdateSDK

Browse source
This commit is contained in:
Rama Krishnan Raghupathy 2017-03-03 14:27:05 -08:00
commit 94dab4559a
3 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Documentation/cli-installation-scenarios.md
View file

@ -209,7 +209,7 @@ The following arguments are needed for the installation script:
| dotnet-install.sh arg (Linux, OSX) | dotnet-install.ps1 arg (Windows) | Defaults | Description |
|-------------------------------------- |------------------------------------ |----------------------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| --channel | -Channel | "Production" | Which channel (i.e. "Future", "preview", "production") to install from. |
| --channel | -Channel | "preview" | Which channel (i.e. "Future", "preview", "production", "release/1.1.0") to install from. |
| --version | -Version | global.json or Latest | Which version of CLI to install; you need to specify the version as 3-part version (i.e. 1.0.0-13232). If omitted, it will default to the first global.json that contains the sdkVersion property; if that is not present it will use Latest. |
| --install-dir | -InstallDir | .dotnet | Path to where to install the CLI bundle. The directory is created if it doesn't exist. On Linux/OSX this directory is created in the user home directory (`$HOME`). On Windows, this directory is created in `%LocalAppData%`. |
| --debug | -Debug | false | Whether to use the "fat" packages that contain debugging symbols or not. |
@ -218,6 +218,18 @@ The following arguments are needed for the installation script:
Note: Powershell arg naming convention is supported on Windows and non-Windows platforms. Non-Windows platforms do additionally support convention specific to their platform.
##### Install the 1.1.0 of the shared runtime
Windows:
```
./dotnet-install.ps1 -Channel 'release/1.1.0' -SharedRuntime -Version 1.1.1
```
macOS/Linux:
```
./dotnet-install.sh --channel 'release/1.1.0' --shared-runtime --version 1.1.1
```
##### Install the latest Future CLI
Windows:

5
build/DependencyVersions.props
View file

@ -2,11 +2,10 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.2.0-preview-000002-01</CLI_MSBuild_Version>
<CLI_MSBuild_Version>15.2.0-preview-000047-02</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
<CLI_NETSDK_Version>1.1.0-alpha-20170303-2</CLI_NETSDK_Version>
<!-- non-official NuGet build taken from https://github.com/nuget/nuget.client/tree/release-4.1.0-netstandard2.0 to contain "2.0" TFMs -->
<CLI_NuGet_Version>4.0.1-beta-2321</CLI_NuGet_Version>
<CLI_NuGet_Version>4.3.0-beta1-2342</CLI_NuGet_Version>
<CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.0.0-preview-20170125-04</CLI_TestPlatform_Version>
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>

11
scripts/obtain/dotnet-install.sh vendored
View file

@ -60,7 +60,10 @@ get_current_os_name() {
eval $invocation
local uname=$(uname)
if [ "$uname" = "Darwin" ]; then
if [ "$linux_portable" = true ]; then
echo "linux"
return 0
elif [ "$uname" = "Darwin" ]; then
echo "osx"
return 0
else
@ -584,6 +587,7 @@ azure_feed="https://dotnetcli.azureedge.net/dotnet"
uncached_feed="https://dotnetcli.blob.core.windows.net/dotnet"
verbose=false
shared_runtime=false
linux_portable=false
while [ $# -ne 0 ]
do
@ -624,6 +628,9 @@ do
shift
azure_feed="$1"
;;
--linux-portable|-[Ll]inux[Pp]ortable)
linux_portable=true
;;
-?|--?|-h|--help|-[Hh]elp)
script_name="$(basename $0)"
echo ".NET Tools Installer"
@ -648,6 +655,8 @@ do
echo " --no-path, -NoPath Do not set PATH for the current process."
echo " --verbose,-Verbose Display diagnostics information."
echo " --azure-feed,-AzureFeed Azure feed location. Defaults to $azure_feed"
echo " --linux-portable Installs the Linux portable .NET Tools instead of a distro-specific version."
echo " -LinuxPortable"
echo " -?,--?,-h,--help,-Help Shows this help message"
echo ""
echo "Install Location:"