diff --git a/src/BuildVision.UI/BuildVision.UI.csproj b/src/BuildVision.UI/BuildVision.UI.csproj index de0f3ae3..5cf92708 100644 --- a/src/BuildVision.UI/BuildVision.UI.csproj +++ b/src/BuildVision.UI/BuildVision.UI.csproj @@ -362,11 +362,8 @@ - - 12.0.4 - - - 12.0.4 + + 14.3.25407 diff --git a/src/BuildVision.UI/Resources/BuildState.Resources.xaml b/src/BuildVision.UI/Resources/BuildState.Resources.xaml index 797363c8..d68cf636 100644 --- a/src/BuildVision.UI/Resources/BuildState.Resources.xaml +++ b/src/BuildVision.UI/Resources/BuildState.Resources.xaml @@ -1,6 +1,6 @@  + xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"> @@ -74,4 +74,4 @@ - \ No newline at end of file + diff --git a/src/BuildVision.UI/Resources/CommonResources.xaml b/src/BuildVision.UI/Resources/CommonResources.xaml index 1a63dec2..e9c29ba0 100644 --- a/src/BuildVision.UI/Resources/CommonResources.xaml +++ b/src/BuildVision.UI/Resources/CommonResources.xaml @@ -1,6 +1,6 @@  + xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"> - \ No newline at end of file + diff --git a/src/BuildVision.UI/Resources/ValueIndicator.Resources.xaml b/src/BuildVision.UI/Resources/ValueIndicator.Resources.xaml index 5ac0f110..1a90fdbf 100644 --- a/src/BuildVision.UI/Resources/ValueIndicator.Resources.xaml +++ b/src/BuildVision.UI/Resources/ValueIndicator.Resources.xaml @@ -1,6 +1,6 @@  + xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"> diff --git a/src/BuildVision.UI/Styles/ExtensionStyle.xaml b/src/BuildVision.UI/Styles/ExtensionStyle.xaml index b5ec6f2d..dcbec3ba 100644 --- a/src/BuildVision.UI/Styles/ExtensionStyle.xaml +++ b/src/BuildVision.UI/Styles/ExtensionStyle.xaml @@ -1,6 +1,6 @@  + xmlns:environment="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"> @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/src/BuildVision.UI/Styles/ScrollViewerStyle.xaml b/src/BuildVision.UI/Styles/ScrollViewerStyle.xaml index d989460d..de31d19b 100644 --- a/src/BuildVision.UI/Styles/ScrollViewerStyle.xaml +++ b/src/BuildVision.UI/Styles/ScrollViewerStyle.xaml @@ -1,6 +1,6 @@  @@ -236,4 +236,4 @@ - \ No newline at end of file + diff --git a/src/BuildVision/BuildVision.csproj b/src/BuildVision/BuildVision.csproj index 91770805..54253341 100644 --- a/src/BuildVision/BuildVision.csproj +++ b/src/BuildVision/BuildVision.csproj @@ -60,28 +60,12 @@ False - - False - - - False - - - False - - - True - - - True - - @@ -105,17 +89,6 @@ - - - {00020430-0000-0000-C000-000000000046} - 2 - 0 - 0 - primary - False - False - - @@ -229,65 +202,34 @@ - - 7.0.4 - - - 12.0.4 - - - 7.0.4 - - - 10.0.4 - - - 11.0.4 - - - 12.0.4 - - - 8.0.4 - - - 9.0.4 - - - 7.0.4 - - - 12.0.4 - - - 10.0.4 - - - 11.0.4 + + 8.0.2 - - 12.0.4 + + 10.0.3 - - 7.0.4 + + 8.0.3 - - 8.0.4 + + 9.0.3 - - 9.0.4 + + 9.0.3 - - 7.0.4 + + 14.3.25407 - - 8.0.4 + + 12.0.30111 - - 12.0.4 + + 15.9.3032 + runtime; build; native; contentfiles; analyzers + all - - 12.0.4 + + 7.0.3303 diff --git a/src/BuildVision/Helpers/ProjectExtensions.cs b/src/BuildVision/Helpers/ProjectExtensions.cs index 45904238..16df3532 100644 --- a/src/BuildVision/Helpers/ProjectExtensions.cs +++ b/src/BuildVision/Helpers/ProjectExtensions.cs @@ -18,6 +18,11 @@ namespace BuildVision.Helpers { + public class EnvDTECodeModelLanguageConstants2 + { + public const string CMLanguageJSharp = "{E6FDF8BF-F3D1-11D4-8576-0002A516ECE8}"; + } + public static class ProjectExtensions { private static readonly HashSet _hiddenProjectsUniqueNames = new HashSet @@ -84,7 +89,7 @@ public static class ProjectExtensions { CodeModelLanguageConstants.vsCMLanguageMC, "MC++" }, // Managed C++ { CodeModelLanguageConstants.vsCMLanguageVB, "VB.NET" }, { CodeModelLanguageConstants.vsCMLanguageVC, "VC++" }, // Visual C++ - { CodeModelLanguageConstants2.vsCMLanguageJSharp, "J#" }, + { EnvDTECodeModelLanguageConstants2.CMLanguageJSharp, "J#" }, { "{F2A71F9B-5D33-465A-A702-920D77279786}", "F#" }, }; @@ -608,7 +613,7 @@ public static Project GetSubProject(this Project solutionFolder, Func GetSubProjects(this Project solutionFolder) continue; // If this is another solution folder, do a recursive call, otherwise add - if (subProject.Kind == ProjectKinds.vsProjectKindSolutionFolder) + if (subProject.Kind == EnvDTEProjectKinds.ProjectKindSolutionFolder) list.AddRange(GetSubProjects(subProject)); else if (!subProject.IsHidden()) list.Add(subProject); diff --git a/src/BuildVision/Helpers/SolutionProjectsExtensions.cs b/src/BuildVision/Helpers/SolutionProjectsExtensions.cs index 1957cfdf..de225fd7 100644 --- a/src/BuildVision/Helpers/SolutionProjectsExtensions.cs +++ b/src/BuildVision/Helpers/SolutionProjectsExtensions.cs @@ -1,13 +1,17 @@ using System; using System.Collections.Generic; - using EnvDTE; -using EnvDTE80; using IServiceProvider = Microsoft.VisualStudio.OLE.Interop.IServiceProvider; using System.Runtime.InteropServices; +using EnvDTE80; namespace BuildVision.Helpers { + public class EnvDTEProjectKinds + { + public const string ProjectKindSolutionFolder = "{66A26720-8FB5-11D2-AA7E-00C04F688DDE}"; + } + public static class SolutionProjectsExtensions { public static IList GetProjects(this Solution solution) @@ -19,7 +23,7 @@ public static IList GetProjects(this Solution solution) if (project == null) continue; - if (project.Kind == ProjectKinds.vsProjectKindSolutionFolder) + if (project.Kind == EnvDTEProjectKinds.ProjectKindSolutionFolder) list.AddRange(project.GetSubProjects()); else if (!project.IsHidden()) list.Add(project); @@ -37,7 +41,7 @@ public static Project GetProject(this Solution solution, Func con if (project == null) continue; - if (project.Kind == ProjectKinds.vsProjectKindSolutionFolder) + if (project.Kind == EnvDTEProjectKinds.ProjectKindSolutionFolder) { Project sub = project.GetSubProject(cond); if (sub != null) @@ -76,4 +80,4 @@ public static object GetService(object serviceProviderObject, Type type) return service; } } -} \ No newline at end of file +} diff --git a/test/BuildVision.IntegrationTests/PackageTests.cs b/test/BuildVision.IntegrationTests/PackageTests.cs index 04eaaa2d..3f590412 100644 --- a/test/BuildVision.IntegrationTests/PackageTests.cs +++ b/test/BuildVision.IntegrationTests/PackageTests.cs @@ -1,7 +1,7 @@ using System; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.VSSDK.Tools.VsIdeTesting; +//using Microsoft.VSSDK.Tools.VsIdeTesting; using System.ComponentModel.Design; using EnvDTE; using Microsoft.VisualStudio; @@ -12,47 +12,47 @@ namespace BuildVision.IntegrationTests [TestClass] public class PackageTests { - private static IVsShell ShellService => VsIdeTestHostContext.ServiceProvider.GetService(typeof(SVsShell)) as IVsShell; - private static IVsUIShell UiShellService => VsIdeTestHostContext.ServiceProvider.GetService(typeof(SVsUIShell)) as IVsUIShell; + //private static IVsShell ShellService => VsIdeTestHostContext.ServiceProvider.GetService(typeof(SVsShell)) as IVsShell; + //private static IVsUIShell UiShellService => VsIdeTestHostContext.ServiceProvider.GetService(typeof(SVsUIShell)) as IVsUIShell; - [Ignore] - [TestMethod] - [HostType("VS IDE")] - public void PackageLoad_Should_Succeed() - { - UIThreadInvoker.Invoke(new Action(() => - { - var guid = PackageGuids.GuidBuildVisionPackage; - Assert.IsTrue(0 == ShellService.LoadPackage(ref guid, out var package)); - Assert.IsNotNull(package, "Package failed to load"); - })); - } + //[Ignore] + //[TestMethod] + //[HostType("VS IDE")] + //public void PackageLoad_Should_Succeed() + //{ + // UIThreadInvoker.Invoke(new Action(() => + // { + // var guid = PackageGuids.GuidBuildVisionPackage; + // Assert.IsTrue(0 == ShellService.LoadPackage(ref guid, out var package)); + // Assert.IsNotNull(package, "Package failed to load"); + // })); + //} - [Ignore] - [TestMethod] - [HostType("VS IDE")] - public void ClickOnBuildVisionMenuItem_Should_ShowBuildVision() - { - UIThreadInvoker.Invoke(new Action(() => - { - var toolwndCommandId = new CommandID(PackageGuids.GuidBuildVisionCmdSet, (int) PackageIds.CmdIdBuildVisionToolWindow); - ExecuteCommand(toolwndCommandId); - Assert.IsTrue(CanFindToolwindow(PackageGuids.GuidBuildVisionToolWindow)); - })); - } + //[Ignore] + //[TestMethod] + //[HostType("VS IDE")] + //public void ClickOnBuildVisionMenuItem_Should_ShowBuildVision() + //{ + // UIThreadInvoker.Invoke(new Action(() => + // { + // var toolwndCommandId = new CommandID(PackageGuids.GuidBuildVisionCmdSet, (int) PackageIds.CmdIdBuildVisionToolWindow); + // ExecuteCommand(toolwndCommandId); + // Assert.IsTrue(CanFindToolwindow(PackageGuids.GuidBuildVisionToolWindow)); + // })); + //} - public static void ExecuteCommand(CommandID cmd) - { - object customin = null; - object customout = null; - VsIdeTestHostContext.Dte.Commands.Raise(cmd.Guid.ToString("B").ToUpper(), cmd.ID, ref customin, ref customout); - } + //public static void ExecuteCommand(CommandID cmd) + //{ + // object customin = null; + // object customout = null; + // VsIdeTestHostContext.Dte.Commands.Raise(cmd.Guid.ToString("B").ToUpper(), cmd.ID, ref customin, ref customout); + //} - public static bool CanFindToolwindow(Guid persistenceGuid) - { - var hr = UiShellService.FindToolWindow((uint) __VSFINDTOOLWIN.FTW_fFindFirst, ref persistenceGuid, out var windowFrame); - Assert.IsTrue(hr == VSConstants.S_OK); - return (windowFrame != null); - } + //public static bool CanFindToolwindow(Guid persistenceGuid) + //{ + // //var hr = UiShellService.FindToolWindow((uint) __VSFINDTOOLWIN.FTW_fFindFirst, ref persistenceGuid, out var windowFrame); + // //Assert.IsTrue(hr == VSConstants.S_OK); + // //return (windowFrame != null); + //} } }