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

Merge pull request #817 from schellap/host-svc

Browse source 
Change name for DOTNET_PACKAGES to NUGET_PACKAGES
This commit is contained in:
Senthil 2016-01-12 17:49:09 -08:00
commit 054aa54b91
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/corehost/cli/args.cpp
View file

@ -11,6 +11,11 @@ arguments_t::arguments_t() :
app_dir(_X("")),
app_argc(0),
app_argv(nullptr),
nuget_packages(_X("")),
dotnet_packages_cache(_X("")),
dotnet_servicing(_X("")),
dotnet_runtime_servicing(_X("")),
dotnet_home(_X("")),
deps_path(_X(""))
{
}
@ -102,7 +107,7 @@ bool parse_arguments(const int argc, const pal::char_t* argv[], arguments_t& arg
args.deps_path.append(_X(".deps"));
}
pal::getenv(_X("DOTNET_PACKAGES"), &args.dotnet_packages);
pal::getenv(_X("NUGET_PACKAGES"), &args.nuget_packages);
pal::getenv(_X("DOTNET_PACKAGES_CACHE"), &args.dotnet_packages_cache);
pal::getenv(_X("DOTNET_SERVICING"), &args.dotnet_servicing);
pal::getenv(_X("DOTNET_RUNTIME_SERVICING"), &args.dotnet_runtime_servicing);

2
src/corehost/cli/args.h
View file

@ -18,7 +18,7 @@ struct arguments_t
pal::string_t dotnet_servicing;
pal::string_t dotnet_runtime_servicing;
pal::string_t dotnet_home;
pal::string_t dotnet_packages;
pal::string_t nuget_packages;
pal::string_t dotnet_packages_cache;
pal::string_t managed_application;

2
src/corehost/cli/clihost.cpp
View file

@ -83,7 +83,7 @@ int run(const arguments_t& args, const pal::string_t& clr_path)
}
// Add packages directory
pal::string_t packages_dir = args.dotnet_packages;
pal::string_t packages_dir = args.nuget_packages;
if (!pal::directory_exists(packages_dir))
{
(void)pal::get_default_packages_directory(&packages_dir);