diff options
| -rw-r--r-- | DotnetCLIVersion.txt | 2 | ||||
| -rw-r--r-- | dir.props | 3 | ||||
| -rw-r--r-- | init-tools.cmd | 4 | ||||
| -rwxr-xr-x | init-tools.sh | 12 |
4 files changed, 11 insertions, 10 deletions
diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt index 23d09af1af..c100eaafde 100644 --- a/DotnetCLIVersion.txt +++ b/DotnetCLIVersion.txt @@ -1 +1 @@ -1.0.0.001718
\ No newline at end of file +1.0.0-beta-002111
\ No newline at end of file @@ -62,7 +62,7 @@ <PackagesBinDir Condition="'$(__PackagesBinDir)'==''">$(BinDir).nuget\</PackagesBinDir> <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools/</ToolsDir> - <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/bin/</DotnetCliPath> + <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/</DotnetCliPath> <BuildToolsSemaphore Condition="'$(BuildToolsSemaphore)' == ''">$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll</BuildToolsSemaphore> <TestWorkingDir>$(__TestWorkingDir)\</TestWorkingDir> @@ -112,6 +112,7 @@ <DnuRestoreCommand>$(DnuRestoreCommand) "$(DotnetToolCommand)"</DnuRestoreCommand> <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand> <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))"</DnuRestoreCommand> + <DnuRestoreCommand Condition="'$(InferRuntimes)'!='false'">$(DnuRestoreCommand) --infer-runtimes</DnuRestoreCommand> </PropertyGroup> <!-- diff --git a/init-tools.cmd b/init-tools.cmd index af77c7bcd2..a419e8b275 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -8,7 +8,7 @@ set INIT_TOOLS_LOG=%~dp0init-tools.log set PACKAGES_DIR=%~dp0packages\ set TOOLRUNTIME_DIR=%~dp0Tools set DOTNET_PATH=%TOOLRUNTIME_DIR%\dotnetcli\ -set DOTNET_CMD=%DOTNET_PATH%bin\dotnet.exe +set DOTNET_CMD=%DOTNET_PATH%dotnet.exe if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://www.myget.org/F/dotnet-buildtools/ set /P BUILDTOOLS_VERSION=< %~dp0BuildToolsVersion.txt set BUILD_TOOLS_PATH=%PACKAGES_DIR%Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION%\lib\ @@ -46,7 +46,7 @@ if exist "%DOTNET_CMD%" goto :afterdotnetrestore echo Installing dotnet cli... if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%" set /p DOTNET_VERSION=< %~dp0DotnetCLIVersion.txt -set DOTNET_ZIP_NAME=dotnet-win-x64.%DOTNET_VERSION%.zip +set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/%DOTNET_VERSION%/%DOTNET_ZIP_NAME% set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME% echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> %INIT_TOOLS_LOG% diff --git a/init-tools.sh b/init-tools.sh index f7d1aa8847..326e6519ea 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -33,7 +33,7 @@ fi __PACKAGES_DIR=$__scriptpath/packages __TOOLRUNTIME_DIR=$__scriptpath/Tools __DOTNET_PATH=$__TOOLRUNTIME_DIR/dotnetcli -__DOTNET_CMD=$__DOTNET_PATH/bin/dotnet +__DOTNET_CMD=$__DOTNET_PATH/dotnet if [ -z "$__BUILDTOOLS_SOURCE" ]; then __BUILDTOOLS_SOURCE=https://www.myget.org/F/dotnet-buildtools/; fi __BUILD_TOOLS_PACKAGE_VERSION=$(cat $__scriptpath/BuildToolsVersion.txt) __DOTNET_TOOLS_VERSION=$(cat $__scriptpath/DotnetCLIVersion.txt) @@ -47,18 +47,18 @@ OSName=$(uname -s) case $OSName in Darwin) OS=OSX - __DOTNET_PKG=dotnet-osx-x64 + __DOTNET_PKG=dotnet-dev-osx-x64 ;; Linux) OS=Linux - __DOTNET_PKG=dotnet-ubuntu-x64 + __DOTNET_PKG=dotnet-dev-ubuntu-x64 ;; *) echo "Unsupported OS $OSName detected. Downloading ubuntu-x64 tools" OS=Linux - __DOTNET_PKG=dotnet-ubuntu-x64 + __DOTNET_PKG=dotnet-dev-ubuntu-x64 ;; esac @@ -66,11 +66,11 @@ esac initDistroName $OS if [ "$__DistroName" == "centos" ]; then - __DOTNET_PKG=dotnet-centos-x64 + __DOTNET_PKG=dotnet-dev-centos-x64 fi if [ "$__DistroName" == "rhel" ]; then - __DOTNET_PKG=dotnet-centos-x64 + __DOTNET_PKG=dotnet-dev-centos-x64 fi __CLIDownloadURL=https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz |