Skip to content

Fix minor build issues with VS 2026 #13750

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
OneBlue merged 3 commits into from
Nov 21, 2025
Merged

Fix minor build issues with VS 2026 #13750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a3fac7
Merge latest master into feature/wsl-for-apps
OneBlue Nov 20, 2025
a00f03d
Fix minor build issues with VS 2026
OneBlue Nov 20, 2025
dccf262
Merge branch 'feature/wsl-for-apps' into user/oneblue/vs2026
OneBlue Nov 21, 2025
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
2 changes: 1 addition & 1 deletion src/windows/wslaclient/DllMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ try
// Check if the WSL package is installed, and if the version supports WSLA
auto version = wsl::windows::common::wslutil::GetInstalledPackageVersion();

constexpr auto minimalPackageVersion = std::tuple{2, 7, 0};
constexpr auto minimalPackageVersion = std::tuple<uint32_t, uint32_t, uint32_t>{2, 7, 0};
WI_SetFlagIf(*Components, WslInstallComponentWslPackage, !version.has_value() || version < minimalPackageVersion);

// TODO: Check if hardware supports virtualization.
Expand Down
4 changes: 2 additions & 2 deletions src/windows/wslaservice/exe/WSLAVirtualMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,9 +879,9 @@ Microsoft::WRL::ComPtr<WSLAProcess> WSLAVirtualMachine::CreateLinuxProcess(_In_
}

std::map<int, wil::unique_handle> stdHandles;
for (auto& [fd, socket] : sockets)
for (auto& [fd, handle] : sockets)
{
stdHandles.emplace(fd, reinterpret_cast<HANDLE>(socket.release()));
stdHandles.emplace(fd, reinterpret_cast<HANDLE>(handle.release()));
}

auto process = wil::MakeOrThrow<WSLAProcess>(std::move(stdHandles), pid, this);
Expand Down