Skip to content

Commit 77b1e4e

Browse files
authored
Improve module docs, ship them in the nuget, and add missing properties to Visual Studio proejct properties page (#1586)
1 parent 5bf2650 commit 77b1e4e

5 files changed

Lines changed: 410 additions & 36 deletions

File tree

nuget/CppWinrtRules.Project.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<Rule.Categories>
55
<Category Name="General" DisplayName="General"/>
6+
<Category Name="Modules" DisplayName="C++20 Modules"/>
67
</Rule.Categories>
78

89
<Rule.DataSource>
@@ -86,4 +87,24 @@
8687
Description="Enables the /await:strict compiler option"
8788
Category="General" />
8889

90+
<BoolProperty Name="CppWinRTMergeNoValidate"
91+
DisplayName="Disable mdmerge Validation"
92+
Description="Disables mdmerge.exe validation of merged Windows Metadata"
93+
Category="General" />
94+
95+
<BoolProperty Name="CppWinRTBuildModule"
96+
DisplayName="Build C++20 Modules"
97+
Description="Generates per-namespace C++20 module interface units (.ixx) alongside projection headers. See modules.md in the NuGet package for guidance."
98+
Category="Modules" />
99+
100+
<StringProperty Name="CppWinRTModuleInclude"
101+
DisplayName="Module Include Filter"
102+
Description="Semicolon-delimited list of namespace prefixes to include in module (.ixx) generation. When empty, all namespaces are candidates."
103+
Category="Modules" />
104+
105+
<StringProperty Name="CppWinRTModuleExclude"
106+
DisplayName="Module Exclude Filter"
107+
Description="Semicolon-delimited list of namespace prefixes to exclude from module (.ixx) generation. Use to avoid generating modules with unsatisfied dependencies, or to avoid duplicating modules already provided by a referenced project."
108+
Category="Modules" />
109+
89110
</Rule>

nuget/Microsoft.Windows.CppWinRT.nuspec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<tags>native C++ WinRT nativepackage</tags>
1313
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1414
<license type="file">LICENSE</license>
15+
<readme>readme.md</readme>
1516
<projectUrl>https://github.com/Microsoft/cppwinrt</projectUrl>
1617
<iconUrl>https://aka.ms/cppwinrt.ico</iconUrl>
1718
</metadata>
@@ -25,5 +26,7 @@
2526
<file src="Microsoft.Windows.CppWinRT.targets" target="build\native"/>
2627
<file src="CppWinrtRules.Project.xml" target="build\native"/>
2728
<file src="readme.txt"/>
29+
<file src="readme.md"/>
30+
<file src="modules.md"/>
2831
</files>
2932
</package>

0 commit comments

Comments
 (0)