Merge pull request #9 from twenzel/master

Little improvements

Author: RicoSuter

src/NuGetReferenceSwitcher.Presentation/ViewModels/MainDialogModel.cs

@@ -134,22 +134,22 @@ await RunTaskAsync(token => Task.Run(() =>
                                     PathUtilities.MakeRelative(assemblyToProjectSwitch.ToProject.Path,
                                         project.CurrentConfigurationPath) + "\t" +
                                     PathUtilities.MakeRelative(fromAssemblyPath, project.CurrentConfigurationPath) +
-                                    "\n";
-
-                                if (SaveProjects)
-                                {
-                                    project.Save();
-                                }
+                                    "\n";                                
                             }
                             else
                             {
                                 MessageBox.Show(
                                     "Cannot switch from assembly '" + assemblyToProjectSwitch.FromAssemblyName + "' to project '" + assemblyToProjectSwitch.ToProjectPath +
-                                    "' because project is not loaded. ", "Project not loaded");
+                                    "' because project is not loaded. ", "Project not loaded", MessageBoxButton.OK, MessageBoxImage.Error);
                             }
                         }
                     }
 
+                    if (SaveProjects)
+                    {
+                        project.Save();
+                    }
+
                     if (!string.IsNullOrEmpty(nuGetReferenceTransformationsForProject))
                     {
                         File.AppendAllText(project.CurrentConfigurationPath, nuGetReferenceTransformationsForProject);
@@ -162,7 +162,7 @@ await RunTaskAsync(token => Task.Run(() =>
         /// <param name="exception">The exception. </param>
         public override void HandleException(Exception exception)
         {
-            MessageBox.Show(exception.Message, "An error occurred");
+            MessageBox.Show(exception.Message, "An error occurred", MessageBoxButton.OK, MessageBoxImage.Error);
         }
 
         /// <summary>Switches the project references to the previously referenced NuGet DLLs. </summary>
@@ -187,14 +187,14 @@ await RunTaskAsync(token => Task.Run(() =>
                             if (!successfullyAdded)
                             {
                                 MessageBox.Show("The project '" + transformation.ToAssemblyPath + "' could not be added. " +
-                                                "\nSkipped.", "Could not add project");
-                            }
-
-                            if (SaveProjects)
-                                project.Save();
+                                                "\nSkipped.", "Could not add project", MessageBoxButton.OK, MessageBoxImage.Error);
+                            }                           
                         }
                     }
 
+                    if (SaveProjects)
+                        project.Save();
+
                     project.DeleteConfigurationFile();
                 }
 
@@ -236,7 +236,7 @@ private void AddProjectToSolutionIfNeeded(FromNuGetToProjectTransformation fromN
                     fromNuGetToProjectTransformation.ToProject = myProject;
                 }
                 else
-                    MessageBox.Show("The project '" + fromNuGetToProjectTransformation.ToProjectPath + "' could not be found. (ignored)", "Project not found");
+                    MessageBox.Show("The project '" + fromNuGetToProjectTransformation.ToProjectPath + "' could not be found. (ignored)", "Project not found", MessageBoxButton.OK, MessageBoxImage.Stop);
             }
         }
 

src/NuGetReferenceSwitcher.Presentation/Views/MainDialog.xaml.cs

@@ -88,6 +88,10 @@ private void OnSelectProjectFile(object sender, RoutedEventArgs e)
             {
                 _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.ToProjectPath != null && t.ToProjectPath.EndsWith(".vbproj", System.StringComparison.OrdinalIgnoreCase)))
+                    _dlg.FilterIndex = 2;
             }
 
             _dlg.Title = string.Format("Select Project for '{0}'", fntpSwitch.FromAssemblyName);

src/NuGetReferenceSwitcher.VS13/NuGetReferenceSwitcherPackage.cs

@@ -41,14 +41,14 @@ private void OnShowDialog(object sender, EventArgs e)
         {
             var application = (DTE)GetService(typeof(SDTE));
             if (application.Solution == null || !application.Solution.IsOpen)
-                MessageBox.Show("Please open a solution first. ", "No solution");
+                MessageBox.Show("Please open a solution first. ", "No solution", MessageBoxButton.OK, MessageBoxImage.Information);
             else
             {
                 if (application.Solution.IsDirty) // solution must be saved otherwise adding/removing projects will raise errors
                 {
                     MessageBox.Show("Please save your solution first. \n" +
                                     "Select the solution in the Solution Explorer and press Ctrl-S. ", 
-                                    "Solution not saved");
+                                    "Solution not saved", MessageBoxButton.OK, MessageBoxImage.Stop);
                 }
                 else
                 {