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

AppDeps Copy Script fix dotnet invocation

Browse source
This commit is contained in:
Bryan 2015-11-18 00:28:50 -08:00
parent d0c07c64b9
commit ebe108c69b
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/build/build_appdeps.sh
View file

@ -6,9 +6,6 @@
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $SCRIPT_DIR/../_common.sh source $SCRIPT_DIR/../_common.sh
export PATH=$REPOROOT/artifacts/$RID/stage0/bin
export DOTNET_HOME=$REPOROOT/artifacts/$RID/stage0/bin
export DOTNET_TOOLS=$REPOROOT/artifacts/$RID/stage0/bin
REPO_ROOT="$SCRIPT_DIR/../.." REPO_ROOT="$SCRIPT_DIR/../.."
APPDEPS_PROJECT_DIR=$REPO_ROOT/src/Microsoft.DotNet.Tools.Compiler.Native/appdep APPDEPS_PROJECT_DIR=$REPO_ROOT/src/Microsoft.DotNet.Tools.Compiler.Native/appdep
@ -22,7 +19,6 @@ popd
pushd $APPDEPS_PROJECT_DIR pushd $APPDEPS_PROJECT_DIR
dotnet restore --packages $APPDEPS_PROJECT_DIR/packages dotnet restore --packages $APPDEPS_PROJECT_DIR/packages
APPDEP_SDK=$APPDEPS_PROJECT_DIR/packages/toolchain*/*/ APPDEP_SDK=$APPDEPS_PROJECT_DIR/packages/toolchain*/*/
popd popd
mkdir -p $OUTPUT_DIR/appdepsdk mkdir -p $OUTPUT_DIR/appdepsdk

2
scripts/compile.sh
View file

@ -108,7 +108,7 @@ chmod a+x $STAGE2_DIR/bin/dotnet-restore
# Copy in AppDeps # Copy in AppDeps
header "Acquiring Native App Dependencies" header "Acquiring Native App Dependencies"
$REPOROOT/scripts/build/build_appdeps.sh "$STAGE2_DIR/bin" DOTNET_HOME=$STAGE2_DIR DOTNET_TOOLS=$STAGE2_DIR $REPOROOT/scripts/build/build_appdeps.sh "$STAGE2_DIR/bin"
# Stamp the output with the commit metadata # Stamp the output with the commit metadata
COMMIT_ID=$(git rev-parse HEAD) COMMIT_ID=$(git rev-parse HEAD)