From 28dea81ed3dc9b6fbc202cc37d6577ff94a51e6e Mon Sep 17 00:00:00 2001
From: Diego Ajassa <daj@templafy.com>
Date: Fri, 26 Oct 2018 13:54:27 +0200
Subject: [PATCH 1/3] Added teh possibility to load also a test project when
 switching to project references. Removing this project when switching back

---
 .../FromNuGetToProjectTransformation.cs       | 32 ++++++++++++++++++
 .../FromProjectToNuGetTransformation.cs       |  3 ++
 .../Models/ProjectModel.cs                    |  5 +--
 .../ViewModels/MainDialogModel.cs             | 33 ++++++++++++++++---
 .../Views/MainDialog.xaml                     | 10 ++++++
 .../Views/MainDialog.xaml.cs                  | 19 +++++++++++
 6 files changed, 95 insertions(+), 7 deletions(-)

diff --git a/src/NuGetReferenceSwitcher.Presentation/Models/FromNuGetToProjectTransformation.cs b/src/NuGetReferenceSwitcher.Presentation/Models/FromNuGetToProjectTransformation.cs
index d6ef538..6059d76 100644
--- a/src/NuGetReferenceSwitcher.Presentation/Models/FromNuGetToProjectTransformation.cs
+++ b/src/NuGetReferenceSwitcher.Presentation/Models/FromNuGetToProjectTransformation.cs
@@ -23,7 +23,9 @@ public enum NuGetToProjectMode
     public class FromNuGetToProjectTransformation : ObservableObject
     {
         private string _toProjectPath;
+        private string _toTestProjectPath;
         private ProjectModel _toProject;
+        private ProjectModel _toTestProject;
 
         /// <summary>Initializes a new instance of the <see cref="FromNuGetToProjectTransformation"/> class. </summary>
         /// <param name="projects">The projects. </param>
@@ -96,6 +98,36 @@ public ProjectModel ToProject
             }
         }
 
+        public ProjectModel ToTestProject
+        {
+            get { return _toTestProject; }
+            set
+            {
+                if (Set(ref _toTestProject, value))
+                {
+                    if (_toTestProject == null)
+                        SelectedMode = NuGetToProjectMode.ProjectPath;
+                    else
+                        SelectedMode = NuGetToProjectMode.Project;
+                }
+            }
+        }
+
+        public string ToTestProjectPath
+        {
+            get { return _toTestProjectPath; }
+            set
+            {
+                if (Set(ref _toTestProjectPath, value))
+                {
+                    if (_toTestProjectPath == null)
+                        SelectedMode = NuGetToProjectMode.Project;
+                    else
+                        SelectedMode = NuGetToProjectMode.ProjectPath;
+                }
+            }
+        }
+
         /// <summary>Gets the evaluated to project path. </summary>
         public string EvaluatedToProjectPath
         {
diff --git a/src/NuGetReferenceSwitcher.Presentation/Models/FromProjectToNuGetTransformation.cs b/src/NuGetReferenceSwitcher.Presentation/Models/FromProjectToNuGetTransformation.cs
index e223bfc..85a2709 100644
--- a/src/NuGetReferenceSwitcher.Presentation/Models/FromProjectToNuGetTransformation.cs
+++ b/src/NuGetReferenceSwitcher.Presentation/Models/FromProjectToNuGetTransformation.cs
@@ -18,5 +18,8 @@ public class FromProjectToNuGetTransformation
 
         /// <summary>Gets or sets the NuGet assembly path name to switch to. </summary>
         public string ToAssemblyPath { get; set; }
+
+        /// <summary>Gets or sets the test project name. </summary>
+        public string FromTestProjectName { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/NuGetReferenceSwitcher.Presentation/Models/ProjectModel.cs b/src/NuGetReferenceSwitcher.Presentation/Models/ProjectModel.cs
index 40e7d48..26f8209 100644
--- a/src/NuGetReferenceSwitcher.Presentation/Models/ProjectModel.cs
+++ b/src/NuGetReferenceSwitcher.Presentation/Models/ProjectModel.cs
@@ -144,7 +144,7 @@ private List<FromProjectToNuGetTransformation> LoadTransformationsFromFile(strin
             {
                 var lines = File.ReadAllLines(configurationPath)
                     .Select(l => l.Split('\t'))
-                    .Where(l => l.Length == 3).ToArray();
+                    .Where(l => l.Length == 4).ToArray();
 
                 
 
@@ -152,7 +152,8 @@ private List<FromProjectToNuGetTransformation> LoadTransformationsFromFile(strin
                     list.Add(new FromProjectToNuGetTransformation {
                         FromProjectName = line[0],
                         FromProjectPath = PathUtilities.MakeAbsolute(line[1], configurationPath),
-                        ToAssemblyPath = PathUtilities.MakeAbsolute(line[2], configurationPath)
+                        ToAssemblyPath = PathUtilities.MakeAbsolute(line[2], configurationPath),
+                        FromTestProjectName = line[3]
                     });
             }
             return list;
diff --git a/src/NuGetReferenceSwitcher.Presentation/ViewModels/MainDialogModel.cs b/src/NuGetReferenceSwitcher.Presentation/ViewModels/MainDialogModel.cs
index 41a9a7a..f0a86cf 100644
--- a/src/NuGetReferenceSwitcher.Presentation/ViewModels/MainDialogModel.cs
+++ b/src/NuGetReferenceSwitcher.Presentation/ViewModels/MainDialogModel.cs
@@ -130,11 +130,16 @@ await RunTaskAsync(token => Task.Run(() =>
 
                                 project.AddProjectReference(assemblyToProjectSwitch.ToProject);
                                 nuGetReferenceTransformationsForProject +=
-                                    assemblyToProjectSwitch.ToProject.Name + "\t" +
+                                    assemblyToProjectSwitch.ToProject.Name + 
+                                    "\t" +
                                     PathUtilities.MakeRelative(assemblyToProjectSwitch.ToProject.Path,
-                                        project.CurrentConfigurationPath) + "\t" +
+                                        project.CurrentConfigurationPath) + 
+                                    "\t" +
                                     PathUtilities.MakeRelative(fromAssemblyPath, project.CurrentConfigurationPath) +
-                                    "\n";                                
+                                    "\t" +
+                                    assemblyToProjectSwitch.ToTestProject.Name +
+                                    "\t" +
+                                    "\n";
                             }
                             else
                             {
@@ -156,6 +161,8 @@ await RunTaskAsync(token => Task.Run(() =>
             }, token));
         }
 
+
+
         /// <summary>Handles an exception which occured in the <see cref="M:MyToolkit.Mvvm.ViewModelBase.RunTaskAsync(System.Func{System.Threading.CancellationToken,System.Threading.Tasks.Task})"/> method. </summary>
         /// <param name="exception">The exception. </param>
         public override void HandleException(Exception exception)
@@ -186,7 +193,7 @@ await RunTaskAsync(token => Task.Run(() =>
                             {
                                 MessageBox.Show("The project '" + transformation.ToAssemblyPath + "' could not be added. " +
                                                 "\nSkipped.", "Could not add project", MessageBoxButton.OK, MessageBoxImage.Error);
-                            }                           
+                            }
                         }
                     }
 
@@ -245,15 +252,31 @@ private void AddProjectToSolutionIfNeeded(FromNuGetToProjectTransformation fromN
                 }
                 else
                     MessageBox.Show("The project '" + fromNuGetToProjectTransformation.ToProjectPath + "' could not be found. (ignored)", "Project not found", MessageBoxButton.OK, MessageBoxImage.Stop);
+                if (!string.IsNullOrEmpty(fromNuGetToProjectTransformation.ToTestProjectPath) && File.Exists(fromNuGetToProjectTransformation.ToTestProjectPath))
+                {
+                    var project = Application.Solution.AddFromFile(fromNuGetToProjectTransformation.ToTestProjectPath);
+                    var myProject = new ProjectModel((VSProject)project.Object, Application);
+                    fromNuGetToProjectTransformation.ToTestProject = myProject;
+                }
+                else
+                    MessageBox.Show("The project '" + fromNuGetToProjectTransformation.ToTestProjectPath + "' could not be found. (ignored)", "Project not found", MessageBoxButton.OK, MessageBoxImage.Stop);
             }
         }
 
         private List<ProjectModel> GetCurrentProjectsToRemove()
         {
-            return Projects
+            var pjToRemove = new List<ProjectModel>();
+            var projectsToRemove = Projects
                 .SelectMany(p => p.CurrentToNuGetTransformations.Select(s => s.FromProjectName))
                 .Select(name => Projects.SingleOrDefault(p => p.Name == name))
                 .ToList();
+            pjToRemove.AddRange(projectsToRemove);
+            var testProjectsToRemove = Projects
+                .SelectMany(p => p.CurrentToNuGetTransformations.Select(s => s.FromTestProjectName))
+                .Select(name => Projects.SingleOrDefault(p => p.Name == name))
+                .ToList();
+            pjToRemove.AddRange(testProjectsToRemove);
+            return pjToRemove;
         }
 
         private void RemoveProjectsFromSolution(List<ProjectModel> projectsToDelete)
diff --git a/src/NuGetReferenceSwitcher.Presentation/Views/MainDialog.xaml b/src/NuGetReferenceSwitcher.Presentation/Views/MainDialog.xaml
index fbb3307..6fa91ff 100644
--- a/src/NuGetReferenceSwitcher.Presentation/Views/MainDialog.xaml
+++ b/src/NuGetReferenceSwitcher.Presentation/Views/MainDialog.xaml
@@ -68,6 +68,16 @@
                                                           SelectedItem="{Binding ToProject, Mode=TwoWay}"
                                                           DisplayMemberPath="Name" />
                                             </StackPanel>
+                                            <StackPanel Visibility="{Binding SelectedMode, Mode=OneWay, ConverterParameter='ProjectPath', Converter={StaticResource NuGetToProjectModeConverter}}">
+                                                <Button Content="Select a Test Project to add" Click="OnSelectTestProjectFile" Tag="{Binding}" />
+                                                <TextBlock Text="{Binding ToTestProjectPath}" TextWrapping="Wrap" Margin="0,4,0,0"
+                                                           Visibility="{Binding ToTestProjectPath, Converter={StaticResource VisibilityConverter}}" />
+                                            </StackPanel>
+                                            <StackPanel Visibility="{Binding SelectedMode, Mode=OneWay, ConverterParameter='Project', Converter={StaticResource NuGetToProjectModeConverter}}">
+                                                    <ComboBox ItemsSource="{Binding Project, Source={StaticResource ViewModel}}"
+                                                              SelectedItem="{Binding ToTestProject, Mode=TwoWay}"
+                                                              DisplayMemberPath="Name" />
+                                                </StackPanel>
                                         </StackPanel>
                                     </StackPanel>
                                 </DataTemplate>
diff --git a/src/NuGetReferenceSwitcher.Presentation/Views/MainDialog.xaml.cs b/src/NuGetReferenceSwitcher.Presentation/Views/MainDialog.xaml.cs
index f415c56..cd5e963 100644
--- a/src/NuGetReferenceSwitcher.Presentation/Views/MainDialog.xaml.cs
+++ b/src/NuGetReferenceSwitcher.Presentation/Views/MainDialog.xaml.cs
@@ -102,5 +102,24 @@ private void OnSelectProjectFile(object sender, RoutedEventArgs e)
             if (_dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
                 fntpSwitch.ToProjectPath = _dlg.FileName;
         }
+
+        private void OnSelectTestProjectFile(object sender, RoutedEventArgs e)
+        {
+            var fntpSwitch = (FromNuGetToProjectTransformation)((Button)sender).Tag;
+            if (_dlg == null)
+            {
+                _dlg = new OpenFileDialog();
+                _dlg.Filter = "CSharp Projects (*.csproj)|*.csproj|VB.NET Projects (*.vbproj)|*.vbproj";
+
+                // switch to VB if any VB project is already referenced
+                if (Model.Transformations.Any(t => t.ToTestProjectPath != null && t.ToTestProjectPath.EndsWith(".vbproj", System.StringComparison.OrdinalIgnoreCase)))
+                    _dlg.FilterIndex = 2;
+            }
+
+            _dlg.Title = string.Format("Select Project for '{0}'", fntpSwitch.FromAssemblyName);
+
+            if (_dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+                fntpSwitch.ToTestProjectPath = _dlg.FileName;
+        }
     }
 }

From 96719f6cc76c3ba3de0b0cd4e3495251bd1f0581 Mon Sep 17 00:00:00 2001
From: Diego Ajassa <daj@templafy.com>
Date: Fri, 26 Oct 2018 14:36:18 +0200
Subject: [PATCH 2/3] allowing empty test projects. Saving and loading previous
 settings also for Test projects

---
 .../Models/FromNuGetToProjectTransformation.cs              | 6 ++++++
 .../Models/FromProjectToNuGetTransformation.cs              | 3 +++
 .../Models/ProjectModel.cs                                  | 5 +++--
 .../ViewModels/MainDialogModel.cs                           | 4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/NuGetReferenceSwitcher.Presentation/Models/FromNuGetToProjectTransformation.cs b/src/NuGetReferenceSwitcher.Presentation/Models/FromNuGetToProjectTransformation.cs
index 6059d76..d26efdf 100644
--- a/src/NuGetReferenceSwitcher.Presentation/Models/FromNuGetToProjectTransformation.cs
+++ b/src/NuGetReferenceSwitcher.Presentation/Models/FromNuGetToProjectTransformation.cs
@@ -46,6 +46,12 @@ public FromNuGetToProjectTransformation(List<ProjectModel> projects, ReferenceMo
                     ToProjectPath = swi.FromProjectPath;
                 else
                     ToProject = targetProject;
+
+                var targetTestProject = projects.FirstOrDefault(p => p.Path == swi.FromTestProjectPath);
+                if (targetTestProject == null)
+                    ToTestProjectPath = swi.FromTestProjectPath;
+                else
+                    ToTestProject = targetProject;
             }
             else
                 SelectedMode = NuGetToProjectMode.Deactivated;
diff --git a/src/NuGetReferenceSwitcher.Presentation/Models/FromProjectToNuGetTransformation.cs b/src/NuGetReferenceSwitcher.Presentation/Models/FromProjectToNuGetTransformation.cs
index 85a2709..e63c71c 100644
--- a/src/NuGetReferenceSwitcher.Presentation/Models/FromProjectToNuGetTransformation.cs
+++ b/src/NuGetReferenceSwitcher.Presentation/Models/FromProjectToNuGetTransformation.cs
@@ -21,5 +21,8 @@ public class FromProjectToNuGetTransformation
 
         /// <summary>Gets or sets the test project name. </summary>
         public string FromTestProjectName { get; set; }
+
+        /// <summary>Gets or sets the test project path. </summary>
+        public string FromTestProjectPath { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/NuGetReferenceSwitcher.Presentation/Models/ProjectModel.cs b/src/NuGetReferenceSwitcher.Presentation/Models/ProjectModel.cs
index 26f8209..6211414 100644
--- a/src/NuGetReferenceSwitcher.Presentation/Models/ProjectModel.cs
+++ b/src/NuGetReferenceSwitcher.Presentation/Models/ProjectModel.cs
@@ -144,7 +144,7 @@ private List<FromProjectToNuGetTransformation> LoadTransformationsFromFile(strin
             {
                 var lines = File.ReadAllLines(configurationPath)
                     .Select(l => l.Split('\t'))
-                    .Where(l => l.Length == 4).ToArray();
+                    .Where(l => l.Length == 5).ToArray();
 
                 
 
@@ -153,7 +153,8 @@ private List<FromProjectToNuGetTransformation> LoadTransformationsFromFile(strin
                         FromProjectName = line[0],
                         FromProjectPath = PathUtilities.MakeAbsolute(line[1], configurationPath),
                         ToAssemblyPath = PathUtilities.MakeAbsolute(line[2], configurationPath),
-                        FromTestProjectName = line[3]
+                        FromTestProjectName = line[3],
+                        FromTestProjectPath = PathUtilities.MakeAbsolute(line[4], configurationPath),
                     });
             }
             return list;
diff --git a/src/NuGetReferenceSwitcher.Presentation/ViewModels/MainDialogModel.cs b/src/NuGetReferenceSwitcher.Presentation/ViewModels/MainDialogModel.cs
index f0a86cf..e908d77 100644
--- a/src/NuGetReferenceSwitcher.Presentation/ViewModels/MainDialogModel.cs
+++ b/src/NuGetReferenceSwitcher.Presentation/ViewModels/MainDialogModel.cs
@@ -139,6 +139,8 @@ await RunTaskAsync(token => Task.Run(() =>
                                     "\t" +
                                     assemblyToProjectSwitch.ToTestProject.Name +
                                     "\t" +
+                                    PathUtilities.MakeRelative(assemblyToProjectSwitch.ToTestProject.Path,
+                                        project.CurrentConfigurationPath) +
                                     "\n";
                             }
                             else
@@ -258,8 +260,6 @@ private void AddProjectToSolutionIfNeeded(FromNuGetToProjectTransformation fromN
                     var myProject = new ProjectModel((VSProject)project.Object, Application);
                     fromNuGetToProjectTransformation.ToTestProject = myProject;
                 }
-                else
-                    MessageBox.Show("The project '" + fromNuGetToProjectTransformation.ToTestProjectPath + "' could not be found. (ignored)", "Project not found", MessageBoxButton.OK, MessageBoxImage.Stop);
             }
         }
 

From 2263959c4a67276ec95a064c12ae9e5edf7713f9 Mon Sep 17 00:00:00 2001
From: Diego Ajassa <daj@templafy.com>
Date: Fri, 26 Oct 2018 16:49:16 +0200
Subject: [PATCH 3/3] AutoSaving solution, plus refactoring

---
 .../Models/ProjectModel.cs                    | 25 +++++++++++--------
 .../ViewModels/MainDialogModel.cs             |  4 +++
 .../Views/MainDialog.xaml                     |  5 +---
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/NuGetReferenceSwitcher.Presentation/Models/ProjectModel.cs b/src/NuGetReferenceSwitcher.Presentation/Models/ProjectModel.cs
index 6211414..8ddbc7a 100644
--- a/src/NuGetReferenceSwitcher.Presentation/Models/ProjectModel.cs
+++ b/src/NuGetReferenceSwitcher.Presentation/Models/ProjectModel.cs
@@ -31,7 +31,7 @@ public ProjectModel(VSProject project, DTE application)
         {
             _vsProject = project;
 
-			Name = project.Project.Name;
+            Name = project.Project.Name;
             SolutionFile = new FileInfo(application.Solution.FileName);
             LoadReferences();
         }
@@ -56,7 +56,7 @@ public string PreviousConfigurationPath
         {
             get { return GetConfigurationPath(".previous.nugetreferenceswitcher"); }
         }
-        
+
         /// <summary>Gets the current project reference to NuGet reference transformations. </summary>
         public List<FromProjectToNuGetTransformation> CurrentToNuGetTransformations
         {
@@ -78,7 +78,7 @@ public string Path
         /// <summary>Deletes the previous configuration file and renames the current 
         /// configuration file to the path of the previous configuration file.  </summary>
         public void DeleteConfigurationFile()
-        {               
+        {
             if (File.Exists(CurrentConfigurationPath))
             {
                 if (File.Exists(PreviousConfigurationPath))
@@ -98,11 +98,15 @@ public void AddProjectReference(ProjectModel project)
         /// <summary>Saves the project. </summary>
         public void Save()
         {
-            // TODO: This may lock up the UI => check and fix
-            Dispatcher.CurrentDispatcher.InvokeAsync(() =>
+            // The Dispatcher was not working, plus not all Project items were saved. This work fines (after also saving the solution)
+            // No need to save the solution manually afterward. 
+            _vsProject.Project.Save();
+            for (int j = 1; j <= _vsProject.Project.ProjectItems.Count; j++)
             {
-                _vsProject.Project.Save();
-            });
+                var item = _vsProject.Project.ProjectItems.Item(j);
+                if (!item.Saved)
+                    item.Save();
+            }
         }
 
         /// <summary>Adds an assembly reference to the project.</summary>
@@ -118,7 +122,7 @@ public bool AddReference(string assemblyPath)
 
                 return true;
             }
-            return false; 
+            return false;
         }
 
         /// <summary>Removes the project from the solution. </summary>
@@ -146,10 +150,11 @@ private List<FromProjectToNuGetTransformation> LoadTransformationsFromFile(strin
                     .Select(l => l.Split('\t'))
                     .Where(l => l.Length == 5).ToArray();
 
-                
+
 
                 foreach (var line in lines)
-                    list.Add(new FromProjectToNuGetTransformation {
+                    list.Add(new FromProjectToNuGetTransformation
+                    {
                         FromProjectName = line[0],
                         FromProjectPath = PathUtilities.MakeAbsolute(line[1], configurationPath),
                         ToAssemblyPath = PathUtilities.MakeAbsolute(line[2], configurationPath),
diff --git a/src/NuGetReferenceSwitcher.Presentation/ViewModels/MainDialogModel.cs b/src/NuGetReferenceSwitcher.Presentation/ViewModels/MainDialogModel.cs
index e908d77..51a4f1b 100644
--- a/src/NuGetReferenceSwitcher.Presentation/ViewModels/MainDialogModel.cs
+++ b/src/NuGetReferenceSwitcher.Presentation/ViewModels/MainDialogModel.cs
@@ -160,6 +160,8 @@ await RunTaskAsync(token => Task.Run(() =>
                         File.AppendAllText(project.CurrentConfigurationPath, nuGetReferenceTransformationsForProject);
                     }
                 }
+                if (!Application.Solution.Saved)
+                    Application.Solution.SaveAs(Application.Solution.FullName);
             }, token));
         }
 
@@ -206,6 +208,8 @@ await RunTaskAsync(token => Task.Run(() =>
                 }
 
                 RemoveProjectsFromSolution(projectsToRemove);
+                if (!Application.Solution.Saved)
+                    Application.Solution.SaveAs(Application.Solution.FullName);
             }, token));
         }
 
diff --git a/src/NuGetReferenceSwitcher.Presentation/Views/MainDialog.xaml b/src/NuGetReferenceSwitcher.Presentation/Views/MainDialog.xaml
index 6fa91ff..c5e39d9 100644
--- a/src/NuGetReferenceSwitcher.Presentation/Views/MainDialog.xaml
+++ b/src/NuGetReferenceSwitcher.Presentation/Views/MainDialog.xaml
@@ -74,10 +74,7 @@
                                                            Visibility="{Binding ToTestProjectPath, Converter={StaticResource VisibilityConverter}}" />
                                             </StackPanel>
                                             <StackPanel Visibility="{Binding SelectedMode, Mode=OneWay, ConverterParameter='Project', Converter={StaticResource NuGetToProjectModeConverter}}">
-                                                    <ComboBox ItemsSource="{Binding Project, Source={StaticResource ViewModel}}"
-                                                              SelectedItem="{Binding ToTestProject, Mode=TwoWay}"
-                                                              DisplayMemberPath="Name" />
-                                                </StackPanel>
+                                                    </StackPanel>
                                         </StackPanel>
                                     </StackPanel>
                                 </DataTemplate>