[WIP] Solution restore

paket.dependencies

@@ -5,7 +5,7 @@ nuget MahApps.Metro
 nuget Paket.Core
 nuget FSharp.Core redirects:force
 nuget Mono.Cecil prerelease redirects:force
-nuget Microsoft.VisualStudio.Sdk.BuildTasks.14.0 prerelease
+//nuget Microsoft.VisualStudio.Sdk.BuildTasks.14.0 prerelease
 nuget VSSDK.DTE.8 copy_local: false
 nuget VSSDK.DTE.9 copy_local: false
 nuget VSSDK.DTE.10 copy_local: false

src/Paket.VisualStudio/IntelliSense/CompletionProviders/NuGetNameCompletionListProvider.cs

@@ -31,9 +31,12 @@ public IEnumerable<Completion> GetCompletionEntries(CompletionContext context)
                     FSharpOption<int>.None,
                     FSharpOption<CancellationToken>.None);
 
-            foreach (var value in searchResults.ResultValue)
+            if (searchResults.IsOk)
             {
-                yield return new Completion2(value, value, null, imageSource, "iconAutomationText");
+                foreach (var value in searchResults.ResultValue)
+                {
+                    yield return new Completion2(value, value, null, imageSource, "iconAutomationText");
+                }
             }
         }
 

src/Paket.VisualStudio/Paket.VisualStudio.csproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <Import Project="..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" Label="Paket" />
   <Import Project="..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props" Condition="Exists('..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props')" Label="Paket" />
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(VisualStudioVersion)' != ''">$(VisualStudioVersion)</MinimumVisualStudioVersion>
@@ -696,5 +695,4 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" Label="Paket" />
 </Project>

src/Paket.VisualStudio/Restore/AutoRestorer.cs

@@ -26,4 +26,4 @@ public void Restore(Dependencies dependencies, IEnumerable<RestoringProject> pro
             restorer.Restore(dependencies, projects);
         }
     }
-}
+}

src/Paket.VisualStudio/Restore/ErrorReportRestorer.cs

@@ -17,18 +17,33 @@ public ErrorReportRestorer(IPackageRestorer restorer)
 
         public void Restore(Dependencies dependencies, IEnumerable<RestoringProject> projects)
         {
-            foreach (var project in projects)
+            if (projects == null)
             {
                 try
                 {
-                    restorer.Restore(dependencies, new[] { project });
+                    restorer.Restore(dependencies, null);
                 }
                 catch (Exception ex)
                 {
-                    PaketErrorPane.ShowError(ex.Message, project.ReferenceFile, "paket-restore.html");
+                    PaketErrorPane.ShowError(ex.Message, dependencies.GetLockFile().FileName, "paket-restore.html");
                     PaketOutputPane.OutputPane.OutputStringThreadSafe(ex.Message + "\r\n");
                 }
             }
+            else
+            {
+                foreach (var project in projects)
+                {
+                    try
+                    {
+                        restorer.Restore(dependencies, new[] { project });
+                    }
+                    catch (Exception ex)
+                    {
+                        PaketErrorPane.ShowError(ex.Message, project.ReferenceFile, "paket-restore.html");
+                        PaketOutputPane.OutputPane.OutputStringThreadSafe(ex.Message + "\r\n");
+                    }
+                }
+            }
         }
     }
 }

src/Paket.VisualStudio/Restore/OutputPaneRestorer.cs

@@ -22,7 +22,14 @@ public void Restore(Dependencies dependencies, IEnumerable<RestoringProject> pro
 
             try
             {
-                restorer.Restore(dependencies, projects);
+                using (var loggingSub = Paket.Logging.@event.Publish.Subscribe(trace =>
+                {
+                    PaketOutputPane.OutputPane.OutputStringThreadSafe(
+                        "Paket: "+ trace.Text + (trace.NewLine ? "\r\n" : ""));
+                }))
+                {
+                    restorer.Restore(dependencies, projects);
+                }
             }
             finally
             {

src/Paket.VisualStudio/Restore/PackageRestorer.cs

@@ -12,15 +12,25 @@ public class PackageRestorer
         private readonly IPackageRestorer restorer;
         private readonly DTE dte;
         private readonly BuildEvents buildEvents;
+        private readonly SolutionEvents solutionEvents;
 
         public PackageRestorer(IPackageRestorer restorer)
         {
             dte = (DTE)Package.GetGlobalService(typeof(DTE));
+            solutionEvents = dte.Events.SolutionEvents;
+            solutionEvents.Opened += SolutionEvents_Opened;
             buildEvents = dte.Events.BuildEvents;
             buildEvents.OnBuildBegin += BuildEvents_OnBuildBegin;
             this.restorer = restorer;
         }
 
+        private void SolutionEvents_Opened()
+        {
+            var dir = SolutionExplorerExtensions.GetSolutionDirectory();
+            var dependencies = Dependencies.Locate(dir);
+            restorer.Restore(dependencies, null);
+        }
+
         private void BuildEvents_OnBuildBegin(vsBuildScope scope, vsBuildAction action)
         {
             if (action == vsBuildAction.vsBuildActionClean)

src/Paket.VisualStudio/Restore/PaketRestorer.cs

@@ -9,9 +9,8 @@ public class PaketRestorer : IPackageRestorer
     {
         public void Restore(Dependencies dependencies, IEnumerable<RestoringProject> project)
         {
-            dependencies.Restore(
-                FSharpOption<string>.None,
-                ListModule.OfSeq(project.Select(p => p.ReferenceFile)));
+            // Note: Performance optimization because this command is optimized in paket itself
+            dependencies.Restore();
         }
     }
-}
+}

src/Paket.VisualStudio/Restore/WaitDialogRestorer.cs

@@ -23,20 +23,39 @@ public WaitDialogRestorer(IPackageRestorer restorer, IVsThreadedWaitDialogFactor
 
         public void Restore(Dependencies dependencies, IEnumerable<RestoringProject> projects)
         {
-            var projectsList = projects.ToList();
+            var projectsList = projects?.ToList();
             IVsThreadedWaitDialog2 waitDialog;
             waitDialogFactory.CreateInstance(out waitDialog);
-            waitDialog.StartWaitDialog("Paket", "Restoring packages", null, null, null, 0, false, true);
+            waitDialog.StartWaitDialog("Paket", "Restoring packages", "Initialize Paket", null, null, 0, false, true);
 
             int i = 0;
             try
             {
-                foreach (var project in projectsList)
+                if (projectsList == null)
                 {
-                    bool canceled;
-                    waitDialog.UpdateProgress(string.Format("Restoring packages for {0}", project.ProjectName), null, null, i++, projectsList.Count, false, out canceled);
+                    using (var loggingSub = Paket.Logging.@event.Publish.Subscribe(trace =>
+                    {
+                        bool canceled;
+                        waitDialog.UpdateProgress(
+                            "Restoring packages for Solution", trace.Text, trace.Text, i++, 50, false, out canceled);
+                    }))
+                    {
+                        bool canceled;
+                        waitDialog.UpdateProgress(
+                            "Restoring packages for Solution", "Restoring packages", "Restoring packages", i++, 50, false, out canceled);
 
-                    restorer.Restore(dependencies, new[] { project });
+                        restorer.Restore(dependencies, null);
+                    }
+                }
+                else
+                {
+                    foreach (var project in projectsList)
+                    {
+                        bool canceled;
+                        waitDialog.UpdateProgress(string.Format("Restoring packages for {0}", project.ProjectName), null, null, i++, projectsList.Count, false, out canceled);
+
+                        restorer.Restore(dependencies, new[] { project });
+                    }
                 }
             }
             finally

src/Paket.VisualStudio/SolutionExplorer/SolutionExplorerExtensions.cs

@@ -103,7 +103,18 @@ public static IEnumerable<Project> GetAllProjects()
             return DteUtils.DTE.Solution.Projects
                 .OfType<Project>()
                 .SelectMany(GetProjects)
-                .Where(p => File.Exists(p.FullName));
+                .Where(p => {
+                    try
+                    {
+                        return File.Exists(p.FullName);
+                    }
+                    catch (NotImplementedException e)
+                    {
+                        // I believe this happens when a project is currently not loaded...
+                        PaketOutputPane.OutputPane.OutputString($"Error while trying to get FullName of project '{p.Name}': {e}\r\n");
+                        return false;
+                    }
+                });
         }
 
         private static IEnumerable<Project> GetProjects(Project project)

src/Paket.VisualStudio/paket.references

@@ -8,7 +8,6 @@ VSSDK.Editor.12
 VSSDK.ComponentModelHost.12
 VSSDK.Shell.12
 VSSDK.Shell.Interop.12
-Microsoft.VisualStudio.Sdk.BuildTasks.14.0
 reactiveui
 reactiveui-events
 MahApps.Metro