Skip to content

Commit a8205a8

Browse files
benhillisBen Hillisalmalinuxautobotgithub-actions[bot]OneBlue
authored
merge master -> feature/wsl-for-apps (#14537)
* test: enable virtiofs tests and enable WSLG during testing (#14387) * test: enable virtiofs tests and enable WSLG during testing * test fix --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * chore(distributions): Almalinux auto-update - 20260311 14:52:02 (#14404) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix CVE-2026-26127: bump .NET runtime from 10.0.0 to 10.0.4 (#14421) Addresses Dependabot alerts #10 and #11. The Microsoft.NETCore.App.Runtime packages (win-x64 and win-arm64) at version 10.0.0 are vulnerable to a denial of service via out-of-bounds read when decoding malformed Base64Url input (CVSS 7.5 High). Bumped to 10.0.4 which includes the fix. Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * Notice change from build: 141806547 (#14423) Co-authored-by: WSL notice <noreply@microsoft.com> * Ship initrd.img in MSI using build-time generation via powershell script (#14424) * Ship initrd.img in MSI using build-time generation via tar.exe Replace the install-time CreateInitrd/RemoveInitrd custom actions with a build-time step that generates initrd.img using the Windows built-in tar.exe (libarchive/bsdtar) and ships it directly in the MSI. The install-time approach had a race condition: wsl.exe could launch before the CreateInitrd custom action completed, causing ERROR_FILE_NOT_FOUND for initrd.img. Changes: - Add CMake custom command to generate initrd.img via tar.exe --format=newc - Add initrd.img as a regular file in the MSI tools component - Remove CreateInitrd/RemoveInitrd custom actions from WiX, DllMain, and wslinstall.def - Remove CreateCpioInitrd helper and its tests (no longer needed) - Update pipeline build targets to build initramfs instead of init * pr feedback * more pr feedback * switch to using a powershell script instead of tar.exe * powershell script feedback * hopefully final pr feedback --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * virtiofs: update logic so querying virtiofs mount source does not require a call to the service (#14380) * virtiofs: update logic so querying virtiofs mount source does not require a call to the service * more pr feedback * use std::filesystem::read_symlink * pr feedback and use canonical path in virtiofs symlink * make sure canonical path is always used --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * virtio networking: add support for ipv6 (#14350) * VirtioProxy: Add IPv6 address, gateway, and route support - Add PreferredIpv6Address field and GetBestGatewayV6* methods to NetworkSettings - Extend GetHostEndpointSettings() to discover IPv6 unicast address and gateway - Add UpdateIpv6Address() using ModifyGuestEndpointSettingRequest<IPAddress> - Push IPv6 default route to guest via UpdateDefaultRoute(AF_INET6) - Remove AF_INET6 early return in ModifyOpenPorts, use INETADDR_PORT() - Add EndpointRoute::DefaultRoute() static factory - Pass client_ip_ipv6 in devicehost options (not yet parsed by devicehost) - Remove gateway_ip from devicehost options (only needed for DHCP) - Include IPv6 DNS servers in non-tunneling DNS settings - Add ConfigurationV6 and DnsResolutionAAAA tests * cleanup and add more ipv6 tests * added test coverage and minor updates * clang format * pr feedback * format source * pr feedback * test fixes --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * Track `bind` syscall when port is 0 (#14333) * Initial work * . * pr feedback and add unit test * minor tweaks an fix use after free in logging statement * implement PR feedback * hopefully final pr feedback * pr feedback in test function * Address PR feedback: add try/catch to TrackPort and PortZeroBind queue push --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * Add iptables to list of apps to install in WSL (#14459) There were instructions already on how to install tcpdump in WSL, but iptables are also needed for the log collection to be complete, so this PR adds instructions on how to also install iptables. Co-authored-by: Andre Muezerie <andremue@linux.microsoft.com> * Update Microsoft.WSL.DeviceHost to version 1.1.39-0 (#14460) Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * Moves all Ubuntu distros to the tar-based format (#14463) * Move all supported Ubuntu images to the new format We backported the build pipeline so all current LTSes come out in the new tar-based format * Remove the appx based distros All WSL users can run tar-based distros by now, right? There is no benefit in maintaining both formats. * Enable DNS tunneling for VirtioProxy networking mode (#14461) - Allow VirtioProxy to keep EnableDnsTunneling=true in config, but clear socket-specific options (BestEffortDnsParsing, DnsTunnelingIpAddress) - Suppress dedicated DNS tunneling hvsocket for VirtioProxy; tunneling is handled through the VirtioNetworking device host instead - Set DnsTunneling flag on VirtioNetworkingFlags so the device host knows to tunnel DNS - Expand SWIOTLB kernel cmdline to cover VirtioFs and VirtioProxy - Bump DeviceHost package to 1.1.39-0 - Add VirtioProxy DNS test coverage for tunneling on/off - Skip GuestPortIsReleasedV6 on Windows 10 Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * test: disable LoopbackExplicit due to OS build 29555 regression (#14477) Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * Refactor: trim unnecessary DLL deps from COMMON_LINK_LIBRARIES (#14426) * Refactor: trim unnecessary DLL deps from COMMON_LINK_LIBRARIES - Split MSI/Wintrust install functions from wslutil.cpp into install.cpp - Remove MI.lib, wsldeps.lib, msi.lib, Wintrust.lib, computecore.lib, computenetwork.lib, Iphlpapi.lib from COMMON_LINK_LIBRARIES - Add per-target MSI_LINK_LIBRARIES, HCS_LINK_LIBRARIES, SERVICE_LINK_LIBRARIES - Delay-load msi.dll and WINTRUST.dll for wsl.exe and wslg.exe - Result: wslhost, wslrelay, wslcsdk, testplugin lose msi/wintrust startup imports; wsl.exe and wslg.exe defer msi/wintrust loading until actually needed; wslservice is the only target that imports computecore/computenetwork/Iphlpapi * minor fixes to install.cpp that were caught during PR * move to wsl::windows::common::install namespace --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * Fix wsl stuck when misconfigured cifs mount presents (#14466) * detach terminal before running mount -a * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * use _exit on error before execv in child process to avoid unintentional resource release * Add regression test * Fix clang format issue * fix all clang format issue * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * resolve ai comments * move test to unit test * Fix string literal * Overwrite fstab to resolve pipeline missing file issue --------- Co-authored-by: Feng Wang <wangfen@microsoft.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Update localization and notice scripts to target the branch that the pipeline is running on (#14492) * test: Add arm64 test distro support (#14500) * test: Add arm64 test distro support * update unit test baseline * more test baseline updates --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * test: remove duplicated DNS test coverage (#14522) * test: remove duplicated DNS test coverage * format source --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * Fix: Fail and warn the user when --uninstall is given parameters (#14524) Fail and warn the user when --uninstall is given parameters. * Localization change from build: 142847827 (#14525) Co-authored-by: WSL localization <noreply@microsoft.com> * virito net: revert to previous DNS behavior while we debug an issue with DNS over TCP (#14532) Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * devicehost: update to latest devicehost nuget with tracing improvements (#14531) Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> * fix merge issues --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com> Co-authored-by: AlmaLinux Autobot <107999298+almalinuxautobot@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Blue <OneBlue@users.noreply.github.com> Co-authored-by: WSL notice <noreply@microsoft.com> Co-authored-by: Daman Mulye <daman_mulye@hotmail.com> Co-authored-by: Andre Muezerie <108841174+andremueiot@users.noreply.github.com> Co-authored-by: Andre Muezerie <andremue@linux.microsoft.com> Co-authored-by: Carlos Nihelton <carlos.santanadeoliveira@canonical.com> Co-authored-by: Feng Wang <wang6922@outlook.com> Co-authored-by: Feng Wang <wangfen@microsoft.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
1 parent 9a0b267 commit a8205a8

35 files changed

Lines changed: 169 additions & 75 deletions

.pipelines/wsl-build-nightly-localization.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ schedules:
1717
- "master"
1818
always: true
1919

20+
variables:
21+
targetBranch: ${{ variables['Build.SourceBranchName'] }}
22+
2023
pool:
2124
vmImage: 'windows-latest'
2225

@@ -45,9 +48,10 @@ steps:
4548

4649
- powershell: |
4750
pip install --user -r tools/devops/requirements.txt
48-
python tools/devops/create-change.py . "$env:token" "WSL localization" "Localization change from build: $env:buildId" "user/localization/$env:buildId"
51+
python tools/devops/create-change.py . "$env:token" "WSL localization" "Localization change from build: $env:buildId" "user/localization/$env:buildId" "$env:targetBranch"
4952
5053
displayName: Create pull request
5154
env:
5255
token: $(GithubPRToken)
53-
buildId: $(Build.BuildId)
56+
buildId: $(Build.BuildId)
57+
targetBranch: $(targetBranch)

.pipelines/wsl-build-notice.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ trigger:
33
include:
44
- master
55

6+
variables:
7+
targetBranch: ${{ variables['Build.SourceBranchName'] }}
8+
69
pool:
710
vmImage: 'windows-latest'
811

@@ -25,9 +28,10 @@ steps:
2528

2629
- powershell: |
2730
pip install --user -r tools/devops/requirements.txt
28-
python tools/devops/create-change.py . "$env:token" "WSL notice" "Notice change from build: $env:buildId" "user/notice/$env:buildId"
31+
python tools/devops/create-change.py . "$env:token" "WSL notice" "Notice change from build: $env:buildId" "user/notice/$env:buildId" "$env:targetBranch"
2932
3033
displayName: Create pull request
3134
env:
3235
token: $(GithubPRToken)
33-
buildId: $(Build.BuildId)
36+
buildId: $(Build.BuildId)
37+
targetBranch: $(targetBranch)

localization/strings/cs-CZ/Resources.resw

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,10 @@ Návrat k sítím NAT.</value>
960960
<value>Aktualizace se nezdařila (ukončovací kód: {}).</value>
961961
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
962962
</data>
963+
<data name="MessageUninstallNoArguments" xml:space="preserve">
964+
<value>{} does not take any arguments. To unregister a distribution, use {} instead.</value>
965+
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
966+
</data>
963967
<data name="MessageUninstallFailed" xml:space="preserve">
964968
<value>Odinstalování se nezdařilo (ukončovací kód: {}).</value>
965969
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/da-DK/Resources.resw

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,10 @@ Går tilbage til NAT-netværk.</value>
960960
<value>Opdateringen mislykkedes (afslutningskode: {}).</value>
961961
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
962962
</data>
963+
<data name="MessageUninstallNoArguments" xml:space="preserve">
964+
<value>{} does not take any arguments. To unregister a distribution, use {} instead.</value>
965+
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
966+
</data>
963967
<data name="MessageUninstallFailed" xml:space="preserve">
964968
<value>Fjernelsen mislykkedes (udgangskode: {}).</value>
965969
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/de-DE/Resources.resw

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -966,6 +966,10 @@ Fallback auf NAT-Netzwerk.</value>
966966
<value>Fehler beim Aktualisieren (Exitcode: {}).</value>
967967
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
968968
</data>
969+
<data name="MessageUninstallNoArguments" xml:space="preserve">
970+
<value>{} does not take any arguments. To unregister a distribution, use {} instead.</value>
971+
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
972+
</data>
969973
<data name="MessageUninstallFailed" xml:space="preserve">
970974
<value>Fehler bei der Deinstallation (Exitcode: {}).</value>
971975
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/en-GB/Resources.resw

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,10 @@ Falling back to NAT networking.</value>
960960
<value>Update failed (exit code: {}).</value>
961961
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
962962
</data>
963+
<data name="MessageUninstallNoArguments" xml:space="preserve">
964+
<value>{} does not take any arguments. To unregister a distribution, use {} instead.</value>
965+
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
966+
</data>
963967
<data name="MessageUninstallFailed" xml:space="preserve">
964968
<value>Uninstall failed (exit code: {}).</value>
965969
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/en-US/Resources.resw

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,10 @@ Falling back to NAT networking.</value>
960960
<value>Update failed (exit code: {}).</value>
961961
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
962962
</data>
963+
<data name="MessageUninstallNoArguments" xml:space="preserve">
964+
<value>{} does not take any arguments. To unregister a distribution, use {} instead.</value>
965+
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
966+
</data>
963967
<data name="MessageUninstallFailed" xml:space="preserve">
964968
<value>Uninstall failed (exit code: {}).</value>
965969
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/es-ES/Resources.resw

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -966,6 +966,10 @@ Revirtiendo a las redes NAT.</value>
966966
<value>Error de actualización (código de salida: {}).</value>
967967
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
968968
</data>
969+
<data name="MessageUninstallNoArguments" xml:space="preserve">
970+
<value>{} does not take any arguments. To unregister a distribution, use {} instead.</value>
971+
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
972+
</data>
969973
<data name="MessageUninstallFailed" xml:space="preserve">
970974
<value>Error de desinstalación (código de salida: {}).</value>
971975
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/fi-FI/Resources.resw

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,10 @@ Palataan nat-verkkopalveluun.</value>
960960
<value>Päivitys epäonnistui (lopetuskoodi: {}).</value>
961961
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
962962
</data>
963+
<data name="MessageUninstallNoArguments" xml:space="preserve">
964+
<value>{} does not take any arguments. To unregister a distribution, use {} instead.</value>
965+
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
966+
</data>
963967
<data name="MessageUninstallFailed" xml:space="preserve">
964968
<value>Asennuksen poistaminen epäonnistui (lopetuskoodi: {}).</value>
965969
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/fr-FR/Resources.resw

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -967,6 +967,10 @@ Retour à la mise en réseau NAT.</value>
967967
<value>Échec de la mise à jour (code de sortie : {}).</value>
968968
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
969969
</data>
970+
<data name="MessageUninstallNoArguments" xml:space="preserve">
971+
<value>{} does not take any arguments. To unregister a distribution, use {} instead.</value>
972+
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
973+
</data>
970974
<data name="MessageUninstallFailed" xml:space="preserve">
971975
<value>Échec de la désinstallation (code de sortie : {}).</value>
972976
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

0 commit comments

Comments
 (0)