From fd78b612d4869ac82b093e5bb68c0f8771815ac2 Mon Sep 17 00:00:00 2001
From: Tiemen <tiemenschreuder@gmail.com>
Date: Thu, 17 Aug 2017 23:09:14 +0200
Subject: [PATCH] - Added support for installing against VS2017 (did some quick
 testing) - Added support for building against VS2017 (untested) - Incremented
 version to 1.4 - Fixed readme asterisk escaping

---
 FortranCodeNav/FortranCodeNav.csproj          | 14 ++++++++++----
 FortranCodeNav/Properties/AssemblyInfo.cs     |  2 +-
 FortranCodeNav/packages.config                |  3 ++-
 FortranCodeNav/source.extension.vsixmanifest  |  7 +++++--
 FortranCodeNavCore/Properties/AssemblyInfo.cs |  4 ++--
 README.md                                     |  2 +-
 VSIntegration/Properties/AssemblyInfo.cs      |  2 +-
 7 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/FortranCodeNav/FortranCodeNav.csproj b/FortranCodeNav/FortranCodeNav.csproj
index db08f2d..894fbd6 100644
--- a/FortranCodeNav/FortranCodeNav.csproj
+++ b/FortranCodeNav/FortranCodeNav.csproj
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props')" />
+  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props" Condition="'$(VisualStudioVersion)' != '14.0' And Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" />
+  <Import Project="..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props" Condition="'$(VisualStudioVersion)' == '14.0' And Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" />
   <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <UseCodebase>true</UseCodebase>
     <TargetFrameworkProfile />
+    <VsixType>v3</VsixType>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -207,10 +210,13 @@
     <PropertyGroup>
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.targets'))" />
+    <Error Condition="'$(VisualStudioVersion)' == '14.0' And !Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props'))" />
+    <Error Condition="'$(VisualStudioVersion)' == '14.0' And !Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets'))" />
+    <Error Condition="'$(VisualStudioVersion)' != '14.0' And !Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props'))" />
+    <Error Condition="'$(VisualStudioVersion)' != '14.0' And !Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets'))" />
   </Target>
-  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.targets')" />
+  <Import Project="..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets" Condition="'$(VisualStudioVersion)' == '14.0' And Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" />
+  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets" Condition="'$(VisualStudioVersion)' != '14.0' And Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/FortranCodeNav/Properties/AssemblyInfo.cs b/FortranCodeNav/Properties/AssemblyInfo.cs
index 3e1f04e..f7aa753 100644
--- a/FortranCodeNav/Properties/AssemblyInfo.cs
+++ b/FortranCodeNav/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("TS")]
 [assembly: AssemblyProduct("FortranCodeNav")]
-[assembly: AssemblyCopyright("Copyright © 2012-2015")]
+[assembly: AssemblyCopyright("Copyright © 2012-2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/FortranCodeNav/packages.config b/FortranCodeNav/packages.config
index f5b8396..b931982 100644
--- a/FortranCodeNav/packages.config
+++ b/FortranCodeNav/packages.config
@@ -3,6 +3,7 @@
   <package id="Microsoft.VisualStudio.CoreUtility" version="14.1.24720" targetFramework="net45" />
   <package id="Microsoft.VisualStudio.Imaging" version="14.1.24720" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net452" />
+  <package id="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" version="14.0.215" targetFramework="net45" developmentDependency="true" />
   <package id="Microsoft.VisualStudio.Shell.14.0" version="14.1.24720" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net452" />
@@ -23,7 +24,7 @@
   <package id="Microsoft.VisualStudio.Threading" version="14.1.111" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.Utilities" version="14.1.24720" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net452" />
-  <package id="Microsoft.VSSDK.BuildTools" version="14.1.24720" targetFramework="net452" developmentDependency="true" />
+  <package id="Microsoft.VSSDK.BuildTools" version="15.1.192" targetFramework="net45" developmentDependency="true" />
   <package id="VSSDK.DTE" version="7.0.4" targetFramework="net40" />
   <package id="VSSDK.GraphModel" version="11.0.4" targetFramework="net40" requireReinstallation="true" />
   <package id="VSSDK.IDE" version="7.0.4" targetFramework="net40" />
diff --git a/FortranCodeNav/source.extension.vsixmanifest b/FortranCodeNav/source.extension.vsixmanifest
index 61bdedb..4c8381b 100644
--- a/FortranCodeNav/source.extension.vsixmanifest
+++ b/FortranCodeNav/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="FortranCodeNav.TS.55948bba-b407-4af9-99d4-eb4fb3cf1eec" Version="1.3" Language="en-US" Publisher="Tiemen Schreuder" />
+    <Identity Id="FortranCodeNav.TS.55948bba-b407-4af9-99d4-eb4fb3cf1eec" Version="1.4" Language="en-US" Publisher="Tiemen Schreuder" />
     <DisplayName>Fortran CodeNav</DisplayName>
     <Description xml:space="preserve">Fortran CodeNav helps you to easily jump and search through Fortran 90 code and also provides code completion (IntelliSense).</Description>
     <MoreInfo>https://www.youtube.com/watch?v=ApumbtDAqMM</MoreInfo>
@@ -16,7 +16,10 @@
     <InstallationTarget Version="[11.0,17.0]" Id="Microsoft.VisualStudio.Community" />
     <!--<InstallationTarget Version="[11.0,15.0)" Id="Microsoft.VisualStudio.VSWinExpress" />-->
     <!--<InstallationTarget Version="[11.0,15.0)" Id="Microsoft.VisualStudio.VSWinDesktopExpress" />-->
-  </Installation>
+  </Installation>  
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25904.2,16.0)" DisplayName="Visual Studio core editor" />
+  </Prerequisites>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
     <Dependency d:Source="Installed" Id="Microsoft.VisualStudio.MPF.11.0" DisplayName="Visual Studio MPF 11.0" Version="[11.0,12.0)" />
diff --git a/FortranCodeNavCore/Properties/AssemblyInfo.cs b/FortranCodeNavCore/Properties/AssemblyInfo.cs
index 9c64b7b..b93a863 100644
--- a/FortranCodeNavCore/Properties/AssemblyInfo.cs
+++ b/FortranCodeNavCore/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("TS")]
 [assembly: AssemblyProduct("FortranCodeNavCore")]
-[assembly: AssemblyCopyright("Copyright © 2012-2015")]
+[assembly: AssemblyCopyright("Copyright © 2012-2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.*")]
+[assembly: AssemblyVersion("1.4.0.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/README.md b/README.md
index 6297288..36f3b50 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Pattern search is a method to quickly filter the results without typing out the
 
 So the search term 'HL' would match 'hello' whereas the search term 'hl' would not. Expressed as a (case insensitive) wildcard pattern:
 - hl = 'hl'
-- HL = 'h*l*'
+- HL = 'h\*l\*'
 
 The pattern search is useful to quickly find members by their acronym:
 - Fortran = FTRN
diff --git a/VSIntegration/Properties/AssemblyInfo.cs b/VSIntegration/Properties/AssemblyInfo.cs
index f89b6e5..5c83b60 100644
--- a/VSIntegration/Properties/AssemblyInfo.cs
+++ b/VSIntegration/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("-TS")]
 [assembly: AssemblyProduct("VSIntegration")]
-[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyCopyright("Copyright © 2012-2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]