Skip to content

Commit bba2527

Browse files
DllieuDllieu
committed
Support VS 2015 / 2017
1 parent 0842f57 commit bba2527

5 files changed

+58
-30
lines changed

‎GenerateFilter/GenerateFilter.cs

+28-9
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
using Microsoft.VisualStudio.Shell;
1010
using Microsoft.VisualStudio.Shell.Interop;
1111
using Microsoft.Internal.VisualStudio.PlatformUI;
12-
using Microsoft.VisualStudio.VCProjectEngine;
1312
using EnvDTE;
1413
using System.Collections.Generic;
1514
using System.IO;
1615
using System.Xml;
16+
using System.Reflection;
1717
using System.Text;
1818

1919
namespace VisualStudioCppExtensions
@@ -140,29 +140,48 @@ public IEnumerable<ProjectItem> Recurse(ProjectItem i)
140140
}
141141
}
142142

143+
static private string GetAssemblyLocalPathFrom(Type type)
144+
{
145+
string codebase = type.Assembly.CodeBase;
146+
var uri = new Uri(codebase, UriKind.Absolute);
147+
return uri.LocalPath;
148+
}
149+
143150
static private void SetAdditionalIncludeDirectories(Project project, Dictionary<string, List<string>> filesPerItemType, string projectPath)
144151
{
145152
if (!filesPerItemType.ContainsKey("ClInclude"))
146153
return;
147-
154+
148155
var includePaths = new HashSet<string> { @"$(StlIncludeDirectories)" };
149156
foreach (var file in filesPerItemType["ClInclude"])
150157
{
151158
includePaths.Add(GetRelativePathIfNeeded(projectPath, Path.GetDirectoryName(file)));
152159
}
153160

154-
var vcProject = project.Object as VCProject;
155-
foreach (VCConfiguration vcConfiguration in vcProject.Configurations)
161+
string filterAssemblyInstallionPath = Path.GetDirectoryName(GetAssemblyLocalPathFrom(typeof(GenerateFilterPackage)));
162+
163+
DTE dte = (DTE)Package.GetGlobalService(typeof(DTE));
164+
if (dte.Version.StartsWith("14"))
165+
{
166+
Assembly.LoadFrom(Path.Combine(filterAssemblyInstallionPath, @"Resources\\VCProjectEngine_14.0.dll"));
167+
}
168+
else
169+
{
170+
Assembly.LoadFrom(Path.Combine(filterAssemblyInstallionPath, @"Resources\\VCProjectEngine_15.0.dll"));
171+
}
172+
173+
dynamic vcProject = project.Object;
174+
foreach (dynamic vcConfiguration in vcProject.Configurations)
156175
{
157-
foreach (var genericTool in vcConfiguration.Tools)
176+
foreach (dynamic genericTool in vcConfiguration.Tools)
158177
{
159-
var compilerTool = genericTool as VCCLCompilerTool;
160-
if (compilerTool != null)
178+
dynamic compilerTool = genericTool;
179+
if (compilerTool != null && compilerTool.GetType().FullName == "Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.VCCLCompilerToolShim")
161180
{
181+
// runtime
162182
if (compilerTool.AdditionalIncludeDirectories == null)
163183
compilerTool.AdditionalIncludeDirectories = string.Empty;
164-
165-
var sss = compilerTool.AdditionalIncludeDirectories;
184+
166185
var currentAdditionalIncludeDirectories = new HashSet<string>(compilerTool.AdditionalIncludeDirectories.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
167186
var pathsToAdd = new StringBuilder();
168187
foreach (var includePath in includePaths)

‎GenerateFilter/GenerateFilter.csproj

+22-15
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props')" />
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" />
44
<PropertyGroup>
5-
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
5+
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
66
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
77
<NuGetPackageImportStamp>
88
</NuGetPackageImportStamp>
99
<UseCodebase>true</UseCodebase>
10+
<FileUpgradeFlags>
11+
</FileUpgradeFlags>
12+
<UpgradeBackupLocation>
13+
</UpgradeBackupLocation>
14+
<OldToolsVersion>15.0</OldToolsVersion>
1015
</PropertyGroup>
1116
<PropertyGroup>
1217
<SignAssembly>true</SignAssembly>
@@ -28,7 +33,7 @@
2833
<AppDesignerFolder>Properties</AppDesignerFolder>
2934
<RootNamespace>VisualStudioCppExtensions</RootNamespace>
3035
<AssemblyName>VisualStudioCppExtensions</AssemblyName>
31-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
36+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
3237
<GeneratePkgDefFile>true</GeneratePkgDefFile>
3338
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
3439
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
@@ -60,7 +65,9 @@
6065
</ItemGroup>
6166
<ItemGroup>
6267
<None Include="Key.snk" />
63-
<None Include="packages.config" />
68+
<None Include="packages.config">
69+
<SubType>Designer</SubType>
70+
</None>
6471
<Content Include="Resources\LICENSE">
6572
<IncludeInVSIX>true</IncludeInVSIX>
6673
</Content>
@@ -81,6 +88,12 @@
8188
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
8289
<IncludeInVSIX>true</IncludeInVSIX>
8390
</Content>
91+
<Content Include="Resources\VCProjectEngine_14.0.dll">
92+
<IncludeInVSIX>true</IncludeInVSIX>
93+
</Content>
94+
<Content Include="Resources\VCProjectEngine_15.0.dll">
95+
<IncludeInVSIX>true</IncludeInVSIX>
96+
</Content>
8497
<Content Include="Resources\PreviewImage.png">
8598
<IncludeInVSIX>true</IncludeInVSIX>
8699
</Content>
@@ -113,10 +126,7 @@
113126
<HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
114127
<Private>True</Private>
115128
</Reference>
116-
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
117-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
118-
<Private>True</Private>
119-
</Reference>
129+
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
120130
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
121131
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
122132
<Private>True</Private>
@@ -180,9 +190,6 @@
180190
<HintPath>..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
181191
<Private>True</Private>
182192
</Reference>
183-
<Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
184-
<EmbedInteropTypes>True</EmbedInteropTypes>
185-
</Reference>
186193
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
187194
<EmbedInteropTypes>False</EmbedInteropTypes>
188195
</Reference>
@@ -206,10 +213,10 @@
206213
<PropertyGroup>
207214
<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>
208215
</PropertyGroup>
209-
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props'))" />
210-
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets'))" />
216+
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props'))" />
217+
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets'))" />
211218
</Target>
212-
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets')" />
219+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" />
213220
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
214221
Other similar extension points exist, see Microsoft.Common.targets.
215222
<Target Name="BeforeBuild">

‎GenerateFilter/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
<package id="Microsoft.VisualStudio.Threading" version="14.1.111" targetFramework="net452" />
1919
<package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net452" />
2020
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net452" />
21-
<package id="Microsoft.VSSDK.BuildTools" version="14.3.25407" targetFramework="net452" developmentDependency="true" />
21+
<package id="Microsoft.VSSDK.BuildTools" version="15.0.26201" targetFramework="net452" developmentDependency="true" />
2222
</packages>

‎GenerateFilter/source.extension.vsixmanifest

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a2d" Version="1.1" Language="en-US" Publisher="Stephane Molina" />
4+
<Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a2d" Version="1.2" Language="en-US" Publisher="Stephane Molina" />
55
<DisplayName>Generate C++ Filters</DisplayName>
66
<Description xml:space="preserve">Simple Extension which provide the ability to generate C++ project filters to replicate the folder hierarchy of underlying sources</Description>
77
<License>Resources\LICENSE</License>
@@ -10,12 +10,14 @@
1010
<Tags>c++;folder;import;filter</Tags>
1111
</Metadata>
1212
<Installation>
13-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
13+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,15.0]" />
1414
</Installation>
1515
<Dependencies>
1616
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
17-
<Dependency Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" d:Source="Installed" Version="[14.0]" />
1817
</Dependencies>
18+
<Prerequisites>
19+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[14.0,)" DisplayName="Visual Studio core editor" />
20+
</Prerequisites>
1921
<Assets>
2022
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
2123
</Assets>

‎VisualStudioCppExtensions.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.9
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenerateFilter", "GenerateFilter\GenerateFilter.csproj", "{18555A86-3A5F-4D33-8C12-01E288BDC30E}"
77
EndProject

0 commit comments

Comments
 (0)