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

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.

Browse source
This commit is contained in:
Livar Cunha 2016-01-20 19:09:49 -08:00
parent 0c3751cd37
commit b1bce2b50a
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/test/validate-dependencies.ps1
View file

@ -6,7 +6,7 @@
. "$PSScriptRoot\..\common\_common.ps1" . "$PSScriptRoot\..\common\_common.ps1"
# Run Validation for Project.json dependencies # 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" $pjvalidatePath = "$Stage2Dir\..\tools\$Configuration\$Tfm"
if (! (Test-Path $pjvalidatePath)) { if (! (Test-Path $pjvalidatePath)) {

6
scripts/test/validate-dependencies.sh
View file

@ -17,13 +17,13 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
source "$DIR/../common/_common.sh" source "$DIR/../common/_common.sh"
# Run Validation for Project.json dependencies # 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 #TODO for release builds this should fail
set +e set +e
PJ_VALIDATE_PATH = "$STAGE2_DIR/../tools/$CONFIGURATION/$TFM" PJ_VALIDATE_PATH="$STAGE2_DIR/../tools/$CONFIGURATION/$TFM"
if [ ! -d "$PJ_VALIDATE_PATH" ] if [ ! -d "$PJ_VALIDATE_PATH" ]
then then
PJ_VALIDATE_PATH = "$STAGE2_DIR/../tools" PJ_VALIDATE_PATH="$STAGE2_DIR/../tools"
fi fi
"$PJ_VALIDATE_PATH/pjvalidate" "$REPOROOT/src" "$PJ_VALIDATE_PATH/pjvalidate" "$REPOROOT/src"