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

Use lock file to find out when dependencies change

Browse source 
Faster to check one file than many
This commit is contained in:
Mihai Codoban 2016-01-14 13:32:39 -08:00
parent 0ddf493f1d
commit 2dcf502946
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Microsoft.DotNet.Tools.Builder/CompileContext.cs
View file

@ -58,9 +58,9 @@ namespace Microsoft.DotNet.Tools.Build
{ {
if (incremental) if (incremental)
{ {
var dependencyContext = ProjectContext.Create(dependency.Path, dependency.Framework); var dependencyProjectContext = ProjectContext.Create(dependency.Path, dependency.Framework);
if (!NeedsRebuilding(dependencyContext, new ProjectDependenciesFacade(dependencyContext, _args.ConfigValue))) if (!NeedsRebuilding(dependencyProjectContext, new ProjectDependenciesFacade(dependencyProjectContext, _args.ConfigValue)))
{ {
continue; continue;
} }
@ -342,11 +342,13 @@ namespace Microsoft.DotNet.Tools.Build
// input: project.json // input: project.json
compilerIO.Inputs.Add(project.ProjectFile.ProjectFilePath); compilerIO.Inputs.Add(project.ProjectFile.ProjectFilePath);
// input: lock file; find when dependencies change
AddLockFile(project, compilerIO);
// input: source files // input: source files
compilerIO.Inputs.AddRange(CompilerUtil.GetCompilationSources(project)); compilerIO.Inputs.AddRange(CompilerUtil.GetCompilationSources(project));
// todo: Factor out dependency resolution between Build and Compile. Ideally Build injects the dependencies into Compile // todo: Factor out dependency resolution between Build and Compile. Ideally Build injects the dependencies into Compile
// todo: use lock file insteaf of dependencies. One file vs many
// input: dependencies // input: dependencies
AddDependencies(dependencies, compilerIO); AddDependencies(dependencies, compilerIO);
@ -365,13 +367,24 @@ namespace Microsoft.DotNet.Tools.Build
return compilerIO; return compilerIO;
} }
private static void AddLockFile(ProjectContext project, CompilerIO compilerIO)
{
if(project.LockFile == null)
{
var errorMessage = $"Project {project.ProjectName()} does not have a lock file.";
Reporter.Error.WriteLine(errorMessage);
throw new InvalidOperationException(errorMessage);
}
compilerIO.Inputs.Add(project.LockFile.LockFilePath);
}
private static void AddDependencies(ProjectDependenciesFacade dependencies, CompilerIO compilerIO) private static void AddDependencies(ProjectDependenciesFacade dependencies, CompilerIO compilerIO)
{ {
// add dependency sources that need compilation // add dependency sources that need compilation
compilerIO.Inputs.AddRange(dependencies.ProjectDependenciesWithSources.Values.SelectMany(p => p.Project.Files.SourceFiles)); compilerIO.Inputs.AddRange(dependencies.ProjectDependenciesWithSources.Values.SelectMany(p => p.Project.Files.SourceFiles));
// add compilation binaries // non project dependencies get captured by changes in the lock file
compilerIO.Inputs.AddRange(dependencies.Dependencies.SelectMany(d => d.CompilationAssemblies.Select(ca => ca.ResolvedPath)));
} }
private static void AddKeyFile(ProjectContext project, string config, CompilerIO compilerIO) private static void AddKeyFile(ProjectContext project, string config, CompilerIO compilerIO)