From 38fa399c900d482f673c9f281c72da1865cf35e5 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 20 Dec 2017 08:30:27 -0800 Subject: [PATCH] Add missing arguments to run.sh --- run.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index fc2bda858a..07cb63a780 100755 --- a/run.sh +++ b/run.sh @@ -18,6 +18,7 @@ repo_path="$DIR" channel='' tools_source='' package_version_props_url='' +asset_root_url='' access_token_suffix='' restore_sources='' msbuild_args='' @@ -186,6 +187,11 @@ while [[ $# -gt 0 ]]; do restore_sources="${1:-}" [ -z "$restore_sources" ] && __usage ;; + --asset-root-url|-AssetRootUrl) + shift + asset_root_url="${1:-}" + [ -z "$asset_root_url" ] && __usage + ;; -u|--update|-Update) update=true ;; @@ -233,7 +239,7 @@ if [ -f "$config_file" ]; then [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" fi -if [ "$package_version_props_url" ]; then +if [ ! -z "$package_version_props_url" ]; then intermediate_dir="$repo_path/obj" props_file_path="$intermediate_dir/external-dependencies.props" mkdir -p "$intermediate_dir" @@ -241,10 +247,18 @@ if [ "$package_version_props_url" ]; then msbuild_args+="-p:DotNetPackageVersionPropsPath=\"$props_file_path\" " fi -if [ "$restore_sources" ]; then +if [ ! -z "$restore_sources" ]; then msbuild_args+="-p:DotNetAdditionalRestoreSources=\"$restore_sources\" " fi +if [ ! -z "$asset_root_url" ]; then + msbuild_args+="-p:DotNetAssetRootUrl=\"$asset_root_url\" " +fi + +if [ ! -z "$asset_root_url" ]; then + msbuild_args+="-p:DotNetAssetRootAccessTokenSuffix=\"$access_token_suffix\" " +fi + [ -z "$channel" ] && channel='dev' [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'