wslc: Switch port relay AcceptThread from WaitForMultipleObjects to IO completion ports

.github/actions/triage/action.yml

@@ -21,14 +21,17 @@ runs:
       - name: 'Run WTI'
         shell: pwsh
         env: 
+            INPUT_COMMENT: "${{ inputs.comment }}"
+            INPUT_ISSUE: "${{ inputs.issue }}"
+            INPUT_TOKEN: "${{ inputs.token }}"
             previous_body: "${{ inputs.previous_body }}"
         run: |
             $ErrorActionPreference = [System.Management.Automation.ActionPreference]::Stop
 
             $maybe_comment = @()
-            if (![string]::IsNullOrEmpty("${{ inputs.comment }}"))
+            if (![string]::IsNullOrEmpty($env:INPUT_COMMENT))
             {
-                $maybe_comment = @("--comment", "${{ inputs.comment }}")
+                $maybe_comment = @("--comment", $env:INPUT_COMMENT)
             }
 
             $maybe_previous_body = @()
@@ -40,4 +43,4 @@ runs:
 
             curl.exe -L https://github.com/OneBlue/wti/releases/download/v0.1.12/wti.exe -o triage/wti.exe
 
-            cd triage && .\wti.exe --issue ${{ inputs.issue }} --config config.yml --github-token "${{ inputs.token }}" --ignore-tags @maybe_comment @maybe_previous_body
+            cd triage && .\wti.exe --issue $env:INPUT_ISSUE --config config.yml --github-token $env:INPUT_TOKEN --ignore-tags @maybe_comment @maybe_previous_body

.github/copilot-instructions.md

@@ -92,7 +92,8 @@ Test execution:
 - **Requires Administrator privileges** - test.bat will fail without admin rights
 
 Test debugging:
-- Wait for debugger: `/waitfordebugger`
+- Attach WinDbgX automatically: `/attachdebugger`
+- Wait for debugger (manual attach): `/waitfordebugger`
 - Break on failure: `/breakonfailure`
 - Run in-process: `/inproc`
 

.pipelines/build-stage.yml

@@ -23,7 +23,7 @@ parameters:
   - name: targets
     type: object
     default:
-      - target: "wsl;libwsl;wslg;wslservice;wslhost;wslrelay;wslinstaller;wslinstall;init;wslserviceproxystub;wslsettings;wslinstallerproxystub;testplugin"
+      - target: "wsl;libwsl;wslg;wslservice;wslhost;wslrelay;wslinstaller;wslinstall;initramfs;wslserviceproxystub;wslsettings;wslinstallerproxystub;testplugin"
         pattern: "wsl.exe,libwsl.dll,wslg.exe,wslservice.exe,wslhost.exe,wslrelay.exe,wslinstaller.exe,wslinstall.dll,wslserviceproxystub.dll,wslsettings/wslsettings.dll,wslsettings/wslsettings.exe,wslinstallerproxystub.dll,wsldevicehost.dll,WSLDVCPlugin.dll,testplugin.dll,wsldeps.dll"
       - target: "msixgluepackage"
         pattern: "gluepackage.msix"
@@ -382,24 +382,26 @@ stages:
           - powershell: |
               $taefVersion = (Select-Xml -Path packages.config -XPath '/packages/package[@id=''Microsoft.Taef'']/@version').Node.Value
               New-Item -ItemType Directory -Path "$(ob_outputDirectory)\bundle" -Force
-              foreach ($arch in @("x64", "ARM64"))
+              # TODO: Add "ARM64" to this list once arm64 testing is supported
+              foreach ($arch in @("x64"))
               {
                 mkdir $(ob_outputDirectory)\testbin\$arch\release
 
                 Move-Item -Path "bin\$arch\release\wsltests.dll" -Destination "$(ob_outputDirectory)\testbin\$arch\release\wsltests.dll"
                 Move-Item -Path "bin\$arch\release\testplugin.dll" -Destination "$(ob_outputDirectory)\testbin\$arch\release\testplugin.dll"
                 Move-Item -Path "packages\Microsoft.Taef.$taefVersion\build\Binaries\$arch" -Destination "$(ob_outputDirectory)\testbin\$arch\release\taef"
+                Move-Item -Path "bin\$arch\cloudtest" -Destination "$(ob_outputDirectory)\testbin\$arch\cloudtest"
+
+                $TestDistroVersion = (Select-Xml -Path packages.config -XPath '/packages/package[@id=''Microsoft.WSL.TestDistro'']/@version').Node.Value
+                Copy-Item "packages\Microsoft.WSL.TestDistro.$TestDistroVersion\$arch\test_distro.tar.xz" "$(ob_outputDirectory)\testbin\$arch"
               }
 
-              Move-Item -Path "bin\x64\cloudtest" -Destination "$(ob_outputDirectory)\testbin\x64\cloudtest"
               Move-Item -Path "tools\test\test-setup.ps1" -Destination "$(ob_outputDirectory)\testbin\test-setup.ps1"
               Move-Item -Path "tools\test\CloudTest-Setup.bat" -Destination "$(ob_outputDirectory)\testbin\CloudTest-Setup.bat"
               Move-Item -Path "diagnostics\wsl.wprp" -Destination "$(ob_outputDirectory)\testbin\wsl.wprp"
               Move-Item -Path "test\linux\unit_tests" -Destination "$(ob_outputDirectory)\testbin\unit_tests"
 
               Move-Item -Path bundle\release\* -Destination $(ob_outputDirectory)\bundle
-              $TestDistroVersion = (Select-Xml -Path packages.config -XPath '/packages/package[@id=''Microsoft.WSL.TestDistro'']/@version').Node.Value
-              Copy-Item "packages\Microsoft.WSL.TestDistro.$TestDistroVersion\test_distro.tar.xz" "$(ob_outputDirectory)\testbin\x64"
 
             displayName: Move artifacts to drop directory
 

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

@@ -17,6 +17,9 @@ schedules:
     - "master"
   always: true
 
+variables:
+  targetBranch: ${{ variables['Build.SourceBranchName'] }}
+
 pool:
   vmImage: 'windows-latest'
 
@@ -45,9 +48,10 @@ steps:
 
 - powershell: |
             pip install --user -r tools/devops/requirements.txt
-            python tools/devops/create-change.py . "$env:token" "WSL localization"  "Localization change from build: $env:buildId" "user/localization/$env:buildId"
+            python tools/devops/create-change.py . "$env:token" "WSL localization"  "Localization change from build: $env:buildId" "user/localization/$env:buildId" "$env:targetBranch"
 
   displayName: Create pull request
   env:
       token: $(GithubPRToken)
-      buildId: $(Build.BuildId)
+      buildId: $(Build.BuildId)
+      targetBranch: $(targetBranch)

.pipelines/wsl-build-notice.yml

@@ -3,6 +3,9 @@ trigger:
     include:
     - master
 
+variables:
+  targetBranch: ${{ variables['Build.SourceBranchName'] }}
+
 pool:
     vmImage: 'windows-latest'
 
@@ -25,9 +28,10 @@ steps:
 
 - powershell: |
             pip install --user -r tools/devops/requirements.txt
-            python tools/devops/create-change.py . "$env:token" "WSL notice"  "Notice change from build: $env:buildId" "user/notice/$env:buildId"
+            python tools/devops/create-change.py . "$env:token" "WSL notice"  "Notice change from build: $env:buildId" "user/notice/$env:buildId" "$env:targetBranch"
 
   displayName: Create pull request
   env:
       token: $(GithubPRToken)
-      buildId: $(Build.BuildId)
+      buildId: $(Build.BuildId)
+      targetBranch: $(targetBranch)

CMakeLists.txt

@@ -16,10 +16,8 @@ endif()
 
 if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "arm64" OR "${TARGET_PLATFORM}" STREQUAL "arm64")
     set(TARGET_PLATFORM "arm64")
-    set(TEST_DISTRO_PLATFORM "arm64")
 elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "x64|amd64" OR "${TARGET_PLATFORM}" MATCHES "x64|amd64")
     set(TARGET_PLATFORM "x64")
-    set(TEST_DISTRO_PLATFORM "amd64")
 else()
     message(FATAL_ERROR "Unsupported platform: ${CMAKE_GENERATOR_PLATFORM}")
 endif()
@@ -35,6 +33,8 @@ include(FetchContent)
 
 set(FETCHCONTENT_BASE_DIR ${CMAKE_BINARY_DIR}/_deps/${TARGET_PLATFORM})
 
+# N.B. Changes to any of the FetchContent dependencies below (GSL, nlohmannjson) must be reflected in cgmanifest.json
+
 FetchContent_Declare(GSL
                      URL https://github.com/microsoft/GSL/archive/refs/tags/v4.0.0.tar.gz
                      URL_HASH SHA256=f0e32cb10654fea91ad56bde89170d78cfbf4363ee0b01d8f097de2ba49f6ce9)
@@ -188,10 +188,12 @@ endif()
 
 if (${TARGET_PLATFORM} STREQUAL "x64")
     add_compile_definitions(_AMD64_)
+    set(DISTRO_HOSTTYPE x86_64)
 endif()
 
 if (${TARGET_PLATFORM} STREQUAL "arm64")
     add_compile_definitions(_ARM64_)
+    set(DISTRO_HOSTTYPE aarch64)
 endif()
 
 add_definitions(/sdl) # Default-initialize class members
@@ -214,6 +216,7 @@ add_compile_definitions(UNICODE
                         WSL_PACKAGE_VERSION_MAJOR=${PACKAGE_VERSION_MAJOR}
                         WSL_PACKAGE_VERSION_MINOR=${PACKAGE_VERSION_MINOR}
                         WSL_PACKAGE_VERSION_REVISION=${PACKAGE_VERSION_REVISION}
+                        DISTRO_HOSTTYPE="${DISTRO_HOSTTYPE}"
                         WSL_BUILD_WSL_SETTINGS=${WSL_BUILD_WSL_SETTINGS})
 
 if (${OFFICIAL_BUILD})
@@ -250,13 +253,19 @@ set(COMMON_LINK_LIBRARIES
     Shlwapi.lib
     synchronization.lib
     Bcrypt.lib
-    Iphlpapi.lib
-    icu.lib
+    icu.lib)
+
+set(MSI_LINK_LIBRARIES
+    Wintrust.lib
+    msi.lib)
+
+set(HCS_LINK_LIBRARIES
     computecore.lib
     computenetwork.lib
+    Iphlpapi.lib)
+
+set(SERVICE_LINK_LIBRARIES
     MI.lib
-    Wintrust.lib
-    msi.lib
     wsldeps.lib)
 
 # Linux

CONTRIBUTING.md

@@ -40,12 +40,12 @@ Note that WSL distro's launch in the Windows Console (unless you have taken step
 
 ### Collect WSL logs for networking issues
 
-Install tcpdump in your WSL distribution using the following commands.
+Install iptables and tcpdump in your WSL distribution using the following commands.
 Note: This will not work if WSL has Internet connectivity issues.
 
 ```
 # sudo apt-get update
-# sudo apt-get -y install tcpdump
+# sudo apt-get -y install iptables tcpdump
 ```
 
 Install [WPR](https://learn.microsoft.com/windows-hardware/test/wpt/windows-performance-recorder)