Skip to content

Commit 04dfb3d

Browse files
StuparStupar
Stupar
authored and
Stupar
committed
v1.6.3
1 parent f072c69 commit 04dfb3d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1194
-1196
lines changed

README.md docs/readme.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Fork of https://github.com/Dllieu/VisualStudioCppExtensions and updated for Visu
1313
- It was originally made to browse easily C++ code hosted on a Linux machine while benefiting of the Visual Studio's features (e.g. GUI, Go to Definition / Declaration, Compile / Debug through SSH, ...)
1414

1515
<p align="center">
16-
<img src="images/usage_project_no_filter.png" alt="Project without filter"/>
17-
<img src="images/usage_project_generate_filter_result.png" alt="Project with filter replicating the folder hierarchy"/>
16+
<img src="usage_project_no_filter.png" alt="Project without filter"/>
17+
<img src="usage_project_generate_filter_result.png" alt="Project with filter replicating the folder hierarchy"/>
1818
</p>
1919

2020
## Installation
@@ -27,31 +27,31 @@ Open an existing C++ solution
2727
In the example below, I drag and dropped a folder into an empty C++ Project, all the files are imported but the whole project is *flat* as visual studio does not replicate the folder hierarchy of the files for C++ projects
2828

2929
<p align="center">
30-
<img src="images/usage_project_no_filter.png" alt="Project without filter"/>
30+
<img src="usage_project_no_filter.png" alt="Project without filter"/>
3131
</p>
3232

3333
Right click on the project for which you want to generate the filters per folder, a menu ```Generate C++ Project Filters``` will appear (*only appearing when right-clicking on a C++ project*)
3434

3535
<p align="center">
36-
<img src="images/usage_project_right_click.png" alt="Right click on the project"/>
36+
<img src="usage_project_right_click.png" alt="Right click on the project"/>
3737
</p>
3838

3939
Click on ```Generate C++ Project Filters```, a confirmation will be required to generate the filters
4040

4141
<p align="center">
42-
<img src="images/usage_project_generate_filter_confirmation.png" alt="Notification for confirmation"/>
42+
<img src="usage_project_generate_filter_confirmation.png" alt="Notification for confirmation"/>
4343
</p>
4444

4545
Once the filters are generated, the extension will automatically reload the current project if needed. Accept the changes made by the extension by clicking yes
4646

4747
<p align="center">
48-
<img src="images/usage_project_generate_filter_save_change.png" alt="Save change made by Generate Filter"/>
48+
<img src="usage_project_generate_filter_save_change.png" alt="Save change made by Generate Filter"/>
4949
</p>
5050

5151
As a result, your C++ project will have filters that replicate your C++ sources folder hierarchy
5252

5353
<p align="center">
54-
<img src="images/usage_project_generate_filter_result.png" alt="Result"/>
54+
<img src="usage_project_generate_filter_result.png" alt="Result"/>
5555
</p>
5656

5757
## Dependencies for developers
File renamed without changes.
File renamed without changes.

source/2022/2022.csproj

+31-31
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,29 @@
1717
<SignAssembly>true</SignAssembly>
1818
</PropertyGroup>
1919
<PropertyGroup>
20-
<AssemblyOriginatorKeyFile>..\shared\key.snk</AssemblyOriginatorKeyFile>
20+
<AssemblyOriginatorKeyFile>..\shared\other\package\package.key.snk</AssemblyOriginatorKeyFile>
2121
</PropertyGroup>
2222
<PropertyGroup>
23-
<ApplicationIcon>..\shared\resources\generateFilters.ico</ApplicationIcon>
23+
<ApplicationIcon>..\shared\other\package\resource\icon.ico</ApplicationIcon>
2424
</PropertyGroup>
2525
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
2626
<DebugSymbols>true</DebugSymbols>
27-
<OutputPath>bin\x64\Debug\</OutputPath>
27+
<OutputPath>bin\$(Platform)\Debug\</OutputPath>
2828
<DefineConstants>DEBUG;TRACE</DefineConstants>
29+
<Optimize>false</Optimize>
2930
<DebugType>full</DebugType>
30-
<PlatformTarget>x64</PlatformTarget>
31-
<LangVersion>7.3</LangVersion>
3231
<ErrorReport>prompt</ErrorReport>
32+
<WarningLevel>4</WarningLevel>
33+
<PlatformTarget>x64</PlatformTarget>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
35-
<OutputPath>bin\x64\Release\</OutputPath>
36+
<OutputPath>bin\$(Platform)\Release\</OutputPath>
3637
<DefineConstants>TRACE</DefineConstants>
3738
<Optimize>true</Optimize>
3839
<DebugType>none</DebugType>
39-
<PlatformTarget>x64</PlatformTarget>
40-
<LangVersion>7.3</LangVersion>
4140
<ErrorReport>prompt</ErrorReport>
41+
<WarningLevel>4</WarningLevel>
42+
<PlatformTarget>x64</PlatformTarget>
4243
</PropertyGroup>
4344
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4445
<PropertyGroup>
@@ -60,14 +61,27 @@
6061
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
6162
</PropertyGroup>
6263
<ItemGroup>
63-
<None Include="..\shared\key.snk">
64-
<Link>key.snk</Link>
65-
</None>
66-
<Content Include="..\shared\resources\license">
67-
<Link>resources\license</Link>
64+
<VSCTCompile Include="..\shared\other\package\gui.xml.vsct">
65+
<Link>other\package\gui.xml.vsct</Link>
66+
<ResourceName>Menus.ctmenu</ResourceName>
67+
</VSCTCompile>
68+
<Content Include="..\shared\other\package\resource\icon.ico">
69+
<Link>other\package\resource\icon.ico</Link>
70+
<IncludeInVSIX>true</IncludeInVSIX>
71+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
72+
</Content>
73+
<Content Include="..\shared\other\package\resource\packageLicense.txt">
74+
<Link>other\package\resource\packageLicense.txt</Link>
75+
<IncludeInVSIX>true</IncludeInVSIX>
76+
</Content>
77+
<Content Include="..\shared\other\package\resource\packagePreview.png">
78+
<Link>other\package\resource\packagePreview.png</Link>
6879
<IncludeInVSIX>true</IncludeInVSIX>
6980
</Content>
70-
<None Include="source.extension.vsixmanifest">
81+
<None Include="..\shared\other\package\package.key.snk">
82+
<Link>other\package\package.key.snk</Link>
83+
</None>
84+
<None Include="other\package\source.extension.vsixmanifest">
7185
<SubType>Designer</SubType>
7286
</None>
7387
</ItemGroup>
@@ -80,34 +94,20 @@
8094
</ItemGroup>
8195
<ItemGroup>
8296
<PackageReference Include="Microsoft.VisualStudio.SDK">
83-
<Version>17.1.32210.191</Version>
97+
<Version>17.2.32505.173</Version>
8498
</PackageReference>
8599
<PackageReference Include="Microsoft.VisualStudio.VCProjectEngine">
86-
<Version>17.1.32210.191</Version>
100+
<Version>17.2.32505.173</Version>
87101
</PackageReference>
88102
<PackageReference Include="Microsoft.VSSDK.BuildTools">
89-
<Version>17.2.2090-preview2</Version>
103+
<Version>17.2.2186</Version>
90104
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
91105
<PrivateAssets>all</PrivateAssets>
92106
</PackageReference>
93107
</ItemGroup>
94108
<ItemGroup>
95109
<Folder Include="Properties\" />
96110
</ItemGroup>
97-
<ItemGroup>
98-
<VSCTCompile Include="..\shared\packageXml.vsct">
99-
<Link>packageXml.vsct</Link>
100-
<ResourceName>Menus.ctmenu</ResourceName>
101-
</VSCTCompile>
102-
<Content Include="..\shared\resources\generateFilters.ico">
103-
<Link>resources\generateFilters.ico</Link>
104-
<IncludeInVSIX>true</IncludeInVSIX>
105-
</Content>
106-
<Content Include="..\shared\resources\previewImage.png">
107-
<Link>resources\previewImage.png</Link>
108-
<IncludeInVSIX>true</IncludeInVSIX>
109-
</Content>
110-
</ItemGroup>
111111
<Import Project="..\shared\project\cppFiltersAutoShared.projitems" Label="Shared" />
112112
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
113113
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />

source/2022/source.extension.vsixmanifest source/2022/other/package/source.extension.vsixmanifest

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
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-f46757c67a2e" Version="1.6.2" Language="en-US" Publisher="Stephane Molina" />
4+
<Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a2e" Version="1.6.3" 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>
7-
<License>resources\license</License>
8-
<Icon>resources\generateFilters.ico</Icon>
9-
<PreviewImage>resources\previewImage.png</PreviewImage>
7+
<License>other\package\resource\packageLicense.txt</License>
8+
<Icon>other\package\resource\icon.ico</Icon>
9+
<PreviewImage>other\package\resource\packagePreview.png</PreviewImage>
1010
<Tags>c++;folder;import;filter</Tags>
1111
</Metadata>
1212
<Installation>

source/other/2015/2015.csproj

+41-52
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,27 @@
1717
<SignAssembly>true</SignAssembly>
1818
</PropertyGroup>
1919
<PropertyGroup>
20-
<AssemblyOriginatorKeyFile>..\..\shared\key.snk</AssemblyOriginatorKeyFile>
20+
<AssemblyOriginatorKeyFile>..\..\shared\other\package\package.key.snk</AssemblyOriginatorKeyFile>
2121
</PropertyGroup>
2222
<PropertyGroup>
23-
<ApplicationIcon>..\..\shared\resources\generateFilters.ico</ApplicationIcon>
23+
<ApplicationIcon>..\..\shared\other\package\resource\icon.ico</ApplicationIcon>
24+
</PropertyGroup>
25+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
26+
<DebugSymbols>true</DebugSymbols>
27+
<OutputPath>bin\$(Platform)\Debug\</OutputPath>
28+
<DefineConstants>DEBUG;TRACE</DefineConstants>
29+
<Optimize>false</Optimize>
30+
<DebugType>full</DebugType>
31+
<ErrorReport>prompt</ErrorReport>
32+
<WarningLevel>4</WarningLevel>
33+
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
35+
<OutputPath>bin\$(Platform)\Release\</OutputPath>
36+
<DefineConstants>TRACE</DefineConstants>
37+
<Optimize>true</Optimize>
38+
<DebugType>none</DebugType>
39+
<ErrorReport>prompt</ErrorReport>
40+
<WarningLevel>4</WarningLevel>
2441
</PropertyGroup>
2542
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2643
<PropertyGroup>
@@ -33,63 +50,49 @@
3350
<AppDesignerFolder>Properties</AppDesignerFolder>
3451
<RootNamespace>VisualStudioCppExtensions</RootNamespace>
3552
<AssemblyName>VisualStudioCppExtensions</AssemblyName>
36-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
53+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
3754
<GeneratePkgDefFile>true</GeneratePkgDefFile>
3855
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
3956
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
4057
<IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
4158
<CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
4259
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
4360
</PropertyGroup>
44-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
45-
<DebugSymbols>true</DebugSymbols>
46-
<OutputPath>bin\Debug\</OutputPath>
47-
<PlatformTarget>AnyCPU</PlatformTarget>
48-
<DefineConstants>TRACE;DEBUG;sVs2015</DefineConstants>
49-
<DebugType>full</DebugType>
50-
</PropertyGroup>
51-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
52-
<OutputPath>bin\Release\</OutputPath>
53-
<PlatformTarget>AnyCPU</PlatformTarget>
54-
<Optimize>true</Optimize>
55-
<DefineConstants>TRACE;sVs2015</DefineConstants>
56-
</PropertyGroup>
5761
<ItemGroup>
58-
<None Include="..\..\shared\key.snk">
59-
<Link>key.snk</Link>
60-
</None>
61-
<Content Include="..\..\shared\resources\license">
62-
<Link>resources\license</Link>
62+
<VSCTCompile Include="..\..\shared\other\package\gui.xml.vsct">
63+
<Link>other\package\gui.xml.vsct</Link>
64+
<ResourceName>Menus.ctmenu</ResourceName>
65+
</VSCTCompile>
66+
<Content Include="..\..\shared\other\package\resource\icon.ico">
67+
<Link>other\package\resource\icon.ico</Link>
68+
<IncludeInVSIX>true</IncludeInVSIX>
69+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
70+
</Content>
71+
<Content Include="..\..\shared\other\package\resource\packageLicense.txt">
72+
<Link>other\package\resource\packageLicense.txt</Link>
73+
<IncludeInVSIX>true</IncludeInVSIX>
74+
</Content>
75+
<Content Include="..\..\shared\other\package\resource\packagePreview.png">
76+
<Link>other\package\resource\packagePreview.png</Link>
6377
<IncludeInVSIX>true</IncludeInVSIX>
6478
</Content>
65-
<None Include="source.extension.vsixmanifest">
79+
<None Include="..\..\shared\other\package\package.key.snk">
80+
<Link>other\package\package.key.snk</Link>
81+
</None>
82+
<None Include="other\package\source.extension.vsixmanifest">
6683
<SubType>Designer</SubType>
6784
</None>
6885
</ItemGroup>
6986
<ItemGroup>
70-
<Reference Include="Microsoft.CSharp" />
71-
<Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
72-
<SpecificVersion>False</SpecificVersion>
73-
<EmbedInteropTypes>False</EmbedInteropTypes>
74-
<HintPath>..\resoruces\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
75-
<Private>True</Private>
76-
</Reference>
7787
<Reference Include="System" />
7888
<Reference Include="System.Data" />
79-
<Reference Include="System.Design" />
8089
<Reference Include="System.Drawing" />
8190
<Reference Include="System.Windows.Forms" />
8291
<Reference Include="System.Xml" />
8392
</ItemGroup>
8493
<ItemGroup>
85-
<PackageReference Include="envdte100">
86-
<Version>10.0.3</Version>
87-
</PackageReference>
88-
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0">
89-
<Version>14.3.25407</Version>
90-
</PackageReference>
91-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.3.DesignTime">
92-
<Version>16.10.31320.204</Version>
94+
<PackageReference Include="Microsoft.VisualStudio.SDK">
95+
<Version>17.1.32210.191</Version>
9396
</PackageReference>
9497
<PackageReference Include="Microsoft.VSSDK.BuildTools">
9598
<Version>16.11.35</Version>
@@ -100,20 +103,6 @@
100103
<ItemGroup>
101104
<Folder Include="Properties\" />
102105
</ItemGroup>
103-
<ItemGroup>
104-
<VSCTCompile Include="..\..\shared\packageXml.vsct">
105-
<Link>packageXml.vsct</Link>
106-
<ResourceName>Menus.ctmenu</ResourceName>
107-
</VSCTCompile>
108-
<Content Include="..\..\shared\resources\generateFilters.ico">
109-
<Link>resources\generateFilters.ico</Link>
110-
<IncludeInVSIX>true</IncludeInVSIX>
111-
</Content>
112-
<Content Include="..\..\shared\resources\previewImage.png">
113-
<Link>resources\previewImage.png</Link>
114-
<IncludeInVSIX>true</IncludeInVSIX>
115-
</Content>
116-
</ItemGroup>
117106
<Import Project="..\..\shared\project\cppFiltersAutoShared.projitems" Label="Shared" />
118107
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
119108
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />

source/other/2015/source.extension.vsixmanifest source/other/2015/other/package/source.extension.vsixmanifest

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
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-f46757c67a31" Version="1.6.2" Language="en-US" Publisher="Stephane Molina" />
4+
<Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a31" Version="1.6.3" 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>
7-
<License>resources\license</License>
8-
<Icon>resources\generateFilters.ico</Icon>
9-
<PreviewImage>resources\previewImage.png</PreviewImage>
7+
<License>other\package\resource\packageLicense.txt</License>
8+
<Icon>other\package\resource\icon.ico</Icon>
9+
<PreviewImage>other\package\resource\packagePreview.png</PreviewImage>
1010
<Tags>c++;folder;import;filter</Tags>
1111
</Metadata>
1212
<Installation>
13-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,15.0)" />
13+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,15.0)">
14+
</InstallationTarget>
1415
</Installation>
1516
<Dependencies>
1617
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />

0 commit comments

Comments
 (0)