Remove lxutil.dll dependency and update Microsoft.WSL.DeviceHost to version 1.0.0-20251201.1 (#13633)
Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Ben Hillis committed
Dec 2, 2025 at 20:05 UTC
c64eb180d826cbc0ea25cb21418ee99601f08021
4 files changed
+2
-10
.pipelines/build-stage.yml
+1
-1
@@ -24,7 +24,7 @@ parameters:
24
type: object
25
default:
26
- target: "wsl;libwsl;wslg;wslservice;wslhost;wslrelay;wslinstaller;wslinstall;initramfs;wslserviceproxystub;wslsettings;wslinstallerproxystub;testplugin"
27
- pattern: "wsl.exe,libwsl.dll,wslg.exe,wslservice.exe,wslhost.exe,wslrelay.exe,wslinstaller.exe,wslinstall.dll,wslserviceproxystub.dll,wslsettings.dll,wslsettings.exe,wslinstallerproxystub.dll,wsldevicehost.dll,lxutil.dll,WSLDVCPlugin.dll,testplugin.dll,wsldeps.dll"
27
+ pattern: "wsl.exe,libwsl.dll,wslg.exe,wslservice.exe,wslhost.exe,wslrelay.exe,wslinstaller.exe,wslinstall.dll,wslserviceproxystub.dll,wslsettings.dll,wslsettings.exe,wslinstallerproxystub.dll,wsldevicehost.dll,WSLDVCPlugin.dll,testplugin.dll,wsldeps.dll"
28
- target: "msixgluepackage"
29
pattern: "gluepackage.msix"
30
- target: "msipackage"
CMakeLists.txt
-5
@@ -74,13 +74,11 @@ find_nuget_package(Wix WIX /tools/net6.0/any)
74
if (${TARGET_PLATFORM} STREQUAL "x64")
75
find_nuget_package(Microsoft.DXCore.Linux.amd64fre DXCORE /build/native)
76
find_nuget_package(Microsoft.WSL.Dependencies.amd64fre WSLDEPS /build/native)
77
- find_nuget_package(Microsoft.WSL.LxUtil.amd64fre LXUTIL /build/native)
77
endif()
78
79
if (${TARGET_PLATFORM} STREQUAL "arm64")
80
find_nuget_package(Microsoft.DXCore.Linux.arm64fre DXCORE /build/native)
81
find_nuget_package(Microsoft.WSL.Dependencies.arm64fre WSLDEPS /build/native)
83
- find_nuget_package(Microsoft.WSL.LxUtil.arm64fre LXUTIL /build/native)
82
endif()
83
84
# Wsl Settings packages
@@ -152,7 +150,6 @@ file(MAKE_DIRECTORY ${GENERATED_DIR})
150
151
set(PACKAGE_CERTIFICATE ${GENERATED_DIR}/dev-cert.pfx)
152
file(CREATE_LINK ${WSL_DEVICE_HOST_SOURCE_DIR}/bin/${TARGET_PLATFORM}/wsldevicehost.dll ${BIN}/wsldevicehost.dll)
155
-file(CREATE_LINK ${LXUTIL_SOURCE_DIR}/bin/lxutil.dll ${BIN}/lxutil.dll)
153
file(CREATE_LINK ${WSLG_SOURCE_DIR}/${TARGET_PLATFORM}/${WSLG_TS_PLUGIN_DLL} ${BIN}/${WSLG_TS_PLUGIN_DLL})
154
file(CREATE_LINK ${WSLDEPS_SOURCE_DIR}/bin/wsldeps.dll ${BIN}/wsldeps.dll)
155
@@ -203,7 +200,6 @@ add_compile_definitions(UNICODE
200
WSL_DEVICE_HOST_VERSION="${WSL_DEVICE_HOST_VERSION}"
201
COMMIT_HASH="${COMMIT_HASH}"
202
WSL_PACKAGE_VERSION="${PACKAGE_VERSION}"
206
- LXUTIL_VERSION="${LXUTIL_VERSION}"
203
MSRDC_VERSION="${MSRDC_VERSION}"
204
DIRECT3D_VERSION="${DIRECT3D_VERSION}"
205
DXCORE_VERSION="${DXCORE_VERSION}"
@@ -235,7 +231,6 @@ endif()
231
232
# Common link libraries
233
link_directories(${WSLDEPS_SOURCE_DIR}/lib/)
238
-link_directories(${LXUTIL_SOURCE_DIR}/lib/)
234
set(COMMON_LINK_LIBRARIES
235
ws2_32.lib
236
Userenv.lib
msipackage/package.wix.in
-1
@@ -242,7 +242,6 @@
242
<File Id="RdpWinStlHelper.dll" Source="${MSRDC_SOURCE_DIR}/${TARGET_PLATFORM}/RdpWinStlHelper.dll" />
243
<?endif?>
244
<File Id="wsldevicehost.dll" Source="${BIN}/wsldevicehost.dll" />
245
- <File Id="lxutil.dll" Source="${BIN}/lxutil.dll" />
245
<File Id="${WSLG_TS_PLUGIN_DLL}" Source="${BIN}/${WSLG_TS_PLUGIN_DLL}" />
246
247
<!-- MSRDC Plugin registration -->
packages.config
+1
-3
@@ -18,11 +18,9 @@
18
<package id="Microsoft.WSL.bsdtar" version="0.0.2-2" />
19
<package id="Microsoft.WSL.Dependencies.amd64fre" version="10.0.27820.1000-250318-1700.rs-base2-hyp" targetFramework="native" />
20
<package id="Microsoft.WSL.Dependencies.arm64fre" version="10.0.27820.1000-250318-1700.rs-base2-hyp" targetFramework="native" />
21
- <package id="Microsoft.WSL.DeviceHost" version="1.0.0-20251015.1" />
21
+ <package id="Microsoft.WSL.DeviceHost" version="1.0.0-20251201.1" />
22
<package id="Microsoft.WSL.Kernel" version="6.6.114.1-1" targetFramework="native" />
23
<package id="Microsoft.WSL.LinuxSdk" version="1.20.0" targetFramework="native" />
24
- <package id="Microsoft.WSL.LxUtil.amd64fre" version="10.0.26100.1-240331-1435.ge-release" />
25
- <package id="Microsoft.WSL.LxUtil.arm64fre" version="10.0.26100.1-240331-1435.ge-release" />
24
<package id="Microsoft.WSL.TestDistro" version="2.5.7-47" />
25
<package id="Microsoft.WSLg" version="1.0.71" />
26
<package id="Microsoft.Xaml.Behaviors.WinUI.Managed" version="3.0.0" />