Skip to content

C++20 module support v2 #1575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ryan Shepherd (DefaultRyan) merged 42 commits into from
May 20, 2026
Merged

C++20 module support v2 #1575

Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
5f7d2f5
Initial implementation of vs modules based on cppwinrtplus fork
DefaultRyan Apr 23, 2026
469c963
Rename WINRT_MODULE -> WINRT_IMPL_BUILD_MODULE; WINRT_CONSUME_MODULE …
DefaultRyan Apr 23, 2026
84da05a
Namespace modules are winrt.Namespace. Non-namespace modules are winr…
DefaultRyan Apr 23, 2026
ab72882
Bootstrap basic unit test
DefaultRyan Apr 24, 2026
464a75c
Fix coroutine export. A few more unit tests.
DefaultRyan Apr 24, 2026
b6d6186
module_include, module_exclude
DefaultRyan Apr 24, 2026
717754a
Rename test_module to test_cpp20_module
DefaultRyan Apr 24, 2026
d9ec817
Nuget test project with module include/exclude
DefaultRyan Apr 24, 2026
ca0090a
Refine generated files in component.
DefaultRyan Apr 24, 2026
1aceeed
Added a type deriving from DependencyObject
DefaultRyan Apr 24, 2026
05a845e
Basic module build/consume support
DefaultRyan Apr 24, 2026
6fffa1d
Prefix namespace ixx files with "winrt." for consistency with module …
DefaultRyan Apr 24, 2026
b8b9715
IFC needs better per-project scoping. Now it fully works end to end.
DefaultRyan Apr 25, 2026
25ce335
Minor fix to TestModuleComponent2
DefaultRyan Apr 25, 2026
ccfee65
Documentation and polish.
DefaultRyan Apr 25, 2026
f4073d3
Fix CI failures
DefaultRyan Apr 25, 2026
d5d1821
Try for better std hygiene
DefaultRyan Apr 25, 2026
4d91f75
Address some PR feedback
DefaultRyan Apr 25, 2026
79eb574
Better automation of AdditionalBMIDirectories
DefaultRyan Apr 25, 2026
b0d4656
Missed fallback definition of WINRT_IMPL_STD_EXPORT
DefaultRyan Apr 26, 2026
392a1c3
Wrap base.h and extern the handler pointers
DefaultRyan Apr 26, 2026
9207cf9
Uniform namespace filtering
DefaultRyan Apr 27, 2026
9a98166
Write trailing comments for #endif
DefaultRyan Apr 27, 2026
c4e1b06
Clarify language version requirement
DefaultRyan Apr 27, 2026
5889c9e
Add source_location test
DefaultRyan Apr 27, 2026
2c83d42
Refactor/cleanup some string writers
DefaultRyan Apr 27, 2026
cb62bc7
Add arm64 configs and replace bogus project guids with real guids.
DefaultRyan Apr 27, 2026
054fdf5
More cleanup of strings. Collected common macros into base_macros.h, …
DefaultRyan Apr 27, 2026
9322551
More strings cleanup. Emit a canonical winrt/base_macros.h
DefaultRyan Apr 28, 2026
805c89c
More clarifications about guidance when sharing pre-built modules
DefaultRyan Apr 28, 2026
6c852cc
Ensure structured bindings are exported for IKeyValuePair
DefaultRyan May 2, 2026
aed4a2d
Fix up module namespace exclude logic so it still generates import st…
DefaultRyan May 4, 2026
a7b1413
intrin.h and <cstddef> only needed by base, not namespace modules
DefaultRyan May 5, 2026
14eb2dc
Tidy up a few codegen bits
DefaultRyan May 6, 2026
b8b0cdd
Fix sln config on test_cpp20_module project
DefaultRyan May 6, 2026
d784e0e
Namespace modules now check version against imported winrt_base
DefaultRyan May 7, 2026
472ac29
PR feedback: Test format, hash, natvis hook visibility, message on ol…
DefaultRyan May 14, 2026
bd96a23
Clean up some handling of numerics-related code and add some numerics…
DefaultRyan May 19, 2026
a72f8d5
De-duplicate windowsnumerics.impl.h logic
DefaultRyan May 19, 2026
4f27edc
A little more WINRT_IMPORT_MODULE cleanup
DefaultRyan May 19, 2026
255a253
Merge branch 'master' into feature/modules_v2
DefaultRyan May 20, 2026
1ea9595
Use write_depends in SCC writers
DefaultRyan May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Prefix namespace ixx files with "winrt." for consistency with module … 
…names and built ifc files.

Co-authored-by: Copilot <copilot@github.com>
  • Loading branch information
@DefaultRyan
DefaultRyan and Copilot committed Apr 25, 2026
commit 6fffa1dc73bc342526c30874cc05753eb216195c
6 changes: 3 additions & 3 deletions cppwinrt/file_writers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ export module winrt_numerics;
w.write("#include \"winrt/impl/%.2.h\"\n", ns);
w.write("#include \"winrt/%.h\"\n", ns);

w.flush_to_file(settings.output_folder + "winrt/" + std::string(ns) + ".ixx");
w.flush_to_file(settings.output_folder + "winrt/winrt." + std::string(ns) + ".ixx");
}

static void write_namespace_scc_owner_ixx(

@sylveon Charles Milette (sylveon) May 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clever, though this was something my design avoided altogether ;)

Expand Down Expand Up @@ -672,7 +672,7 @@ export module winrt_numerics;
w.write("#include \"winrt/%.h\"\n", ns);
}

w.flush_to_file(settings.output_folder + "winrt/" + std::string(owner) + ".ixx");
w.flush_to_file(settings.output_folder + "winrt/winrt." + std::string(owner) + ".ixx");
}

static void write_namespace_reexport_ixx(
Expand All @@ -686,6 +686,6 @@ export module winrt_numerics;
w.write("// WinRT namespace module dependency graph (SCC owner consolidation).\n\n");
w.write("export module winrt.%;\n", ns);
w.write("export import winrt.%;\n", owner);
w.flush_to_file(settings.output_folder + "winrt/" + std::string(ns) + ".ixx");
w.flush_to_file(settings.output_folder + "winrt/winrt." + std::string(ns) + ".ixx");
}
}