Skip to content

Commit 054c6fc

Browse files
committed
Filter folders were not working correctly causing all the headers to just
be directly under one folder instead of their respective ones. After some experimenting I found a way to make this work and fixed it up. There is no need for the filterdefs.props file any more. I also noticed some vcxproj files were missing filters files so I added them.
1 parent 2d84663 commit 054c6fc

10 files changed

+43
-34
lines changed
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="filterdefs.props" />
43
<Import Project="sources.proj" />
54
</Project>

Release/src/build/casablanca110.winrt.vcxproj.filters

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<PropertyGroup>
44
<WinRTProject>true</WinRTProject>
55
</PropertyGroup>
6-
<Import Project="filterdefs.props" />
76
<Import Project="sources.proj" />
87
</Project>

Release/src/build/casablanca110.wp8.vcxproj.filters

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<PropertyGroup>
44
<WinRTProject>true</WinRTProject>
55
</PropertyGroup>
6-
<Import Project="filterdefs.props" />
76
<Import Project="sources.proj" />
87
</Project>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="sources.proj" />
4+
</Project>
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<WinRTProject>true</WinRTProject>
5-
</PropertyGroup>
6-
<Import Project="filterdefs.props" />
3+
<Import Project="sources.proj" />
74
</Project>
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="filterdefs.props" />
3+
<PropertyGroup>
4+
<WinRTProject>true</WinRTProject>
5+
</PropertyGroup>
6+
<Import Project="sources.proj" />
47
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<WinRTProject>true</WinRTProject>
5+
</PropertyGroup>
6+
<Import Project="sources.proj" />
7+
</Project>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="sources.proj" />
4+
</Project>

Release/src/build/filterdefs.props

Lines changed: 0 additions & 26 deletions
This file was deleted.

Release/src/build/sources.proj

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="Header Files\pplx">
13+
<UniqueIdentifier>{8ee80092-f08b-4b6a-914c-1990a3fc88de}</UniqueIdentifier>
14+
</Filter>
15+
<Filter Include="Header Files\compat">
16+
<UniqueIdentifier>{e02ecd04-cecf-4527-9ae9-9fc076e7be12}</UniqueIdentifier>
17+
</Filter>
18+
<Filter Include="Header Files\cpprest">
19+
<UniqueIdentifier>{eaaa2a63-6b14-4626-920e-b6c1d8dfdcf8}</UniqueIdentifier>
20+
</Filter>
21+
<Filter Include="Header Files\precompiled header">
22+
<UniqueIdentifier>{c299a1f3-2885-4aa3-a3e8-fe656d132dcf}</UniqueIdentifier>
23+
</Filter>
24+
</ItemGroup>
25+
326
<ItemGroup>
427
<ClInclude Include="$(CasablancaSrcDir)\pch\stdafx.h">
528
<Filter>Header Files\precompiled header</Filter>

0 commit comments

Comments
 (0)