Skip to content

Commit c64eb18

Browse files
benhillisBen Hillis
andauthored
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>
1 parent 2844e4a commit c64eb18

File tree

4 files changed

+2
-10
lines changed

4 files changed

+2
-10
lines changed

.pipelines/build-stage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ parameters:
2424
type: object
2525
default:
2626
- 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"
2828
- target: "msixgluepackage"
2929
pattern: "gluepackage.msix"
3030
- target: "msipackage"

CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,11 @@ find_nuget_package(Wix WIX /tools/net6.0/any)
7474
if (${TARGET_PLATFORM} STREQUAL "x64")
7575
find_nuget_package(Microsoft.DXCore.Linux.amd64fre DXCORE /build/native)
7676
find_nuget_package(Microsoft.WSL.Dependencies.amd64fre WSLDEPS /build/native)
77-
find_nuget_package(Microsoft.WSL.LxUtil.amd64fre LXUTIL /build/native)
7877
endif()
7978

8079
if (${TARGET_PLATFORM} STREQUAL "arm64")
8180
find_nuget_package(Microsoft.DXCore.Linux.arm64fre DXCORE /build/native)
8281
find_nuget_package(Microsoft.WSL.Dependencies.arm64fre WSLDEPS /build/native)
83-
find_nuget_package(Microsoft.WSL.LxUtil.arm64fre LXUTIL /build/native)
8482
endif()
8583

8684
# Wsl Settings packages
@@ -152,7 +150,6 @@ file(MAKE_DIRECTORY ${GENERATED_DIR})
152150

153151
set(PACKAGE_CERTIFICATE ${GENERATED_DIR}/dev-cert.pfx)
154152
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)
156153
file(CREATE_LINK ${WSLG_SOURCE_DIR}/${TARGET_PLATFORM}/${WSLG_TS_PLUGIN_DLL} ${BIN}/${WSLG_TS_PLUGIN_DLL})
157154
file(CREATE_LINK ${WSLDEPS_SOURCE_DIR}/bin/wsldeps.dll ${BIN}/wsldeps.dll)
158155

@@ -203,7 +200,6 @@ add_compile_definitions(UNICODE
203200
WSL_DEVICE_HOST_VERSION="${WSL_DEVICE_HOST_VERSION}"
204201
COMMIT_HASH="${COMMIT_HASH}"
205202
WSL_PACKAGE_VERSION="${PACKAGE_VERSION}"
206-
LXUTIL_VERSION="${LXUTIL_VERSION}"
207203
MSRDC_VERSION="${MSRDC_VERSION}"
208204
DIRECT3D_VERSION="${DIRECT3D_VERSION}"
209205
DXCORE_VERSION="${DXCORE_VERSION}"
@@ -235,7 +231,6 @@ endif()
235231

236232
# Common link libraries
237233
link_directories(${WSLDEPS_SOURCE_DIR}/lib/)
238-
link_directories(${LXUTIL_SOURCE_DIR}/lib/)
239234
set(COMMON_LINK_LIBRARIES
240235
ws2_32.lib
241236
Userenv.lib

msipackage/package.wix.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@
242242
<File Id="RdpWinStlHelper.dll" Source="${MSRDC_SOURCE_DIR}/${TARGET_PLATFORM}/RdpWinStlHelper.dll" />
243243
<?endif?>
244244
<File Id="wsldevicehost.dll" Source="${BIN}/wsldevicehost.dll" />
245-
<File Id="lxutil.dll" Source="${BIN}/lxutil.dll" />
246245
<File Id="${WSLG_TS_PLUGIN_DLL}" Source="${BIN}/${WSLG_TS_PLUGIN_DLL}" />
247246

248247
<!-- MSRDC Plugin registration -->

packages.config

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818
<package id="Microsoft.WSL.bsdtar" version="0.0.2-2" />
1919
<package id="Microsoft.WSL.Dependencies.amd64fre" version="10.0.27820.1000-250318-1700.rs-base2-hyp" targetFramework="native" />
2020
<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" />
2222
<package id="Microsoft.WSL.Kernel" version="6.6.114.1-1" targetFramework="native" />
2323
<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" />
2624
<package id="Microsoft.WSL.TestDistro" version="2.5.7-47" />
2725
<package id="Microsoft.WSLg" version="1.0.71" />
2826
<package id="Microsoft.Xaml.Behaviors.WinUI.Managed" version="3.0.0" />

0 commit comments

Comments
 (0)