Fixed issue with buildvision breaking on breaking build

StefanKert · Apr 27, 2019 · 9251aca · 9251aca
1 parent 7720135
commit 9251aca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/src/BuildVision/Core/Services.cs b/src/BuildVision/Core/Services.cs
@@ -45,12 +45,6 @@ public static IVsSolution GetSolution(this IServiceProvider provider)
             return GetGlobalService<SVsSolution, IVsSolution>(provider);
         }
 
-        public static Solution GetDteSolution(this IServiceProvider provider)
-        {
-            var ret = provider.GetService(typeof(DTE)) as DTE2;
-            return ret.Solution;
-        }
-
         public static IVsSolution GetSolution()
         {
             return GetGlobalService<SVsSolution, IVsSolution>();

diff --git a/src/BuildVision/Services/BuildService.cs b/src/BuildVision/Services/BuildService.cs
@@ -124,7 +124,7 @@ private void RaiseCommand(VSConstants.VSStd97CmdID command)
         private void SelectProjectInSolutionExplorer(IProjectItem projectItem)
         {
             var solutionExplorer = Core.Services.Dte2.ToolWindows.SolutionExplorer;
-            var project = _serviceProvider.GetDteSolution().FirstOrDefaultProject(x => x.UniqueName == projectItem.UniqueName);
+            var project = Core.Services.Dte2.Solution.FirstOrDefaultProject(x => x.UniqueName == projectItem.UniqueName);
             var item = solutionExplorer.FindHierarchyItem(project);
             if (item == null)
             {
@@ -139,7 +139,7 @@ public void ProjectCopyBuildOutputFilesToClipBoard(IProjectItem projItem)
         {
             try
             {
-                var project = _serviceProvider.GetDteSolution().FirstOrDefaultProject(x => x.UniqueName == projItem.UniqueName);
+                var project = Core.Services.Dte2.Solution.FirstOrDefaultProject(x => x.UniqueName == projItem.UniqueName);
                 var fileTypes = _packageSettingsProvider.Settings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard;
                 if (fileTypes.IsEmpty)
                 {

diff --git a/src/BuildVision/Services/ErrorNavigationService.cs b/src/BuildVision/Services/ErrorNavigationService.cs
@@ -36,7 +36,7 @@ public void NavigateToErrorItem(ErrorItem errorItem)
                     throw new ArgumentNullException(nameof(errorItem));
                 }
 
-                var project = _serviceProvider.GetDteSolution().FirstProject(x => x.FileName == errorItem.ProjectFile);
+                var project = Core.Services.Dte2.Solution.FirstProject(x => x.FileName == errorItem.ProjectFile);
                 if (!errorItem.CanNavigateTo)
                 {
                     return;

diff --git a/src/BuildVision/Services/SolutionProvider.cs b/src/BuildVision/Services/SolutionProvider.cs
@@ -34,7 +34,7 @@ public SolutionProvider([Import(typeof(SVsServiceProvider))] IServiceProvider se
 
         public void ReloadSolution()
         {
-            _solution = _serviceProvider.GetDteSolution();
+            _solution = Services.Dte2.Solution;
             RefrehSolutionModel();
         }