DTH applies out-of-date lock file to reduce error messages

aspnet · Mar 24, 2015 · 7ea973d · 7ea973d
1 parent b61b3f8
commit 7ea973d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Microsoft.Framework.DesignTimeHost/ApplicationContext.cs b/src/Microsoft.Framework.DesignTimeHost/ApplicationContext.cs
@@ -1044,7 +1044,8 @@ private ApplicationHostContext GetApplicationHostContext(Project project, string
                                                                         cache: _cache,
                                                                         cacheContextAccessor: _cacheContextAccessor,
                                                                         namedCacheDependencyProvider: _namedDependencyProvider,
-                                                                        loadContextFactory: GetRuntimeLoadContextFactory(project));
+                                                                        loadContextFactory: GetRuntimeLoadContextFactory(project),
+                                                                        skipLockFileValidation: true);
 
                 applicationHostContext.DependencyWalker.Walk(project.Name, project.Version, frameworkName);
 

diff --git a/src/Microsoft.Framework.Runtime/ApplicationHostContext.cs b/src/Microsoft.Framework.Runtime/ApplicationHostContext.cs
@@ -27,7 +27,8 @@ public class ApplicationHostContext
                                       ICache cache,
                                       ICacheContextAccessor cacheContextAccessor,
                                       INamedCacheDependencyProvider namedCacheDependencyProvider,
-                                      IAssemblyLoadContextFactory loadContextFactory = null)
+                                      IAssemblyLoadContextFactory loadContextFactory = null,
+                                      bool skipLockFileValidation = false)
         {
             ProjectDirectory = projectDirectory;
             Configuration = configuration;
@@ -67,7 +68,7 @@ public class ApplicationHostContext
                 var lockFile = lockFileFormat.Read(projectLockJsonPath);
                 validLockFile = lockFile.IsValidForProject(Project);
 
-                if (validLockFile)
+                if (validLockFile || skipLockFileValidation)
                 {
                     NuGetDependencyProvider.ApplyLockFile(lockFile);
 
@@ -81,9 +82,9 @@ public class ApplicationHostContext
                 }
             }
 
-            if (!lockFileExists || !validLockFile)
+            if (!validLockFile && !skipLockFileValidation)
             {
-                // If we are unable to apply the lockfile, we don't add NuGetDependencyProvider to DependencyWalker
+                // We don't add NuGetDependencyProvider to DependencyWalker
                 // It will leave all NuGet packages unresolved and give error message asking users to run "kpm restore"
                 DependencyWalker = new DependencyWalker(new IDependencyProvider[] {
                     ProjectDepencyProvider,