From 3188851eb183865552eb7e7225672091bb1cbf51 Mon Sep 17 00:00:00 2001 From: Brian Peek Date: Fri, 22 Sep 2017 23:10:37 -0400 Subject: [PATCH] VS2017 support --- Merlin32Language.csproj | 87 +++++++++++++++++++++++++++----- Merlin32Language.sln | 13 ++--- Resources/data.Designer.cs | 2 +- Resources/directives.Designer.cs | 2 +- Resources/opcodes.Designer.cs | 2 +- source.extension.vsixmanifest | 49 +++++++++--------- 6 files changed, 108 insertions(+), 47 deletions(-) diff --git a/Merlin32Language.csproj b/Merlin32Language.csproj index 1f21300..ff5c2f0 100644 --- a/Merlin32Language.csproj +++ b/Merlin32Language.csproj @@ -1,7 +1,7 @@  - 14.0 + 15.0 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) SAK @@ -12,8 +12,9 @@ - 4.0 + 14.0 + false publish\ true Disk @@ -26,7 +27,6 @@ true 0 1.0.0.%2a - false false true @@ -73,30 +73,68 @@ /rootsuffix Exp + + False + packages\VSSDK.DTE.7.0.4\lib\net20\envdte.dll + True + False False + + packages\VSSDK.GraphModel.11.0.4\lib\net45\Microsoft.VisualStudio.GraphModel.dll + False + False - + + packages\VSSDK.OLE.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll + True + False + + + packages\VSSDK.Shell.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll + False + + + packages\VSSDK.Shell.Immutable.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll + True + False + + + packages\VSSDK.Shell.Immutable.11.11.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll + True + False + + + packages\VSSDK.Shell.Immutable.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll + True + False + + + packages\VSSDK.Shell.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.dll + True + False + + + packages\VSSDK.Shell.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.8.0.dll + True False - - - true - - - - + + packages\VSSDK.Shell.Interop.9.9.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll + True + False + False @@ -109,16 +147,40 @@ False - + + packages\VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll + True + False + + + packages\VSSDK.TextManager.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.8.0.dll + True + False + + + packages\VSSDK.Threading.12.0.4\lib\net45\Microsoft.VisualStudio.Threading.dll + False + + + False + packages\VSSDK.DTE.7.0.4\lib\net20\stdole.dll + True + + + + + + + @@ -152,6 +214,7 @@ + Designer diff --git a/Merlin32Language.sln b/Merlin32Language.sln index 3d53302..af5e229 100644 --- a/Merlin32Language.sln +++ b/Merlin32Language.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merlin32Language", "Merlin32Language.csproj", "{F091221E-FD10-41A7-AAC4-C9359178BDB1}" EndProject @@ -20,12 +20,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 2 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = https://aito.visualstudio.com/ - SccLocalPath0 = . - SccProjectUniqueName1 = Merlin32Language.csproj - SccLocalPath1 = . + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {9D218EEF-2353-4C46-A1B0-E20B193CFF70} EndGlobalSection EndGlobal diff --git a/Resources/data.Designer.cs b/Resources/data.Designer.cs index 8b580cd..93bdd45 100644 --- a/Resources/data.Designer.cs +++ b/Resources/data.Designer.cs @@ -19,7 +19,7 @@ namespace VSMerlin32.Resources { // 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", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class data { diff --git a/Resources/directives.Designer.cs b/Resources/directives.Designer.cs index 6134741..fda1d9d 100644 --- a/Resources/directives.Designer.cs +++ b/Resources/directives.Designer.cs @@ -19,7 +19,7 @@ namespace VSMerlin32.Resources { // 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", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class directives { diff --git a/Resources/opcodes.Designer.cs b/Resources/opcodes.Designer.cs index b1bd9ea..d9a86d1 100644 --- a/Resources/opcodes.Designer.cs +++ b/Resources/opcodes.Designer.cs @@ -19,7 +19,7 @@ namespace VSMerlin32.Resources { // 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", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class opcodes { diff --git a/source.extension.vsixmanifest b/source.extension.vsixmanifest index 428ed5d..55b9b83 100644 --- a/source.extension.vsixmanifest +++ b/source.extension.vsixmanifest @@ -10,27 +10,30 @@ // //***************************************************************************--> - - - Merlin32 Language Service - Merlin32 classifier extension to the Visual Studio Editor. - http://www.brutaldeluxe.fr/products/crossdevtools/merlin/ - License.txt - https://github.com/OlivierGuinart/Merlin32Language - VSLanguageServiceIcon.jpg - VSLanguageServicePreviewImage.jpg - 6502, merlin32, assembly language, language service, Apple II - - - - - - - - - - - - - + + + Merlin32 Language Service + Merlin32 classifier extension to the Visual Studio Editor. + http://www.brutaldeluxe.fr/products/crossdevtools/merlin/ + License.txt + https://github.com/OlivierGuinart/Merlin32Language + VSLanguageServiceIcon.jpg + VSLanguageServicePreviewImage.jpg + 6502, merlin32, assembly language, language service, Apple II + + + + + + + + + + + + + + + + \ No newline at end of file