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

put all deb packages in the same root, small fix to package tool, renable upgrade tests

Browse source
This commit is contained in:
Bryan Thornbury 2016-03-22 11:14:29 -07:00
parent ad2f1991b8
commit 6ed82a1a3f
6 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/dotnet-cli-build/DebTargets.cs
View file

@ -49,7 +49,7 @@ namespace Microsoft.DotNet.Cli.Build
"-m", manPagesDir,
"--framework-nuget-name", Monikers.SharedFrameworkName,
"--framework-nuget-version", c.BuildContext.Get<string>("SharedFrameworkNugetVersion"),
//"--previous-version-url", previousVersionURL,
"--previous-version-url", previousVersionURL,
"--obj-root", objRoot)
.Execute()
.EnsureSuccessful();

8
scripts/package/package-debian.sh
View file

@ -106,6 +106,10 @@ parseargs(){
echo "Provide the NuGet name of the targetted Shared Framework. Missing option '--framework-nuget-name'" && help
fi
if [ -z "$PREVIOUS_VERSION_URL" ]; then
echo "Provide a URL to the previous debian pacakge (Required for running upgrade tests). Missing option '--previous-version-url'" && help
fi
if [ -z "$SHARED_FRAMEWORK_NUGET_VERSION" ]; then
echo "Provide the NuGet version of the targetted Shared Framework. Missing option '--framework-nuget-version'" && help
fi
@ -195,9 +199,7 @@ install_bats() {
run_package_integrity_tests() {
# Set LAST_VERSION_URL to enable upgrade tests
if [ -z "$PREVIOUS_VERSION_URL" ]; then
export LAST_VERSION_URL="$PREVIOUS_VERSION_URL"
fi
export LAST_VERSION_URL="$PREVIOUS_VERSION_URL"
$TEST_STAGE_DIR/bin/bats $PACKAGE_OUTPUT_DIR/test_package.bats
}