From 663b77419a024c9769fe978ce0ff80f22e6a4313 Mon Sep 17 00:00:00 2001 From: AndrueCope Date: Fri, 11 Jan 2019 09:47:14 +0000 Subject: [PATCH 1/3] Updating to support VS 2019 --- TidyTabs.sln | 11 ++-- TidyTabs/Properties/Resources.Designer.cs | 2 +- TidyTabs/Properties/Settings.Designer.cs | 2 +- TidyTabs/TidyTabs.csproj | 74 +++++++++-------------- TidyTabs/packages.config | 8 ++- TidyTabs/source.extension.vsixmanifest | 52 ++++++++-------- 6 files changed, 68 insertions(+), 81 deletions(-) diff --git a/TidyTabs.sln b/TidyTabs.sln index 57fd9a6..a93b7b2 100644 --- a/TidyTabs.sln +++ b/TidyTabs.sln @@ -1,10 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30110.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28407.52 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TidyTabs", "TidyTabs\TidyTabs.csproj", "{7FDA9E0C-BB8E-4E6E-A914-D54A573732DF}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{A24FDB4C-FC69-4B6C-88AF-7266526E71C1}" ProjectSection(SolutionItems) = preProject .nuget\NuGet.Config = .nuget\NuGet.Config @@ -12,6 +10,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{A24FDB .nuget\NuGet.targets = .nuget\NuGet.targets EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TidyTabs", "TidyTabs\TidyTabs.csproj", "{7FDA9E0C-BB8E-4E6E-A914-D54A573732DF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -26,4 +26,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {AA906A5E-76C1-49F3-845A-DD9B41D226A2} + EndGlobalSection EndGlobal diff --git a/TidyTabs/Properties/Resources.Designer.cs b/TidyTabs/Properties/Resources.Designer.cs index 54015bb..47128bb 100644 --- a/TidyTabs/Properties/Resources.Designer.cs +++ b/TidyTabs/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace DaveMcKeown.TidyTabs.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { diff --git a/TidyTabs/Properties/Settings.Designer.cs b/TidyTabs/Properties/Settings.Designer.cs index 1f77daf..e2a4706 100644 --- a/TidyTabs/Properties/Settings.Designer.cs +++ b/TidyTabs/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace DaveMcKeown.TidyTabs.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/TidyTabs/TidyTabs.csproj b/TidyTabs/TidyTabs.csproj index d0dd969..f112e4f 100644 --- a/TidyTabs/TidyTabs.csproj +++ b/TidyTabs/TidyTabs.csproj @@ -1,8 +1,8 @@  - + - 15.0 + 16.0 12.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) ..\ @@ -69,10 +69,17 @@ true + + ..\packages\EnvDTE.8.0.2\lib\net10\EnvDTE.dll + True + + + ..\packages\EnvDTE80.8.0.3\lib\net10\EnvDTE80.dll + True + - @@ -84,55 +91,28 @@ - - ..\packages\NLog.2.1.0\lib\net45\NLog.dll + + ..\packages\NLog.4.5.11\lib\net45\NLog.dll + + + ..\packages\stdole.7.0.3303\lib\net10\stdole.dll + True + + + + + - - {80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2} - 8 - 0 - 0 - primary - False - False - - - {26AD1324-4B7C-44BC-84F8-B86AED45729F} - 10 - 0 - 0 - primary - False - False - - - {1A31287A-4D7D-413E-8E32-3B374931BD89} - 8 - 0 - 0 - primary - False - False - - - {2CE2370E-D744-4936-A090-3FFFE667B0E1} - 9 - 0 - 0 - primary - False - False - {1CBA492E-7263-47BB-87FE-639000619B15} 8 @@ -202,9 +182,7 @@ README.md - - Designer - + SettingsSingleFileGenerator Settings.Designer.cs @@ -268,12 +246,14 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + + - + +