Skip to content
This repository has been archived by the owner on Dec 18, 2017. It is now read-only.

Commit

Permalink
Made some changes to DTH
Browse files Browse the repository at this point in the history
- Added RefreshDependencies message
- Fixed issue in DesignTimeAssemblyLoadContextFactory where it
wasn't picking up changes because of the trigger name changes
- Renamed _restoreComplete to _refreshDependencies

#1439
  • Loading branch information
davidfowl committed Mar 19, 2015
1 parent 15823fb commit d6fc2b5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions src/Microsoft.Framework.DesignTimeHost/ApplicationContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class ApplicationContext
private readonly Trigger<Void> _pluginWorkNeeded = new Trigger<Void>();
private readonly Trigger<Void> _filesChanged = new Trigger<Void>();
private readonly Trigger<Void> _rebuild = new Trigger<Void>();
private readonly Trigger<Void> _restoreComplete = new Trigger<Void>();
private readonly Trigger<Void> _refreshDependencies = new Trigger<Void>();
private readonly Trigger<Void> _sourceTextChanged = new Trigger<Void>();
private readonly Trigger<Void> _requiresCompilation = new Trigger<Void>();

Expand Down Expand Up @@ -250,9 +250,10 @@ private bool ProcessMessage()
_configuration.Value = data.Configuration;
}
break;
case "RefreshDependencies":
case "RestoreComplete":
{
_restoreComplete.Value = default(Void);
_refreshDependencies.Value = default(Void);
}
break;
case "Rebuild":
Expand Down Expand Up @@ -336,19 +337,19 @@ private bool ResolveDependencies()
_configuration.WasAssigned ||
_filesChanged.WasAssigned ||
_rebuild.WasAssigned ||
_restoreComplete.WasAssigned ||
_refreshDependencies.WasAssigned ||
_sourceTextChanged.WasAssigned ||
_pluginRegistration.WasAssigned)
{
bool triggerBuildOutputs = _rebuild.WasAssigned || _filesChanged.WasAssigned;
bool triggerDependencies = _restoreComplete.WasAssigned || _rebuild.WasAssigned;
bool triggerDependencies = _refreshDependencies.WasAssigned || _rebuild.WasAssigned;

_appPath.ClearAssigned();
_configuration.ClearAssigned();
_filesChanged.ClearAssigned();
_rebuild.ClearAssigned();
_sourceTextChanged.ClearAssigned();
_restoreComplete.ClearAssigned();
_refreshDependencies.ClearAssigned();

// Trigger that the project outputs changes in case the runtime process
// hasn't died yet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private IAssemblyLoadContextFactory GetRuntimeFactory()
}
// Add a cache dependency on restore complete to reevaluate dependencies
ctx.Monitor(_namedDependencyProvider.GetNamedDependency(_project.Name + "_RestoreComplete"));
ctx.Monitor(_namedDependencyProvider.GetNamedDependency(_project.Name + "_Dependencies"));
return new AssemblyLoadContextFactory(applicationHostContext.ServiceProvider);
});
Expand Down

0 comments on commit d6fc2b5

Please sign in to comment.