diff --git a/src/Microsoft.Framework.DesignTimeHost/ApplicationContext.cs b/src/Microsoft.Framework.DesignTimeHost/ApplicationContext.cs index 36c02888d..e289265e1 100644 --- a/src/Microsoft.Framework.DesignTimeHost/ApplicationContext.cs +++ b/src/Microsoft.Framework.DesignTimeHost/ApplicationContext.cs @@ -35,7 +35,7 @@ public class ApplicationContext private readonly Trigger _pluginWorkNeeded = new Trigger(); private readonly Trigger _filesChanged = new Trigger(); private readonly Trigger _rebuild = new Trigger(); - private readonly Trigger _restoreComplete = new Trigger(); + private readonly Trigger _refreshDependencies = new Trigger(); private readonly Trigger _sourceTextChanged = new Trigger(); private readonly Trigger _requiresCompilation = new Trigger(); @@ -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": @@ -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 diff --git a/src/Microsoft.Framework.DesignTimeHost/DesignTimeAssemblyLoadContextFactory.cs b/src/Microsoft.Framework.DesignTimeHost/DesignTimeAssemblyLoadContextFactory.cs index 765f267f3..ac19dcfdf 100644 --- a/src/Microsoft.Framework.DesignTimeHost/DesignTimeAssemblyLoadContextFactory.cs +++ b/src/Microsoft.Framework.DesignTimeHost/DesignTimeAssemblyLoadContextFactory.cs @@ -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); });