From b1bce2b50a05332e87aecc6d3a1f9d0a56a92eae Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 20 Jan 2016 19:09:49 -0800 Subject: [PATCH] Making the multi project validator compile for the passed configuration to make the scripts work for release as well. Also fixed the variable assignment in the .sh script. --- scripts/test/validate-dependencies.ps1 | 2 +- scripts/test/validate-dependencies.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/test/validate-dependencies.ps1 b/scripts/test/validate-dependencies.ps1 index 820d751c7..e47e55c1a 100644 --- a/scripts/test/validate-dependencies.ps1 +++ b/scripts/test/validate-dependencies.ps1 @@ -6,7 +6,7 @@ . "$PSScriptRoot\..\common\_common.ps1" # Run Validation for Project.json dependencies -dotnet publish $RepoRoot\tools\MultiProjectValidator -o $Stage2Dir\..\tools +dotnet publish $RepoRoot\tools\MultiProjectValidator -o $Stage2Dir\..\tools -c "$Configuration" $pjvalidatePath = "$Stage2Dir\..\tools\$Configuration\$Tfm" if (! (Test-Path $pjvalidatePath)) { diff --git a/scripts/test/validate-dependencies.sh b/scripts/test/validate-dependencies.sh index 8dc54e9ae..80a93e8a9 100755 --- a/scripts/test/validate-dependencies.sh +++ b/scripts/test/validate-dependencies.sh @@ -17,13 +17,13 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" source "$DIR/../common/_common.sh" # Run Validation for Project.json dependencies -dotnet publish "$REPOROOT/tools/MultiProjectValidator" -o "$STAGE2_DIR/../tools" +dotnet publish "$REPOROOT/tools/MultiProjectValidator" -o "$STAGE2_DIR/../tools" -c "$CONFIGURATION" #TODO for release builds this should fail set +e -PJ_VALIDATE_PATH = "$STAGE2_DIR/../tools/$CONFIGURATION/$TFM" +PJ_VALIDATE_PATH="$STAGE2_DIR/../tools/$CONFIGURATION/$TFM" if [ ! -d "$PJ_VALIDATE_PATH" ] then - PJ_VALIDATE_PATH = "$STAGE2_DIR/../tools" + PJ_VALIDATE_PATH="$STAGE2_DIR/../tools" fi "$PJ_VALIDATE_PATH/pjvalidate" "$REPOROOT/src"