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

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

4
packaging/debian/dotnet-debian_config.json
View file

@ -3,7 +3,7 @@
"maintainer_email": "dotnetcore@microsoft.com",
"package_name": "dotnet-dev-%SDK_NUGET_VERSION%",
"install_root": "/usr/share/dotnet/sdk/%SDK_NUGET_VERSION%",
"install_root": "/usr/share/dotnet",
"short_description": ".NET Core & command line tools",
"long_description": ".NET Core is a cross-platform implementation of .NET Framework, a modern, modular platform\n for building diverse kinds of applications, from command-line applications to microservices and \n modern websites.\n This package contains the tools you will need to start writing applications for .NET Core. It includes \n compilers, package managers and other utilities that developers need.",
@ -30,7 +30,7 @@
"debian_dependencies":{
"clang-3.5" : {},
"SHARED_FRAMEWORK_NUGET_NAME" : {}
"%SHARED_FRAMEWORK_NUGET_NAME%" : {}
},
"package_conflicts" : [

2
packaging/debian/dotnet-nightly-debian_config.json
View file

@ -29,7 +29,7 @@
"debian_dependencies":{
"clang-3.5" : {},
"SHARED_FRAMEWORK_NUGET_NAME" : {}
"%SHARED_FRAMEWORK_NUGET_NAME%" : {}
},
"package_conflicts" : [

2
packaging/sharedframework/debian/dotnet-sharedframework-debian_config.json
View file

@ -3,7 +3,7 @@
"maintainer_email": "dotnetcore@microsoft.com",
"package_name": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%",
"install_root": "/usr/share/dotnet/shared/%SHARED_FRAMEWORK_NUGET_NAME%/%SHARED_FRAMEWORK_NUGET_VERSION%",
"install_root": "/usr/share/dotnet",
"short_description": ".NET Core Shared Framework %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%",
"long_description": ".NET Core is a cross-platform implementation of .NET Framework, a modern, modular platform\n for building diverse kinds of applications, from command-line applications to microservices and \n modern websites.\n This package contains a runtime and framework which can be used by .NET Core applications.",

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();

6
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
$TEST_STAGE_DIR/bin/bats $PACKAGE_OUTPUT_DIR/test_package.bats
}

2
tools/DebianPackageTool/package_tool
View file

@ -218,7 +218,7 @@ package_docs(){
## Generation Functions ##
generate_config_templates(){
python ${SCRIPT_DIR}/scripts/config_template_generator.py $CONFIG $SCRIPT_DIR/templates/debian $DEBIAN_DIR $PACKAGE_VERSION
python ${SCRIPT_DIR}/scripts/config_template_generator.py $CONFIG $SCRIPT_DIR/templates/debian $DEBIAN_DIR $PACKAGE_NAME $PACKAGE_VERSION
}
generate_manpages(){