Skip to content

merge master -> feature/wsl-for-apps#14212

Merged
benhillis merged 9 commits intofeature/wsl-for-appsfrom
user/benhill/merge_main
Feb 13, 2026
Merged

merge master -> feature/wsl-for-apps#14212
benhillis merged 9 commits intofeature/wsl-for-appsfrom
user/benhill/merge_main

Conversation

@benhillis
Copy link
Copy Markdown
Member

This change pulls the most recent payload from master into the feature branch. Biggest thing here is the new and improve wsldevicehost package with improved virtio networking and virtiofs.

benhillis and others added 9 commits February 7, 2026 12:47
* Move from shipping the initrd to generating during package install.

* pr feedback

* working

* adjust custom action conditions

* update initrd test to cover more cases

* Update msipackage/package.wix.in

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* use stack buffer

* move initrd helper to filesystem.cpp and add unit test

---------

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
…versions of Visual Studio (#14160)

* Updating to support VS2026 and insiders builds

* Updated max ver (exclusive) to 19.0

* Fix command for vswhere to include prerelease

---------

Co-authored-by: Ben Hillis <benhillis@gmail.com>
…14198)

improvements.

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

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
@benhillis benhillis requested a review from a team as a code owner February 12, 2026 23:56
Copilot AI review requested due to automatic review settings February 12, 2026 23:56
@benhillis benhillis enabled auto-merge February 12, 2026 23:57
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR merges the latest changes from master into the feature/wsl-for-apps branch. The primary updates include an upgraded wsldevicehost package (version 1.1.14-0) with improvements to virtio networking and virtiofs, refactoring of VirtioNetworking to use a flags-based API, Ubuntu 24.04.4 LTS distribution updates, and various bug fixes and improvements to CPIO archive generation and testing infrastructure.

Changes:

  • Upgraded Microsoft.WSL.DeviceHost package from 1.1.10-0 to 1.1.14-0, bringing improved virtio networking and virtiofs functionality
  • Refactored VirtioNetworking class to use VirtioNetworkingFlags enum instead of individual boolean parameters for better extensibility
  • Updated Ubuntu distribution URLs and SHA256 hashes to version 24.04.4 LTS
  • Fixed CPIO archive generation to properly handle trailer entries and archive padding with correct type conversions
  • Enhanced CMakeLists.txt to support Visual Studio 2024 (version 18.x) and improve error messaging
  • Removed virtiofs-specific test skips now that the functionality works correctly
  • Improved network test logging and replaced duplicate code with common utility functions

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
packages.config Upgraded DeviceHost package to version 1.1.14-0 with improved virtio networking
src/windows/common/VirtioNetworking.h Introduced VirtioNetworkingFlags enum with LocalhostRelay and DnsTunneling options; changed GUID members to std::optional
src/windows/common/VirtioNetworking.cpp Major refactoring: moved adapter initialization to RefreshGuestConnection, implemented conditional DNS tunneling based on flags, removed unused FindVirtioInterfaceLuid function
src/windows/wslaservice/exe/HcsVirtualMachine.cpp Updated to use VirtioNetworkingFlags enum; added validation that DNS socket is not provided when DNS tunneling is disabled
src/windows/service/exe/WslCoreVm.cpp Updated VirtioNetworking instantiation to use flags; expanded IsDnsTunnelingSupported assertion to include VirtioProxy mode
src/windows/common/filesystem.cpp Fixed CPIO trailer entry generation with explicit isTrailer flag; fixed archive padding calculation to use ULONGLONG to prevent overflow
test/windows/SimpleTests.cpp Updated test to allocate 111-byte header buffer but read exactly 110 bytes (correct for null-terminated strings)
test/windows/NetworkTests.cpp Replaced local SockaddrToString with common SockAddrInetToWstring utility; changed internet connectivity messages from LogSkipped to LogInfo
test/linux/unit_tests/fscommon.c Removed virtiofs test skips and consolidated Plan9/virtiofs skip logic for noatime flag test
test/linux/unit_tests/drvfs.c Removed virtiofs-specific TODO skip for delete loop test
distributions/DistributionInfo.json Updated Ubuntu 24.04 URLs and SHA256 hashes to version 24.04.4
CMakeLists.txt Expanded Visual Studio version range to include VS 2024; added Clang component requirement; improved error messaging

Comment thread src/windows/service/exe/WslCoreVm.cpp
@OneBlue OneBlue mentioned this pull request Feb 13, 2026
6 tasks
@benhillis benhillis merged commit b9f6a9b into feature/wsl-for-apps Feb 13, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants