diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..310a319 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,3 @@ +[*.cs] +indent_size = 2 +indent_style = space \ No newline at end of file diff --git a/AxoCover.Dependencies/AxoCover.Dependencies.csproj b/AxoCover.Dependencies/AxoCover.Dependencies.csproj index f022fb7..f1832bc 100644 --- a/AxoCover.Dependencies/AxoCover.Dependencies.csproj +++ b/AxoCover.Dependencies/AxoCover.Dependencies.csproj @@ -43,6 +43,7 @@ + @@ -124,22 +125,10 @@ - - Always - %(Filename)%(Extension) - - - Always - x86\%(Filename)%(Extension) - Always x86\%(Filename)%(Extension) - - Always - x64\%(Filename)%(Extension) - Always x64\%(Filename)%(Extension) diff --git a/AxoCover.Native/AxoCover.Native.Build.vcxproj b/AxoCover.Native/AxoCover.Native.Build.vcxproj index 880be07..ddbbd2a 100644 --- a/AxoCover.Native/AxoCover.Native.Build.vcxproj +++ b/AxoCover.Native/AxoCover.Native.Build.vcxproj @@ -25,6 +25,13 @@ - - + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/AxoCover.Native/AxoCover.Native.vcxproj b/AxoCover.Native/AxoCover.Native.vcxproj index b414b43..ee34784 100644 --- a/AxoCover.Native/AxoCover.Native.vcxproj +++ b/AxoCover.Native/AxoCover.Native.vcxproj @@ -28,28 +28,28 @@ DynamicLibrary true - v110 true Unicode + v140 DynamicLibrary false - v110 + v140 true Unicode DynamicLibrary true - v110 + v140 true Unicode DynamicLibrary false - v110 + v140 true Unicode @@ -96,7 +96,7 @@ - ..\packages\EasyHookNativePackage.2.7.6270\build\native\lib\Win32\v110\Debug;%(AdditionalLibraryDirectories) + ..\packages\EasyHookNativePackage.2.7.7097\build\native\lib\Win32\v140\Debug;%(AdditionalLibraryDirectories) true @@ -109,7 +109,7 @@ - ..\packages\EasyHookNativePackage.2.7.6270\build\native\lib\Win32\x64\Debug;%(AdditionalLibraryDirectories) + ..\packages\EasyHookNativePackage.2.7.7097\build\native\lib\x64\v140\Debug;%(AdditionalLibraryDirectories) true @@ -121,7 +121,7 @@ - ..\packages\EasyHookNativePackage.*\build\native\lib\Win32\v110\Release;%(AdditionalLibraryDirectories) + ..\packages\EasyHookNativePackage.2.7.7097\build\native\lib\Win32\v140\Release;%(AdditionalLibraryDirectories) true @@ -133,7 +133,7 @@ - ..\packages\EasyHookNativePackage.*\build\native\lib\x64\v110\Release;%(AdditionalLibraryDirectories) + ..\packages\EasyHookNativePackage.2.7.7097\build\native\lib\x64\v140\Release;%(AdditionalLibraryDirectories) true @@ -157,20 +157,18 @@ - - Designer - + - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - \ No newline at end of file + diff --git a/AxoCover.Native/packages.config b/AxoCover.Native/packages.config index 64f45a2..8a39938 100644 --- a/AxoCover.Native/packages.config +++ b/AxoCover.Native/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/AxoCover.sln b/AxoCover.sln index 4174b81..28c51f5 100644 --- a/AxoCover.sln +++ b/AxoCover.sln @@ -28,6 +28,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AxoCover.Host-x64", "AxoCov EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A39C9015-0D1C-4389-B58D-E71142DD8518}" ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig .gitignore = .gitignore appveyor.yml = appveyor.yml README.md = README.md diff --git a/AxoCover/AxoCover.csproj b/AxoCover/AxoCover.csproj index d5ef153..7da25a6 100644 --- a/AxoCover/AxoCover.csproj +++ b/AxoCover/AxoCover.csproj @@ -66,30 +66,9 @@ True - - ..\packages\VSSDK.DTE.7.0.4\lib\net20\envdte.dll - False - False - - - ..\packages\VSSDK.DTE.10.10.0.4\lib\net20\envdte100.dll - False - False - - - ..\packages\VSSDK.DTE.8.8.0.4\lib\net20\envdte80.dll - False - False - - - ..\packages\VSSDK.DTE.9.9.0.4\lib\net20\envdte90.dll - False - False - - - ..\packages\VSSDK.DTE.9.9.0.4\lib\net20\envdte90a.dll - False - False + + ..\packages\EnvDTE.8.0.2\lib\net10\EnvDTE.dll + True @@ -108,90 +87,65 @@ ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll True - - ..\packages\VSSDK.CoreUtility.11.0.4\lib\net45\Microsoft.VisualStudio.CoreUtility.dll - False - False + + ..\packages\Microsoft.VisualStudio.CoreUtility.14.3.25407\lib\net45\Microsoft.VisualStudio.CoreUtility.dll - - ..\packages\VSSDK.GraphModel.11.0.4\lib\net45\Microsoft.VisualStudio.GraphModel.dll - False - False + + ..\packages\Microsoft.VisualStudio.Imaging.14.3.25407\lib\net45\Microsoft.VisualStudio.Imaging.dll - ..\packages\VSSDK.OLE.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll - False - False + ..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll - - ..\packages\VSSDK.Shell.11.11.0.4\lib\net45\Microsoft.VisualStudio.Shell.11.0.dll - False - False + + ..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll - ..\packages\VSSDK.Shell.Immutable.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - False - False + ..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - ..\packages\VSSDK.Shell.Immutable.11.11.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll - False - False + ..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll - - ..\packages\VSSDK.Shell.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.dll - False - False + + ..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll - - ..\packages\VSSDK.Shell.Interop.10.10.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.10.0.dll - False - False + + ..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll - - ..\packages\VSSDK.Shell.Interop.11.11.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.11.0.dll - False - False + + ..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll - ..\packages\VSSDK.Shell.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.8.0.dll - False - False + ..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll - ..\packages\VSSDK.Shell.Interop.9.9.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll - False - False + ..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll - - ..\packages\VSSDK.Text.11.0.4\lib\net45\Microsoft.VisualStudio.Text.Data.dll - False - False + + ..\packages\Microsoft.VisualStudio.Text.Data.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Data.dll - - ..\packages\VSSDK.Text.11.0.4\lib\net45\Microsoft.VisualStudio.Text.Logic.dll - False - False + + ..\packages\Microsoft.VisualStudio.Text.Logic.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Logic.dll - - ..\packages\VSSDK.Text.11.0.4\lib\net45\Microsoft.VisualStudio.Text.UI.dll - False - False + + ..\packages\Microsoft.VisualStudio.Text.UI.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.dll - - ..\packages\VSSDK.Text.11.0.4\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll - False - False + + ..\packages\Microsoft.VisualStudio.Text.UI.Wpf.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll - ..\packages\VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll - False - False + ..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll - ..\packages\VSSDK.TextManager.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - False - False + ..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll + + + ..\packages\Microsoft.VisualStudio.Threading.14.1.111\lib\net45\Microsoft.VisualStudio.Threading.dll + + + ..\packages\Microsoft.VisualStudio.Utilities.14.3.25407\lib\net45\Microsoft.VisualStudio.Utilities.dll + + + ..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll @@ -199,9 +153,8 @@ - ..\packages\VSSDK.DTE.7.0.4\lib\net20\stdole.dll - False - False + ..\packages\stdole.7.0.3302\lib\net10\stdole.dll + True @@ -225,34 +178,12 @@ - ..\packages\VSSDK.VSLangProj.7.0.4\lib\net20\VSLangProj.dll - False - False - - - ..\packages\VSSDK.VSLangProj.10.10.0.4\lib\net20\VSLangProj100.dll - False - False - - - ..\packages\VSSDK.VSLangProj.11.11.0.4\lib\net20\VSLangProj110.dll - False - False + ..\packages\VSLangProj.7.0.3301\lib\net10\VSLangProj.dll + True - ..\packages\VSSDK.VSLangProj.7.0.4\lib\net20\VSLangProj2.dll - False - False - - - ..\packages\VSSDK.VSLangProj.8.8.0.4\lib\net20\VSLangProj80.dll - False - False - - - ..\packages\VSSDK.VSLangProj.9.9.0.4\lib\net20\VSLangProj90.dll - False - False + ..\packages\VSLangProj2.7.0.5001\lib\net11\VSLangProj2.dll + True @@ -678,4 +609,4 @@ --> - + \ No newline at end of file diff --git a/AxoCover/AxoCoverPackage.cs b/AxoCover/AxoCoverPackage.cs index 031d21a..0ae476e 100644 --- a/AxoCover/AxoCoverPackage.cs +++ b/AxoCover/AxoCoverPackage.cs @@ -3,24 +3,25 @@ using AxoCover.Models.Updater; using AxoCover.Views; using Microsoft.Practices.Unity; +using Microsoft.VisualStudio; using Microsoft.VisualStudio.Shell; -using Microsoft.VisualStudio.Shell.Interop; using System; using System.IO; using System.Reflection; using System.Runtime.InteropServices; +using System.Threading; using System.Windows; using System.Windows.Threading; namespace AxoCover { - [PackageRegistration(UseManagedResourcesOnly = true)] + [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)] [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)] - [ProvideToolWindow(typeof(TestExplorerToolWindow), MultiInstances = false, Style = VsDockStyle.Tabbed, Orientation = ToolWindowOrientation.Left, Window = EnvDTE.Constants.vsWindowKindClassView)] - [ProvideAutoLoad(UIContextGuids.SolutionExists)] + [ProvideToolWindow(typeof(TestExplorerToolWindow), MultiInstances = false, Style = VsDockStyle.Tabbed, Orientation = ToolWindowOrientation.Left, Window = "{C9C0AE26-AA77-11D2-B3F0-0000F87570EE}")] + [ProvideAutoLoad(VSConstants.UICONTEXT.SolutionExistsAndFullyLoaded_string, PackageAutoLoadFlags.BackgroundLoad)] [Guid(Id)] [ProvideMenuResource("Menus.ctmenu", 1)] - public sealed class AxoCoverPackage : Package + public sealed class AxoCoverPackage : AsyncPackage { public const string Id = "26901782-38e1-48d4-94e9-557d44db052e"; @@ -36,18 +37,27 @@ static AxoCoverPackage() Manifest = PackageManifest.FromFile(Path.Combine(PackageRoot, "extension.vsixmanifest")); } - private readonly IOptions _options; + private IOptions _options; - public AxoCoverPackage() + protected override async System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress progress) { _options = ContainerProvider.Container.Resolve(); - Application.Current.Dispatcher.BeginInvoke(new Action(InitializeTelemetry), DispatcherPriority.ApplicationIdle); + + await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken); + + var dte = await GetServiceAsync(typeof(EnvDTE.DTE)) as EnvDTE.DTE; + + await InitializeTelemetryAsync(); + + await CommandRepository.InitializeAsync(this, dte); } - private void InitializeTelemetry() + private async System.Threading.Tasks.Task InitializeTelemetryAsync() { if (!_options.IsTelemetryModeSelected) { + ThreadHelper.ThrowIfNotOnUIThread(); + var dialog = new ViewDialog() { ResizeMode = ResizeMode.NoResize @@ -59,11 +69,5 @@ private void InitializeTelemetry() } } } - - protected override void Initialize() - { - base.Initialize(); - CommandRepository.Initialize(this); - } } } \ No newline at end of file diff --git a/AxoCover/CommandRepository.cs b/AxoCover/CommandRepository.cs index fbd0bf2..df660ed 100644 --- a/AxoCover/CommandRepository.cs +++ b/AxoCover/CommandRepository.cs @@ -1,7 +1,9 @@ -using Microsoft.VisualStudio.Shell; +using EnvDTE; +using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using System; using System.ComponentModel.Design; +using System.Threading.Tasks; namespace AxoCover { @@ -14,22 +16,22 @@ public enum CommandId : int } public static readonly Guid CommandSet = new Guid("713f743a-d55e-47be-bfc4-4f4259f6fee6"); - - private readonly Package _package; - - private readonly OleMenuCommandService _commandService; - - private CommandRepository(Package package) + + private readonly AsyncPackage _package; + + private readonly IMenuCommandService _commandService; + + private CommandRepository(AsyncPackage package, IMenuCommandService oleMenuCommandService) { _package = package; - _commandService = ServiceProvider.GetService(typeof(IMenuCommandService)) as OleMenuCommandService; + _commandService = oleMenuCommandService; if (_commandService != null) { AddCommand(CommandId.OpenAxoCover, OnOpenAxoCover); AddCommand(CommandId.ToggleCoverage, OnToggleCoverage, p => p.Checked = true); } } - + private void AddCommand(CommandId id, EventHandler callback, Action initialize = null) { var menuCommandId = new CommandID(CommandSet, (int)id); @@ -37,26 +39,7 @@ private void AddCommand(CommandId id, EventHandler callback, Action _commandService.AddCommand(menuItem); initialize?.Invoke(menuItem); } - - public static CommandRepository Instance - { - get; - private set; - } - - private IServiceProvider ServiceProvider - { - get - { - return _package; - } - } - - public static void Initialize(Package package) - { - Instance = new CommandRepository(package); - } - + private void OnOpenAxoCover(object sender, EventArgs e) { var window = _package.FindToolWindow(typeof(TestExplorerToolWindow), 0, true); @@ -68,5 +51,12 @@ private void OnToggleCoverage(object sender, EventArgs e) LineCoverageAdornment.IsEnabled = !LineCoverageAdornment.IsEnabled; (sender as MenuCommand).Checked = LineCoverageAdornment.IsEnabled; } + + internal static async System.Threading.Tasks.Task InitializeAsync(AsyncPackage package, DTE dte) + { + var commandService = (IMenuCommandService)await package.GetServiceAsync(typeof(IMenuCommandService)); + + var commands = new CommandRepository(package, commandService); + } } } diff --git a/AxoCover/Controls/ActionButton.xaml b/AxoCover/Controls/ActionButton.xaml index 07dcd2e..025750a 100644 --- a/AxoCover/Controls/ActionButton.xaml +++ b/AxoCover/Controls/ActionButton.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.11.0" + xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" xmlns:converters="clr-namespace:AxoCover.Converters" xmlns:controls="clr-namespace:AxoCover.Controls" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300" Click="OnClick" SnapsToDevicePixels="True" diff --git a/AxoCover/Controls/ListEditor.xaml b/AxoCover/Controls/ListEditor.xaml index b762ec6..bdd78ef 100644 --- a/AxoCover/Controls/ListEditor.xaml +++ b/AxoCover/Controls/ListEditor.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.11.0" + xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" xmlns:controls="clr-namespace:AxoCover.Controls" xmlns:converters="clr-namespace:AxoCover.Converters" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300"> diff --git a/AxoCover/Controls/SearchBox.xaml b/AxoCover/Controls/SearchBox.xaml index da76c98..1742568 100644 --- a/AxoCover/Controls/SearchBox.xaml +++ b/AxoCover/Controls/SearchBox.xaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:controls="clr-namespace:AxoCover.Controls" - xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.11.0" + xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300" Foreground="{DynamicResource {x:Static vsui:EnvironmentColors.ComboBoxTextBrushKey}}" CaretBrush="{DynamicResource {x:Static vsui:EnvironmentColors.ComboBoxTextBrushKey}}"> diff --git a/AxoCover/Controls/Spinner.xaml b/AxoCover/Controls/Spinner.xaml index 1fb4cdc..5a8adc2 100644 --- a/AxoCover/Controls/Spinner.xaml +++ b/AxoCover/Controls/Spinner.xaml @@ -3,8 +3,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.11.0" mc:Ignorable="d" + xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" d:DesignHeight="300" d:DesignWidth="300"> diff --git a/AxoCover/Controls/Styles.xaml b/AxoCover/Controls/Styles.xaml index 068d15d..b84e503 100644 --- a/AxoCover/Controls/Styles.xaml +++ b/AxoCover/Controls/Styles.xaml @@ -1,6 +1,6 @@  diff --git a/AxoCover/Models/Editor/ProjectExtensions.cs b/AxoCover/Models/Editor/ProjectExtensions.cs index 343e1dd..43c9e89 100644 --- a/AxoCover/Models/Editor/ProjectExtensions.cs +++ b/AxoCover/Models/Editor/ProjectExtensions.cs @@ -11,6 +11,8 @@ namespace AxoCover.Models.Editor { public static class ProjectExtensions { + const string vsProjectItemKindPhysicalFolder = "{6BB5F8EF-4483-11D3-8BCF-00C04F8EC28C}"; + public static IEnumerable GetProjects(this Solution solution) { return solution.Projects @@ -33,7 +35,7 @@ public static IEnumerable FindFiles(this Project project, Regex filter) { return project.ProjectItems? .OfType() - .Flatten(p => p.Kind == Constants.vsProjectItemKindPhysicalFolder ? p.ProjectItems.OfType() : null) + .Flatten(p => p.Kind == vsProjectItemKindPhysicalFolder ? p.ProjectItems.OfType() : null) .SelectMany(p => Enumerable.Range(1, p.FileCount).Select(q => p.FileNames[(short)q])) .Where(p => filter.IsMatch(p ?? string.Empty)) ?? new string[0]; } @@ -42,7 +44,7 @@ public static IEnumerable GetSourceFiles(this Project project) { return project.ProjectItems? .OfType() - .Flatten(p => p.Kind == Constants.vsProjectItemKindPhysicalFolder ? p.ProjectItems.OfType() : null) + .Flatten(p => p.Kind == vsProjectItemKindPhysicalFolder ? p.ProjectItems.OfType() : null) .Select(p => p.Try(q => q.FileCodeModel)) .Where(p => p != null) ?? new FileCodeModel[0]; } @@ -129,7 +131,7 @@ public static Dictionary GetAllProperties(this EnvDTE.Properties } catch { - //Skip + //Skip } } } diff --git a/AxoCover/Views/CoverageDetailsView.xaml b/AxoCover/Views/CoverageDetailsView.xaml index 05869ee..d2e7311 100644 --- a/AxoCover/Views/CoverageDetailsView.xaml +++ b/AxoCover/Views/CoverageDetailsView.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.11.0" + xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" xmlns:converters="clr-namespace:AxoCover.Converters" xmlns:controls="clr-namespace:AxoCover.Controls" xmlns:models="clr-namespace:AxoCover.Models" diff --git a/AxoCover/Views/CoverageExplorerView.xaml b/AxoCover/Views/CoverageExplorerView.xaml index 899630e..257be42 100644 --- a/AxoCover/Views/CoverageExplorerView.xaml +++ b/AxoCover/Views/CoverageExplorerView.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.11.0" + xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" xmlns:converters="clr-namespace:AxoCover.Converters" xmlns:controls="clr-namespace:AxoCover.Controls" xmlns:models="clr-namespace:AxoCover.Models" diff --git a/AxoCover/Views/ReportGeneratorView.xaml b/AxoCover/Views/ReportGeneratorView.xaml index 7e4eb25..84c4ffe 100644 --- a/AxoCover/Views/ReportGeneratorView.xaml +++ b/AxoCover/Views/ReportGeneratorView.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.11.0" + xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" xmlns:converters="clr-namespace:AxoCover.Converters" xmlns:controls="clr-namespace:AxoCover.Controls" xmlns:models="clr-namespace:AxoCover.Models" diff --git a/AxoCover/Views/SettingsView.xaml b/AxoCover/Views/SettingsView.xaml index 9e4fcd5..6a8ada5 100644 --- a/AxoCover/Views/SettingsView.xaml +++ b/AxoCover/Views/SettingsView.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.11.0" + xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" xmlns:converters="clr-namespace:AxoCover.Converters" xmlns:controls="clr-namespace:AxoCover.Controls" xmlns:models="clr-namespace:AxoCover.Models" diff --git a/AxoCover/Views/TerminalExceptionView.xaml b/AxoCover/Views/TerminalExceptionView.xaml index cac5f4e..03aecad 100644 --- a/AxoCover/Views/TerminalExceptionView.xaml +++ b/AxoCover/Views/TerminalExceptionView.xaml @@ -6,7 +6,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:viewModels="clr-namespace:AxoCover.ViewModels" xmlns:views="clr-namespace:AxoCover.Views" - xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.11.0" + xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" xmlns:res="clr-namespace:AxoCover" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300"> diff --git a/AxoCover/Views/TestDetailsView.xaml b/AxoCover/Views/TestDetailsView.xaml index 86839a5..69535ef 100644 --- a/AxoCover/Views/TestDetailsView.xaml +++ b/AxoCover/Views/TestDetailsView.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.11.0" + xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" xmlns:converters="clr-namespace:AxoCover.Converters" xmlns:controls="clr-namespace:AxoCover.Controls" xmlns:models="clr-namespace:AxoCover.Models" diff --git a/AxoCover/Views/TestExplorerView.xaml b/AxoCover/Views/TestExplorerView.xaml index 401e075..fd9ecf5 100644 --- a/AxoCover/Views/TestExplorerView.xaml +++ b/AxoCover/Views/TestExplorerView.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.11.0" + xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" xmlns:converters="clr-namespace:AxoCover.Converters" xmlns:models="clr-namespace:AxoCover.Models.Toolkit" xmlns:viewModels="clr-namespace:AxoCover.ViewModels" diff --git a/AxoCover/Views/TextView.xaml b/AxoCover/Views/TextView.xaml index 83dbd63..a66004b 100644 --- a/AxoCover/Views/TextView.xaml +++ b/AxoCover/Views/TextView.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.11.0" + xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0" xmlns:views="clr-namespace:AxoCover.Views" xmlns:viewModels="clr-namespace:AxoCover.ViewModels" mc:Ignorable="d" diff --git a/AxoCover/packages.config b/AxoCover/packages.config index 9699b11..4446819 100644 --- a/AxoCover/packages.config +++ b/AxoCover/packages.config @@ -1,38 +1,32 @@  + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/AxoCover/source.extension.vsixmanifest b/AxoCover/source.extension.vsixmanifest index 28b1ca9..fd6f9c9 100644 --- a/AxoCover/source.extension.vsixmanifest +++ b/AxoCover/source.extension.vsixmanifest @@ -12,9 +12,7 @@ test, coverage, OpenCover, runner - - - + @@ -27,6 +25,6 @@ - +