merge origin/master -> feature/wsl-for-apps by benhillis · Pull Request #13945 · microsoft/WSL

benhillis · 2025-12-19T22:11:25Z

This change gets the WSLA feature branch up-to-date with master to avoid complicated merge conflicts in the future.

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

* Localization change from build: 135812430 * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * remove unused string --------- Co-authored-by: WSL localization <noreply@microsoft.com> Co-authored-by: Ben Hillis <benhillis@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

…cted header. (#13898) * Resolve issue with config file writing sections outside of their expected header. * add more writewslconfig variations * formatting --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

…3921) * Resolve issue with buttons on notifications not working correctly * pr feedback --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

) Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

* test: extend coverage of virtioproxy networking mode * test: add dns test variations to all networking classes * remove bridged dns variations * pr feedback --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

…13928) Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

…3930)

* [GH 13837] Remove trailing slash from $XDG_RUNTIME_DIR * pr feedback --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

* test: add more path translation variations * Update test/windows/SimpleTests.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

* cleanup: add scsi disks during VM creation * pr feedback --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

* cleanup: switch drvfs.cpp to use common MountUtil helper * adjust mount.drvfs error logging * adjust mount.drvfs error logging --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

Copilot

Pull request overview

This PR merges the latest changes from origin/master into the feature/wsl-for-apps branch to prevent future merge conflicts. The merge brings in multiple improvements including bug fixes for WSL configuration file handling, SCSI device attachment refactoring, enhanced test coverage, and various code quality improvements.

Key changes include:

Fixed a critical bug (GitHub #12671) where WSL Settings GUI wrote configuration keys before section headers, causing "Unknown key" errors
Refactored SCSI disk attachment to occur during VM creation rather than post-initialization for better efficiency
Improved error handling and logging throughout the codebase, particularly for HCS operations and path translation

Reviewed changes

Copilot reviewed 50 out of 50 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
test/windows/UnitTests.cpp	Added comprehensive regression tests for config file section header ordering bug fix; updated user session tests for XDG_RUNTIME_DIR fix; updated registry AppID GUID
test/windows/SimpleTests.cpp	Added test for Windows path translation with spaces
test/windows/NetworkTests.cpp	Added DNS resolution tests for NAT, Mirrored, and VirtioProxy networking modes; added VirtioProxy loopback and UDP/TCP binding tests; added BridgedTests as friend class
test/windows/DrvFsTests.cpp	Removed VirtioFs-specific test workarounds now that symlink functionality is fixed; updated comments to reference both Plan9 and VirtioFs
test/linux/unit_tests/wslpath.c	Added path translation tests for Windows paths containing spaces
test/linux/unit_tests/drvfs.c	Added skip logic for VirtioFs-specific test that needs debugging
src/windows/wslinstall/DllMain.cpp	Updated COM AppID GUID to match new DeviceHost registration
src/windows/wslhost/main.cpp	Fixed notification activation argument parsing by removing redundant executable name prepending
src/windows/service/exe/WslCoreVm.h	Added default parameter to ReserveLun and m_kernelModulesDeviceId member variable
src/windows/service/exe/WslCoreVm.cpp	Refactored SCSI disk attachment to occur during VM JSON configuration generation; moved system distro and kernel modules mounting to GenerateConfigJson
src/windows/service/exe/LxssUserSession.h	Removed drvFsNotifications parameter from TelemetryWorker signature
src/windows/service/exe/LxssUserSession.cpp	Moved drvFsNotifications check inside TelemetryWorker for better encapsulation
src/windows/inc/wslhost.h	Changed embedding_option from "--Embedding" to "-Embedding" to match COM standards
src/windows/common/notifications.cpp	Removed "--" prefix from notification action arguments since arguments are now parsed directly
src/windows/common/interop.cpp	Removed SetDesktop call since desktop policy is handled via SetDesktopAppPolicy
src/windows/common/hcs_schema.h	Fixed Scsi::Attachments type from EmptyObject to Attachment to properly serialize disk attachments
src/windows/common/hcs.cpp	Split HCS error logging into separate calls to prevent truncation of long configuration strings
src/windows/common/SubProcess.h	Removed unused SetDesktop method declaration
src/windows/common/SubProcess.cpp	Removed SetDesktop implementation (member variable remains with nullptr default)
src/shared/configfile/configfile.cpp	Fixed critical bug where keys could be written before section headers; improved logic to write pending keys when encountering new sections
src/linux/init/wslinfo.cpp	Updated to use MessageFailedToTranslate with path parameter instead of parameterless MessageFailedToTranslatePath
src/linux/init/util.cpp	Centralized mount retry logic with filesystem-specific error handling; improved comments explaining retry conditions
src/linux/init/init.cpp	Removed trailing slash from XDG_RUNTIME_DIR value
src/linux/init/drvfs.cpp	Simplified MountWithRetry by delegating retry logic to UtilMount
packages.config	Updated Microsoft.WSL.DeviceHost package from 1.1.6-0 to 1.1.8-0
msipackage/package.wix.in	Updated COM AppID GUID and removed redundant AppID registry configuration
localization/strings/*/Resources.resw	Removed MessageFailedToTranslatePath entries (replaced by MessageFailedToTranslate with parameter); added Polish and Czech translations for MessagePassVhdFlag
UserConfig.cmake.sample	Fixed typo in comment: wsldevicehost.exe → wsldevicehost.dll
.github/copilot-instructions.md	Added critical documentation about always building the entire project before running tests

benhillis and others added 15 commits December 13, 2025 10:59

cleanup: minor tweaks to path translation failed messages (#13892)

b4c0ced

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

Resolve issue with buttons on notifications not working correctly (#1…

e24df7e

…3921) * Resolve issue with buttons on notifications not working correctly * pr feedback --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

Fix minor typo in UserConfig.cmake.sample (.exe instead of .dll) (#13926

c6ac743

) Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

test: extend networking test coverage (#13914)

d48d374

* test: extend coverage of virtioproxy networking mode * test: add dns test variations to all networking classes * remove bridged dns variations * pr feedback --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

cleanup: remove duplicate AppId registration for wsldevicehost.dll (#…

f02f8ef

…13928) Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

Remove the explicit desktop field when creating a Windows process (#1…

1e3ef15

…3930)

[GH 13837] Remove trailing slash from $XDG_RUNTIME_DIR (#13929)

d060939

* [GH 13837] Remove trailing slash from $XDG_RUNTIME_DIR * pr feedback --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

test: add more path translation variations (#13927)

c5fd672

* test: add more path translation variations * Update test/windows/SimpleTests.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

virtiofs: enable additional test cases and skip one racey test (#13933)

77a35b9

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

cleanup: add scsi disks during VM creation (#13939)

a4f1f7a

* cleanup: add scsi disks during VM creation * pr feedback --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

cleanup: hcs logging improvements (#13942)

cb8bc9a

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

cleanup: switch drvfs.cpp to use common MountUtil helper (#13890)

f4b67e3

* cleanup: switch drvfs.cpp to use common MountUtil helper * adjust mount.drvfs error logging * adjust mount.drvfs error logging --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>

Merge remote-tracking branch 'origin/master' into HEAD

1ab2f5b

Copilot AI review requested due to automatic review settings December 19, 2025 22:11

benhillis requested a review from a team as a code owner December 19, 2025 22:11

Copilot started reviewing on behalf of benhillis December 19, 2025 22:12 View session

Copilot AI reviewed Dec 19, 2025

View reviewed changes

OneBlue approved these changes Dec 19, 2025

View reviewed changes

benhillis merged commit 98ba3c4 into feature/wsl-for-apps Dec 20, 2025
12 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge origin/master -> feature/wsl-for-apps#13945

merge origin/master -> feature/wsl-for-apps#13945
benhillis merged 15 commits intofeature/wsl-for-appsfrom
user/benhill/merge_master

benhillis commented Dec 19, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

benhillis commented Dec 19, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants