From b52b6eb8c532c8bdb20c99eaea9d3163edcacaa6 Mon Sep 17 00:00:00 2001 From: Abhijeet Shah Date: Tue, 18 Apr 2017 14:18:33 -0700 Subject: [PATCH 1/4] enable scopes and travis --- .travis.yml | 23 +++++ Directory.Build.props | 2 + build.proj | 4 +- testSdkOnLinux.sh | 27 ++++++ test_on_linux.sh | 32 +++++++ tools/buildTargets/additional.targets | 26 ++++++ tools/buildTargets/common.targets | 124 ++++++++++++++++++++++---- tools/buildTargets/signing.targets | 6 +- 8 files changed, 226 insertions(+), 18 deletions(-) create mode 100644 .travis.yml create mode 100644 testSdkOnLinux.sh create mode 100644 test_on_linux.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000000..b80925d31d924 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,23 @@ +language: csharp +sudo: required +dist: trusty +addons: + apt: + sources: + packages: +install: + - sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' + - sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893 + - sudo apt-get update + - sudo apt-get install dotnet-dev-1.0.0-preview2-003121 -y +script: + - ./testSdkOnLinux.sh +after_script: + - echo "========== Server log: ============" + - pwd + - ls -al + - ls -al TestResults + - cat TestResults/*.log +notifications: + slack: + secure: d0PFVLcyqcMxNtmZ8JaEpIBzXbUbZCgKs8QtBB5qEIXDnxflSR3AhczlILNhTBKtMEBlwVzsz65yP09XcmvB6xpAfJbHqSRzk2frKa5viPcAD8Wr/NYamt9/UiTCsnql8MqzjVy0tLdMscXKRmsUey4YF570zl0b7gAbq7XTqxM= diff --git a/Directory.Build.props b/Directory.Build.props index 936f6fdb1e7a2..783fc4898e050 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -12,9 +12,11 @@ AzureManagementLibraries.sln $(LibraryRoot)binaries $(BinariesFolder)\packages + false false All "$(LibraryToolsFolder)\nuget.exe" + 1234 true diff --git a/build.proj b/build.proj index 827e30dcdda4d..2859f0068530f 100644 --- a/build.proj +++ b/build.proj @@ -1,4 +1,4 @@ - + @@ -8,5 +8,5 @@ - + diff --git a/testSdkOnLinux.sh b/testSdkOnLinux.sh new file mode 100644 index 0000000000000..a9df554c23f01 --- /dev/null +++ b/testSdkOnLinux.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +set -e +base=`dirname {BASH_SOURCE[0]}` +rootdir="$( cd "$base" && pwd )" + +dotnet build build.proj +dotnet Test build.proj + +armdir=$rootdir/src/SDKs +for folder in $armdir/* + +cd $armdir/AnalysisServices/AnalysisServices.Tests +dotnet test +cd $armdir + +cd $armdir/Billing/Management.Billing +dotnet test +cd $armdir + +cd $armdir/Cdn/Cdn.Tests +dotnet test +cd $armdir + +cd $armdir/SDKs/CognitiveServices +dotnet test +cd $armdir diff --git a/test_on_linux.sh b/test_on_linux.sh new file mode 100644 index 0000000000000..88885ef06bf32 --- /dev/null +++ b/test_on_linux.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e +base=`dirname {BASH_SOURCE[0]}` +rootdir="$( cd "$base" && pwd )" + +dotnet restore +cd $rootdir/src/TestFramework/HttpRecorder.Tests +dotnet restore +dotnet build --framework netcoreapp1.0 +dotnet test +cd ../TestFramework.Tests +dotnet restore +dotnet build --framework netcoreapp1.0 +dotnet test + +armdir=$rootdir/src/ResourceManagement +for folder in $armdir/* +do + item=`basename $folder` + if [ -d $armdir/$item ] + then + if [ -d $armdir/$item/$item.Tests ] && [ -f $armdir/$item/$item.Tests/project.json ] + then + cd $armdir/$item/$item.Tests + dotnet restore + dotnet build --framework netcoreapp1.0 + dotnet test + cd $armdir + fi + fi +done diff --git a/tools/buildTargets/additional.targets b/tools/buildTargets/additional.targets index 92f7d9da69c89..b9c36f4f2dc65 100644 --- a/tools/buildTargets/additional.targets +++ b/tools/buildTargets/additional.targets @@ -56,4 +56,30 @@ --> + + + + + + + + + + -Source $(NuGetPublishingSource) + + + + + + + + + + + \ No newline at end of file diff --git a/tools/buildTargets/common.targets b/tools/buildTargets/common.targets index e1e82f709b2c0..3344c6dd6ab53 100644 --- a/tools/buildTargets/common.targets +++ b/tools/buildTargets/common.targets @@ -14,9 +14,17 @@ BuildCiSign; BuildMsBuildTask; CategorizeProjects; + GetScopedProjects; + + + CategorizeProjects; + GetScopedProjects; + + + @@ -60,16 +68,20 @@ - Restore - + + + ContinueOnError="ErrorAndStop" Condition="$(Scope) == 'All'" /> + + @@ -111,19 +123,17 @@ - + - + + - + + + + + + + + $(LibraryRoot)\PublishedNugets + + + + + + + -Source $(PublishNugetToDir) + + + + + + - - - + + + + + + + + + - - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + -Source $(NuGetPublishingSource) + + + + + + + + + + + + diff --git a/tools/buildTargets/signing.targets b/tools/buildTargets/signing.targets index 56cd56deea691..3105b01b14601 100644 --- a/tools/buildTargets/signing.targets +++ b/tools/buildTargets/signing.targets @@ -3,7 +3,7 @@ 31bf3856ad364e35 - + @@ -88,6 +88,10 @@ + + Date: Tue, 18 Apr 2017 14:22:30 -0700 Subject: [PATCH 2/4] adding unsaved file --- tools/buildTargets/common.targets | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/tools/buildTargets/common.targets b/tools/buildTargets/common.targets index 3344c6dd6ab53..707ad5262c2b8 100644 --- a/tools/buildTargets/common.targets +++ b/tools/buildTargets/common.targets @@ -219,30 +219,7 @@ - - - - - - - - - -Source $(NuGetPublishingSource) - - - - - - - - - - + From ddbe78277d634a54ff624b6f2f3e98006576e625 Mon Sep 17 00:00:00 2001 From: Abhijeet Shah Date: Tue, 18 Apr 2017 14:32:33 -0700 Subject: [PATCH 3/4] adding dotnet install on travis --- dotnet-install.sh | 685 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 685 insertions(+) create mode 100644 dotnet-install.sh diff --git a/dotnet-install.sh b/dotnet-install.sh new file mode 100644 index 0000000000000..d3a590e109a72 --- /dev/null +++ b/dotnet-install.sh @@ -0,0 +1,685 @@ +# 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. +# + +# Note: This script should be compatible with the dash shell used in Ubuntu. So avoid bashisms! See https://wiki.ubuntu.com/DashAsBinSh for more info + +# Stop script on NZEC +set -e +# Stop script if unbound variable found (use ${var:-} if intentional) +set -u +# By default cmd1 | cmd2 returns exit code of cmd2 regardless of cmd1 success +# This is causing it to fail +set -o pipefail + +# Use in the the functions: eval $invocation +invocation='say_verbose "Calling: ${yellow:-}${FUNCNAME[0]} ${green:-}$*${normal:-}"' + +# standard output may be used as a return value in the functions +# we need a way to write text on the screen in the functions so that +# it won't interfere with the return value. +# Exposing stream 3 as a pipe to standard output of the script itself +exec 3>&1 + +# Setup some colors to use. These need to work in fairly limited shells, like the Ubuntu Docker container where there are only 8 colors. +# See if stdout is a terminal +if [ -t 1 ]; then + # see if it supports colors + ncolors=$(tput colors) + if [ -n "$ncolors" ] && [ $ncolors -ge 8 ]; then + bold="$(tput bold || echo)" + normal="$(tput sgr0 || echo)" + black="$(tput setaf 0 || echo)" + red="$(tput setaf 1 || echo)" + green="$(tput setaf 2 || echo)" + yellow="$(tput setaf 3 || echo)" + blue="$(tput setaf 4 || echo)" + magenta="$(tput setaf 5 || echo)" + cyan="$(tput setaf 6 || echo)" + white="$(tput setaf 7 || echo)" + fi +fi + +say_err() { + printf "%b\n" "${red:-}dotnet_install: Error: $1${normal:-}" >&2 +} + +say() { + # using stream 3 (defined in the beginning) to not interfere with stdout of functions + # which may be used as return value + printf "%b\n" "${cyan:-}dotnet-install:${normal:-} $1" >&3 +} + +say_verbose() { + if [ "$verbose" = true ]; then + say "$1" + fi +} + +get_current_os_name() { + eval $invocation + + local uname=$(uname) + if [ "$uname" = "Darwin" ]; then + echo "osx" + return 0 + else + if [ -e /etc/os-release ]; then + . /etc/os-release + + case "$ID.$VERSION_ID" in + "centos.7") + echo "centos" + return 0 + ;; + "debian.8") + echo "debian" + return 0 + ;; + "fedora.23") + echo "fedora.23" + return 0 + ;; + "fedora.24") + echo "fedora.24" + return 0 + ;; + "opensuse.13.2") + echo "opensuse.13.2" + return 0 + ;; + "opensuse.42.1") + echo "opensuse.42.1" + return 0 + ;; + "rhel.7.0" | "rhel.7.1" | "rhel.7.2") + echo "rhel" + return 0 + ;; + "ubuntu.14.04") + echo "ubuntu" + return 0 + ;; + "ubuntu.16.04") + echo "ubuntu.16.04" + return 0 + ;; + "ubuntu.16.10") + echo "ubuntu.16.10" + return 0 + ;; + "alpine.3.4.3") + echo "alpine" + return 0 + ;; + esac + fi + fi + + say_err "OS name could not be detected: $ID.$VERSION_ID" + return 1 +} + +machine_has() { + eval $invocation + + which "$1" > /dev/null 2>&1 + return $? +} + +check_min_reqs() { + if ! machine_has "curl"; then + say_err "curl is required to download dotnet. Install curl to proceed." + return 1 + fi + + return 0 +} + +check_pre_reqs() { + eval $invocation + + local failing=false; + + if [ "${DOTNET_INSTALL_SKIP_PREREQS:-}" = "1" ]; then + return 0 + fi + + if [ "$(uname)" = "Linux" ]; then + if ! [ -x "$(command -v ldconfig)" ]; then + echo "ldconfig is not in PATH, trying /sbin/ldconfig." + LDCONFIG_COMMAND="/sbin/ldconfig" + else + LDCONFIG_COMMAND="ldconfig" + fi + + [ -z "$($LDCONFIG_COMMAND -p | grep libunwind)" ] && say_err "Unable to locate libunwind. Install libunwind to continue" && failing=true + [ -z "$($LDCONFIG_COMMAND -p | grep libssl)" ] && say_err "Unable to locate libssl. Install libssl to continue" && failing=true + [ -z "$($LDCONFIG_COMMAND -p | grep libcurl)" ] && say_err "Unable to locate libcurl. Install libcurl to continue" && failing=true + [ -z "$($LDCONFIG_COMMAND -p | grep libicu)" ] && say_err "Unable to locate libicu. Install libicu to continue" && failing=true + fi + + if [ "$failing" = true ]; then + return 1 + fi + + return 0 +} + +# args: +# input - $1 +to_lowercase() { + #eval $invocation + + echo "$1" | tr '[:upper:]' '[:lower:]' + return 0 +} + +# args: +# input - $1 +remove_trailing_slash() { + #eval $invocation + + local input=${1:-} + echo "${input%/}" + return 0 +} + +# args: +# input - $1 +remove_beginning_slash() { + #eval $invocation + + local input=${1:-} + echo "${input#/}" + return 0 +} + +# args: +# root_path - $1 +# child_path - $2 - this parameter can be empty +combine_paths() { + eval $invocation + + # TODO: Consider making it work with any number of paths. For now: + if [ ! -z "${3:-}" ]; then + say_err "combine_paths: Function takes two parameters." + return 1 + fi + + local root_path=$(remove_trailing_slash $1) + local child_path=$(remove_beginning_slash ${2:-}) + say_verbose "combine_paths: root_path=$root_path" + say_verbose "combine_paths: child_path=$child_path" + echo "$root_path/$child_path" + return 0 +} + +get_machine_architecture() { + eval $invocation + + # Currently the only one supported + echo "x64" + return 0 +} + +# args: +# architecture - $1 +get_normalized_architecture_from_architecture() { + eval $invocation + + local architecture=$(to_lowercase $1) + case $architecture in + \) + echo "$(get_normalized_architecture_from_architecture $(get_machine_architecture))" + return 0 + ;; + amd64|x64) + echo "x64" + return 0 + ;; + x86) + say_err "Architecture ``x86`` currently not supported" + return 1 + ;; + esac + + say_err "Architecture ``$architecture`` not supported. If you think this is a bug, please report it at https://github.com/dotnet/cli/issues" + return 1 +} + +# version_info is a conceptual two line string representing commit hash and 4-part version +# format: +# Line 1: # commit_hash +# Line 2: # 4-part version + +# args: +# version_text - stdin +get_version_from_version_info() { + eval $invocation + + cat | tail -n 1 + return 0 +} + +# args: +# version_text - stdin +get_commit_hash_from_version_info() { + eval $invocation + + cat | head -n 1 + return 0 +} + +# args: +# install_root - $1 +# relative_path_to_package - $2 +# specific_version - $3 +is_dotnet_package_installed() { + eval $invocation + + local install_root=$1 + local relative_path_to_package=$2 + local specific_version=${3//[$'\t\r\n']} + + local dotnet_package_path=$(combine_paths $(combine_paths $install_root $relative_path_to_package) $specific_version) + say_verbose "is_dotnet_package_installed: dotnet_package_path=$dotnet_package_path" + + if [ -d "$dotnet_package_path" ]; then + return 0 + else + return 1 + fi +} + +# args: +# azure_feed - $1 +# azure_channel - $2 +# normalized_architecture - $3 +get_latest_version_info() { + eval $invocation + + local azure_feed=$1 + local azure_channel=$2 + local normalized_architecture=$3 + + local osname + osname=$(get_current_os_name) || return 1 + + local version_file_url=null + if [ "$shared_runtime" = true ]; then + version_file_url="$uncached_feed/$azure_channel/dnvm/latest.sharedfx.$osname.$normalized_architecture.version" + else + version_file_url="$uncached_feed/Sdk/$azure_channel/latest.version" + fi + say_verbose "get_latest_version_info: latest url: $version_file_url" + + download $version_file_url + return $? +} + +# args: +# channel - $1 +get_azure_channel_from_channel() { + eval $invocation + + local channel=$(to_lowercase $1) + case $channel in + future|dev) + echo "dev" + return 0 + ;; + esac + + echo $channel + return 0 +} + +# args: +# azure_feed - $1 +# azure_channel - $2 +# normalized_architecture - $3 +# version - $4 +get_specific_version_from_version() { + eval $invocation + + local azure_feed=$1 + local azure_channel=$2 + local normalized_architecture=$3 + local version=$(to_lowercase $4) + + case $version in + latest) + local version_info + version_info="$(get_latest_version_info $azure_feed $azure_channel $normalized_architecture)" || return 1 + say_verbose "get_specific_version_from_version: version_info=$version_info" + echo "$version_info" | get_version_from_version_info + return 0 + ;; + lkg) + say_err "``--version LKG`` not supported yet." + return 1 + ;; + *) + echo $version + return 0 + ;; + esac +} + +# args: +# azure_feed - $1 +# azure_channel - $2 +# normalized_architecture - $3 +# specific_version - $4 +construct_download_link() { + eval $invocation + + local azure_feed=$1 + local azure_channel=$2 + local normalized_architecture=$3 + local specific_version=${4//[$'\t\r\n']} + + local osname + osname=$(get_current_os_name) || return 1 + + local download_link=null + if [ "$shared_runtime" = true ]; then + download_link="$azure_feed/$azure_channel/Binaries/$specific_version/dotnet-$osname-$normalized_architecture.$specific_version.tar.gz" + else + download_link="$azure_feed/Sdk/$specific_version/dotnet-dev-$osname-$normalized_architecture.$specific_version.tar.gz" + fi + + echo "$download_link" + return 0 +} + +get_user_share_path() { + eval $invocation + + if [ ! -z "${DOTNET_INSTALL_DIR:-}" ]; then + echo $DOTNET_INSTALL_DIR + else + echo "$HOME/.dotnet" + fi + return 0 +} + +# args: +# install_dir - $1 +resolve_installation_path() { + eval $invocation + + local install_dir=$1 + if [ "$install_dir" = "" ]; then + local user_share_path=$(get_user_share_path) + say_verbose "resolve_installation_path: share_path=$user_share_path" + echo "$user_share_path" + return 0 + fi + + echo "$install_dir" + return 0 +} + +# args: +# install_root - $1 +get_installed_version_info() { + eval $invocation + + local install_root=$1 + local version_file=$(combine_paths "$install_root" "$local_version_file_relative_path") + say_verbose "Local version file: $version_file" + if [ ! -z "$version_file" ] | [ -r "$version_file" ]; then + local version_info="$(cat $version_file)" + echo "$version_info" + return 0 + fi + + say_verbose "Local version file not found." + return 0 +} + +# args: +# relative_or_absolute_path - $1 +get_absolute_path() { + eval $invocation + + local relative_or_absolute_path=$1 + echo $(cd $(dirname "$1") && pwd -P)/$(basename "$1") + return 0 +} + +# args: +# input_files - stdin +# root_path - $1 +# out_path - $2 +# override - $3 +copy_files_or_dirs_from_list() { + eval $invocation + + local root_path=$(remove_trailing_slash $1) + local out_path=$(remove_trailing_slash $2) + local override=$3 + local override_switch=$(if [ "$override" = false ]; then printf -- "-n"; fi) + + cat | uniq | while read -r file_path; do + local path=$(remove_beginning_slash ${file_path#$root_path}) + local target=$out_path/$path + if [ "$override" = true ] || (! ([ -d "$target" ] || [ -e "$target" ])); then + mkdir -p $out_path/$(dirname $path) + cp -R $override_switch $root_path/$path $target + fi + done +} + +# args: +# zip_path - $1 +# out_path - $2 +extract_dotnet_package() { + eval $invocation + + local zip_path=$1 + local out_path=$2 + + local temp_out_path=$(mktemp -d $temporary_file_template) + + local failed=false + tar -xzf "$zip_path" -C "$temp_out_path" > /dev/null || failed=true + + local folders_with_version_regex='^.*/[0-9]+\.[0-9]+[^/]+/' + find $temp_out_path -type f | grep -Eo $folders_with_version_regex | copy_files_or_dirs_from_list $temp_out_path $out_path false + find $temp_out_path -type f | grep -Ev $folders_with_version_regex | copy_files_or_dirs_from_list $temp_out_path $out_path true + + rm -rf $temp_out_path + + if [ "$failed" = true ]; then + say_err "Extraction failed" + return 1 + fi +} + +# args: +# remote_path - $1 +# [out_path] - $2 - stdout if not provided +download() { + eval $invocation + + local remote_path=$1 + local out_path=${2:-} + + local failed=false + if [ -z "$out_path" ]; then + curl --fail -s $remote_path || failed=true + else + curl --fail -s -o $out_path $remote_path || failed=true + fi + + if [ "$failed" = true ]; then + say_err "Download failed" + return 1 + fi +} + +calculate_vars() { + eval $invocation + + azure_channel=$(get_azure_channel_from_channel "$channel") + say_verbose "azure_channel=$azure_channel" + + normalized_architecture=$(get_normalized_architecture_from_architecture "$architecture") + say_verbose "normalized_architecture=$normalized_architecture" + + specific_version=$(get_specific_version_from_version $azure_feed $azure_channel $normalized_architecture $version) + say_verbose "specific_version=$specific_version" + if [ -z "$specific_version" ]; then + say_err "Could not get version information." + return 1 + fi + + download_link=$(construct_download_link $azure_feed $azure_channel $normalized_architecture $specific_version) + say_verbose "download_link=$download_link" + + install_root=$(resolve_installation_path $install_dir) + say_verbose "install_root=$install_root" +} + +install_dotnet() { + eval $invocation + + if is_dotnet_package_installed $install_root "sdk" $specific_version; then + say ".NET SDK version $specific_version is already installed." + return 0 + fi + + mkdir -p $install_root + zip_path=$(mktemp $temporary_file_template) + say_verbose "Zip path: $zip_path" + + say "Downloading $download_link" + download "$download_link" $zip_path + say_verbose "Downloaded file exists and readable? $(if [ -r $zip_path ]; then echo "yes"; else echo "no"; fi)" + + say "Extracting zip" + extract_dotnet_package $zip_path $install_root + + return 0 +} + +local_version_file_relative_path="/.version" +bin_folder_relative_path="" +temporary_file_template="${TMPDIR:-/tmp}/dotnet.XXXXXXXXX" + +channel="production" +version="Latest" +install_dir="" +architecture="" +debug_symbols=false +dry_run=false +no_path=false +azure_feed="https://dotnetcli.azureedge.net/dotnet" +uncached_feed="https://dotnetcli.blob.core.windows.net/dotnet" +verbose=false +shared_runtime=false + +while [ $# -ne 0 ] +do + name=$1 + case $name in + -c|--channel|-[Cc]hannel) + shift + channel=$1 + ;; + -v|--version|-[Vv]ersion) + shift + version="$1" + ;; + -i|--install-dir|-[Ii]nstall[Dd]ir) + shift + install_dir="$1" + ;; + --arch|--architecture|-[Aa]rch|-[Aa]rchitecture) + shift + architecture="$1" + ;; + --shared-runtime|-[Ss]hared[Rr]untime) + shared_runtime=true + ;; + --debug-symbols|-[Dd]ebug[Ss]ymbols) + debug_symbols=true + ;; + --dry-run|-[Dd]ry[Rr]un) + dry_run=true + ;; + --no-path|-[Nn]o[Pp]ath) + no_path=true + ;; + --verbose|-[Vv]erbose) + verbose=true + ;; + --azure-feed|-[Aa]zure[Ff]eed) + shift + azure_feed="$1" + ;; + -?|--?|-h|--help|-[Hh]elp) + script_name="$(basename $0)" + echo ".NET Tools Installer" + echo "Usage: $script_name [-c|--channel ] [-v|--version ] [-p|--prefix ]" + echo " $script_name -h|-?|--help" + echo "" + echo "$script_name is a simple command line interface for obtaining dotnet cli." + echo "" + echo "Options:" + echo " -c,--channel Download from the CHANNEL specified (default: $channel)." + echo " -Channel" + echo " -v,--version Use specific version, ``latest`` or ``lkg``. Defaults to ``latest``." + echo " -Version" + echo " -i,--install-dir Install under specified location (see Install Location below)" + echo " -InstallDir" + echo " --architecture Architecture of .NET Tools. Currently only x64 is supported." + echo " --arch,-Architecture,-Arch" + echo " --shared-runtime Installs just the shared runtime bits, not the entire SDK." + echo " -SharedRuntime" + echo " --debug-symbols,-DebugSymbols Specifies if symbols should be included in the installation." + echo " --dry-run,-DryRun Do not perform installation. Display download link." + 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 " -?,--?,-h,--help,-Help Shows this help message" + echo "" + echo "Install Location:" + echo " Location is chosen in following order:" + echo " - --install-dir option" + echo " - Environmental variable DOTNET_INSTALL_DIR" + echo " - /usr/local/share/dotnet" + exit 0 + ;; + *) + say_err "Unknown argument \`$name\`" + exit 1 + ;; + esac + + shift +done + +check_min_reqs +calculate_vars +if [ "$dry_run" = true ]; then + say "Payload URL: $download_link" + say "Repeatable invocation: ./$(basename $0) --version $specific_version --channel $channel --install-dir $install_dir" + exit 0 +fi + +check_pre_reqs +install_dotnet + +bin_path=$(get_absolute_path $(combine_paths $install_root $bin_folder_relative_path)) +if [ "$no_path" = false ]; then + say "Adding to current process PATH: ``$bin_path``. Note: This change will be visible only when sourcing script." + export PATH=$bin_path:$PATH +else + say "Binaries of dotnet can be found in $bin_path" +fi + +say "Installation finished successfully." From 3c1810af124371a837263af1063e35bf0a6c20a0 Mon Sep 17 00:00:00 2001 From: Abhijeet Shah Date: Tue, 18 Apr 2017 15:06:22 -0700 Subject: [PATCH 4/4] Enabling publish --- .gitignore | 1 + Directory.Build.props | 5 +++-- build.proj | 6 +++--- tools/buildTargets/common.targets | 12 +++++++----- tools/buildTargets/signing.targets | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 1f4e022913451..51e1e635620f7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ binaries/ [Rr]elease/ build/ restoredPackages/ +PublishedNugets/ src/NuGet.Config tools/7-zip/ diff --git a/Directory.Build.props b/Directory.Build.props index 783fc4898e050..9d9664880dda2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,8 +16,9 @@ false All "$(LibraryToolsFolder)\nuget.exe" - 1234 - true + 1234 + + true diff --git a/build.proj b/build.proj index 2859f0068530f..ad50ce80cee0d 100644 --- a/build.proj +++ b/build.proj @@ -1,6 +1,6 @@ - - + + @@ -8,5 +8,5 @@ - + diff --git a/tools/buildTargets/common.targets b/tools/buildTargets/common.targets index 707ad5262c2b8..a9143216ef1e8 100644 --- a/tools/buildTargets/common.targets +++ b/tools/buildTargets/common.targets @@ -143,8 +143,7 @@ VisualStudioVersion=$(VisualStudioVersion); PackageOutputPath=$(PackageOutputPath); NoPackageAnalysis=true; - IncludeSymbols=true; - Properties=TargetFramework=$(NetFx452); + IncludeSymbols=true; NoBuild=true;"> @@ -153,11 +152,14 @@ + + + - $(LibraryRoot)\PublishedNugets + $(LibraryRoot)PublishedNugets - + @@ -166,7 +168,7 @@ - diff --git a/tools/buildTargets/signing.targets b/tools/buildTargets/signing.targets index 1f7b3fdcd10e2..9ece96445176a 100644 --- a/tools/buildTargets/signing.targets +++ b/tools/buildTargets/signing.targets @@ -87,7 +87,7 @@ - +