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

PR Feedback

Browse source
This commit is contained in:
PiotrP 2016-01-11 13:10:55 -08:00
parent ec5a50dfe8
commit 9eed889217
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/specs/corehost.md
View file

@ -78,7 +78,7 @@ During host start-up, the host identifies if a `.deps` file is present and loads
A `.deps` file is **not** required to successfully launch an application, but without it, all the dependent assemblies must be located within the same folder as the application. Also, since servicing is performed on the basis of packages, an application without a `.deps` file cannot use the servicing index to override the location of assemblies.
The host looks for the `.deps` file in the Application Base with the file name `[AssemblyName].deps`. The path to the deps file can be overriden by specifying `--corehost-depsfile:{path to deps file}` as the first parameter to the application.
The host looks for the `.deps` file in the Application Base with the file name `[AssemblyName].deps`. The path to the deps file can be overriden by specifying `--depsfile:{path to deps file}` as the first parameter to the application.
Given the set of assembly names, the host performs the following resolution. In some steps, the Package ID/Version/Relative Path data is required. This is only available if the assembly was listed in the deps file. If the assembly comes from the app-local folder, these resolution steps are skipped.

2
src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs
View file

@ -176,7 +176,7 @@ namespace Microsoft.DotNet.Cli.Utils
if (depsPath != null)
{
depsArg = $"\"--corehost-depsfile:{depsPath}\" ";
depsArg = $"\"--depsfile:{depsPath}\" ";
}
args = $"\"{dllPath}\" {depsArg}{args}";

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

@ -8,7 +8,7 @@
#include "pal.h"
#include "trace.h"
static const pal::string_t s_depsArgPrefix = _X("--corehost-depsfile:");
static const pal::string_t s_depsArgPrefix = _X("--depsfile:");
struct arguments_t
{

3
src/corehost/common/utils.cpp
View file

@ -20,8 +20,7 @@ bool ends_with(const pal::string_t& value, const pal::string_t& suffix)
bool starts_with(const pal::string_t& value, const pal::string_t& prefix)
{
return prefix.length() <= value.length() &&
(0 == value.compare(0, prefix.length(), prefix));
return value.find(prefix.c_str(), 0, prefix.length()) == 0;
}
void append_path(pal::string_t* path1, const pal::char_t* path2)